Skip to content

Commit 8b8b111

Browse files
authored
Reorganize folder structure (#5)
* move utilities classes to parent folder * rename Utility->utility * reorganize configuratorAgents folder * rename BoardConfigurationProtocol->boardConfigurationProtocol
1 parent d887ec0 commit 8b8b111

32 files changed

+31
-31
lines changed

.github/workflows/compile-examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- source-path: ./
3131
- name: Arduino_DebugUtils
3232
- source-url: https://github.com/fabik111/Arduino_ConnectionHandler.git
33-
version: 0314cf54593029aea05bb8c179e40a26128f7d67
33+
version: 54b93d64da130f653fb437819c22fb89b78732d0
3434
- source-url: https://github.com/arduino-libraries/ArduinoBLE.git
3535
- source-url: https://github.com/arduino-libraries/Arduino_CloudUtils.git
3636
- source-url: https://github.com/arduino-libraries/Arduino_KVStore.git

examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include <GenericConnectionHandler.h>
3535
#include <Arduino_KVStore.h>
3636
#include <Arduino_NetworkConfigurator.h>
37-
#include <ConfiguratorAgents/agents/BLE/BLEAgent.h>
38-
#include <ConfiguratorAgents/agents/Serial/SerialAgent.h>
37+
#include <configuratorAgents/agents/BLEAgent.h>
38+
#include <configuratorAgents/agents/SerialAgent.h>
3939

4040
KVStore kvstore;
4141
BLEAgentClass BLEAgent;

extras/test/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ endif()
4646

4747
include_directories(include)
4848
include_directories(../../src)
49-
include_directories(../../src/ConfiguratorAgents)
50-
include_directories(../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor)
49+
include_directories(../../src/configuratorAgents)
50+
include_directories(../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor)
5151

5252
# add_library(cloudutils STATIC IMPORTED GLOBAL)
5353
add_library(cloudutils INTERFACE)
@@ -98,8 +98,8 @@ set(TEST_SRCS
9898
)
9999

100100
set(TEST_DUT_SRCS
101-
../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
102-
../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
101+
../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/Decoder.cpp
102+
../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/Encoder.cpp
103103

104104
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder.c
105105
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder_close_container_checked.c

extras/test/src/test_provisioning_command_decode.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
#include <Decoder.h>
1515
#include <cbor/MessageDecoder.h>
16-
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
17-
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
16+
#include "../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/CBOR.h"
17+
#include "../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/CBORInstances.h"
1818
#include <IPAddress.h>
1919

2020
/******************************************************************************

extras/test/src/test_provisioning_command_encode.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <memory>
1212
#include <Encoder.h>
1313
#include <cbor/MessageEncoder.h>
14-
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
15-
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
14+
#include "../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/CBOR.h"
15+
#include "../../src/configuratorAgents/agents/boardConfigurationProtocol/cbor/CBORInstances.h"
1616

1717
/******************************************************************************
1818
TEST CODE

src/Arduino_NetworkConfigurator.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include <Arduino_DebugUtils.h>
1313
#include "ConnectionHandlerDefinitions.h"
14-
#include "ConfiguratorAgents/MessagesDefinitions.h"
15-
#include "Utility/LEDFeedback/LEDFeedback.h"
14+
#include "configuratorAgents/MessagesDefinitions.h"
15+
1616
#ifdef BOARD_HAS_WIFI
1717
#include "WiFiConnectionHandler.h"
1818
#endif

src/Arduino_NetworkConfigurator.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
#include "Arduino.h"
1414
#include "Arduino_ConnectionHandler.h"
15-
#include "ConfiguratorAgents/AgentsManager.h"
15+
#include "configuratorAgents/AgentsManager.h"
1616
#include <settings/settings.h>
1717
#include <Arduino_TimedAttempt.h>
1818
#include <Arduino_KVStore.h>
19-
#include "Utility/ResetInput/ResetInput.h"
20-
#include "Utility/LEDFeedback/LEDFeedback.h"
19+
#include "utility/ResetInput.h"
20+
#include "utility/LEDFeedback.h"
2121

2222
/**
2323
* @enum NetworkConfiguratorStates

src/ConfiguratorAgents/AgentsManager.cpp renamed to src/configuratorAgents/AgentsManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <settings/settings.h>
1414
#include "AgentsManager.h"
1515
#include "NetworkOptionsDefinitions.h"
16-
#include "Utility/LEDFeedback/LEDFeedback.h"
16+
#include "utility/LEDFeedback.h"
1717

1818
/******************************************************************************
1919
* PUBLIC MEMBER FUNCTIONS

src/ConfiguratorAgents/agents/BLE/BLEAgent.h renamed to src/configuratorAgents/agents/BLEAgent.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include "utility/HCI.h"
1616
#include "BLEStringCharacteristic.h"
1717
#include "BLECharacteristic.h"
18-
#include "ConfiguratorAgents/agents/ConfiguratorAgent.h"
19-
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
20-
#include "Utility/LEDFeedback/LEDFeedback.h"
21-
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
18+
#include "configuratorAgents/agents/ConfiguratorAgent.h"
19+
#include "configuratorAgents/agents/boardConfigurationProtocol/BoardConfigurationProtocol.h"
20+
#include "utility/LEDFeedback.h"
21+
#include "configuratorAgents/agents/boardConfigurationProtocol/cbor/CBORInstances.h"
2222

2323
#define BASE_LOCAL_NAME "Arduino"
2424
#define ARDUINO_COMPANY_ID 0x09A3

src/ConfiguratorAgents/agents/ConfiguratorAgent.h renamed to src/configuratorAgents/agents/ConfiguratorAgent.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
#pragma once
1010
#include "settings/settings.h"
11-
#include "ConfiguratorAgents/NetworkOptionsDefinitions.h"
12-
#include "ConfiguratorAgents/MessagesDefinitions.h"
11+
#include "configuratorAgents/NetworkOptionsDefinitions.h"
12+
#include "configuratorAgents/MessagesDefinitions.h"
1313
#include "Arduino.h"
1414

1515
/**

src/ConfiguratorAgents/agents/Serial/SerialAgent.h renamed to src/configuratorAgents/agents/SerialAgent.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#pragma once
1010
#include <list>
1111
#include "Arduino.h"
12-
#include "ConfiguratorAgents/agents/ConfiguratorAgent.h"
13-
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
14-
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
15-
#include "Utility/LEDFeedback/LEDFeedback.h"
12+
#include "configuratorAgents/agents/ConfiguratorAgent.h"
13+
#include "configuratorAgents/agents/boardConfigurationProtocol/BoardConfigurationProtocol.h"
14+
#include "configuratorAgents/agents/boardConfigurationProtocol/cbor/CBORInstances.h"
15+
#include "utility/LEDFeedback.h"
1616

1717
/**
1818
* @class SerialAgentClass

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h renamed to src/configuratorAgents/agents/boardConfigurationProtocol/BoardConfigurationProtocol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010
#include <list>
1111
#include "PacketManager.h"
12-
#include "ConfiguratorAgents/MessagesDefinitions.h"
12+
#include "configuratorAgents/MessagesDefinitions.h"
1313

1414
/**
1515
* @class BoardConfigurationProtocol

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h renamed to src/configuratorAgents/agents/boardConfigurationProtocol/CBORAdapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#pragma once
1010
#include "Arduino.h"
11-
#include "ConfiguratorAgents/MessagesDefinitions.h"
11+
#include "configuratorAgents/MessagesDefinitions.h"
1212
#include "settings/settings.h"
1313
#include "cbor/CBOR.h"
1414
#include "./cbor/CBOR.h"

src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h renamed to src/configuratorAgents/agents/boardConfigurationProtocol/cbor/ProvisioningMessage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <Arduino_CBOR.h>
1313
#include <ConnectionHandlerDefinitions.h>
1414
#include <settings/settings.h>
15-
#include <ConfiguratorAgents/NetworkOptionsDefinitions.h>
15+
#include <configuratorAgents/NetworkOptionsDefinitions.h>
1616

1717
#define UHWID_SIZE 32
1818
#define PROVISIONING_JWT_SIZE 269 // Max length of jwt is 268 + \0
File renamed without changes.
File renamed without changes.

src/Utility/ResetInput/ResetInput.cpp renamed to src/utility/ResetInput.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#if NETWORK_CONFIGURATOR_COMPATIBLE
1010

1111
#include "ResetInput.h"
12-
#include "Utility/LEDFeedback/LEDFeedback.h"
12+
#include "utility/LEDFeedback.h"
1313

1414
ResetInput &ResetInput::getInstance() {
1515
static ResetInput instance;
File renamed without changes.

0 commit comments

Comments
 (0)