From cbb7474d31e0380987b6264c8611b129fea911f6 Mon Sep 17 00:00:00 2001 From: fabik111 Date: Mon, 28 Apr 2025 14:39:53 +0200 Subject: [PATCH 1/4] move utilities classes to parent folder --- src/Arduino_NetworkConfigurator.cpp | 2 +- src/Arduino_NetworkConfigurator.h | 4 ++-- src/ConfiguratorAgents/AgentsManager.cpp | 2 +- src/ConfiguratorAgents/agents/BLE/BLEAgent.h | 2 +- src/ConfiguratorAgents/agents/Serial/SerialAgent.h | 2 +- src/Utility/{LEDFeedback => }/LEDFeedback.cpp | 0 src/Utility/{LEDFeedback => }/LEDFeedback.h | 0 src/Utility/{ResetInput => }/ResetInput.cpp | 2 +- src/Utility/{ResetInput => }/ResetInput.h | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename src/Utility/{LEDFeedback => }/LEDFeedback.cpp (100%) rename src/Utility/{LEDFeedback => }/LEDFeedback.h (100%) rename src/Utility/{ResetInput => }/ResetInput.cpp (97%) rename src/Utility/{ResetInput => }/ResetInput.h (100%) diff --git a/src/Arduino_NetworkConfigurator.cpp b/src/Arduino_NetworkConfigurator.cpp index 5e0b0f4..9d656e2 100644 --- a/src/Arduino_NetworkConfigurator.cpp +++ b/src/Arduino_NetworkConfigurator.cpp @@ -12,7 +12,7 @@ #include #include "ConnectionHandlerDefinitions.h" #include "ConfiguratorAgents/MessagesDefinitions.h" -#include "Utility/LEDFeedback/LEDFeedback.h" + #ifdef BOARD_HAS_WIFI #include "WiFiConnectionHandler.h" #endif diff --git a/src/Arduino_NetworkConfigurator.h b/src/Arduino_NetworkConfigurator.h index fe6c7bc..a8b0076 100644 --- a/src/Arduino_NetworkConfigurator.h +++ b/src/Arduino_NetworkConfigurator.h @@ -16,8 +16,8 @@ #include #include #include -#include "Utility/ResetInput/ResetInput.h" -#include "Utility/LEDFeedback/LEDFeedback.h" +#include "Utility/ResetInput.h" +#include "Utility/LEDFeedback.h" /** * @enum NetworkConfiguratorStates diff --git a/src/ConfiguratorAgents/AgentsManager.cpp b/src/ConfiguratorAgents/AgentsManager.cpp index b9ce385..a507228 100644 --- a/src/ConfiguratorAgents/AgentsManager.cpp +++ b/src/ConfiguratorAgents/AgentsManager.cpp @@ -13,7 +13,7 @@ #include #include "AgentsManager.h" #include "NetworkOptionsDefinitions.h" -#include "Utility/LEDFeedback/LEDFeedback.h" +#include "Utility/LEDFeedback.h" /****************************************************************************** * PUBLIC MEMBER FUNCTIONS diff --git a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h b/src/ConfiguratorAgents/agents/BLE/BLEAgent.h index d9b45d0..52f58fa 100644 --- a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h +++ b/src/ConfiguratorAgents/agents/BLE/BLEAgent.h @@ -17,7 +17,7 @@ #include "BLECharacteristic.h" #include "ConfiguratorAgents/agents/ConfiguratorAgent.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" -#include "Utility/LEDFeedback/LEDFeedback.h" +#include "Utility/LEDFeedback.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" #define BASE_LOCAL_NAME "Arduino" diff --git a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h b/src/ConfiguratorAgents/agents/Serial/SerialAgent.h index abcdb85..1e8535b 100644 --- a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h +++ b/src/ConfiguratorAgents/agents/Serial/SerialAgent.h @@ -12,7 +12,7 @@ #include "ConfiguratorAgents/agents/ConfiguratorAgent.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" -#include "Utility/LEDFeedback/LEDFeedback.h" +#include "Utility/LEDFeedback.h" /** * @class SerialAgentClass diff --git a/src/Utility/LEDFeedback/LEDFeedback.cpp b/src/Utility/LEDFeedback.cpp similarity index 100% rename from src/Utility/LEDFeedback/LEDFeedback.cpp rename to src/Utility/LEDFeedback.cpp diff --git a/src/Utility/LEDFeedback/LEDFeedback.h b/src/Utility/LEDFeedback.h similarity index 100% rename from src/Utility/LEDFeedback/LEDFeedback.h rename to src/Utility/LEDFeedback.h diff --git a/src/Utility/ResetInput/ResetInput.cpp b/src/Utility/ResetInput.cpp similarity index 97% rename from src/Utility/ResetInput/ResetInput.cpp rename to src/Utility/ResetInput.cpp index ddfc1f2..7e2458e 100644 --- a/src/Utility/ResetInput/ResetInput.cpp +++ b/src/Utility/ResetInput.cpp @@ -9,7 +9,7 @@ #if NETWORK_CONFIGURATOR_COMPATIBLE #include "ResetInput.h" -#include "Utility/LEDFeedback/LEDFeedback.h" +#include "Utility/LEDFeedback.h" ResetInput &ResetInput::getInstance() { static ResetInput instance; diff --git a/src/Utility/ResetInput/ResetInput.h b/src/Utility/ResetInput.h similarity index 100% rename from src/Utility/ResetInput/ResetInput.h rename to src/Utility/ResetInput.h From 893eef49634097e46e284bcb3d571166e159fc02 Mon Sep 17 00:00:00 2001 From: fabik111 Date: Mon, 28 Apr 2025 15:03:55 +0200 Subject: [PATCH 2/4] rename Utility->utility --- src/Arduino_NetworkConfigurator.h | 4 ++-- src/ConfiguratorAgents/AgentsManager.cpp | 2 +- src/ConfiguratorAgents/agents/BLE/BLEAgent.h | 2 +- src/ConfiguratorAgents/agents/Serial/SerialAgent.h | 2 +- src/{Utility => utility}/LEDFeedback.cpp | 0 src/{Utility => utility}/LEDFeedback.h | 0 src/{Utility => utility}/ResetInput.cpp | 2 +- src/{Utility => utility}/ResetInput.h | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename src/{Utility => utility}/LEDFeedback.cpp (100%) rename src/{Utility => utility}/LEDFeedback.h (100%) rename src/{Utility => utility}/ResetInput.cpp (98%) rename src/{Utility => utility}/ResetInput.h (100%) diff --git a/src/Arduino_NetworkConfigurator.h b/src/Arduino_NetworkConfigurator.h index a8b0076..772d3a8 100644 --- a/src/Arduino_NetworkConfigurator.h +++ b/src/Arduino_NetworkConfigurator.h @@ -16,8 +16,8 @@ #include #include #include -#include "Utility/ResetInput.h" -#include "Utility/LEDFeedback.h" +#include "utility/ResetInput.h" +#include "utility/LEDFeedback.h" /** * @enum NetworkConfiguratorStates diff --git a/src/ConfiguratorAgents/AgentsManager.cpp b/src/ConfiguratorAgents/AgentsManager.cpp index a507228..5d29311 100644 --- a/src/ConfiguratorAgents/AgentsManager.cpp +++ b/src/ConfiguratorAgents/AgentsManager.cpp @@ -13,7 +13,7 @@ #include #include "AgentsManager.h" #include "NetworkOptionsDefinitions.h" -#include "Utility/LEDFeedback.h" +#include "utility/LEDFeedback.h" /****************************************************************************** * PUBLIC MEMBER FUNCTIONS diff --git a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h b/src/ConfiguratorAgents/agents/BLE/BLEAgent.h index 52f58fa..5534d6d 100644 --- a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h +++ b/src/ConfiguratorAgents/agents/BLE/BLEAgent.h @@ -17,7 +17,7 @@ #include "BLECharacteristic.h" #include "ConfiguratorAgents/agents/ConfiguratorAgent.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" -#include "Utility/LEDFeedback.h" +#include "utility/LEDFeedback.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" #define BASE_LOCAL_NAME "Arduino" diff --git a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h b/src/ConfiguratorAgents/agents/Serial/SerialAgent.h index 1e8535b..e7a5125 100644 --- a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h +++ b/src/ConfiguratorAgents/agents/Serial/SerialAgent.h @@ -12,7 +12,7 @@ #include "ConfiguratorAgents/agents/ConfiguratorAgent.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" #include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" -#include "Utility/LEDFeedback.h" +#include "utility/LEDFeedback.h" /** * @class SerialAgentClass diff --git a/src/Utility/LEDFeedback.cpp b/src/utility/LEDFeedback.cpp similarity index 100% rename from src/Utility/LEDFeedback.cpp rename to src/utility/LEDFeedback.cpp diff --git a/src/Utility/LEDFeedback.h b/src/utility/LEDFeedback.h similarity index 100% rename from src/Utility/LEDFeedback.h rename to src/utility/LEDFeedback.h diff --git a/src/Utility/ResetInput.cpp b/src/utility/ResetInput.cpp similarity index 98% rename from src/Utility/ResetInput.cpp rename to src/utility/ResetInput.cpp index 7e2458e..0df5fc0 100644 --- a/src/Utility/ResetInput.cpp +++ b/src/utility/ResetInput.cpp @@ -9,7 +9,7 @@ #if NETWORK_CONFIGURATOR_COMPATIBLE #include "ResetInput.h" -#include "Utility/LEDFeedback.h" +#include "utility/LEDFeedback.h" ResetInput &ResetInput::getInstance() { static ResetInput instance; diff --git a/src/Utility/ResetInput.h b/src/utility/ResetInput.h similarity index 100% rename from src/Utility/ResetInput.h rename to src/utility/ResetInput.h From ca4a8ea5db95585320c40b76eebb9ae4c7cce1d5 Mon Sep 17 00:00:00 2001 From: fabik111 Date: Mon, 28 Apr 2025 15:42:32 +0200 Subject: [PATCH 3/4] reorganize configuratorAgents folder --- .../NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino | 4 ++-- extras/test/CMakeLists.txt | 8 ++++---- extras/test/src/test_provisioning_command_decode.cpp | 4 ++-- extras/test/src/test_provisioning_command_encode.cpp | 4 ++-- src/Arduino_NetworkConfigurator.cpp | 2 +- src/Arduino_NetworkConfigurator.h | 2 +- .../AgentsManager.cpp | 0 .../AgentsManager.h | 0 .../MessagesDefinitions.h | 0 .../NetworkOptionsDefinitions.h | 0 .../agents/BLE => configuratorAgents/agents}/BLEAgent.h | 6 +++--- .../BoardConfigurationProtocol.cpp | 0 .../BoardConfigurationProtocol.h | 2 +- .../agents/BoardConfigurationProtocol/CBORAdapter.cpp | 0 .../agents/BoardConfigurationProtocol/CBORAdapter.h | 2 +- .../agents/BoardConfigurationProtocol/PacketBuffer.h | 0 .../agents/BoardConfigurationProtocol/PacketManager.cpp | 0 .../agents/BoardConfigurationProtocol/PacketManager.h | 0 .../agents/BoardConfigurationProtocol/cbor/CBOR.h | 0 .../BoardConfigurationProtocol/cbor/CBORInstances.h | 0 .../agents/BoardConfigurationProtocol/cbor/Decoder.cpp | 0 .../agents/BoardConfigurationProtocol/cbor/Decoder.h | 0 .../agents/BoardConfigurationProtocol/cbor/Encoder.cpp | 0 .../agents/BoardConfigurationProtocol/cbor/Encoder.h | 0 .../BoardConfigurationProtocol/cbor/ProvisioningMessage.h | 2 +- .../agents/ConfiguratorAgent.h | 4 ++-- .../Serial => configuratorAgents/agents}/SerialAgent.h | 6 +++--- 27 files changed, 23 insertions(+), 23 deletions(-) rename src/{ConfiguratorAgents => configuratorAgents}/AgentsManager.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/AgentsManager.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/MessagesDefinitions.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/NetworkOptionsDefinitions.h (100%) rename src/{ConfiguratorAgents/agents/BLE => configuratorAgents/agents}/BLEAgent.h (98%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h (98%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/CBORAdapter.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/CBORAdapter.h (97%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/PacketBuffer.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/PacketManager.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/PacketManager.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/CBOR.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/CBORInstances.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/Decoder.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/Decoder.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/Encoder.cpp (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/Encoder.h (100%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h (98%) rename src/{ConfiguratorAgents => configuratorAgents}/agents/ConfiguratorAgent.h (96%) rename src/{ConfiguratorAgents/agents/Serial => configuratorAgents/agents}/SerialAgent.h (96%) diff --git a/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino b/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino index d832a2a..1bb8e6c 100644 --- a/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino +++ b/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include KVStore kvstore; BLEAgentClass BLEAgent; diff --git a/extras/test/CMakeLists.txt b/extras/test/CMakeLists.txt index 1393140..d8e0556 100644 --- a/extras/test/CMakeLists.txt +++ b/extras/test/CMakeLists.txt @@ -46,8 +46,8 @@ endif() include_directories(include) include_directories(../../src) -include_directories(../../src/ConfiguratorAgents) -include_directories(../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor) +include_directories(../../src/configuratorAgents) +include_directories(../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor) # add_library(cloudutils STATIC IMPORTED GLOBAL) add_library(cloudutils INTERFACE) @@ -98,8 +98,8 @@ set(TEST_SRCS ) set(TEST_DUT_SRCS - ../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp - ../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp + ../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp + ../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp ${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder.c ${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder_close_container_checked.c diff --git a/extras/test/src/test_provisioning_command_decode.cpp b/extras/test/src/test_provisioning_command_decode.cpp index 8571697..7346e1a 100644 --- a/extras/test/src/test_provisioning_command_decode.cpp +++ b/extras/test/src/test_provisioning_command_decode.cpp @@ -13,8 +13,8 @@ #include #include - #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h" - #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" + #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h" + #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" #include /****************************************************************************** diff --git a/extras/test/src/test_provisioning_command_encode.cpp b/extras/test/src/test_provisioning_command_encode.cpp index 28ef8f5..c137ee1 100644 --- a/extras/test/src/test_provisioning_command_encode.cpp +++ b/extras/test/src/test_provisioning_command_encode.cpp @@ -11,8 +11,8 @@ #include #include #include - #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h" - #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" + #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h" + #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" /****************************************************************************** TEST CODE diff --git a/src/Arduino_NetworkConfigurator.cpp b/src/Arduino_NetworkConfigurator.cpp index 9d656e2..85bf4a0 100644 --- a/src/Arduino_NetworkConfigurator.cpp +++ b/src/Arduino_NetworkConfigurator.cpp @@ -11,7 +11,7 @@ #include #include "ConnectionHandlerDefinitions.h" -#include "ConfiguratorAgents/MessagesDefinitions.h" +#include "configuratorAgents/MessagesDefinitions.h" #ifdef BOARD_HAS_WIFI #include "WiFiConnectionHandler.h" diff --git a/src/Arduino_NetworkConfigurator.h b/src/Arduino_NetworkConfigurator.h index 772d3a8..ff1d1db 100644 --- a/src/Arduino_NetworkConfigurator.h +++ b/src/Arduino_NetworkConfigurator.h @@ -12,7 +12,7 @@ #include "Arduino.h" #include "Arduino_ConnectionHandler.h" -#include "ConfiguratorAgents/AgentsManager.h" +#include "configuratorAgents/AgentsManager.h" #include #include #include diff --git a/src/ConfiguratorAgents/AgentsManager.cpp b/src/configuratorAgents/AgentsManager.cpp similarity index 100% rename from src/ConfiguratorAgents/AgentsManager.cpp rename to src/configuratorAgents/AgentsManager.cpp diff --git a/src/ConfiguratorAgents/AgentsManager.h b/src/configuratorAgents/AgentsManager.h similarity index 100% rename from src/ConfiguratorAgents/AgentsManager.h rename to src/configuratorAgents/AgentsManager.h diff --git a/src/ConfiguratorAgents/MessagesDefinitions.h b/src/configuratorAgents/MessagesDefinitions.h similarity index 100% rename from src/ConfiguratorAgents/MessagesDefinitions.h rename to src/configuratorAgents/MessagesDefinitions.h diff --git a/src/ConfiguratorAgents/NetworkOptionsDefinitions.h b/src/configuratorAgents/NetworkOptionsDefinitions.h similarity index 100% rename from src/ConfiguratorAgents/NetworkOptionsDefinitions.h rename to src/configuratorAgents/NetworkOptionsDefinitions.h diff --git a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h b/src/configuratorAgents/agents/BLEAgent.h similarity index 98% rename from src/ConfiguratorAgents/agents/BLE/BLEAgent.h rename to src/configuratorAgents/agents/BLEAgent.h index 5534d6d..813d5a1 100644 --- a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h +++ b/src/configuratorAgents/agents/BLEAgent.h @@ -15,10 +15,10 @@ #include "utility/HCI.h" #include "BLEStringCharacteristic.h" #include "BLECharacteristic.h" -#include "ConfiguratorAgents/agents/ConfiguratorAgent.h" -#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" +#include "configuratorAgents/agents/ConfiguratorAgent.h" +#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" #include "utility/LEDFeedback.h" -#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" +#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" #define BASE_LOCAL_NAME "Arduino" #define ARDUINO_COMPANY_ID 0x09A3 diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp rename to src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h similarity index 98% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h index 4db3bba..3a82291 100644 --- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h +++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h @@ -9,7 +9,7 @@ #pragma once #include #include "PacketManager.h" -#include "ConfiguratorAgents/MessagesDefinitions.h" +#include "configuratorAgents/MessagesDefinitions.h" /** * @class BoardConfigurationProtocol diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp rename to src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h similarity index 97% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h index 40917df..88fc856 100644 --- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h +++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h @@ -8,7 +8,7 @@ #pragma once #include "Arduino.h" -#include "ConfiguratorAgents/MessagesDefinitions.h" +#include "configuratorAgents/MessagesDefinitions.h" #include "settings/settings.h" #include "cbor/CBOR.h" #include "./cbor/CBOR.h" diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h similarity index 100% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h similarity index 98% rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h index 383c9ef..ac9d467 100644 --- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h +++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #define UHWID_SIZE 32 #define PROVISIONING_JWT_SIZE 269 // Max length of jwt is 268 + \0 diff --git a/src/ConfiguratorAgents/agents/ConfiguratorAgent.h b/src/configuratorAgents/agents/ConfiguratorAgent.h similarity index 96% rename from src/ConfiguratorAgents/agents/ConfiguratorAgent.h rename to src/configuratorAgents/agents/ConfiguratorAgent.h index 4022e11..32cd731 100644 --- a/src/ConfiguratorAgents/agents/ConfiguratorAgent.h +++ b/src/configuratorAgents/agents/ConfiguratorAgent.h @@ -8,8 +8,8 @@ #pragma once #include "settings/settings.h" -#include "ConfiguratorAgents/NetworkOptionsDefinitions.h" -#include "ConfiguratorAgents/MessagesDefinitions.h" +#include "configuratorAgents/NetworkOptionsDefinitions.h" +#include "configuratorAgents/MessagesDefinitions.h" #include "Arduino.h" /** diff --git a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h b/src/configuratorAgents/agents/SerialAgent.h similarity index 96% rename from src/ConfiguratorAgents/agents/Serial/SerialAgent.h rename to src/configuratorAgents/agents/SerialAgent.h index e7a5125..fdab7cc 100644 --- a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h +++ b/src/configuratorAgents/agents/SerialAgent.h @@ -9,9 +9,9 @@ #pragma once #include #include "Arduino.h" -#include "ConfiguratorAgents/agents/ConfiguratorAgent.h" -#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" -#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" +#include "configuratorAgents/agents/ConfiguratorAgent.h" +#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h" +#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h" #include "utility/LEDFeedback.h" /** From 5da0abaf7b6ae23035fbf0028bf90ed2b049da76 Mon Sep 17 00:00:00 2001 From: fabik111 Date: Mon, 28 Apr 2025 16:37:29 +0200 Subject: [PATCH 4/4] update test --- .github/workflows/compile-examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml index 1644caf..8e3d1e0 100644 --- a/.github/workflows/compile-examples.yml +++ b/.github/workflows/compile-examples.yml @@ -30,7 +30,7 @@ jobs: - source-path: ./ - name: Arduino_DebugUtils - source-url: https://github.com/fabik111/Arduino_ConnectionHandler.git - version: 0314cf54593029aea05bb8c179e40a26128f7d67 + version: 54b93d64da130f653fb437819c22fb89b78732d0 - source-url: https://github.com/arduino-libraries/ArduinoBLE.git - source-url: https://github.com/arduino-libraries/Arduino_CloudUtils.git - source-url: https://github.com/arduino-libraries/Arduino_KVStore.git