tidy up

.vscode/settings.json

@@ -78,5 +78,5 @@
   },
 
   "idf.currentSetup": "C:\\esp\\v5.4.3\\esp-idf",
-  "idf.port": "COM4"
+  "idf.port": "COM16"
 }

CMakeLists.txt

@@ -20,6 +20,6 @@ else()
             )
         include($ENV{IDF_PATH}/tools/cmake/project.cmake)
         message("Using Main App")
-        project(WatchController)
+        project(LeoLightShow)
     endif()
 endif()

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

dependencies.lock

@@ -1,21 +1,10 @@
 dependencies:
-  frozen-eye/esp_telnet:
-    component_hash: e00a16d6372fa31df46b32e330847d6e09af2ec184d8c7cac4d183b3daac02e5
-    dependencies:
-    - name: idf
-      require: private
-      version: '>=4.0'
-    source:
-      registry_url: https://components.espressif.com/
-      type: service
-    version: 0.0.2
   idf:
     source:
       type: idf
     version: 5.4.3
 direct_dependencies:
-- frozen-eye/esp_telnet
 - idf
-manifest_hash: f3dbb2beffe19f6e4fa3818b79ea2bfac679eaaf47effee78f152007a2be54f5
+manifest_hash: f963becbad30dee4a0a46222b7f0ae7dd40100701f7b7147a846011f8dabe9ca
 target: esp32
 version: 2.0.0

main/Kconfig.projbuild

@@ -1,28 +0,0 @@
-menu "Example Configuration"
-
-    config DEVICE_WIFI_SSID
-        string "Wi-Fi SSID"
-        default "eth2ap"
-        help
-            Set the SSID of Wi-Fi ap interface.
-
-    config DEVICE_WIFI_PASSWORD
-        string "Wi-Fi Password"
-        default "12345678"
-        help
-            Set the password of Wi-Fi ap interface.
-
-    config DEVICE_WIFI_CHANNEL
-        int "WiFi channel"
-        range 1 13
-        default 1
-        help
-            Set the channel of Wi-Fi ap.
-
-    config DEVICE_MAX_STA_CONN
-        int "Maximum STA connections"
-        default 4
-        help
-            Maximum number of the station that allowed to connect to current Wi-Fi hotspot.
-
-endmenu

main/idf_component.yml

@@ -1,6 +0,0 @@
-## IDF Component Manager Manifest File
-# https://docs.espressif.com/projects/idf-component-manager/en/latest/reference/manifest_file.html
-# https://components.espressif.com
-
-dependencies:
-  frozen-eye/esp_telnet: "^0.0.2"

main/lighsMain.hpp

@@ -1,8 +1,6 @@
 /**
  * @file watchMain.hpp
  * @author Gustice
- *
- * @copyright Copyright (c) 2024
  */
 #pragma once
 
@@ -10,6 +8,11 @@
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
+#include <chrono>
+#include <string>
+#include <map>
+#include <vector>
+
 #include "sdkconfig.h"
 #include "esp_event.h"
 #include "esp_log.h"
@@ -43,7 +46,5 @@
 #include "spit_player.hpp"
 #include "spit_type.hpp"
 #include "spit_client.hpp"
-#include <chrono>
+#include "addressableLeRtz.hpp"
-#include <string>
+#include "systemFunctions.hpp"
-#include <map>
-#include <vector>

main/lightsMain.cpp

@@ -13,6 +13,9 @@
 //    ETH_PHY_LAN8720,      // eth_type,
 //    ETH_CLOCK_GPIO0_IN	// eth_clk_mode as input
 //  },
+//
+// LED-Strips: 14 - 22 - 30
+// >> update http://172.16.16.10:8000/LeoLightShow.bin
 
 #include "config.hpp"
 #include "lighsMain.hpp"
@@ -22,63 +25,32 @@ using namespace std;
 
 string ClientName = "LeoLightsDev";
 string ProjectName = "LeoLightsProj";
