Skip to content

Reorganize folder structure #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/compile-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <GenericConnectionHandler.h>
#include <Arduino_KVStore.h>
#include <Arduino_NetworkConfigurator.h>
#include <ConfiguratorAgents/agents/BLE/BLEAgent.h>
#include <ConfiguratorAgents/agents/Serial/SerialAgent.h>
#include <configuratorAgents/agents/BLEAgent.h>
#include <configuratorAgents/agents/SerialAgent.h>

KVStore kvstore;
BLEAgentClass BLEAgent;
Expand Down
8 changes: 4 additions & 4 deletions extras/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions extras/test/src/test_provisioning_command_decode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

#include <Decoder.h>
#include <cbor/MessageDecoder.h>
#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 <IPAddress.h>

/******************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions extras/test/src/test_provisioning_command_encode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <memory>
#include <Encoder.h>
#include <cbor/MessageEncoder.h>
#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
Expand Down
4 changes: 2 additions & 2 deletions src/Arduino_NetworkConfigurator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <Arduino_DebugUtils.h>
#include "ConnectionHandlerDefinitions.h"
#include "ConfiguratorAgents/MessagesDefinitions.h"
#include "Utility/LEDFeedback/LEDFeedback.h"
#include "configuratorAgents/MessagesDefinitions.h"

#ifdef BOARD_HAS_WIFI
#include "WiFiConnectionHandler.h"
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/Arduino_NetworkConfigurator.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

#include "Arduino.h"
#include "Arduino_ConnectionHandler.h"
#include "ConfiguratorAgents/AgentsManager.h"
#include "configuratorAgents/AgentsManager.h"
#include <settings/settings.h>
#include <Arduino_TimedAttempt.h>
#include <Arduino_KVStore.h>
#include "Utility/ResetInput/ResetInput.h"
#include "Utility/LEDFeedback/LEDFeedback.h"
#include "utility/ResetInput.h"
#include "utility/LEDFeedback.h"

/**
* @enum NetworkConfiguratorStates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <settings/settings.h>
#include "AgentsManager.h"
#include "NetworkOptionsDefinitions.h"
#include "Utility/LEDFeedback/LEDFeedback.h"
#include "utility/LEDFeedback.h"

/******************************************************************************
* PUBLIC MEMBER FUNCTIONS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 "Utility/LEDFeedback/LEDFeedback.h"
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
#include "configuratorAgents/agents/ConfiguratorAgent.h"
#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
#include "utility/LEDFeedback.h"
#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"

#define BASE_LOCAL_NAME "Arduino"
#define ARDUINO_COMPANY_ID 0x09A3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once
#include <list>
#include "PacketManager.h"
#include "ConfiguratorAgents/MessagesDefinitions.h"
#include "configuratorAgents/MessagesDefinitions.h"

/**
* @class BoardConfigurationProtocol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <Arduino_CBOR.h>
#include <ConnectionHandlerDefinitions.h>
#include <settings/settings.h>
#include <ConfiguratorAgents/NetworkOptionsDefinitions.h>
#include <configuratorAgents/NetworkOptionsDefinitions.h>

#define UHWID_SIZE 32
#define PROVISIONING_JWT_SIZE 269 // Max length of jwt is 268 + \0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#pragma once
#include <list>
#include "Arduino.h"
#include "ConfiguratorAgents/agents/ConfiguratorAgent.h"
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
#include "Utility/LEDFeedback/LEDFeedback.h"
#include "configuratorAgents/agents/ConfiguratorAgent.h"
#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
#include "utility/LEDFeedback.h"

/**
* @class SerialAgentClass
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
Loading