reorganized files into folders

Platformio/src/commandHandler.cpp

@@ -1,12 +1,12 @@
 #include <string>
 #include <sstream>
-#include "infrared.h"
-#include "mqtt.h"
+#include "hardware/infrared_sender.h"
+#include "hardware/mqtt.h"
+#include "device_samsungTV/device_samsungTV.h"
+#include "device_yamahaAmp/device_yamahaAmp.h"
+#include "device_keyboard_mqtt/device_keyboard_mqtt.h"
+#include "device_keyboard_ble/device_keyboard_ble.h"
 #include "commandHandler.h"
-#include "device_samsung.h"
-#include "device_yamaha.h"
-#include "device_keyboard_mqtt.h"
-#include "device_keyboard_ble.h"
 
 std::map<std::string, commandData> commands;
 byte allDevsPowered = 0;

Platformio/src/commandHandler.h

@@ -9,8 +9,8 @@
 #include <list>
 #include <map>
 
-#include "device_keyboard_mqtt.h"
-#include "device_keyboard_ble.h"
+#include "device_keyboard_mqtt/device_keyboard_mqtt.h"
+#include "device_keyboard_ble/device_keyboard_ble.h"
 
 /*
   Depending on which keyboard is enabled (BLE or MQTT), we define KEYBOARD_UP, KEYBOARD_DOWN and so on.

Platformio/src/device_appleTV/gui_appleTV.cpp

@@ -1,8 +1,8 @@
 #include <lvgl.h>
 // #include "assets.c"
-#include "tft.h"
-#include "gui.h"
-#include "infrared.h"
+#include "gui_general/gui.h"
+#include "hardware/tft.h"
+#include "hardware/infrared_sender.h"
 
 // LVGL declarations
 LV_IMG_DECLARE(appleTvIcon);

Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp

@@ -1,8 +1,8 @@
 #include <BleKeyboard.h>
 #include "commandHandler.h"
-#include "device_keyboard_ble.h"
-#include "gui.h"
-#include "battery.h"
+#include "device_keyboard_ble/device_keyboard_ble.h"
+#include "gui_general/gui.h"
+#include "hardware/battery.h"
 
 #ifdef ENABLE_KEYBOARD_BLE
 

Platformio/src/device_keyboard_mqtt/device_keyboard_mqtt.cpp

@@ -1,5 +1,5 @@
 #include "commandHandler.h"
-#include "device_keyboard_mqtt.h"
+#include "device_keyboard_mqtt/device_keyboard_mqtt.h"
 
 #ifdef ENABLE_KEYBOARD_MQTT
 

Platformio/src/device_samsungTV/device_samsungTV.cpp

@@ -1,5 +1,5 @@
 #include "commandHandler.h"
-#include "device_samsung.h"
+#include "device_samsungTV/device_samsungTV.h"
 
 void init_samsung_commands() {
   // both GC and SAMSUNG work well

Platformio/src/device_smarthome/gui_smarthome.cpp

@@ -1,8 +1,8 @@
 #include <lvgl.h>
 // #include "assets.c"
-#include "tft.h"
-#include "gui.h"
-#include "mqtt.h"
+#include "gui_general/gui.h"
+#include "hardware/tft.h"
+#include "hardware/mqtt.h"
 #include "commandHandler.h"
 
 // LVGL declarations

Platformio/src/device_yamahaAmp/device_yamahaAmp.cpp

@@ -1,5 +1,5 @@
 #include "commandHandler.h"
-#include "device_yamaha.h"
+#include "device_yamahaAmp/device_yamahaAmp.h"
 
 void init_yamaha_commands() {
   commands[YAMAHA_INPUT_DVD]           = makeCommandData(IR_NEC, {"0x5EA1837C"});

Platformio/src/gui_general/gui.cpp

@@ -1,13 +1,13 @@
 #include <lvgl.h>
 // #include "assets.c"
-#include "tft.h"
-#include "gui.h"
-#include "sleep.h"
-#include "gui_irReceiver.h"
-#include "gui_settings.h"
-#include "gui_numpad.h"
-#include "gui_appleTV.h"
-#include "gui_smarthome.h"
+#include "hardware/tft.h"
+#include "hardware/sleep.h"
+#include "gui_general/gui.h"
+#include "gui_general/gui_irReceiver.h"
+#include "gui_general/gui_numpad.h"
+#include "gui_general/gui_settings.h"
+#include "device_appleTV/gui_appleTV.h"
+#include "device_smarthome/gui_smarthome.h"
 
 lv_obj_t* panel;
 lv_color_t color_primary = lv_color_hex(0x303030); // gray

Platformio/src/gui_general/gui.h

@@ -2,7 +2,7 @@
 #define __GUI_H__
 
 #include <lvgl.h>
-#include "tft.h"
+#include "../hardware/tft.h"
 
 // LVGL declarations
 LV_IMG_DECLARE(high_brightness);

Platformio/src/gui_general/gui_irReceiver.cpp

@@ -2,10 +2,10 @@
 #include <string>
 #include <iostream>
 // #include "assets.c"
-#include "tft.h"
-#include "sleep.h"
-#include "gui.h"
-#include "infrared_receiver.h"
+#include "hardware/tft.h"
+#include "hardware/sleep.h"
+#include "hardware/infrared_receiver.h"
+#include "gui_general/gui.h"
 
 lv_obj_t* menuBoxToggle;
 lv_obj_t* menuBoxMessages;

Platformio/src/gui_general/gui_numpad.cpp

@@ -1,7 +1,7 @@
 #include <lvgl.h>
 // #include "assets.c"
-#include "tft.h"
-#include "gui.h"
+#include "hardware/tft.h"
+#include "gui_general/gui.h"
 #include "commandHandler.h"
 
 // Virtual Keypad Event handler

Platformio/src/gui_general/gui_settings.cpp

@@ -1,8 +1,8 @@
 #include <lvgl.h>
 // #include "assets.c"
-#include "tft.h"
-#include "gui.h"
-#include "sleep.h"
+#include "hardware/tft.h"
+#include "hardware/sleep.h"
+#include "gui_general/gui.h"
 
 lv_obj_t* objBattSettingsVoltage;
 lv_obj_t* objBattSettingsPercentage;

Platformio/src/hardware/battery.cpp

@@ -1,7 +1,7 @@
 #include <Arduino.h>
-#include "battery.h"
-#include "gui.h"
-#include "gui_settings.h"
+#include "hardware/battery.h"
+#include "gui_general/gui.h"
+#include "gui_general/gui_settings.h"
 
 void init_battery(void) {
   // Currently the battery charge status cannot be recognized in a reliable way due to a design flaw in the PCB.

Platformio/src/hardware/infrared_receiver.cpp

@@ -39,8 +39,8 @@
 #include <IRtext.h>
 #include <IRutils.h>
 
-#include "infrared_receiver.h"
-#include "gui_irReceiver.h"
+#include "hardware/infrared_receiver.h"
+#include "gui_general/gui_irReceiver.h"
 
 bool irReceiverEnabled = false;
 

Platformio/src/hardware/infrared_sender.cpp

@@ -2,7 +2,7 @@
 #include <IRsend.h>
 #include <IRrecv.h>
 #include <IRutils.h>
-#include "infrared.h"
+#include "hardware/infrared_sender.h"
 
 IRsend IrSender(IR_LED, true);
 

Platformio/src/hardware/keys.cpp

@@ -1,11 +1,11 @@
 #include <map>
 #include <string.h>
-#include "keys.h"
-#include "sleep.h"
-#include "infrared.h"
-#include "mqtt.h"
-#include "device_samsung.h"
-#include "device_yamaha.h"
+#include "hardware/keys.h"
+#include "hardware/sleep.h"
+#include "hardware/infrared_sender.h"
+#include "hardware/mqtt.h"
+#include "device_samsungTV/device_samsungTV.h"
+#include "device_yamahaAmp/device_yamahaAmp.h"
 #include "commandHandler.h"
 
 const byte ROWS = 5; //five rows

Platformio/src/hardware/mqtt.cpp

@@ -1,9 +1,9 @@
 #include <PubSubClient.h>
 #include <lvgl.h>
+#include "hardware/mqtt.h"
+#include "gui_general/gui.h"
 #include "secrets.h"
-#include "mqtt.h"
 #include "commandHandler.h"
-#include "gui.h"
 
 #ifdef ENABLE_WIFI_AND_MQTT
 WiFiClient espClient;

Platformio/src/hardware/sleep.cpp

@@ -1,14 +1,14 @@
 #include <Arduino.h>
 #include "SparkFunLIS3DH.h"
-#include "sleep.h"
+#include "hardware/sleep.h"
+#include "hardware/tft.h"
+#include "hardware/mqtt.h"
+#include "hardware/keys.h"
+#include "hardware/infrared_sender.h"
+#include "hardware/infrared_receiver.h"
+#include "hardware/battery.h"
+#include "gui_general/gui.h"
 #include "preferences_storage.h"
-#include "tft.h"
-#include "mqtt.h"
-#include "gui.h"
-#include "keys.h"
-#include "infrared.h"
-#include "infrared_receiver.h"
-#include "battery.h"
 #include "commandHandler.h"
 
 int motion = 0;

Platformio/src/hardware/tft.cpp

@@ -1,7 +1,7 @@
 #include <Arduino.h>
 #include "driver/ledc.h"
-#include "tft.h"
-#include "sleep.h"
+#include "hardware/tft.h"
+#include "hardware/sleep.h"
 
 TFT_eSPI tft = TFT_eSPI();
 Adafruit_FT6206 touch = Adafruit_FT6206();

Platformio/src/hardware/user_led.cpp

@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include "user_led.h"
+#include "hardware/user_led.h"
 
 void init_userled(void) {
   pinMode(USER_LED, OUTPUT);

Platformio/src/main.cpp

@@ -3,20 +3,20 @@
 // OMOTE firmware for ESP32
 // 2023 Maximilian Kern
 
-#include "tft.h"
-#include "gui.h"
-#include "infrared.h"
-#include "infrared_receiver.h"
-#include "mqtt.h"
-#include "keys.h"
-#include "sleep.h"
+#include "hardware/tft.h"
+#include "hardware/infrared_sender.h"
+#include "hardware/infrared_receiver.h"
+#include "hardware/mqtt.h"
+#include "hardware/keys.h"
+#include "hardware/sleep.h"
+#include "hardware/battery.h"
+#include "hardware/user_led.h"
+#include "device_samsungTV/device_samsungTV.h"
+#include "device_yamahaAmp/device_yamahaAmp.h"
+#include "device_keyboard_mqtt/device_keyboard_mqtt.h"
+#include "device_keyboard_ble/device_keyboard_ble.h"
+#include "gui_general/gui.h"
 #include "preferences_storage.h"
-#include "battery.h"
-#include "user_led.h"
-#include "device_samsung.h"
-#include "device_yamaha.h"
-#include "device_keyboard_mqtt.h"
-#include "device_keyboard_ble.h"
 #include "commandHandler.h"
 
 void setup() {  

Platformio/src/preferences_storage.cpp

@@ -1,7 +1,7 @@
 #include "preferences_storage.h"
-#include "sleep.h"
-#include "tft.h"
-#include "gui.h"
+#include "hardware/sleep.h"
+#include "hardware/tft.h"
+#include "gui_general/gui.h"
 #include "commandHandler.h"
 
 Preferences preferences;