+gpio_num_t LedPin = gpio_num_t::GPIO_NUM_16;
+gpio_num_t RelayPin = gpio_num_t::GPIO_NUM_18;
 
 extern "C" {  // This switch allows the ROS C-implementation to find this main
 void app_main(void);
 }
 
 struct DeviceState {
-    Color color{0x80, 0x80, 0x80};
+    Color color{0x80, 0x80, 0x40};  // Color for the chosen bottle
-    vector<uint8_t> counts;
+    vector<uint8_t> grouping;       // LED groups for LED-Strip
-    vector<uint8_t> times;
+    vector<uint8_t> times;          // Step times for effects
 };
-struct StartCommand {
+struct MasterRequest {};
-    uint8_t pos;  // 0 for none / Valid indexes 1 .. 6
+struct SlaveResponse {};
-};
+static fos::Queue<MasterRequest> commandQ(2);
-static fos::Queue<StartCommand> commandQ(2);
+static fos::Queue<SlaveResponse> responseQ(2);
 
 DeviceState State;
 static const char* TAG = "Light";
-
+static const char* VERSION = "V 0.7.0";
 unique_ptr<Cli> pShell;
 
 void onCommand(string name, Cli::CArgs args) {
     ESP_LOGI(TAG, "Invoking: %s", name.c_str());
 }
 
