From 8f25ceddcfa8bf318fd9acc442d9fae810e2b19f Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 23 Sep 2023 13:37:35 +0000 Subject: [PATCH] restructure code --- .github/workflows/build_check.yml | 49 +++++++------------ platformio.ini | 2 +- {lib => src}/APRS-IS/APRS-IS.cpp | 0 {lib => src}/APRS-IS/APRS-IS.h | 0 {lib => src}/BoardFinder/BoardFinder.cpp | 2 +- {lib => src}/BoardFinder/BoardFinder.h | 0 .../ConfigurationManagement/configuration.cpp | 0 .../ConfigurationManagement/configuration.h | 0 {lib => src}/Display/Bitmap.cpp | 0 {lib => src}/Display/Bitmap.h | 0 {lib => src}/Display/Display.cpp | 2 +- {lib => src}/Display/Display.h | 6 +-- {lib => src}/Display/FontConfig.cpp | 0 {lib => src}/Display/FontConfig.h | 0 {lib => src}/Display/Fonts/FontDesc.h | 0 {lib => src}/Display/Fonts/HoloLens_12.h | 0 {lib => src}/Display/Fonts/HoloLens_20.h | 0 {lib => src}/Display/Fonts/Roboto_12.h | 0 {lib => src}/Display/Fonts/Terminal_11.h | 0 {lib => src}/Display/Fonts/Terminal_8.h | 0 {lib => src}/Display/OLEDDisplay.cpp | 0 {lib => src}/Display/OLEDDisplay.h | 0 {lib => src}/Display/SSD1306.cpp | 0 {lib => src}/Display/SSD1306.h | 0 src/LoRaModem.h | 2 +- src/LoRa_APRS_iGate.cpp | 10 ++-- {lib => src}/NTPClient/NTPClient.cpp | 0 {lib => src}/NTPClient/NTPClient.h | 0 .../PowerManagement/power_management.cpp | 0 .../PowerManagement/power_management.h | 0 {lib => src}/System/System.cpp | 0 {lib => src}/System/System.h | 6 +-- {lib => src}/System/TaskManager.cpp | 2 +- {lib => src}/System/TaskManager.h | 6 +-- {lib => src}/System/TaskQueue.h | 0 {lib => src}/System/Timer.cpp | 0 {lib => src}/System/Timer.h | 0 src/TaskAprsIs.h | 6 +-- src/TaskBeacon.cpp | 2 +- src/TaskBeacon.h | 2 +- src/TaskDisplay.h | 4 +- src/TaskEth.h | 2 +- src/TaskFTP.h | 2 +- src/TaskMQTT.h | 2 +- src/TaskNTP.cpp | 2 +- src/TaskNTP.h | 4 +- src/TaskOTA.h | 2 +- src/TaskRadiolib.cpp | 4 +- src/TaskRadiolib.h | 6 +-- src/TaskRouter.cpp | 2 +- src/TaskRouter.h | 2 +- src/TaskWifi.h | 2 +- {lib => src}/TimeLib/TimeLib.cpp | 0 {lib => src}/TimeLib/TimeLib.h | 0 {lib => src}/TimeLib/TimeLibString.cpp | 0 src/project_configuration.h | 4 +- test/test_BoardFinder/test.cpp | 2 +- 57 files changed, 63 insertions(+), 74 deletions(-) rename {lib => src}/APRS-IS/APRS-IS.cpp (100%) rename {lib => src}/APRS-IS/APRS-IS.h (100%) rename {lib => src}/BoardFinder/BoardFinder.cpp (99%) rename {lib => src}/BoardFinder/BoardFinder.h (100%) rename {lib => src}/ConfigurationManagement/configuration.cpp (100%) rename {lib => src}/ConfigurationManagement/configuration.h (100%) rename {lib => src}/Display/Bitmap.cpp (100%) rename {lib => src}/Display/Bitmap.h (100%) rename {lib => src}/Display/Display.cpp (98%) rename {lib => src}/Display/Display.h (93%) rename {lib => src}/Display/FontConfig.cpp (100%) rename {lib => src}/Display/FontConfig.h (100%) rename {lib => src}/Display/Fonts/FontDesc.h (100%) rename {lib => src}/Display/Fonts/HoloLens_12.h (100%) rename {lib => src}/Display/Fonts/HoloLens_20.h (100%) rename {lib => src}/Display/Fonts/Roboto_12.h (100%) rename {lib => src}/Display/Fonts/Terminal_11.h (100%) rename {lib => src}/Display/Fonts/Terminal_8.h (100%) rename {lib => src}/Display/OLEDDisplay.cpp (100%) rename {lib => src}/Display/OLEDDisplay.h (100%) rename {lib => src}/Display/SSD1306.cpp (100%) rename {lib => src}/Display/SSD1306.h (100%) rename {lib => src}/NTPClient/NTPClient.cpp (100%) rename {lib => src}/NTPClient/NTPClient.h (100%) rename {lib => src}/PowerManagement/power_management.cpp (100%) rename {lib => src}/PowerManagement/power_management.h (100%) rename {lib => src}/System/System.cpp (100%) rename {lib => src}/System/System.h (89%) rename {lib => src}/System/TaskManager.cpp (98%) rename {lib => src}/System/TaskManager.h (93%) rename {lib => src}/System/TaskQueue.h (100%) rename {lib => src}/System/Timer.cpp (100%) rename {lib => src}/System/Timer.h (100%) rename {lib => src}/TimeLib/TimeLib.cpp (100%) rename {lib => src}/TimeLib/TimeLib.h (100%) rename {lib => src}/TimeLib/TimeLibString.cpp (100%) diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index f70b540..85b2c52 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -37,17 +37,6 @@ jobs: formatting-check: name: Formatting Check runs-on: ubuntu-latest - strategy: - matrix: - path: - - 'src' - - 'lib/BoardFinder' - - 'lib/ConfigurationManagement' - #- 'lib/Display' - - 'lib/NTPClient' - - 'lib/PowerManagement' - - 'lib/System' - - 'lib/TimeLib' steps: - name: Checkout code uses: actions/checkout@v3 @@ -55,7 +44,7 @@ jobs: uses: jidicula/clang-format-action@v4.10.2 with: clang-format-version: '14' - check-path: ${{ matrix.path }} + check-path: src cppcheck: name: Run cppcheck @@ -81,24 +70,24 @@ jobs: - name: Run PlatformIO Check run: pio check --fail-on-defect high --fail-on-defect medium --fail-on-defect low -e lora_board - cppcheck-docker: - name: Run cppcheck in Docker - runs-on: ubuntu-latest - env: - CPPCHECK_ARGS: --enable=all --std=c++20 --inline-suppr -I lib/BoardFinder -I lib/ConfigurationManagement -I lib/Display -I lib/LoRa -I lib/LoRa_APRS -I lib/NTPClient -I lib/PowerManagement -I lib/System -I lib/TimeLib -i lib/Display -i lib/LoRa -i lib/NTPClient -i lib/TimeLib src lib - steps: - - name: checkout code - uses: actions/checkout@v3 - - run: docker pull facthunder/cppcheck:latest - - name: Run cppcheck and print result - run: docker run --rm -v ${PWD}:/src facthunder/cppcheck:latest /bin/bash -c "cppcheck $CPPCHECK_ARGS" - - name: Run cppcheck and create html - run: docker run --rm -v ${PWD}:/src facthunder/cppcheck:latest /bin/bash -c "cppcheck --xml $CPPCHECK_ARGS 2> report.xml && cppcheck-htmlreport --file=report.xml --report-dir=output" - - name: Upload report - uses: actions/upload-artifact@v3 - with: - name: Cppcheck Report - path: output +# cppcheck-docker: +# name: Run cppcheck in Docker +# runs-on: ubuntu-latest +# env: +# CPPCHECK_ARGS: --enable=all --std=c++20 --inline-suppr -I lib/BoardFinder -I lib/ConfigurationManagement -I lib/Display -I lib/LoRa -I lib/LoRa_APRS -I lib/NTPClient -I lib/PowerManagement -I lib/System -I lib/TimeLib -i lib/Display -i lib/LoRa -i lib/NTPClient -i lib/TimeLib src lib +# steps: +# - name: checkout code +# uses: actions/checkout@v3 +# - run: docker pull facthunder/cppcheck:latest +# - name: Run cppcheck and print result +# run: docker run --rm -v ${PWD}:/src facthunder/cppcheck:latest /bin/bash -c "cppcheck $CPPCHECK_ARGS" +# - name: Run cppcheck and create html +# run: docker run --rm -v ${PWD}:/src facthunder/cppcheck:latest /bin/bash -c "cppcheck --xml $CPPCHECK_ARGS 2> report.xml && cppcheck-htmlreport --file=report.xml --report-dir=output" +# - name: Upload report +# uses: actions/upload-artifact@v3 +# with: +# name: Cppcheck Report +# path: output hw_testing: name: Hardware Testing diff --git a/platformio.ini b/platformio.ini index f813a45..bdd9470 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,7 +28,7 @@ lib_deps = shaggydog/OneButton @ 1.5.0 jgromes/RadioLib @ 6.1.0 check_tool = cppcheck -check_flags = cppcheck: --std=c++20 --suppress=*:*.pio\* --inline-suppr --suppress=unusedFunction -DCPPCHECK --force lib -ilib/TimeLib +check_flags = cppcheck: --std=c++20 --suppress=*:*.pio\* --inline-suppr --suppress=unusedFunction --suppress=shadowFunction:*TimeLib.cpp --suppress=unreadVariable:*TimeLib.cpp check_skip_packages = yes test_build_src = yes # activate for OTA Update, use the CALLSIGN from is-cfg.json as upload_port: diff --git a/lib/APRS-IS/APRS-IS.cpp b/src/APRS-IS/APRS-IS.cpp similarity index 100% rename from lib/APRS-IS/APRS-IS.cpp rename to src/APRS-IS/APRS-IS.cpp diff --git a/lib/APRS-IS/APRS-IS.h b/src/APRS-IS/APRS-IS.h similarity index 100% rename from lib/APRS-IS/APRS-IS.h rename to src/APRS-IS/APRS-IS.h diff --git a/lib/BoardFinder/BoardFinder.cpp b/src/BoardFinder/BoardFinder.cpp similarity index 99% rename from lib/BoardFinder/BoardFinder.cpp rename to src/BoardFinder/BoardFinder.cpp index efb1691..f4ed539 100644 --- a/lib/BoardFinder/BoardFinder.cpp +++ b/src/BoardFinder/BoardFinder.cpp @@ -1,6 +1,6 @@ #include "BoardFinder.h" +#include "PowerManagement/power_management.h" #include -#include #define MODULE_NAME "BoardFinder" diff --git a/lib/BoardFinder/BoardFinder.h b/src/BoardFinder/BoardFinder.h similarity index 100% rename from lib/BoardFinder/BoardFinder.h rename to src/BoardFinder/BoardFinder.h diff --git a/lib/ConfigurationManagement/configuration.cpp b/src/ConfigurationManagement/configuration.cpp similarity index 100% rename from lib/ConfigurationManagement/configuration.cpp rename to src/ConfigurationManagement/configuration.cpp diff --git a/lib/ConfigurationManagement/configuration.h b/src/ConfigurationManagement/configuration.h similarity index 100% rename from lib/ConfigurationManagement/configuration.h rename to src/ConfigurationManagement/configuration.h diff --git a/lib/Display/Bitmap.cpp b/src/Display/Bitmap.cpp similarity index 100% rename from lib/Display/Bitmap.cpp rename to src/Display/Bitmap.cpp diff --git a/lib/Display/Bitmap.h b/src/Display/Bitmap.h similarity index 100% rename from lib/Display/Bitmap.h rename to src/Display/Bitmap.h diff --git a/lib/Display/Display.cpp b/src/Display/Display.cpp similarity index 98% rename from lib/Display/Display.cpp rename to src/Display/Display.cpp index c673659..5ae5212 100644 --- a/lib/Display/Display.cpp +++ b/src/Display/Display.cpp @@ -1,5 +1,5 @@ #include "Display.h" -#include +#include "System/TaskManager.h" #include Display::Display() : _disp(0), _statusFrame(0), _displaySaveMode(false) { diff --git a/lib/Display/Display.h b/src/Display/Display.h similarity index 93% rename from lib/Display/Display.h rename to src/Display/Display.h index 6347737..d1b6b76 100644 --- a/lib/Display/Display.h +++ b/src/Display/Display.h @@ -1,10 +1,10 @@ #ifndef DISPLAY_H_ #define DISPLAY_H_ +#include "BoardFinder/BoardFinder.h" +#include "Display/SSD1306.h" +#include "System/Timer.h" #include -#include -#include -#include #include #include #include diff --git a/lib/Display/FontConfig.cpp b/src/Display/FontConfig.cpp similarity index 100% rename from lib/Display/FontConfig.cpp rename to src/Display/FontConfig.cpp diff --git a/lib/Display/FontConfig.h b/src/Display/FontConfig.h similarity index 100% rename from lib/Display/FontConfig.h rename to src/Display/FontConfig.h diff --git a/lib/Display/Fonts/FontDesc.h b/src/Display/Fonts/FontDesc.h similarity index 100% rename from lib/Display/Fonts/FontDesc.h rename to src/Display/Fonts/FontDesc.h diff --git a/lib/Display/Fonts/HoloLens_12.h b/src/Display/Fonts/HoloLens_12.h similarity index 100% rename from lib/Display/Fonts/HoloLens_12.h rename to src/Display/Fonts/HoloLens_12.h diff --git a/lib/Display/Fonts/HoloLens_20.h b/src/Display/Fonts/HoloLens_20.h similarity index 100% rename from lib/Display/Fonts/HoloLens_20.h rename to src/Display/Fonts/HoloLens_20.h diff --git a/lib/Display/Fonts/Roboto_12.h b/src/Display/Fonts/Roboto_12.h similarity index 100% rename from lib/Display/Fonts/Roboto_12.h rename to src/Display/Fonts/Roboto_12.h diff --git a/lib/Display/Fonts/Terminal_11.h b/src/Display/Fonts/Terminal_11.h similarity index 100% rename from lib/Display/Fonts/Terminal_11.h rename to src/Display/Fonts/Terminal_11.h diff --git a/lib/Display/Fonts/Terminal_8.h b/src/Display/Fonts/Terminal_8.h similarity index 100% rename from lib/Display/Fonts/Terminal_8.h rename to src/Display/Fonts/Terminal_8.h diff --git a/lib/Display/OLEDDisplay.cpp b/src/Display/OLEDDisplay.cpp similarity index 100% rename from lib/Display/OLEDDisplay.cpp rename to src/Display/OLEDDisplay.cpp diff --git a/lib/Display/OLEDDisplay.h b/src/Display/OLEDDisplay.h similarity index 100% rename from lib/Display/OLEDDisplay.h rename to src/Display/OLEDDisplay.h diff --git a/lib/Display/SSD1306.cpp b/src/Display/SSD1306.cpp similarity index 100% rename from lib/Display/SSD1306.cpp rename to src/Display/SSD1306.cpp diff --git a/lib/Display/SSD1306.h b/src/Display/SSD1306.h similarity index 100% rename from lib/Display/SSD1306.h rename to src/Display/SSD1306.h diff --git a/src/LoRaModem.h b/src/LoRaModem.h index bbd3523..28a514b 100644 --- a/src/LoRaModem.h +++ b/src/LoRaModem.h @@ -3,7 +3,7 @@ #include -#include "BoardFinder.h" +#include "BoardFinder/BoardFinder.h" #include "project_configuration.h" class LoRaModem { diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 0e9579d..a22e9b8 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -1,13 +1,13 @@ #ifndef UNIT_TEST #include -#include -#include -#include -#include +#include "APRS-IS/APRS-IS.h" +#include "BoardFinder/BoardFinder.h" +#include "PowerManagement/power_management.h" +#include "System/System.h" +#include "System/TaskManager.h" #include #include -#include #include "TaskAprsIs.h" #include "TaskBeacon.h" diff --git a/lib/NTPClient/NTPClient.cpp b/src/NTPClient/NTPClient.cpp similarity index 100% rename from lib/NTPClient/NTPClient.cpp rename to src/NTPClient/NTPClient.cpp diff --git a/lib/NTPClient/NTPClient.h b/src/NTPClient/NTPClient.h similarity index 100% rename from lib/NTPClient/NTPClient.h rename to src/NTPClient/NTPClient.h diff --git a/lib/PowerManagement/power_management.cpp b/src/PowerManagement/power_management.cpp similarity index 100% rename from lib/PowerManagement/power_management.cpp rename to src/PowerManagement/power_management.cpp diff --git a/lib/PowerManagement/power_management.h b/src/PowerManagement/power_management.h similarity index 100% rename from lib/PowerManagement/power_management.h rename to src/PowerManagement/power_management.h diff --git a/lib/System/System.cpp b/src/System/System.cpp similarity index 100% rename from lib/System/System.cpp rename to src/System/System.cpp diff --git a/lib/System/System.h b/src/System/System.h similarity index 89% rename from lib/System/System.h rename to src/System/System.h index 374a634..7d3ccf6 100644 --- a/lib/System/System.h +++ b/src/System/System.h @@ -4,10 +4,10 @@ #include #include +#include "BoardFinder/BoardFinder.h" +#include "ConfigurationManagement/configuration.h" +#include "Display/Display.h" #include "TaskManager.h" -#include -#include -#include class System { public: diff --git a/lib/System/TaskManager.cpp b/src/System/TaskManager.cpp similarity index 98% rename from lib/System/TaskManager.cpp rename to src/System/TaskManager.cpp index b643c1e..cb01b88 100644 --- a/lib/System/TaskManager.cpp +++ b/src/System/TaskManager.cpp @@ -1,5 +1,5 @@ #include "TaskManager.h" -#include +#include "Display/FontConfig.h" #include #define MODULE_NAME "TaskManager" diff --git a/lib/System/TaskManager.h b/src/System/TaskManager.h similarity index 93% rename from lib/System/TaskManager.h rename to src/System/TaskManager.h index ba32e8f..ce949d1 100644 --- a/lib/System/TaskManager.h +++ b/src/System/TaskManager.h @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include "BoardFinder/BoardFinder.h" +#include "ConfigurationManagement/configuration.h" +#include "Display/Display.h" #include "TaskQueue.h" diff --git a/lib/System/TaskQueue.h b/src/System/TaskQueue.h similarity index 100% rename from lib/System/TaskQueue.h rename to src/System/TaskQueue.h diff --git a/lib/System/Timer.cpp b/src/System/Timer.cpp similarity index 100% rename from lib/System/Timer.cpp rename to src/System/Timer.cpp diff --git a/lib/System/Timer.h b/src/System/Timer.h similarity index 100% rename from lib/System/Timer.h rename to src/System/Timer.h diff --git a/src/TaskAprsIs.h b/src/TaskAprsIs.h index d2de355..63d74bb 100644 --- a/src/TaskAprsIs.h +++ b/src/TaskAprsIs.h @@ -1,10 +1,10 @@ #ifndef TASK_APRS_IS_H_ #define TASK_APRS_IS_H_ -#include +#include "APRS-IS/APRS-IS.h" +#include "System/TaskManager.h" +#include "System/Timer.h" #include -#include -#include class AprsIsTask : public Task { public: diff --git a/src/TaskBeacon.cpp b/src/TaskBeacon.cpp index 3a0b292..4c172a1 100644 --- a/src/TaskBeacon.cpp +++ b/src/TaskBeacon.cpp @@ -1,7 +1,7 @@ #include +#include "TimeLib/TimeLib.h" #include -#include #include "Task.h" #include "TaskBeacon.h" diff --git a/src/TaskBeacon.h b/src/TaskBeacon.h index ba0ff22..0a8c565 100644 --- a/src/TaskBeacon.h +++ b/src/TaskBeacon.h @@ -4,9 +4,9 @@ #include #include +#include "System/TaskManager.h" #include #include -#include class BeaconTask : public Task { public: diff --git a/src/TaskDisplay.h b/src/TaskDisplay.h index 95dff61..e3a4421 100644 --- a/src/TaskDisplay.h +++ b/src/TaskDisplay.h @@ -1,8 +1,8 @@ #ifndef TASK_DISPLAY_H_ #define TASK_DISPLAY_H_ -#include -#include +#include "Display/Display.h" +#include "System/TaskManager.h" class DisplayTask : public Task { public: diff --git a/src/TaskEth.h b/src/TaskEth.h index 50f1d63..8cfad32 100644 --- a/src/TaskEth.h +++ b/src/TaskEth.h @@ -1,7 +1,7 @@ #ifndef TASK_ETH_H_ #define TASK_ETH_H_ -#include +#include "System/TaskManager.h" void setWiFiLogger(logging::Logger *logger); void WiFiEvent(WiFiEvent_t event); diff --git a/src/TaskFTP.h b/src/TaskFTP.h index 83c0ea7..cd9e838 100644 --- a/src/TaskFTP.h +++ b/src/TaskFTP.h @@ -1,8 +1,8 @@ #ifndef TASK_FTP_H_ #define TASK_FTP_H_ +#include "System/TaskManager.h" #include -#include class FTPTask : public Task { public: diff --git a/src/TaskMQTT.h b/src/TaskMQTT.h index 082ec2e..654e50f 100644 --- a/src/TaskMQTT.h +++ b/src/TaskMQTT.h @@ -1,9 +1,9 @@ #ifndef TASK_MQTT_H_ #define TASK_MQTT_H_ +#include "System/TaskManager.h" #include #include -#include #include class MQTTTask : public Task { diff --git a/src/TaskNTP.cpp b/src/TaskNTP.cpp index 7622032..48e56b2 100644 --- a/src/TaskNTP.cpp +++ b/src/TaskNTP.cpp @@ -1,6 +1,6 @@ #include -#include +#include "TimeLib/TimeLib.h" #include "Task.h" #include "TaskNTP.h" diff --git a/src/TaskNTP.h b/src/TaskNTP.h index 3eab8e3..1dc9174 100644 --- a/src/TaskNTP.h +++ b/src/TaskNTP.h @@ -1,8 +1,8 @@ #ifndef TASK_NTP_H_ #define TASK_NTP_H_ -#include -#include +#include "NTPClient/NTPClient.h" +#include "System/TaskManager.h" class NTPTask : public Task { public: diff --git a/src/TaskOTA.h b/src/TaskOTA.h index 1942d69..e26e551 100644 --- a/src/TaskOTA.h +++ b/src/TaskOTA.h @@ -1,8 +1,8 @@ #ifndef TASK_OTA_H_ #define TASK_OTA_H_ +#include "System/TaskManager.h" #include -#include class OTATask : public Task { public: diff --git a/src/TaskRadiolib.cpp b/src/TaskRadiolib.cpp index 4a9fa4f..332b822 100644 --- a/src/TaskRadiolib.cpp +++ b/src/TaskRadiolib.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "Task.h" +#include "TimeLib/TimeLib.h" #include #include "TaskRadiolib.h" diff --git a/src/TaskRadiolib.h b/src/TaskRadiolib.h index 4876d20..bb57a0f 100644 --- a/src/TaskRadiolib.h +++ b/src/TaskRadiolib.h @@ -1,11 +1,11 @@ #ifndef TASK_LORA_H_ #define TASK_LORA_H_ +#include "BoardFinder/BoardFinder.h" +#include "LoRaModem.h" +#include "System/TaskManager.h" #include "project_configuration.h" #include -#include -#include -#include class RadiolibTask : public Task { public: diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp index dc9da8a..0f2704b 100644 --- a/src/TaskRouter.cpp +++ b/src/TaskRouter.cpp @@ -1,6 +1,6 @@ #include -#include +#include "TimeLib/TimeLib.h" #include "Task.h" #include "TaskRouter.h" diff --git a/src/TaskRouter.h b/src/TaskRouter.h index a2e1bbe..c11b3ea 100644 --- a/src/TaskRouter.h +++ b/src/TaskRouter.h @@ -1,9 +1,9 @@ #ifndef TASK_ROUTER_H_ #define TASK_ROUTER_H_ +#include "System/TaskManager.h" #include #include -#include class RouterTask : public Task { public: diff --git a/src/TaskWifi.h b/src/TaskWifi.h index 8196629..85a1218 100644 --- a/src/TaskWifi.h +++ b/src/TaskWifi.h @@ -1,7 +1,7 @@ #ifndef TASK_WIFI_H_ #define TASK_WIFI_H_ -#include +#include "System/TaskManager.h" #include class WifiTask : public Task { diff --git a/lib/TimeLib/TimeLib.cpp b/src/TimeLib/TimeLib.cpp similarity index 100% rename from lib/TimeLib/TimeLib.cpp rename to src/TimeLib/TimeLib.cpp diff --git a/lib/TimeLib/TimeLib.h b/src/TimeLib/TimeLib.h similarity index 100% rename from lib/TimeLib/TimeLib.h rename to src/TimeLib/TimeLib.h diff --git a/lib/TimeLib/TimeLibString.cpp b/src/TimeLib/TimeLibString.cpp similarity index 100% rename from lib/TimeLib/TimeLibString.cpp rename to src/TimeLib/TimeLibString.cpp diff --git a/src/project_configuration.h b/src/project_configuration.h index f5d4ad9..de0d383 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -1,8 +1,8 @@ #ifndef PROJECT_CONFIGURATION_H_ #define PROJECT_CONFIGURATION_H_ -#include -#include +#include "BoardFinder/BoardFinder.h" +#include "ConfigurationManagement/configuration.h" class Configuration { public: diff --git a/test/test_BoardFinder/test.cpp b/test/test_BoardFinder/test.cpp index 41154bd..83230d8 100644 --- a/test/test_BoardFinder/test.cpp +++ b/test/test_BoardFinder/test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include "BoardFinder/BoardFinder.h" std::list boardConfigs; logging::Logger logger;