diff --git a/components/watchFace/uTest/WatchFaceUTest.cpp b/components/watchFace/uTest/WatchFaceUTest.cpp index 9ef3476..6d059c2 100644 --- a/components/watchFace/uTest/WatchFaceUTest.cpp +++ b/components/watchFace/uTest/WatchFaceUTest.cpp @@ -2,8 +2,6 @@ * @file TestableUTest.cpp * @author Gustice * @brief - * - * @copyright Copyright (c) 2024 */ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN diff --git a/core b/core index 8d92153..1c21d08 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8d92153e82e97d19287a79a61bdac89ebba7b4b9 +Subproject commit 1c21d0840ffdf5cb3f752ce8a7ffcd5f3d060a3f diff --git a/main/lighsMain.hpp b/main/lighsMain.hpp index a7fe8bf..a3ba4b4 100644 --- a/main/lighsMain.hpp +++ b/main/lighsMain.hpp @@ -1,8 +1,6 @@ /** * @file watchMain.hpp * @author Gustice - * - * @copyright Copyright (c) 2024 */ #pragma once diff --git a/main/lightsMain.cpp b/main/lightsMain.cpp index 19c66c0..cb1abab 100644 --- a/main/lightsMain.cpp +++ b/main/lightsMain.cpp @@ -15,7 +15,7 @@ // }, // // LED-Strips: 14 - 22 - 30 -// update http://172.16.16.10:8000/WatchController.bin +// >> update http://172.16.16.10:8000/WatchController.bin #include "config.hpp" #include "lighsMain.hpp" diff --git a/sdkconfig b/sdkconfig index 2677bb0..a0cc9ad 100644 --- a/sdkconfig +++ b/sdkconfig @@ -838,7 +838,7 @@ CONFIG_HTTPD_SERVER_EVENT_POST_TIMEOUT=2000 # ESP HTTPS OTA # # CONFIG_ESP_HTTPS_OTA_DECRYPT_CB is not set -# CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP is not set +CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y CONFIG_ESP_HTTPS_OTA_EVENT_POST_TIMEOUT=2000 # end of ESP HTTPS OTA @@ -2088,7 +2088,7 @@ CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y CONFIG_GDBSTUB_SUPPORT_TASKS=y CONFIG_GDBSTUB_MAX_TASKS=32 -# CONFIG_OTA_ALLOW_HTTP is not set +CONFIG_OTA_ALLOW_HTTP=y # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 5adba1b..1e7e562 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -23,3 +23,8 @@ CONFIG_ETH_MDC_GPIO=23 CONFIG_ETH_MDIO_GPIO=33 CONFIG_ETH_PHY_RST_GPIO=5 CONFIG_ETH_PHY_ADDR=1 + +# +# OTA over plain HTTP (no TLS server in use yet) +# +CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y diff --git a/test/integration/main/movementTests.cpp b/test/integration/main/movementTests.cpp index 5f91e34..dca53ab 100644 --- a/test/integration/main/movementTests.cpp +++ b/test/integration/main/movementTests.cpp @@ -2,8 +2,6 @@ * @file watchMain.cpp * @author Gustice * @brief ChaosWatch Application - * - * @copyright Copyright (c) 2024 */ /// NOTE: Create IDF shell navigate to directory ("test/integration") diff --git a/test/unitOnTarget/main/unitTest.cpp b/test/unitOnTarget/main/unitTest.cpp index 90aea1d..b4b002d 100644 --- a/test/unitOnTarget/main/unitTest.cpp +++ b/test/unitOnTarget/main/unitTest.cpp @@ -2,8 +2,6 @@ * @file unitTest.cpp * @author Gustice * @brief Unit/Integration-Test frame for hardware bound components - * - * @copyright Copyright (c) 2024 */ #include "unity.h"