renamed .h to .hpp

fablab-bergamo · Nov 16, 2023 · d9743f7 · d9743f7
1 parent 392f4e4
commit d9743f7
Show file tree

Hide file tree

Showing 27 changed files with 149 additions and 88 deletions.
diff --git a/include/AuthProvider.h → include/AuthProvider.hpp b/include/AuthProvider.h → include/AuthProvider.hpp
@@ -1,7 +1,7 @@
 #ifndef AUTHPROVIDER_H_
 #define AUTHPROVIDER_H_
 
-#include "FabUser.h"
+#include "FabUser.hpp"
 #include <list>
 #include <string_view>
 #include <tuple>

diff --git a/include/BoardInfo.hpp b/include/BoardInfo.hpp
@@ -0,0 +1,19 @@
+#ifndef BOARDINFO_HPP
+#define BOARDINFO_HPP
+
+#include "Machine.hpp"
+
+struct BoardInfo
+{
+  bool server_connected;
+  Machine::PowerState power_state;
+  bool power_warning;
+  bool operator==(const BoardInfo &t) const
+  {
+    return server_connected == t.server_connected &&
+           power_state == t.power_state &&
+           power_warning == t.power_warning;
+  }
+};
+
+#endif // BOARDINFO_HPP
diff --git a/include/BoardLogic.h → include/BoardLogic.hpp b/include/BoardLogic.h → include/BoardLogic.hpp
@@ -1,10 +1,10 @@
 #ifndef BOARDLOGIC_H
 #define BOARDLOGIC_H
 
-#include "FabUser.h"
-#include "card.h"
+#include "FabUser.hpp"
+#include "card.hpp"
 #include <Adafruit_NeoPixel.h>
