From 417660c1ce34692edbbcb4880f4118bb901cf3c9 Mon Sep 17 00:00:00 2001 From: RavenSystem Date: Sun, 8 Oct 2023 16:38:58 +0200 Subject: [PATCH] Home Accessory Architect v12.9.0 Merlin --- HAA/HAA_Installer/main/header.h | 2 +- HAA/HAA_Installer/main/main.c | 2 +- HAA/HAA_Installer/main/setup.c | 237 +- HAA/HAA_Installer/main/setup.html | 2 +- HAA/HAA_Main/main/header.h | 18 +- HAA/HAA_Main/main/main.c | 214 +- HAA/HAA_Main/main/setup.c | 277 +- HAA/HAA_Main/main/setup.h | 4 +- HAA/HAA_Main/main/setup.html | 2 +- external_libs/cJSON/CMakeLists.txt | 9 - .../cJSON/cJSON/.github/CONTRIBUTING.md | 54 - external_libs/cJSON/cJSON/.gitignore | 16 - external_libs/cJSON/cJSON/.travis.yml | 28 - external_libs/cJSON/cJSON/CHANGELOG.md | 354 -- external_libs/cJSON/cJSON/CMakeLists.txt | 247 -- external_libs/cJSON/cJSON/CONTRIBUTORS.md | 48 - external_libs/cJSON/cJSON/LICENSE | 20 - external_libs/cJSON/cJSON/Makefile | 157 - external_libs/cJSON/cJSON/README.md | 531 --- external_libs/cJSON/cJSON/appveyor.yml | 86 - external_libs/cJSON/cJSON/cJSON.c | 2895 ----------------- external_libs/cJSON/cJSON/cJSON.h | 277 -- external_libs/cJSON/cJSON/cJSON_Utils.c | 1449 --------- external_libs/cJSON/cJSON/cJSON_Utils.h | 88 - external_libs/cJSON/cJSON/fuzzing/.gitignore | 1 - .../cJSON/cJSON/fuzzing/CMakeLists.txt | 28 - .../cJSON/cJSON/fuzzing/afl-prepare-linux.sh | 5 - external_libs/cJSON/cJSON/fuzzing/afl.c | 176 - external_libs/cJSON/cJSON/fuzzing/afl.sh | 9 - .../cJSON/cJSON/fuzzing/inputs/test1 | 22 - .../cJSON/cJSON/fuzzing/inputs/test10 | 1 - .../cJSON/cJSON/fuzzing/inputs/test11 | 8 - .../cJSON/cJSON/fuzzing/inputs/test2 | 11 - .../cJSON/cJSON/fuzzing/inputs/test3 | 26 - .../cJSON/cJSON/fuzzing/inputs/test3.bu | 26 - .../cJSON/cJSON/fuzzing/inputs/test3.uf | 26 - .../cJSON/cJSON/fuzzing/inputs/test3.uu | 26 - .../cJSON/cJSON/fuzzing/inputs/test4 | 88 - .../cJSON/cJSON/fuzzing/inputs/test5 | 27 - .../cJSON/cJSON/fuzzing/inputs/test6 | 16 - .../cJSON/cJSON/fuzzing/inputs/test7 | 22 - .../cJSON/cJSON/fuzzing/inputs/test8 | 13 - .../cJSON/cJSON/fuzzing/inputs/test9 | 5 - external_libs/cJSON/cJSON/fuzzing/json.dict | 47 - .../cJSON/library_config/cJSONConfig.cmake.in | 29 - .../cJSONConfigVersion.cmake.in | 11 - .../cJSON/cJSON/library_config/libcjson.pc.in | 10 - .../cJSON/library_config/libcjson_utils.pc.in | 10 - external_libs/cJSON/cJSON/test.c | 268 -- .../cJSON/cJSON/tests/CMakeLists.txt | 112 - external_libs/cJSON/cJSON/tests/cjson_add.c | 416 --- external_libs/cJSON/cJSON/tests/common.h | 122 - .../cJSON/cJSON/tests/compare_tests.c | 205 -- external_libs/cJSON/cJSON/tests/inputs/test1 | 22 - .../cJSON/cJSON/tests/inputs/test1.expected | 22 - external_libs/cJSON/cJSON/tests/inputs/test10 | 1 - .../cJSON/cJSON/tests/inputs/test10.expected | 1 - external_libs/cJSON/cJSON/tests/inputs/test11 | 8 - .../cJSON/cJSON/tests/inputs/test11.expected | 10 - external_libs/cJSON/cJSON/tests/inputs/test2 | 11 - .../cJSON/cJSON/tests/inputs/test2.expected | 18 - external_libs/cJSON/cJSON/tests/inputs/test3 | 26 - .../cJSON/cJSON/tests/inputs/test3.expected | 28 - external_libs/cJSON/cJSON/tests/inputs/test4 | 88 - .../cJSON/cJSON/tests/inputs/test4.expected | 94 - external_libs/cJSON/cJSON/tests/inputs/test5 | 27 - .../cJSON/cJSON/tests/inputs/test5.expected | 54 - external_libs/cJSON/cJSON/tests/inputs/test6 | 16 - external_libs/cJSON/cJSON/tests/inputs/test7 | 22 - .../cJSON/cJSON/tests/inputs/test7.expected | 19 - external_libs/cJSON/cJSON/tests/inputs/test8 | 13 - .../cJSON/cJSON/tests/inputs/test8.expected | 13 - external_libs/cJSON/cJSON/tests/inputs/test9 | 5 - .../cJSON/cJSON/tests/inputs/test9.expected | 1 - .../tests/json-patch-tests/.editorconfig | 10 - .../cJSON/tests/json-patch-tests/.gitignore | 4 - .../cJSON/tests/json-patch-tests/.npmignore | 2 - .../cJSON/tests/json-patch-tests/README.md | 75 - .../json-patch-tests/cjson-utils-tests.json | 91 - .../cJSON/tests/json-patch-tests/package.json | 15 - .../tests/json-patch-tests/spec_tests.json | 233 -- .../cJSON/tests/json-patch-tests/tests.json | 434 --- .../cJSON/cJSON/tests/json_patch_tests.c | 243 -- external_libs/cJSON/cJSON/tests/misc_tests.c | 555 ---- .../cJSON/cJSON/tests/misc_utils_tests.c | 80 - .../cJSON/cJSON/tests/old_utils_tests.c | 205 -- external_libs/cJSON/cJSON/tests/parse_array.c | 166 - .../cJSON/cJSON/tests/parse_examples.c | 214 -- external_libs/cJSON/cJSON/tests/parse_hex4.c | 73 - .../cJSON/cJSON/tests/parse_number.c | 110 - .../cJSON/cJSON/tests/parse_object.c | 176 - .../cJSON/cJSON/tests/parse_string.c | 135 - external_libs/cJSON/cJSON/tests/parse_value.c | 112 - .../cJSON/cJSON/tests/parse_with_opts.c | 112 - external_libs/cJSON/cJSON/tests/print_array.c | 100 - .../cJSON/cJSON/tests/print_number.c | 105 - .../cJSON/cJSON/tests/print_object.c | 101 - .../cJSON/cJSON/tests/print_string.c | 78 - external_libs/cJSON/cJSON/tests/print_value.c | 107 - .../cJSON/cJSON/tests/readme_examples.c | 258 -- .../cJSON/cJSON/tests/unity/.gitattributes | 30 - .../cJSON/cJSON/tests/unity/.gitignore | 9 - .../cJSON/cJSON/tests/unity/.travis.yml | 29 - .../cJSON/cJSON/tests/unity/README.md | 231 -- .../cJSON/tests/unity/auto/colour_prompt.rb | 118 - .../cJSON/tests/unity/auto/colour_reporter.rb | 39 - .../tests/unity/auto/generate_config.yml | 36 - .../cJSON/tests/unity/auto/generate_module.rb | 308 -- .../tests/unity/auto/generate_test_runner.rb | 454 --- .../cJSON/tests/unity/auto/parse_output.rb | 220 -- .../tests/unity/auto/stylize_as_junit.rb | 252 -- .../tests/unity/auto/test_file_filter.rb | 25 - .../cJSON/tests/unity/auto/type_sanitizer.rb | 6 - .../tests/unity/auto/unity_test_summary.py | 139 - .../tests/unity/auto/unity_test_summary.rb | 136 - .../cJSON/tests/unity/auto/unity_to_junit.py | 146 - .../docs/ThrowTheSwitchCodingStandard.md | 207 -- ...tSuitableforPrintingandPossiblyFraming.pdf | Bin 144467 -> 0 bytes .../unity/docs/UnityAssertionsReference.md | 770 ----- .../unity/docs/UnityConfigurationGuide.md | 435 --- .../unity/docs/UnityGettingStartedGuide.md | 191 -- .../unity/docs/UnityHelperScriptsGuide.md | 254 -- .../cJSON/cJSON/tests/unity/docs/license.txt | 21 - .../tests/unity/examples/example_1/makefile | 71 - .../tests/unity/examples/example_1/readme.txt | 5 - .../examples/example_1/src/ProductionCode.c | 24 - .../examples/example_1/src/ProductionCode.h | 3 - .../examples/example_1/src/ProductionCode2.c | 11 - .../examples/example_1/src/ProductionCode2.h | 2 - .../tests/unity/examples/example_2/makefile | 70 - .../tests/unity/examples/example_2/readme.txt | 5 - .../examples/example_2/src/ProductionCode.c | 24 - .../examples/example_2/src/ProductionCode.h | 3 - .../examples/example_2/src/ProductionCode2.c | 11 - .../examples/example_2/src/ProductionCode2.h | 2 - .../examples/example_3/helper/UnityHelper.c | 10 - .../examples/example_3/helper/UnityHelper.h | 12 - .../unity/examples/example_3/rakefile.rb | 43 - .../examples/example_3/rakefile_helper.rb | 249 -- .../tests/unity/examples/example_3/readme.txt | 13 - .../examples/example_3/src/ProductionCode.c | 24 - .../examples/example_3/src/ProductionCode.h | 3 - .../examples/example_3/src/ProductionCode2.c | 11 - .../examples/example_3/src/ProductionCode2.h | 2 - .../examples/example_3/target_gcc_32.yml | 46 - .../cJSON/tests/unity/examples/unity_config.h | 239 -- .../unity/extras/eclipse/error_parsers.txt | 26 - .../tests/unity/extras/fixture/rakefile.rb | 48 - .../unity/extras/fixture/rakefile_helper.rb | 178 - .../tests/unity/extras/fixture/readme.txt | 9 - .../unity/extras/fixture/src/unity_fixture.c | 432 --- .../unity/extras/fixture/src/unity_fixture.h | 83 - .../fixture/src/unity_fixture_internals.h | 51 - .../src/unity_fixture_malloc_overrides.h | 47 - .../cJSON/tests/unity/release/build.info | 2 - .../cJSON/tests/unity/release/version.info | 2 - .../cJSON/cJSON/tests/unity/src/unity.c | 1570 --------- .../cJSON/cJSON/tests/unity/src/unity.h | 503 --- .../cJSON/tests/unity/src/unity_internals.h | 870 ----- external_libs/cJSON/cJSON/valgrind.supp | 6 - external_libs/cJSON/component.mk | 8 - libs/adv_logger_ntp/adv_logger_ntp.h | 40 - libs/adv_pwm/times.txt | 0 libs/homekit-rsf/Kconfig | 29 - libs/homekit-rsf/Makefile.projbuild | 36 - libs/homekit-rsf/include/homekit/homekit.h | 3 + libs/homekit-rsf/src/server.c | 91 +- libs/homekit-rsf/src/storage.c | 10 +- libs/ping/component.mk | 8 - libs/ping/ping.c | 198 -- libs/ping/ping.h | 16 - sdk/esp-open-rtos-rsf/core/include/esp/File | 0 .../open_esplibs/include/esplibs/libmain.h | 4 +- .../open_esplibs/libmain/timers.c | 107 +- .../open_esplibs/libwpa/wpa_main.c | 13 +- 175 files changed, 611 insertions(+), 21794 deletions(-) delete mode 100644 external_libs/cJSON/CMakeLists.txt delete mode 100644 external_libs/cJSON/cJSON/.github/CONTRIBUTING.md delete mode 100644 external_libs/cJSON/cJSON/.gitignore delete mode 100644 external_libs/cJSON/cJSON/.travis.yml delete mode 100644 external_libs/cJSON/cJSON/CHANGELOG.md delete mode 100644 external_libs/cJSON/cJSON/CMakeLists.txt delete mode 100644 external_libs/cJSON/cJSON/CONTRIBUTORS.md delete mode 100644 external_libs/cJSON/cJSON/LICENSE delete mode 100644 external_libs/cJSON/cJSON/Makefile delete mode 100644 external_libs/cJSON/cJSON/README.md delete mode 100644 external_libs/cJSON/cJSON/appveyor.yml delete mode 100644 external_libs/cJSON/cJSON/cJSON.c delete mode 100644 external_libs/cJSON/cJSON/cJSON.h delete mode 100644 external_libs/cJSON/cJSON/cJSON_Utils.c delete mode 100644 external_libs/cJSON/cJSON/cJSON_Utils.h delete mode 100644 external_libs/cJSON/cJSON/fuzzing/.gitignore delete mode 100644 external_libs/cJSON/cJSON/fuzzing/CMakeLists.txt delete mode 100755 external_libs/cJSON/cJSON/fuzzing/afl-prepare-linux.sh delete mode 100644 external_libs/cJSON/cJSON/fuzzing/afl.c delete mode 100755 external_libs/cJSON/cJSON/fuzzing/afl.sh delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test1 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test10 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test11 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test2 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test3 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test3.bu delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test3.uf delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test3.uu delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test4 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test5 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test6 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test7 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test8 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/inputs/test9 delete mode 100644 external_libs/cJSON/cJSON/fuzzing/json.dict delete mode 100644 external_libs/cJSON/cJSON/library_config/cJSONConfig.cmake.in delete mode 100644 external_libs/cJSON/cJSON/library_config/cJSONConfigVersion.cmake.in delete mode 100644 external_libs/cJSON/cJSON/library_config/libcjson.pc.in delete mode 100644 external_libs/cJSON/cJSON/library_config/libcjson_utils.pc.in delete mode 100644 external_libs/cJSON/cJSON/test.c delete mode 100644 external_libs/cJSON/cJSON/tests/CMakeLists.txt delete mode 100644 external_libs/cJSON/cJSON/tests/cjson_add.c delete mode 100644 external_libs/cJSON/cJSON/tests/common.h delete mode 100644 external_libs/cJSON/cJSON/tests/compare_tests.c delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test1 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test1.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test10 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test10.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test11 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test11.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test2 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test2.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test3 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test3.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test4 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test4.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test5 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test5.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test6 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test7 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test7.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test8 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test8.expected delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test9 delete mode 100644 external_libs/cJSON/cJSON/tests/inputs/test9.expected delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/.editorconfig delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/.gitignore delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/.npmignore delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/README.md delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/cjson-utils-tests.json delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/package.json delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/spec_tests.json delete mode 100644 external_libs/cJSON/cJSON/tests/json-patch-tests/tests.json delete mode 100644 external_libs/cJSON/cJSON/tests/json_patch_tests.c delete mode 100644 external_libs/cJSON/cJSON/tests/misc_tests.c delete mode 100644 external_libs/cJSON/cJSON/tests/misc_utils_tests.c delete mode 100644 external_libs/cJSON/cJSON/tests/old_utils_tests.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_array.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_examples.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_hex4.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_number.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_object.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_string.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_value.c delete mode 100644 external_libs/cJSON/cJSON/tests/parse_with_opts.c delete mode 100644 external_libs/cJSON/cJSON/tests/print_array.c delete mode 100644 external_libs/cJSON/cJSON/tests/print_number.c delete mode 100644 external_libs/cJSON/cJSON/tests/print_object.c delete mode 100644 external_libs/cJSON/cJSON/tests/print_string.c delete mode 100644 external_libs/cJSON/cJSON/tests/print_value.c delete mode 100644 external_libs/cJSON/cJSON/tests/readme_examples.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/.gitattributes delete mode 100644 external_libs/cJSON/cJSON/tests/unity/.gitignore delete mode 100644 external_libs/cJSON/cJSON/tests/unity/.travis.yml delete mode 100644 external_libs/cJSON/cJSON/tests/unity/README.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/colour_prompt.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/colour_reporter.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/generate_config.yml delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/generate_module.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/generate_test_runner.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/parse_output.rb delete mode 100755 external_libs/cJSON/cJSON/tests/unity/auto/stylize_as_junit.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/test_file_filter.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/type_sanitizer.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.py delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/unity_test_summary.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/auto/unity_to_junit.py delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/ThrowTheSwitchCodingStandard.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/UnityAssertionsReference.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/UnityConfigurationGuide.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/UnityGettingStartedGuide.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/UnityHelperScriptsGuide.md delete mode 100644 external_libs/cJSON/cJSON/tests/unity/docs/license.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/makefile delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/readme.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_1/src/ProductionCode2.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/makefile delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/readme.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_2/src/ProductionCode2.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/helper/UnityHelper.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/rakefile_helper.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/readme.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/src/ProductionCode2.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/example_3/target_gcc_32.yml delete mode 100644 external_libs/cJSON/cJSON/tests/unity/examples/unity_config.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/eclipse/error_parsers.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/rakefile_helper.rb delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/readme.txt delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_internals.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/extras/fixture/src/unity_fixture_malloc_overrides.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/release/build.info delete mode 100644 external_libs/cJSON/cJSON/tests/unity/release/version.info delete mode 100644 external_libs/cJSON/cJSON/tests/unity/src/unity.c delete mode 100644 external_libs/cJSON/cJSON/tests/unity/src/unity.h delete mode 100644 external_libs/cJSON/cJSON/tests/unity/src/unity_internals.h delete mode 100644 external_libs/cJSON/cJSON/valgrind.supp delete mode 100644 external_libs/cJSON/component.mk delete mode 100644 libs/adv_logger_ntp/adv_logger_ntp.h delete mode 100644 libs/adv_pwm/times.txt delete mode 100644 libs/homekit-rsf/Kconfig delete mode 100644 libs/homekit-rsf/Makefile.projbuild delete mode 100644 libs/ping/component.mk delete mode 100644 libs/ping/ping.c delete mode 100644 libs/ping/ping.h delete mode 100644 sdk/esp-open-rtos-rsf/core/include/esp/File diff --git a/HAA/HAA_Installer/main/header.h b/HAA/HAA_Installer/main/header.h index c329d523..503b356d 100644 --- a/HAA/HAA_Installer/main/header.h +++ b/HAA/HAA_Installer/main/header.h @@ -11,6 +11,6 @@ #include "../../common/common_headers.h" #define INSTALLER_BETA_REVISION "" -#define INSTALLER_VERSION "7.6.0"INSTALLER_BETA_REVISION +#define INSTALLER_VERSION "7.7.0"INSTALLER_BETA_REVISION #endif // __HAA_OTA_HEADER_H__ diff --git a/HAA/HAA_Installer/main/main.c b/HAA/HAA_Installer/main/main.c index 9db683ff..41979788 100644 --- a/HAA/HAA_Installer/main/main.c +++ b/HAA/HAA_Installer/main/main.c @@ -101,7 +101,7 @@ void init_task() { wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); esp_wifi_init(&cfg); esp_wifi_set_storage(WIFI_STORAGE_RAM); - esp_wifi_set_mode(WIFI_MODE_STA); + //esp_wifi_set_mode(WIFI_MODE_APSTA); const esp_partition_t* running_partition = esp_ota_get_running_partition(); #ifdef HAABOOT diff --git a/HAA/HAA_Installer/main/setup.c b/HAA/HAA_Installer/main/setup.c index 1affba6a..35c9b4f7 100644 --- a/HAA/HAA_Installer/main/setup.c +++ b/HAA/HAA_Installer/main/setup.c @@ -84,6 +84,17 @@ void setup_set_esp_netif(esp_netif_t* esp_netif) { setup_esp_netif = esp_netif; //esp_netif_set_default_netif(esp_netif); } + +#define haa_sdk_wifi_set_opmode(mode) esp_wifi_set_mode(mode) + +#else + +void haa_sdk_wifi_set_opmode(const uint8_t opmode) { + LOCK_TCPIP_CORE(); + sdk_wifi_set_opmode(opmode); + UNLOCK_TCPIP_CORE(); +} + #endif typedef struct _wifi_network_info { @@ -125,9 +136,6 @@ typedef struct _client { uint32_t body_length; } client_t; - -static void wifi_config_station_connect(); - void setup_mode_reset_sysparam() { sysparam_create_area(SYSPARAMSECTOR, SYSPARAMSIZE, true); sysparam_init(SYSPARAMSECTOR, 0); @@ -424,9 +432,9 @@ static void wifi_config_smart_connect() { } #ifdef ESP_PLATFORM -static uint8_t wifi_config_connect(); +static void wifi_config_connect(); #else -static uint8_t wifi_config_connect(const uint8_t phy); +static void wifi_config_connect(const uint8_t phy); static void wifi_config_reset() { INFO("Wifi clean"); @@ -1124,9 +1132,7 @@ static void http_task(void *arg) { } static void wifi_config_softap_start() { - LOCK_TCPIP_CORE(); - sdk_wifi_set_opmode(STATIONAP_MODE); - UNLOCK_TCPIP_CORE(); + haa_sdk_wifi_set_opmode(STATIONAP_MODE); //sdk_wifi_set_sleep_type(WIFI_SLEEP_NONE); uint8_t macaddr[6]; @@ -1277,9 +1283,9 @@ static void on_disconnect(void *arg, esp_event_base_t event_base, int32_t event_ sdk_wifi_station_connect(); } -static uint8_t wifi_config_connect() { +static void wifi_config_connect() { #else -static uint8_t wifi_config_connect(const uint8_t phy) { +static void wifi_config_connect(const uint8_t phy) { #endif sysparam_set_string(INSTALLER_VERSION_SYSPARAM, INSTALLER_VERSION); @@ -1299,120 +1305,117 @@ static uint8_t wifi_config_connect(const uint8_t phy) { esp_wifi_set_ps(WIFI_PS_NONE); #endif - if (wifi_ssid) { #ifndef ESP_PLATFORM - wifi_config_reset(); + wifi_config_reset(); #endif - - sdk_wifi_station_disconnect(); - vTaskDelay(1); + + sdk_wifi_station_disconnect(); + vTaskDelay(1); - char* wifi_password = NULL; - sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password); - + char* wifi_password = NULL; + sysparam_get_string(WIFI_STA_PASSWORD_SYSPARAM, &wifi_password); + #ifdef ESP_PLATFORM - esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL); - esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL); - - strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1); - - if (wifi_password) { - strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1); - } + esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &on_got_ip, NULL); + esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &on_disconnect, NULL); + + strncpy((char*) sta_config.sta.ssid, wifi_ssid, sizeof(sta_config.sta.ssid) - 1); + + if (wifi_password) { + strncpy((char*) sta_config.sta.password, wifi_password, sizeof(sta_config.sta.password) - 1); + } #else - struct sdk_station_config sta_config; - memset(&sta_config, 0, sizeof(sta_config)); - - strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1); - - if (wifi_password) { - strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1); - } + struct sdk_station_config sta_config; + memset(&sta_config, 0, sizeof(sta_config)); + + strncpy((char*) sta_config.ssid, wifi_ssid, sizeof(sta_config.ssid) - 1); + + if (wifi_password) { + strncpy((char*) sta_config.password, wifi_password, sizeof(sta_config.password) - 1); + } #endif - - int8_t wifi_mode = 0; - sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode); - - uint8_t* wifi_bssid = NULL; - sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL); - - INFO_NNL("BSSID "); - if (wifi_bssid) { - INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]); - } else { - INFO("-"); - } - - INFO_NNL("Mode "); - if (wifi_mode < 2) { - if (wifi_mode == 1 && wifi_bssid) { + + int8_t wifi_mode = 0; + sysparam_get_int8(WIFI_STA_MODE_SYSPARAM, &wifi_mode); + + uint8_t* wifi_bssid = NULL; + sysparam_get_blob(WIFI_STA_BSSID_SYSPARAM, &wifi_bssid, NULL); + + INFO_NNL("BSSID "); + if (wifi_bssid) { + INFO("%02x%02x%02x%02x%02x%02x", wifi_bssid[0], wifi_bssid[1], wifi_bssid[2], wifi_bssid[3], wifi_bssid[4], wifi_bssid[5]); + } else { + INFO("-"); + } + + INFO_NNL("Mode "); + if (wifi_mode < 2) { + if (wifi_mode == 1 && wifi_bssid) { #ifdef ESP_PLATFORM - sta_config.sta.bssid_set = 1; - memcpy(sta_config.sta.bssid, wifi_bssid, 6); + sta_config.sta.bssid_set = 1; + memcpy(sta_config.sta.bssid, wifi_bssid, 6); #else - sta_config.bssid_set = 1; - memcpy(sta_config.bssid, wifi_bssid, 6); + sta_config.bssid_set = 1; + memcpy(sta_config.bssid, wifi_bssid, 6); #endif - INFO("Forced"); - - //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]); - - } else { - INFO("Normal"); - } - - LOCK_TCPIP_CORE(); - sdk_wifi_set_opmode(STATION_MODE); - UNLOCK_TCPIP_CORE(); - sdk_wifi_station_set_config(&sta_config); - sdk_wifi_station_set_auto_connect(true); - -#ifndef ESP_PLATFORM - wifi_config_toggle_phy_mode(phy); -#endif - - sdk_wifi_station_connect(); + INFO("Forced"); + //INFO("Wifi Mode: Forced BSSID %02x%02x%02x%02x%02x%02x", sta_config.bssid[0], sta_config.bssid[1], sta_config.bssid[2], sta_config.bssid[3], sta_config.bssid[4], sta_config.bssid[5]); + } else { - INFO("Roaming"); - sysparam_erase(WIFI_STA_BSSID_SYSPARAM); - LOCK_TCPIP_CORE(); - sdk_wifi_set_opmode(STATION_MODE); - UNLOCK_TCPIP_CORE(); - sdk_wifi_station_set_config(&sta_config); - sdk_wifi_station_set_auto_connect(true); - + INFO("Normal"); + } + + haa_sdk_wifi_set_opmode(STATION_MODE); + sdk_wifi_station_set_config(&sta_config); + sdk_wifi_station_set_auto_connect(true); + #ifndef ESP_PLATFORM - wifi_config_toggle_phy_mode(phy); + wifi_config_toggle_phy_mode(phy); #endif - - if (wifi_mode == 4) { - xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL); - } else { - wifi_config_smart_connect(); - } - - vTaskDelay(MS_TO_TICKS(5000)); - } - free(wifi_ssid); + sdk_wifi_station_connect(); - if (wifi_password) { - free(wifi_password); - } + } else { + INFO("Roaming"); + sysparam_erase(WIFI_STA_BSSID_SYSPARAM); + haa_sdk_wifi_set_opmode(STATION_MODE); + sdk_wifi_station_set_config(&sta_config); + sdk_wifi_station_set_auto_connect(true); - if (wifi_bssid) { - free(wifi_bssid); +#ifndef ESP_PLATFORM + wifi_config_toggle_phy_mode(phy); +#endif + + if (wifi_mode == 4) { + xTaskCreate(wifi_scan_sc_task, "SMA", (TASK_SIZE_FACTOR * 384), NULL, (tskIDLE_PRIORITY + 2), NULL); + } else { + wifi_config_smart_connect(); } - return 1; + vTaskDelay(MS_TO_TICKS(5000)); } - INFO("No Wifi config"); - return 0; + free(wifi_ssid); + + if (wifi_password) { + free(wifi_password); + } + + if (wifi_bssid) { + free(wifi_bssid); + } } static void wifi_config_station_connect() { +#ifndef ESP_PLATFORM + void connect_to_wifi() { + int8_t phy_mode = 3; + sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode); + wifi_config_connect(phy_mode); + } +#endif + vTaskDelay(1); int8_t setup_mode = 3; @@ -1420,21 +1423,35 @@ static void wifi_config_station_connect() { INFO("HAA INSTALLER"); + char *wifi_ssid = NULL; + sysparam_get_string(WIFI_STA_SSID_SYSPARAM, &wifi_ssid); + + if (wifi_ssid && setup_mode == 0) { + INFO("* NORMAL"); + #ifdef ESP_PLATFORM - if (wifi_config_connect() == 1 && setup_mode == 0) { + wifi_config_connect(); #else - int8_t phy_mode = 0; - sysparam_get_int8(WIFI_LAST_WORKING_PHY_SYSPARAM, &phy_mode); - - if (wifi_config_connect(phy_mode) == 1 && setup_mode == 0) { + connect_to_wifi(); #endif - INFO("* NORMAL"); + sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 1); xTaskCreate(wifi_config_sta_connect_timeout_task, "STI", (TASK_SIZE_FACTOR * 640), NULL, (tskIDLE_PRIORITY + 1), &context->sta_connect_timeout); } else { INFO("* SETUP"); + + wifi_config_softap_start(); + + if (wifi_ssid) { +#ifdef ESP_PLATFORM + wifi_config_connect(); +#else + connect_to_wifi(); +#endif + } + adv_logger_close_buffered_task(); vTaskDelete(context->ota_task); sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0); @@ -1443,10 +1460,12 @@ static void wifi_config_station_connect() { context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, false, NULL, auto_reboot_run); rs_esp_timer_start_forced(context->auto_reboot_timer); } - - wifi_config_softap_start(); } +#ifdef ESP_PLATFORM + esp_wifi_start(); +#endif + vTaskDelete(NULL); } diff --git a/HAA/HAA_Installer/main/setup.html b/HAA/HAA_Installer/main/setup.html index dfe3de43..15cfe6df 100644 --- a/HAA/HAA_Installer/main/setup.html +++ b/HAA/HAA_Installer/main/setup.html @@ -79,7 +79,7 @@

Please, support this project by dona
© 2018-2023 José A. Jiménez Campos
-

If you have paid for this firmware or for a device with it installed, you have been scammed. You must report the fraud to the authorities and claim the amount paid. LICENSE

+

If you have paid for this firmware or for a device with it installed, you have been scammed. LICENSE