-void startUpdate(Cli::CArgs args) {
-    ESP_LOGI(TAG, "Invoking Update");
-    if (args.size() != 1) {
-        pShell->writeLine("Need URL to application");
-        return;
-    }
-    // @ToDo: Start Update here
-}
-
-void getConfig(Cli::CArgs args) {
-    if (args.size() != 1) {
-        pShell->writeLine("Needs string key for query");
-        return;
-    }
-    auto key = args[0];
-    auto& store = NvsApi::getInstance();
-    auto val = store.getValue(key);
-    pShell->writeLine(key + ": " + val + "");
-}
-
-void setConfig(Cli::CArgs args) {
-    if (args.size() != 2) {
-        pShell->writeLine("Needs string key and value");
-        return;
-    }
-    auto key = args[0];
-    auto val = args[1];
-
-    auto& store = NvsApi::getInstance();
-    pShell->writeLine(string{"Storing value = '"} + val + "'");
-    store.setValue(key, val);
-}
-
 void setLogServerConfig(Cli::CArgs args) {
     ESP_LOGI(TAG, "on showLogServerConfig:");
     auto& store = NvsApi::getInstance();
@@ -94,7 +66,7 @@ void setLogServerConfig(Cli::CArgs args) {
 
 void testLights(Cli::CArgs args) {
     ESP_LOGI(TAG, "on testLights:");
-    commandQ.enqueue(make_unique<StartCommand>());
+    commandQ.enqueue(make_unique<MasterRequest>());
 }
 
 void showProcessValues(Cli::CArgs args) {
@@ -103,7 +75,7 @@ void showProcessValues(Cli::CArgs args) {
 
     sprintf(buff, "%02x,%02x,%02x", State.color.getRed(), State.color.getGreen(), State.color.getBlue());
     std::stringstream ssC;
-    for (auto& c : State.counts) {
+    for (auto& c : State.grouping) {
         ssC << string{c} << ",";
     }
     std::stringstream ssT;
@@ -115,24 +87,6 @@ void showProcessValues(Cli::CArgs args) {
     pShell->writeLine(string{"    Switch-Times: "} + ssT.str());
 }
 
-void setSyslogLevel(Cli::CArgs args) {
-    if (args.size() != 1) {
-        pShell->writeLine("Needs SyslogLevel Warning = 4, Notice = 5, Informational = 6, Debug = 7");
-        return;
-    }
-
-    try {
-        auto lvl = stoi(args[0]);
-        if (lvl >= (int)Syslog::Severity::Warning && lvl <= (int)Syslog::Severity::Debug) {
-            Syslog::setSeverity((Syslog::Severity)lvl);
-        } else {
-            pShell->writeLine("New level was not accepted");
-        }
-    } catch (const exception& e) {
-        ESP_LOGI(TAG, "Failed to parse %s", args[0].c_str());
-    }
-}
-
 /**
  * @brief Telnet socket via TCP/IP
  *
@@ -146,22 +100,14 @@ static void telnetSocketTask(int addrFamily) {
         telnet.run(
             [](TcpSession& session) {
                 pShell = make_unique<Cli>(session, [](string n, Cli::CArgs a) { onCommand(n, a); });
-                pShell->addBinding(
-                    {"update", "Start OTA-Update-Process",
-                     [](Cli::CArgs a) { startUpdate(a); }});
                 pShell->addBinding(
                     {"setLogserver", "Set log server config ip",
                      [](Cli::CArgs a) { setLogServerConfig(a); }});
-                pShell->addBinding(
+                
-                    {"setLogLevel", "Set severity log server",
+                Syslog::registerCli(*pShell);
-                     [](Cli::CArgs a) { setSyslogLevel(a); }});
+                auto& store = NvsApi::getInstance();
-
+                store.registerCli(*pShell);
-                pShell->addBinding(
+                SystemFunctions::registerCli(*pShell);
-                    {"getcfg", "Get configuration value for key",
-                     [](Cli::CArgs a) { getConfig(a); }});
-                pShell->addBinding(
-                    {"setcfg", "Set configuration value by key and value",
-                     [](Cli::CArgs a) { setConfig(a); }});
 
                 pShell->addBinding(
                     {"setDyn", "set dynamics of movement (velocity,accelerations) as floats",
@@ -184,29 +130,62 @@ void startShow(string data) {
     ESP_LOGI(TAG, "StartShuffle command %s", data.c_str());
     try {
         Syslog::logv(Syslog::Severity::Informational, "got Shuffle-Command");
-        commandQ.enqueue(make_unique<StartCommand>());
+        commandQ.enqueue(make_unique<MasterRequest>());
     } catch (const exception& e) {
         ESP_LOGE(TAG, "Error to process data %s, with ex: %s", data.c_str(), e.what());
     }
 }
 
+constexpr uint32_t DmxUniverse = 0;
+constexpr int DmxChannelCount = 9;
+array<uint8_t, 512> LedData;
+
+static void UniverseCallback(const uint8_t* data, const uint16_t size) {
+    ESP_LOGD(TAG, "Got DMX");
+    ESP_LOG_BUFFER_HEXDUMP("DMX", data, size, ESP_LOG_DEBUG);
+    Syslog::logv(Syslog::Severity::Debug, "Got DMX: r%0x g%0x b%0x i%0x  ...",
+                 /* RGB*/ data[0], data[1], data[2], /*Intens*/ data[3]);
+
+    // DMX 512
+    for (int i = 0; i < LedData.size() / 4;) {
+        LedData[i] = data[i];
+        i++;
+        LedData[i] = data[i];
+        i++;
+        LedData[i] = data[i];
+        i++;
+        LedData[i] = data[i];
+        i++;
+    }
+}
+
 /**
  * @brief DMX-Socket for ArtNet TCP/IP
  *
  * @details Tested with [Q Light Controller+](https://www.qlcplus.org/)
  * @param args ignored task argument
  */
-static void dmxSocketSenderTask(UdpSocket& socket) {
+static void dmxSocketTask(int addrFamily) {
+    ESP_LOGI(TAG, "Starting ArtNet task");
+    constexpr uint16_t ArtNetPort = arx::artnet::DEFAULT_PORT;
+    IpAdr address = addrFamily == AF_INET ? IpAdr(INADDR_ANY, ArtNetPort) : IpAdr(ArtNetPort);
+
     try {
-        ArtnetSender artnet(socket);
+        while (true) {
-        array<uint8_t, 16> data;
+            UdpSocket socket(address);
-        while (socket.isActive()) {
+            socket.bindTo();
-            data[0]++;
+
-            artnet.send("", 0, data.data(), data.size());
+            ArtnetReceiver artnet(socket);
-            fos::Task::delayMs(500);
+            artnet.subscribe(DmxUniverse, UniverseCallback);
+            artnet.parse();
+            // parse artnet as long socket is active, then restart socket
+            while (socket.isActive()) {
+                ESP_LOGD(TAG, "Waiting for data");
+                artnet.parse();
+            }
         }
 
-    } catch (const exception& e) {
+    } catch (const std::exception& e) {
         ESP_LOGE("UDP", "%s", e.what());
     }
 }
@@ -285,31 +264,19 @@ const Macro macDemoFlicker = {
 void LightingTask() {
     ESP_LOGI(TAG, "Start Lighting");
     auto const& colorSource = State.color;
-    array<Effect::EffectProcessor, 2> processors{
-        Effect::EffectProcessor(8),
-        Effect::EffectProcessor(8)};
-    processors[0].setEffect(Effect::macDark, &colorSource, 0);
-    processors[1].setEffect(Effect::macDark, &colorSource, 0);
 
-    const array<Effect::Macro, 2> PictoEffects{
+    AddressableLeRtz strip(LedPin, AddressableLeRtz::Type::Rgb, LedData.size() / 4);
-        Effect::macDemoPulse,
+    OutputPort relay(RelayPin);
-        Effect::macDemoPulse};
+    relay.write(true);
 
     while (true) {
-        // ESP_LOGI(TAG, "Current color set r%i g%i b%i ",
+        for (int i = 0; i < (LedData.size() / 4); i++) {
-        //             State.color.getRed(), State.color.getGreen(), State.color.getBlue());
+            auto* c = &LedData[i * 4];
-        //     processors[0].setEffect(Effect::macDark, &colorSource, 0);
+            Color C{c[0], c[1], c[2], c[3]};
-        //     auto idx = 0;
+            strip.set(C, i, 1);
-        //     Syslog::logv(Syslog::Severity::Informational, "Running show");
+        }
-        //     processors[idx].setEffect(PictoEffects[idx], &colorSource, 0);
+        strip.send();  // takes ca. 5ms to send all the data
-
+        fos::Task::delayMs(20);
-        // for (size_t i = 0; i < processors.size(); i++) {
-        //     auto col = processors[i].tick();
-        // }
-        // fos::Task::delayMs(40);
-        static int cnt{};
-        fos::Task::delayMs(1000);
-        printf("running %d\n", cnt++);
     }
 }
 
@@ -318,7 +285,7 @@ struct LocalSpitObj {
     string groupName;
     string name;
 };
-map<string, StartCommand> ProvidedSpitActions;
+map<string, MasterRequest> ProvidedSpitActions;
 map<string, string> ExpectedObjects;
 
 void onServerEvent(SClient::ServerEvent event, const SadDetectedServer& p_DetectedServer) {
@@ -514,8 +481,8 @@ void onPlaySpitType(string p_PlayerID, string spitTypeId, bool p_PlayerIsRunning
     if (p_Started == true) {
         auto command = ProvidedSpitActions[spitTypeId];
         // ESP_LOGI(TAG, "Player: %s is running: %s Object", p_PlayerID.data(), spitTypeId.c_str());
-        commandQ.enqueue(make_unique<StartCommand>());
+        commandQ.enqueue(make_unique<MasterRequest>());
-        Syslog::logv(Syslog::Severity::Informational, "Got SPIT command for move ot : r%d", command.pos);
+        Syslog::logv(Syslog::Severity::Informational, "Got SPIT command");
     }
 }
 
@@ -531,90 +498,83 @@ void onPlayRemoteObjectStatus(const SType& sType, const SObject& sObject, uint64
     ESP_EARLY_LOGD(TAG, "eventPlayRemoteObjectStatus RemoteSPITType: %s RemoteSPITObject: %s Position: %lld Value: %d", sType.Name.get().data(), sObject.Name.get().data(), frameInsideObject, value);
 }
 
-// void SpitClientApp() {
+void SpitClientApp() {
-//     ESP_LOGI(TAG, "Starting SPIT task");
+    ESP_LOGI(TAG, "Starting SPIT task");
 
-//     auto& provided = SpitTypes.Provided;
+    auto& provided = SpitTypes.Provided;
-//     auto& expected = SpitTypes.Expected;
+    auto& expected = SpitTypes.Expected;
-//     vector<LocalSpitObj> ProvidedObj;
-//     ProvidedSpitActions[provided.startShuffle] = MoveCommand{.type = MoveType::Shuffle, .pos = 0};
-//     ProvidedObj.push_back(LocalSpitObj{.iD = provided.startShuffle, .groupName = provided.group, .name = provided.startShuffle});
-//     ExpectedObjects[expected.changingPos] = "";
-//     for (size_t i = 0; i < 6; i++) {
-//         ProvidedSpitActions[provided.moveToX[i]] = MoveCommand{.type = MoveType::StepTo, .pos = (uint8_t)(i + 1)};
-//         ProvidedObj.push_back(LocalSpitObj{.iD = provided.moveToX[i], .groupName = provided.group, .name = provided.moveToX[i]});
-//         ExpectedObjects[expected.inPosX[i]] = "";
-//     }
 
-//     auto ip = spit::Socket::getAdaptersInfo();
+    vector<LocalSpitObj> ProvidedObj;
-//     spit::Socket socket(ip);
+    ProvidedSpitActions[provided.group] = MasterRequest{};
-//     SClient spitClient(ClientName, ProjectName, socket,
+    ProvidedObj.push_back(LocalSpitObj{.iD = provided.group, .groupName = provided.group, .name = provided.group});
-//                        {
+    ProvidedSpitActions[provided.startShow] = MasterRequest{};
-//                            .onServerEvent = onServerEvent,
+    ProvidedObj.push_back(LocalSpitObj{.iD = provided.startShow, .groupName = provided.group, .name = provided.startShow});
-//                            .onConnectionStatus = onConnectionStatus,
-//                            .onProjectUpdate = onProjectUpdate,
-//                            .onSpitType = onSpitType,
-//                            .onSpitObject = onSpitObject,
-//                            .onPlay = onPlay,
-//                            .onPlaySpitType = onPlaySpitType,
-//                            .onPlayRemoteObjectStatus = onPlayRemoteObjectStatus,
-//                            .onCheckSpitTypeVeto = onCheckSpitTypeVeto,
-//                            .onCheckSpitObjectVeto = onCheckSpitObjectVeto,
-//                        });
 
-//     for (auto& obj : ProvidedObj) {
+    ExpectedObjects[expected.showDone] = "";
-//         SType* ptrSPITType1Fix = spitClient.createTypeFixed(obj.iD, obj.groupName, obj.name, 0, 0);
-//         spitClient.setActionType(ptrSPITType1Fix->getID(), true);  // should be executed whenever a SPITObject with this SPITType is played
-//     }
-//     spitClient.clientProjectLoaded();
-//     spitClient.startServerAutoDetect();
 
-//     spitProjectFinish.take();
+    auto ip = spit::Socket::getAdaptersInfo();
-//     string serverProjectID = spitClient.getServerProjectID();
+    spit::Socket socket(ip);
-//     string serverProjectName = spitClient.getClientProjectName();
+    SClient spitClient(ClientName, ProjectName, socket,
-//     int serverFramesPerSecond = spitClient.getServerFramesPerSecond();  // set when the server reports his project, see eventProjectReport
+                       {
-//     ESP_LOGI(TAG, "eventProjectReport ID: %s Name: %s FramesPerSecond: %d", serverProjectID.data(), serverProjectName.data(), serverFramesPerSecond);
+                           .onServerEvent = onServerEvent,
+                           .onConnectionStatus = onConnectionStatus,
+                           .onProjectUpdate = onProjectUpdate,
+                           .onSpitType = onSpitType,
+                           .onSpitObject = onSpitObject,
+                           .onPlay = onPlay,
+                           .onPlaySpitType = onPlaySpitType,
+                           .onPlayRemoteObjectStatus = onPlayRemoteObjectStatus,
+                           .onCheckSpitTypeVeto = onCheckSpitTypeVeto,
+                           .onCheckSpitObjectVeto = onCheckSpitObjectVeto,
+                       });
 
-//     for (auto&& obj : ExpectedObjects) {
+    for (auto& obj : ProvidedObj) {
-//         if (obj.second == "") {
+        SType* ptrSPITType1Fix = spitClient.createTypeFixed(obj.iD, obj.groupName, obj.name, 0, 0);
-//             ESP_LOGE(TAG, "No matching Remote ID for %s", obj.first.c_str());
+        spitClient.setActionType(ptrSPITType1Fix->getID(), true);  // should be executed whenever a SPITObject with this SPITType is played
-//         }
+    }
-//     }
+    spitClient.clientProjectLoaded();
+    spitClient.startServerAutoDetect();
 
-//     while (true) {
+    spitProjectFinish.take();
-//         auto res = responseQueue.dequeue();
+    string serverProjectID = spitClient.getServerProjectID();
-//         if (res->type == ResponseType::StartMoving) {
+    string serverProjectName = spitClient.getClientProjectName();
-//             spitClient.sendRemoteObject(ExpectedObjects[expected.changingPos]);
+    int serverFramesPerSecond = spitClient.getServerFramesPerSecond();  // set when the server reports his project, see eventProjectReport
-//         } else if (res->type == ResponseType::StepAt) {
+    ESP_LOGI(TAG, "eventProjectReport ID: %s Name: %s FramesPerSecond: %d", serverProjectID.data(), serverProjectName.data(), serverFramesPerSecond);
-//             spitClient.sendRemoteObject(ExpectedObjects[expected.inPosX[res->pos - 1]]);
-//         }
-//     }
-// }
 
-// void MqttThread() {
+    for (auto&& obj : ExpectedObjects) {
-//     ESP_LOGI(TAG, "Starting MQTT task");
+        if (obj.second == "") {
+            ESP_LOGE(TAG, "No matching Remote ID for %s", obj.first.c_str());
+        }
+    }
 
-//     auto& store = NvsApi::getInstance();
+    while (true) {
-//     auto broker = store.getValue(ConfigKeys.mqttBroker);
+        auto res = responseQ.dequeue();
-//     if (broker != "") {
+        spitClient.sendRemoteObject(ExpectedObjects[expected.showDone]);
-//         ESP_LOGI(TAG, "Initializing MQTT");
+    }
-//         auto prefix = store.getValue(ConfigKeys.mqttPrefix);
+}
-//         auto& client = MqttClient::init(broker, prefix);
-//         if (!client.isRunning()) {
-//             client.addSubscription(MqttTopics.moveTo, [](string d) { startShuffle(d); });
-//             client.start();
-//         }
 
-//         while (true) {
+void MqttThread() {
-//             auto res = responseQueue.dequeue();
+    ESP_LOGI(TAG, "Starting MQTT task");
-//             if (res->type == ResponseType::StartMoving) {
+
-//                 client.publish(MqttTopics.showDone, "");
+    auto& store = NvsApi::getInstance();
-//             } else if (res->type == ResponseType::StepAt) {
+    auto broker = store.getValue(ConfigKeys.mqttBroker);
-//                 client.publish(MqttTopics.inPosition, to_string(res->pos));
+    if (broker != "") {
-//             }
+        ESP_LOGI(TAG, "Initializing MQTT");
-//         }
+        auto prefix = store.getValue(ConfigKeys.mqttPrefix);
-//     }
+        auto& client = MqttClient::init(broker, prefix);
-// }
+        if (!client.isRunning()) {
+            client.addSubscription(MqttTopics.startShow, [](string d) {
+                commandQ.enqueue(make_unique<MasterRequest>());
+            });
+            client.start();
+        }
+
+        while (true) {
+            auto res = responseQ.dequeue();
+            client.publish(MqttTopics.showDone, "");
+        }
+    }
+}
 
 void app_main(void) {
     initialize_ethernet();
@@ -624,11 +584,11 @@ void app_main(void) {
     etherActive.take();
     ESP_LOGI(TAG, "Start net services");
 
-    // static int ipVersion = AF_INET;
+    static int ipVersion = AF_INET;
-    // static fos::TaskT<int> telnetSocket(telnetSocketTask, ipVersion, "tcpServer", 4096);
+    static fos::TaskT<int> telnetSocket(telnetSocketTask, ipVersion, "tcpServer", 4096);
     // static fos::Task spit(SpitClientApp, "SpitClient");
-    // // static fos::Task mqtt(MqttThread, "MqttEndpoint");
+    // static fos::Task mqtt(MqttThread, "MqttEndpoint");
-    // // static Task otaUpdate(SystemFunctions::OtaTaskEntry, "otaTask", 8192);
+    static fos::TaskT<int> dmxNode(dmxSocketTask, ipVersion, "dmxNode", 4096);
 
     auto& store = NvsApi::getInstance();
     auto logger = store.getValue(ConfigKeys.syslogDest);
@@ -638,9 +598,12 @@ void app_main(void) {
 
     ESP_LOGI(TAG, "Configuration");
     ESP_LOGI(TAG, "%s: %s", ConfigKeys.syslogDest, store.getValue(ConfigKeys.syslogDest).c_str());
-    ESP_LOGI(TAG, "%s: %s", ConfigKeys.mqttBroker, store.getValue(ConfigKeys.mqttBroker).c_str());
+    // ESP_LOGI(TAG, "%s: %s", ConfigKeys.mqttBroker, store.getValue(ConfigKeys.mqttBroker).c_str());
-    ESP_LOGI(TAG, "%s: %s", ConfigKeys.mqttPrefix, store.getValue(ConfigKeys.mqttPrefix).c_str());
+    // ESP_LOGI(TAG, "%s: %s", ConfigKeys.mqttPrefix, store.getValue(ConfigKeys.mqttPrefix).c_str());
-    ESP_LOGI(TAG, "%s: %s", ConfigKeys.spitServer, store.getValue(ConfigKeys.spitServer).c_str());
+    // ESP_LOGI(TAG, "%s: %s", ConfigKeys.spitServer, store.getValue(ConfigKeys.spitServer).c_str());
+
+    ESP_LOGI(TAG, "## Starting : %s : %s",
+             CONFIG_LWIP_LOCAL_HOSTNAME, VERSION);
 
     while (true) {
         fos::Task::delayMs(5000);

partitions.csv

@@ -0,0 +1,8 @@
+#   Name, Type,  SubType, Offset,    Size, Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+     nvs,  data,      nvs,       ,  0x4000,
+ otadata,  data,      ota,       ,  0x2000,
+phy_init,  data,      phy,       ,  0x1000,
+   ota_0,   app,    ota_0,       ,   1536K,
+   ota_1,   app,    ota_1,       ,   1536K,
+   spiffs, data,   spiffs,       ,    936K,

sdkconfig

@@ -373,14 +373,14 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -394,26 +394,17 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 #
 # Partition Table
 #
-CONFIG_PARTITION_TABLE_SINGLE_APP=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
-#
-# Example Configuration
-#
-CONFIG_DEVICE_WIFI_SSID="eth2ap"
-CONFIG_DEVICE_WIFI_PASSWORD="12345678"
-CONFIG_DEVICE_WIFI_CHANNEL=1
-CONFIG_DEVICE_MAX_STA_CONN=4
-# end of Example Configuration
-
 #
 # Example Ethernet Configuration
 #
@@ -838,7 +829,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
 
@@ -2027,17 +2018,6 @@ CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT=y
 # CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL is not set
 CONFIG_LITTLEFS_ASSERTS=y
 # end of LittleFS
-
-#
-# Telnet Server
-#
-CONFIG_TELNET_SERVER_DEFAULT_PORT=23
-CONFIG_TELNET_SERVER_MAX_CONNECTIONS=5
-CONFIG_TELNET_SERVER_STACK_SIZE=4096
-CONFIG_TELNET_SERVER_TASK_PRIORITY=24
-CONFIG_TELNET_SERVER_TASK_CORE=0
-CONFIG_TELNET_SERVER_REDIRECT_LOGS=0
-# end of Telnet Server
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
@@ -2088,7 +2068,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

sdkconfig.defaults

@@ -23,3 +23,15 @@ 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
+
+# Enable filesystem
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+

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")

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"