-#include "pins.h"
+#include "pins.hpp"
 
 class BoardLogic
 {

diff --git a/include/FabServer.h → include/FabServer.hpp b/include/FabServer.h → include/FabServer.hpp
@@ -1,15 +1,15 @@
 #ifndef FABSERVER_H_
 #define FABSERVER_H_
 
-#include "FabUser.h"
-#include "WiFi.h"
+#include "FabUser.hpp"
+#include "Wifi.h"
 #include <array>
-#include "conf.h"
+#include "conf.hpp"
 #include <string>
 #include <MQTTClient.h>
 #include <functional>
 #include <ArduinoJson.h>
-#include "MQTTtypes.h"
+#include "MQTTtypes.hpp"
 #include <chrono>
 
 using namespace ServerMQTT;

diff --git a/include/FabUser.h → include/FabUser.hpp b/include/FabUser.h → include/FabUser.hpp
@@ -5,8 +5,8 @@
 #include <string>
 #include <array>
 #include "Arduino.h"
-#include "conf.h"
-#include "card.h"
+#include "conf.hpp"
+#include "card.hpp"
 #include <sstream>
 
 struct FabUser

diff --git a/include/LCDWrapper.h → include/LCDWrapper.hpp b/include/LCDWrapper.h → include/LCDWrapper.hpp
@@ -2,26 +2,14 @@
 #define LCDWRAPPER_H_
 
 #include <array>
+#include "BoardInfo.hpp"
 #include "LiquidCrystal.h"
-#include "Machine.h"
-#include "pins.h"
+#include "Machine.hpp"
+#include "pins.hpp"
 #include <chrono>
 
 using namespace std::chrono;
 
-struct BoardInfo
-{
-  bool server_connected;
-  Machine::PowerState power_state;
-  bool power_warning;
-  bool operator==(const BoardInfo &t) const
-  {
-    return server_connected == t.server_connected &&
-           power_state == t.power_state &&
-           power_warning == t.power_warning;
-  }
-};
-
 template <uint8_t _COLS, uint8_t _ROWS>
 class LCDWrapper
 {

diff --git a/include/MQTTtypes.h → include/MQTTtypes.hpp b/include/MQTTtypes.h → include/MQTTtypes.hpp
@@ -1,11 +1,11 @@
 #ifndef MQTTTYPES_H_
 #define MQTTTYPES_H_
 
-#include "card.h"
+#include "card.hpp"
 #include "string"
 #include <memory>
-#include "FabUser.h"
-#include "Machine.h"
+#include "FabUser.hpp"
+#include "Machine.hpp"
 #include <string_view>
 #include "ArduinoJson.h"
 

diff --git a/include/Machine.h → include/Machine.hpp b/include/Machine.h → include/Machine.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <array>
 #include <chrono>
-#include "FabUser.h"
+#include "FabUser.hpp"
 
 class FabServer;
 

diff --git a/include/MockMQTTBroker.h → include/MockMQTTBroker.hpp b/include/MockMQTTBroker.h → include/MockMQTTBroker.hpp
@@ -2,7 +2,7 @@
 #ifndef MOCKMQTTBROKER_H_
 #define MOCKMQTTBROKER_H_
 
-#include "sMQTTBroker.h"
+#include "sMQTTBroker.hpp"
 
 class MockMQTTBroker : public sMQTTBroker
 {

diff --git a/include/MockRFIDWrapper.h → include/MockRFIDWrapper.hpp b/include/MockRFIDWrapper.h → include/MockRFIDWrapper.hpp
@@ -4,8 +4,8 @@
 #include <string>
 #include <memory>
 
-#include "conf.h"
-#include "card.h"
+#include "conf.hpp"
+#include "card.hpp"
 
 class MockRFIDWrapper
 {

diff --git a/include/RFIDWrapper.h → include/RFIDWrapper.hpp b/include/RFIDWrapper.h → include/RFIDWrapper.hpp
@@ -4,8 +4,8 @@
 #include <string>
 #include <memory>
 
-#include "conf.h"
-#include "card.h"
+#include "conf.hpp"
+#include "card.hpp"
 #include "MFRC522v2.h"
 #include "MFRC522DriverSPI.h"
 #include "MFRC522DriverPinSimple.h"

diff --git a/include/card.h → include/card.hpp b/include/card.h → include/card.hpp
@@ -2,7 +2,7 @@
 #define CARD_H_
 
 #include "Arduino.h"
-#include "conf.h"
+#include "conf.hpp"
 
 namespace card
 {

diff --git a/include/conf.h → include/conf.hpp b/include/conf.h → include/conf.hpp
diff --git a/include/globals.h → include/globals.hpp b/include/globals.h → include/globals.hpp
@@ -1,18 +1,18 @@
 #ifndef GLOBALS_H_
 #define GLOBALS_H_
 
-#include "FabServer.h"
-#include "Machine.h"
-#include "LCDWrapper.h"
-#include "conf.h"
-#include "MockRFIDWrapper.h"
-#include "RFIDWrapper.h"
-#include "pins.h"
-#include "secrets.h"
-#include "AuthProvider.h"
-#include "BoardLogic.h"
+#include "FabServer.hpp"
+#include "Machine.hpp"
+#include "LCDWrapper.hpp"
+#include "conf.hpp"
+#include "MockRFIDWrapper.hpp"
+#include "RFIDWrapper.hpp"
+#include "pins.hpp"
+#include "secrets.hpp"
+#include "AuthProvider.hpp"
+#include "BoardLogic.hpp"
 #include <TaskScheduler.h>
-#include "MockMQTTBroker.h"
+#include "MockMQTTBroker.hpp"
 
 // Global variables
 namespace Board

diff --git a/include/pins.h → include/pins.hpp b/include/pins.h → include/pins.hpp
diff --git a/include/secrets.h.example b/include/secrets.h.example
@@ -4,9 +4,9 @@
 #include <cstdint>
 #include <array>
 #include <string_view>
-#include "Machine.h"
-#include "conf.h"
-#include "FabUser.h"
+#include "Machine.hpp"
+#include "conf.hpp"
+#include "FabUser.hpp"
 
 namespace secrets::cards
 {

diff --git a/include/secrets.hpp b/include/secrets.hpp
@@ -0,0 +1,56 @@
+#ifndef SECRETS_H_
+#define SECRETS_H_
+
+#include <cstdint>
+#include <array>
+#include <string_view>
+#include "Machine.hpp"
+#include "conf.hpp"
+#include "FabUser.hpp"
+
+namespace secrets::cards
+{
+  using WhiteListEntry = std::tuple<card::uid_t, FabUser::UserLevel, std::string_view>;
+  using WhiteList = std::array<WhiteListEntry, conf::whitelist::LEN>;
+
+  static constexpr WhiteList whitelist /* List of RFID tags whitelisted, regardless of connection */
+      {
+          std::make_tuple(0xAABBCCD1, FabUser::UserLevel::FABLAB_ADMIN, "ABCDEFG"),
+          std::make_tuple(0xAABBCCD2, FabUser::UserLevel::FABLAB_ADMIN, "PIPPO"),
+          std::make_tuple(0xAABBCCD3, FabUser::UserLevel::FABLAB_USER, "USER1"),
+          std::make_tuple(0xAABBCCD4, FabUser::UserLevel::FABLAB_USER, "USER2"),
+          std::make_tuple(0xAABBCCD5, FabUser::UserLevel::FABLAB_USER, "USER3"),
+          std::make_tuple(0xAABBCCD6, FabUser::UserLevel::FABLAB_USER, "USER1"),
+          std::make_tuple(0xAABBCCD7, FabUser::UserLevel::FABLAB_USER, "USER1"),
+          std::make_tuple(0xAABBCCD8, FabUser::UserLevel::FABLAB_USER, "USER1"),
+          std::make_tuple(0xAABBCCD9, FabUser::UserLevel::FABLAB_USER, "USER1"),
+          std::make_tuple(0xAABBCCDA, FabUser::UserLevel::FABLAB_USER, "USER1")};
+} // namespace secrets::cards
+
+namespace secrets::machine
+{
+  // Machine connected to the ESP32
+  static constexpr std::string_view machine_name = "LASER1";
+  static constexpr Machine::MachineType machine_type = Machine::MachineType::LASER;
+  static constexpr std::string_view machine_topic = "shellyplus1-007/command/switch:0";
+  static constexpr Machine::MachineID machine_id{1}; /* ID of the machine. Will be used to compose MQTT topic*/
+
+} // namespace secrets::machine
+
+namespace secrets::wifi
+{
+  static constexpr std::string_view ssid = "MORIA";                /* Change with WIFI SSID name */
+  static constexpr std::string_view password = "Youshallnotpass!"; /* Change with WIFI SSID password */
+} // namespace secrets::wifi
+
+namespace secrets::mqtt
+{
+  static constexpr std::string_view client = "BOARD-1";        /* Name of with MQTT client */
+  static constexpr std::string_view user = "user!";            /* Change with MQTT user */
+  static constexpr std::string_view password = "password";     /* Change with MQTT password */
+  static constexpr std::string_view server = "192.168.1.123";  /* IP of MQTT broker*/
+  static constexpr std::string_view topic = "/machine";        /* Initial part of the topic, machine ID will be added */
+  static constexpr std::string_view response_topic = "/reply"; /* Server reply (sub-topic of the full machine topic) */
+} // namespace secrets::mqtt
+
+#endif // SECRETS_H_
diff --git a/src/AuthProvider.cpp b/src/AuthProvider.cpp
@@ -1,8 +1,9 @@
-#include "AuthProvider.h"
+#include "AuthProvider.hpp"
 
-#include <string>
 #include <cstdint>
-#include "FabServer.h"
+#include <string>
+
+#include "FabServer.hpp"
 
 namespace Board
 {

diff --git a/src/BoardLogic.cpp b/src/BoardLogic.cpp
@@ -1,16 +1,16 @@
-#include "BoardLogic.h"
+#include "BoardLogic.hpp"
 #include "Arduino.h"
-#include "secrets.h"
-#include "conf.h"
-#include "Machine.h"
-#include "FabServer.h"
-#include "RFIDWrapper.h"
-#include "MockRFIDWrapper.h"
-#include "AuthProvider.h"
+#include "secrets.hpp"
+#include "conf.hpp"
+#include "Machine.hpp"
+#include "FabServer.hpp"
+#include "RFIDWrapper.hpp"
+#include "MockRFIDWrapper.hpp"
+#include "AuthProvider.hpp"
 #include <esp_task_wdt.h>
-#include "LCDWrapper.h"
+#include "LCDWrapper.hpp"
 #include <sstream>
-#include "pins.h"
+#include "pins.hpp"
 #include <Adafruit_NeoPixel.h>
 
 namespace Board

diff --git a/src/FabServer.cpp b/src/FabServer.cpp
@@ -1,5 +1,5 @@
-#include "FabServer.h"
-#include "secrets.h"
+#include "FabServer.hpp"
+#include "secrets.hpp"
 
 #include <string>
 #include <string_view>

diff --git a/src/LCDWrapper.tpp b/src/LCDWrapper.tpp
@@ -1,10 +1,7 @@
-#include "LCDWrapper.h"
-
 #include <cstdint>
 #include <string>
 #include <array>
 #include <sstream>
-#include "Machine.h"
 
 template <uint8_t _COLS, uint8_t _ROWS>
 LCDWrapper<_COLS, _ROWS>::LCDWrapper(const pins_config::lcd_config &conf) : config(conf),

diff --git a/src/MQTTtypes.cpp b/src/MQTTtypes.cpp
@@ -1,11 +1,11 @@
-#include "MQTTtypes.h"
-#include "card.h"
+#include "MQTTtypes.hpp"
+#include "card.hpp"
 #include "string"
 #include <memory>
-#include "FabUser.h"
+#include "FabUser.hpp"
 #include <string_view>
 #include <sstream>
-#include "ArduinoJson.h"
+#include "ArduinoJson.hpp"
 
 namespace ServerMQTT
 {

diff --git a/src/Machine.cpp b/src/Machine.cpp
@@ -1,11 +1,11 @@
-#include "Machine.h"
+#include "Machine.hpp"
 #include "Arduino.h"
 #include <sstream>
 #include <cstdint>
 #include <type_traits>
 #include <chrono>
-#include "secrets.h"
-#include "FabServer.h"
+#include "secrets.hpp"
+#include "FabServer.hpp"
 
 using namespace std::chrono_literals;
 using namespace std::chrono;

diff --git a/src/MockMQTTBroker.cpp b/src/MockMQTTBroker.cpp
@@ -1,6 +1,6 @@
 #ifdef WOKWI_SIMULATION
-#include "MockMQTTBroker.h"
-#include "conf.h"
+#include "MockMQTTBroker.hpp"
+#include "conf.hpp"
 
 MockMQTTBroker::MockMQTTBroker()
 {

diff --git a/src/MockRFIDWrapper.cpp b/src/MockRFIDWrapper.cpp
@@ -1,9 +1,9 @@
-#include "MockRFIDWrapper.h"
-#include "pins.h"
-#include "conf.h"
-#include "card.h"
+#include "MockRFIDWrapper.hpp"
+#include "pins.hpp"
+#include "conf.hpp"
+#include "card.hpp"
 #include <memory>
-#include "secrets.h"
+#include "secrets.hpp"
 
 MockRFIDWrapper::MockRFIDWrapper()
 {

diff --git a/src/RFIDWrapper.cpp b/src/RFIDWrapper.cpp
@@ -1,11 +1,11 @@
-#include "RFIDWrapper.h"
-#include "pins.h"
+#include "RFIDWrapper.hpp"
+#include "pins.hpp"
 #include "MFRC522v2.h"
 #include "MFRC522DriverSPI.h"
 #include "MFRC522DriverPinSimple.h"
 #include "MFRC522Debug.h"
-#include "conf.h"
-#include "card.h"
+#include "conf.hpp"
+#include "card.hpp"
 #include <memory>
 
 RFIDWrapper::RFIDWrapper()