diff --git a/include/AuthProvider.hpp b/include/AuthProvider.hpp index b21499a1..56b37abd 100644 --- a/include/AuthProvider.hpp +++ b/include/AuthProvider.hpp @@ -1,12 +1,12 @@ -#ifndef AUTHPROVIDER_H_ -#define AUTHPROVIDER_H_ +#ifndef AUTHPROVIDER_HPP_ +#define AUTHPROVIDER_HPP_ #include "FabUser.hpp" +#include "secrets.hpp" #include +#include #include #include -#include -#include "secrets.hpp" namespace fablabbg { @@ -29,4 +29,4 @@ namespace fablabbg void setWhitelist(WhiteList list); }; } // namespace fablabbg -#endif // AUTHPROVIDER_H_ +#endif // AUTHPROVIDER_HPP_ diff --git a/include/BaseLCDWrapper.hpp b/include/BaseLCDWrapper.hpp index f2a4d688..53c081c2 100644 --- a/include/BaseLCDWrapper.hpp +++ b/include/BaseLCDWrapper.hpp @@ -1,10 +1,10 @@ -#ifndef BASELCDWRAPPER_H_ -#define BASELCDWRAPPER_H_ +#ifndef BASELCDWRAPPER_HPP_ +#define BASELCDWRAPPER_HPP_ -#include #include "BoardInfo.hpp" #include "Machine.hpp" #include +#include using namespace std::chrono; @@ -23,4 +23,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // BASELCDWRAPPER_H_ +#endif // BASELCDWRAPPER_HPP_ diff --git a/include/BaseRfidWrapper.hpp b/include/BaseRfidWrapper.hpp index 77bc15db..e9b31b4b 100644 --- a/include/BaseRfidWrapper.hpp +++ b/include/BaseRfidWrapper.hpp @@ -1,5 +1,5 @@ -#ifndef BASE_RFID_WRAPPER_HPP_ -#define BASE_RFID_WRAPPER_HPP_ +#ifndef BASERFIDWRAPPER_HPP_ +#define BASERFIDWRAPPER_HPP_ #include #include "card.hpp" @@ -18,4 +18,4 @@ namespace fablabbg virtual card::uid_t getUid() const = 0; }; } // namespace fablabbg -#endif // BASE_RFID_WRAPPER_HPP_ \ No newline at end of file +#endif // BASERFIDWRAPPER_HPP_ \ No newline at end of file diff --git a/include/BoardLogic.hpp b/include/BoardLogic.hpp index 35804fb1..66858b77 100644 --- a/include/BoardLogic.hpp +++ b/include/BoardLogic.hpp @@ -1,18 +1,17 @@ -#ifndef BOARDLOGIC_H -#define BOARDLOGIC_H +#ifndef BOARDLOGIC_HPP_ +#define BOARDLOGIC_HPP_ -#include "FabUser.hpp" -#include "card.hpp" -#include -#include "pins.hpp" -#include "FabBackend.hpp" -#include "BaseRfidWrapper.hpp" #include "AuthProvider.hpp" -#include "Machine.hpp" -#include "secrets.hpp" #include "BaseLCDWrapper.hpp" #include "BaseRfidWrapper.hpp" +#include "FabBackend.hpp" +#include "FabUser.hpp" #include "Led.hpp" +#include "Machine.hpp" +#include "card.hpp" +#include "pins.hpp" +#include "secrets.hpp" +#include namespace fablabbg { @@ -104,4 +103,4 @@ namespace fablabbg bool longTap(const card::uid_t card, const std::string &short_prompt) const; }; } // namespace fablabbg -#endif // BOARDLOGIC_H \ No newline at end of file +#endif // BOARDLOGIC_HPP_ \ No newline at end of file diff --git a/include/FabBackend.hpp b/include/FabBackend.hpp index bfb44a00..ee38b905 100644 --- a/include/FabBackend.hpp +++ b/include/FabBackend.hpp @@ -1,19 +1,19 @@ -#ifndef FABSERVER_H_ -#define FABSERVER_H_ +#ifndef FABBACKEND_HPP_ +#define FABBACKEND_HPP_ #include #include #include #include -#include #include "WiFi.h" +#include #include #include "FabUser.hpp" -#include "conf.hpp" #include "MQTTtypes.hpp" #include "SavedConfig.hpp" +#include "conf.hpp" namespace fablabbg { @@ -81,4 +81,4 @@ namespace fablabbg FabBackend &operator=(FabBackend &&) = delete; // move assignment }; } // namespace fablabbg -#endif // FABSERVER_H_ \ No newline at end of file +#endif // FABBACKEND_HPP_ \ No newline at end of file diff --git a/include/FabUser.hpp b/include/FabUser.hpp index 02d406c7..b6e62d98 100644 --- a/include/FabUser.hpp +++ b/include/FabUser.hpp @@ -1,13 +1,13 @@ -#ifndef FABUSER_H_ -#define FABUSER_H_ +#ifndef FABUSER_HPP_ +#define FABUSER_HPP_ -#include -#include -#include #include "Arduino.h" -#include "conf.hpp" #include "card.hpp" +#include "conf.hpp" +#include +#include #include +#include namespace fablabbg { @@ -56,4 +56,4 @@ namespace fablabbg } }; } // namespace fablabbg -#endif // FABUSER_H_ \ No newline at end of file +#endif // FABUSER_HPP_ \ No newline at end of file diff --git a/include/LCDWrapper.hpp b/include/LCDWrapper.hpp index abf554cf..8324231b 100644 --- a/include/LCDWrapper.hpp +++ b/include/LCDWrapper.hpp @@ -1,12 +1,12 @@ -#ifndef LCDWRAPPER_H_ -#define LCDWRAPPER_H_ +#ifndef LCDWRAPPER_HPP_ +#define LCDWRAPPER_HPP_ -#include +#include "BaseLCDWrapper.hpp" #include "BoardInfo.hpp" #include "Machine.hpp" #include "pins.hpp" +#include #include -#include "BaseLCDWrapper.hpp" using namespace std::chrono; @@ -63,4 +63,4 @@ namespace fablabbg #include "LCDWrapper.tpp" -#endif // LCDWRAPPER_H_ +#endif // LCDWRAPPER_HPP_ diff --git a/include/Led.hpp b/include/Led.hpp index f66a13d8..2e040923 100644 --- a/include/Led.hpp +++ b/include/Led.hpp @@ -1,8 +1,8 @@ -#ifndef FABLABBG_LED_HPP_ -#define FABLABBG_LED_HPP_ +#ifndef LED_HPP_ +#define LED_HPP_ -#include #include +#include #include #include "pins.hpp" @@ -37,4 +37,4 @@ namespace fablabbg } // namespace fablabbg -#endif // FABLABBG_LED_HPP_ \ No newline at end of file +#endif // LED_HPP_ \ No newline at end of file diff --git a/include/Logging.hpp b/include/Logging.hpp index e458cb57..96c8faf9 100644 --- a/include/Logging.hpp +++ b/include/Logging.hpp @@ -1,8 +1,8 @@ -#ifndef FABLAB_LOGGING_HPP_ -#define FABLAB_LOGGING_HPP_ +#ifndef LOGGING_HPP_ +#define LOGGING_HPP_ #include "esp_log.h" [[maybe_unused]] static const char *TAG = "Rfid-Arduino"; // Required for ESP32 Logging -#endif // FABLAB_LOGGING_HPP_ \ No newline at end of file +#endif // LOGGING_HPP_ \ No newline at end of file diff --git a/include/MQTTtypes.hpp b/include/MQTTtypes.hpp index 26f10a72..e64913db 100644 --- a/include/MQTTtypes.hpp +++ b/include/MQTTtypes.hpp @@ -1,13 +1,13 @@ -#ifndef MQTTTYPES_H_ -#define MQTTTYPES_H_ +#ifndef MQTTTYPES_HPP_ +#define MQTTTYPES_HPP_ +#include "ArduinoJson.h" +#include "FabUser.hpp" +#include "Machine.hpp" #include "card.hpp" #include "string" #include -#include "FabUser.hpp" -#include "Machine.hpp" #include -#include "ArduinoJson.h" namespace fablabbg::ServerMQTT { @@ -160,4 +160,4 @@ namespace fablabbg::ServerMQTT }; } // namespace fablabbg::ServerMQTT -#endif +#endif // MQTTTYPES_HPP_ diff --git a/include/Machine.hpp b/include/Machine.hpp index 0c763238..61061564 100644 --- a/include/Machine.hpp +++ b/include/Machine.hpp @@ -1,11 +1,11 @@ -#ifndef MACHINE_H_ -#define MACHINE_H_ +#ifndef MACHINE_HPP_ +#define MACHINE_HPP_ -#include -#include -#include #include "FabUser.hpp" #include "MachineConfig.hpp" +#include +#include +#include namespace fablabbg { @@ -105,4 +105,4 @@ namespace fablabbg void power_relay(bool on_or_off); }; } // namespace fablabbg -#endif // MACHINE_H_ \ No newline at end of file +#endif // MACHINE_HPP_ \ No newline at end of file diff --git a/include/MachineConfig.hpp b/include/MachineConfig.hpp index 4da2f4f5..552ff6e1 100644 --- a/include/MachineConfig.hpp +++ b/include/MachineConfig.hpp @@ -1,10 +1,10 @@ -#ifndef MACHINE_CONFIG_H_ -#define MACHINE_CONFIG_H_ +#ifndef MACHINECONFIG_HPP_ +#define MACHINECONFIG_HPP_ +#include "pins.hpp" +#include #include #include -#include -#include "pins.hpp" using namespace std::chrono; @@ -66,4 +66,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // MACHINE_CONFIG_H_ \ No newline at end of file +#endif // MACHINECONFIG_HPP_ \ No newline at end of file diff --git a/include/Mrfc522Driver.hpp b/include/Mrfc522Driver.hpp index 2c7fadf3..8a954437 100644 --- a/include/Mrfc522Driver.hpp +++ b/include/Mrfc522Driver.hpp @@ -1,14 +1,14 @@ -#ifndef MRFC522_DRIVER_HPP_ -#define MRFC522_DRIVER_HPP_ +#ifndef MRFC522DRIVER_HPP_ +#define MRFC522DRIVER_HPP_ -#include #include "Arduino.h" +#include -#include "MFRC522v2.h" -#include "MFRC522DriverSPI.h" -#include "MFRC522DriverPinSimple.h" -#include "MFRC522Debug.h" #include "FabUser.hpp" +#include "MFRC522Debug.h" +#include "MFRC522DriverPinSimple.h" +#include "MFRC522DriverSPI.h" +#include "MFRC522v2.h" #include "pins.hpp" namespace fablabbg @@ -43,4 +43,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // MRFC522_DRIVER_HPP_ \ No newline at end of file +#endif // MRFC522DRIVER_HPP_ \ No newline at end of file diff --git a/include/RFIDWrapper.hpp b/include/RFIDWrapper.hpp index e0243487..b6fd4e38 100644 --- a/include/RFIDWrapper.hpp +++ b/include/RFIDWrapper.hpp @@ -1,14 +1,14 @@ -#ifndef RFIDWRAPPER_H_ -#define RFIDWRAPPER_H_ +#ifndef RFIDWRAPPER_HPP_ +#define RFIDWRAPPER_HPP_ -#include +#include #include #include -#include +#include -#include "conf.hpp" -#include "card.hpp" #include "BaseRfidWrapper.hpp" +#include "card.hpp" +#include "conf.hpp" namespace fablabbg { @@ -57,4 +57,4 @@ namespace fablabbg #include "RFIDWrapper.tpp" -#endif // RFIDWRAPPER_H_ \ No newline at end of file +#endif // RFIDWRAPPER_HPP_ \ No newline at end of file diff --git a/include/SavedConfig.hpp b/include/SavedConfig.hpp index d4218a17..4aeac1de 100644 --- a/include/SavedConfig.hpp +++ b/include/SavedConfig.hpp @@ -1,14 +1,14 @@ -#ifndef SAVED_CONFIG_H_ -#define SAVED_CONFIG_H_ +#ifndef SAVEDCONFIG_HPP_ +#define SAVEDCONFIG_HPP_ -#include #include #include +#include #include -#include "conf.hpp" #include "MachineConfig.hpp" +#include "conf.hpp" namespace fablabbg { @@ -60,4 +60,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // SAVED_CONFIG_H_ \ No newline at end of file +#endif // SAVEDCONFIG_HPP_ \ No newline at end of file diff --git a/include/Tasks.hpp b/include/Tasks.hpp index 6066ba30..3a71253c 100644 --- a/include/Tasks.hpp +++ b/include/Tasks.hpp @@ -1,5 +1,5 @@ -#ifndef TASKS_H_ -#define TASKS_H_ +#ifndef TASKS_HPP_ +#define TASKS_HPP_ #include #include @@ -128,4 +128,4 @@ namespace fablabbg::Tasks void task_delay(const milliseconds delay); } // namespace fablabbg::Tasks -#endif \ No newline at end of file +#endif // TASKS_HPP_ \ No newline at end of file diff --git a/include/card.hpp b/include/card.hpp index 2941edac..3d199cb5 100644 --- a/include/card.hpp +++ b/include/card.hpp @@ -1,10 +1,10 @@ -#ifndef CARD_H_ -#define CARD_H_ +#ifndef CARD_HPP_ +#define CARD_HPP_ #include "Arduino.h" #include "conf.hpp" -#include #include +#include #include "Logging.hpp" @@ -39,4 +39,4 @@ namespace fablabbg::card ESP_LOGI(TAG, "Card UID = %s", card::uid_str(uid).c_str()); } } // namespace fablabbg::card -#endif // CARD_H_ \ No newline at end of file +#endif // CARD_HPP_ \ No newline at end of file diff --git a/include/globals.hpp b/include/globals.hpp index 2af92eab..fdaa40c0 100644 --- a/include/globals.hpp +++ b/include/globals.hpp @@ -1,23 +1,21 @@ -#ifndef GLOBALS_H_ -#define GLOBALS_H_ +#ifndef GLOBALS_HPP_ +#define GLOBALS_HPP_ +#include "AuthProvider.hpp" +#include "BoardLogic.hpp" #include "FabBackend.hpp" -#include "MachineConfig.hpp" -#include "Machine.hpp" #include "LCDWrapper.hpp" -#include "conf.hpp" +#include "LiquidCrystal.h" +#include "Machine.hpp" +#include "MachineConfig.hpp" +#include "Mrfc522Driver.hpp" #include "RFIDWrapper.hpp" -#include "pins.hpp" -#include "secrets.hpp" -#include "AuthProvider.hpp" -#include "BoardLogic.hpp" +#include "SavedConfig.hpp" #include "Tasks.hpp" +#include "conf.hpp" #include "mock/MockMrfc522.hpp" -#include "SavedConfig.hpp" -#include "LCDWrapper.hpp" #include "pins.hpp" -#include "LiquidCrystal.h" -#include "Mrfc522Driver.hpp" +#include "secrets.hpp" #if (WOKWI_SIMULATION) #include "mock/MockMQTTBroker.hpp" #endif @@ -38,4 +36,4 @@ namespace fablabbg::Board DRAM_ATTR Tasks::Scheduler scheduler; } // namespace fablabbg::Board -#endif // GLOBALS_H_ +#endif // GLOBALS_HPP_ diff --git a/include/mock/MockLcdLibrary.hpp b/include/mock/MockLcdLibrary.hpp index d5a490ed..9df869ff 100644 --- a/include/mock/MockLcdLibrary.hpp +++ b/include/mock/MockLcdLibrary.hpp @@ -1,11 +1,11 @@ -#ifndef MOCK_LCDLIBRARY_HPP_ -#define MOCK_LCDLIBRARY_HPP_ +#ifndef MOCK_MOCKLCDLIBRARY_HPP_ +#define MOCK_MOCKLCDLIBRARY_HPP_ #include namespace fablabbg { - class MockLcdLibrary + class MockLcdLibrary final { public: constexpr MockLcdLibrary() = default; @@ -19,4 +19,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // MOCK_LCDLIBRARY_HPP_ \ No newline at end of file +#endif // MOCK_MOCKLCDLIBRARY_HPP_ \ No newline at end of file diff --git a/include/mock/MockMQTTBroker.hpp b/include/mock/MockMQTTBroker.hpp index 782cddbd..53b749d1 100644 --- a/include/mock/MockMQTTBroker.hpp +++ b/include/mock/MockMQTTBroker.hpp @@ -1,13 +1,13 @@ -#ifndef MOCKMQTTBROKER_H_ -#define MOCKMQTTBROKER_H_ +#ifndef MOCK_MOCKMQTTBROKER_HPP_ +#define MOCK_MOCKMQTTBROKER_HPP_ #include #include -#include #include +#include -#include "sMQTTBroker.h" #include "BaseRfidWrapper.hpp" +#include "sMQTTBroker.h" namespace fablabbg { @@ -50,4 +50,4 @@ namespace fablabbg void unlock() { isLocked = false; } }; } // namespace fablabbg -#endif // MOCKMQTTBROKER_H_ \ No newline at end of file +#endif // MOCK_MOCKMQTTBROKER_HPP_ \ No newline at end of file diff --git a/include/mock/MockMrfc522.hpp b/include/mock/MockMrfc522.hpp index 5888efc3..d441ed03 100644 --- a/include/mock/MockMrfc522.hpp +++ b/include/mock/MockMrfc522.hpp @@ -1,14 +1,14 @@ -#ifndef MOCKMRFC522_HPP_ -#define MOCKMRFC522_HPP_ +#ifndef MOCK_MOCKMRFC522_HPP_ +#define MOCK_MOCKMRFC522_HPP_ +#include "Arduino.h" #include #include -#include "Arduino.h" -#include "MFRC522v2.h" -#include "MFRC522DriverSPI.h" -#include "MFRC522DriverPinSimple.h" #include "FabUser.hpp" +#include "MFRC522DriverPinSimple.h" +#include "MFRC522DriverSPI.h" +#include "MFRC522v2.h" namespace fablabbg { @@ -46,4 +46,4 @@ namespace fablabbg }; } // namespace fablabbg -#endif // MOCKMRFC522_HPP_ \ No newline at end of file +#endif // MOCK_MOCKMRFC522_HPP_ \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 5f1842db..cb0dd29c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,7 +19,8 @@ platform_packages = framework-arduinoespressif32 framework = arduino test_framework = unity check_tool = clangtidy -check_flags = clangtidy: --checks=-*,cert-*,clang-analyzer-*,llvm-* --fix +check_flags = + clangtidy: --checks=-*,cert-*,clang-analyzer-*,llvm-* --fix monitor_speed = 115200 test_build_src = yes monitor_filters = esp32_exception_decoder diff --git a/src/AuthProvider.cpp b/src/AuthProvider.cpp index 2f093aa3..a62bfa3f 100644 --- a/src/AuthProvider.cpp +++ b/src/AuthProvider.cpp @@ -3,8 +3,8 @@ #include #include -#include "Logging.hpp" #include "FabBackend.hpp" +#include "Logging.hpp" namespace fablabbg { @@ -70,7 +70,8 @@ namespace fablabbg if (server.isOnline()) { - if (auto response = server.checkCard(uid); response->request_ok && response->getResult() == UserResult::USER_AUTHORIZED) + auto response = server.checkCard(uid); + if (response->request_ok && response->getResult() == UserResult::USER_AUTHORIZED) { user.authenticated = true; user.card_uid = uid; @@ -83,17 +84,15 @@ namespace fablabbg return user; } - else - { - ESP_LOGD(TAG, " -> online check NOT OK"); - user.authenticated = false; + ESP_LOGD(TAG, " -> online check NOT OK"); - if (response->request_ok) - return std::nullopt; + user.authenticated = false; - // If request failed, we need to check the whitelist - } + if (response->request_ok) + return std::nullopt; + + // If request failed, we need to check the whitelist } if (auto result = WhiteListLookup(uid); result.has_value()) diff --git a/src/BaseLCDWrapper.cpp b/src/BaseLCDWrapper.cpp index 9b69dc26..71707490 100644 --- a/src/BaseLCDWrapper.cpp +++ b/src/BaseLCDWrapper.cpp @@ -1,6 +1,6 @@ -#include #include +#include #include "BaseLCDWrapper.hpp" diff --git a/src/BoardLogic.cpp b/src/BoardLogic.cpp index 3aa8cea7..ec99833d 100644 --- a/src/BoardLogic.cpp +++ b/src/BoardLogic.cpp @@ -2,21 +2,21 @@ #include "Arduino.h" #include "WiFi.h" -#include #include +#include -#include "BoardLogic.hpp" -#include "secrets.hpp" -#include "conf.hpp" -#include "Machine.hpp" -#include "FabBackend.hpp" -#include "BaseRfidWrapper.hpp" #include "AuthProvider.hpp" #include "BaseLCDWrapper.hpp" -#include "pins.hpp" -#include "SavedConfig.hpp" +#include "BaseRfidWrapper.hpp" +#include "BoardLogic.hpp" +#include "FabBackend.hpp" #include "Logging.hpp" +#include "Machine.hpp" +#include "SavedConfig.hpp" #include "Tasks.hpp" +#include "conf.hpp" +#include "pins.hpp" +#include "secrets.hpp" #ifndef GIT_VERSION #define GIT_VERSION "??????" diff --git a/src/FabBackend.cpp b/src/FabBackend.cpp index e88a5447..9ec287c0 100644 --- a/src/FabBackend.cpp +++ b/src/FabBackend.cpp @@ -1,15 +1,15 @@ #include "FabBackend.hpp" #include "secrets.hpp" -#include -#include -#include -#include -#include -#include -#include "SavedConfig.hpp" #include "Logging.hpp" +#include "SavedConfig.hpp" #include "Tasks.hpp" +#include +#include +#include +#include +#include +#include namespace fablabbg { diff --git a/src/LCDWrapper.tpp b/src/LCDWrapper.tpp index e9773012..f9ba928c 100644 --- a/src/LCDWrapper.tpp +++ b/src/LCDWrapper.tpp @@ -1,10 +1,10 @@ -#include -#include +#include "LCDWrapper.hpp" +#include "Logging.hpp" #include +#include #include -#include "LCDWrapper.hpp" +#include #include -#include "Logging.hpp" namespace fablabbg { diff --git a/src/MQTTtypes.cpp b/src/MQTTtypes.cpp index 1cba3032..05b9e280 100644 --- a/src/MQTTtypes.cpp +++ b/src/MQTTtypes.cpp @@ -1,11 +1,11 @@ #include "MQTTtypes.hpp" +#include "ArduinoJson.hpp" +#include "FabUser.hpp" #include "card.hpp" #include "string" #include -#include "FabUser.hpp" -#include #include -#include "ArduinoJson.hpp" +#include namespace fablabbg::ServerMQTT { diff --git a/src/Machine.cpp b/src/Machine.cpp index 3cfb6410..0bf71ca2 100644 --- a/src/Machine.cpp +++ b/src/Machine.cpp @@ -1,14 +1,14 @@ #include "Machine.hpp" #include "Arduino.h" -#include -#include -#include -#include -#include "pins.hpp" -#include "secrets.hpp" #include "FabBackend.hpp" #include "Logging.hpp" #include "Tasks.hpp" +#include "pins.hpp" +#include "secrets.hpp" +#include +#include +#include +#include namespace fablabbg { diff --git a/src/Mrfc522Driver.cpp b/src/Mrfc522Driver.cpp index 0f31c9a1..b13b5281 100644 --- a/src/Mrfc522Driver.cpp +++ b/src/Mrfc522Driver.cpp @@ -1,9 +1,9 @@ -#include #include "Arduino.h" +#include -#include "MFRC522v2.h" -#include "MFRC522DriverSPI.h" #include "MFRC522DriverPinSimple.h" +#include "MFRC522DriverSPI.h" +#include "MFRC522v2.h" #include "Mrfc522Driver.hpp" diff --git a/src/RFIDWrapper.tpp b/src/RFIDWrapper.tpp index 4d1befff..0c27317e 100644 --- a/src/RFIDWrapper.tpp +++ b/src/RFIDWrapper.tpp @@ -1,10 +1,10 @@ #include +#include "Logging.hpp" #include "RFIDWrapper.hpp" -#include "pins.hpp" -#include "conf.hpp" #include "card.hpp" -#include "Logging.hpp" +#include "conf.hpp" +#include "pins.hpp" namespace fablabbg { diff --git a/src/SavedConfig.cpp b/src/SavedConfig.cpp index 55fa62e4..49a8f7c4 100644 --- a/src/SavedConfig.cpp +++ b/src/SavedConfig.cpp @@ -3,10 +3,10 @@ #include #include +#include "Logging.hpp" #include "SavedConfig.hpp" -#include "secrets.hpp" #include "conf.hpp" -#include "Logging.hpp" +#include "secrets.hpp" namespace fablabbg { diff --git a/src/Tasks.cpp b/src/Tasks.cpp index dabc9ed0..63cc9892 100644 --- a/src/Tasks.cpp +++ b/src/Tasks.cpp @@ -1,10 +1,10 @@ #include "Tasks.hpp" -#include "conf.hpp" #include "Arduino.h" +#include "conf.hpp" -#include #include "Arduino.h" #include "ArduinoOTA.h" +#include #include "Logging.hpp" diff --git a/src/main.cpp b/src/main.cpp index e01ea5fe..b2a9575b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,20 +1,20 @@ +#include "pthread.h" +#include #include #include -#include -#include "pthread.h" -#include -#include #include "ArduinoOTA.h" +#include +#include -#include "globals.hpp" -#include "pins.hpp" #include "BoardLogic.hpp" -#include "Tasks.hpp" -#include "SavedConfig.hpp" +#include "Logging.hpp" #include "Mrfc522Driver.hpp" +#include "SavedConfig.hpp" +#include "Tasks.hpp" +#include "globals.hpp" #include "mock/MockMQTTBroker.hpp" -#include "Logging.hpp" +#include "pins.hpp" // For ArduinoOTA const char *ssid = secrets::credentials::ssid.data(); diff --git a/src/mock/MockMQTTBroker.cpp b/src/mock/MockMQTTBroker.cpp index cf6a04c2..98b007b9 100644 --- a/src/mock/MockMQTTBroker.cpp +++ b/src/mock/MockMQTTBroker.cpp @@ -1,11 +1,10 @@ #include "mock/MockMQTTBroker.hpp" -#include "conf.hpp" #include "Logging.hpp" +#include "conf.hpp" static const char *TAG2 = "MockMQTTBroker"; namespace fablabbg { - MockMQTTBroker::MockMQTTBroker() { }