From 6f24a0c5284b069d1acee37ab151f6b3f04d45f8 Mon Sep 17 00:00:00 2001 From: KlausMu Date: Fri, 26 Jan 2024 17:01:58 +0100 Subject: [PATCH] reorganized files into folders --- Platformio/src/commandHandler.cpp | 12 ++++----- Platformio/src/commandHandler.h | 4 +-- .../src/{ => device_appleTV}/gui_appleTV.cpp | 6 ++--- .../src/{ => device_appleTV}/gui_appleTV.h | 0 .../device_keyboard_ble.cpp | 6 ++--- .../device_keyboard_ble.h | 0 .../device_keyboard_mqtt.cpp | 2 +- .../device_keyboard_mqtt.h | 0 .../device_samsungTV.cpp} | 2 +- .../device_samsungTV.h} | 0 .../{ => device_smarthome}/gui_smarthome.cpp | 6 ++--- .../{ => device_smarthome}/gui_smarthome.h | 0 .../device_yamahaAmp.cpp} | 2 +- .../device_yamahaAmp.h} | 0 Platformio/src/{ => gui_general}/gui.cpp | 16 ++++++------ Platformio/src/{ => gui_general}/gui.h | 2 +- .../src/{ => gui_general}/gui_irReceiver.cpp | 8 +++--- .../src/{ => gui_general}/gui_irReceiver.h | 0 .../src/{ => gui_general}/gui_numpad.cpp | 4 +-- Platformio/src/{ => gui_general}/gui_numpad.h | 0 .../src/{ => gui_general}/gui_settings.cpp | 6 ++--- .../src/{ => gui_general}/gui_settings.h | 0 Platformio/src/{ => hardware}/battery.cpp | 6 ++--- Platformio/src/{ => hardware}/battery.h | 0 .../src/{ => hardware}/infrared_receiver.cpp | 4 +-- .../src/{ => hardware}/infrared_receiver.h | 0 .../infrared_sender.cpp} | 2 +- .../infrared_sender.h} | 0 Platformio/src/{ => hardware}/keys.cpp | 12 ++++----- Platformio/src/{ => hardware}/keys.h | 0 Platformio/src/{ => hardware}/mqtt.cpp | 4 +-- Platformio/src/{ => hardware}/mqtt.h | 0 Platformio/src/{ => hardware}/sleep.cpp | 16 ++++++------ Platformio/src/{ => hardware}/sleep.h | 0 Platformio/src/{ => hardware}/tft.cpp | 4 +-- Platformio/src/{ => hardware}/tft.h | 0 Platformio/src/{ => hardware}/user_led.cpp | 2 +- Platformio/src/{ => hardware}/user_led.h | 0 Platformio/src/main.cpp | 26 +++++++++---------- Platformio/src/preferences_storage.cpp | 6 ++--- 40 files changed, 79 insertions(+), 79 deletions(-) rename Platformio/src/{ => device_appleTV}/gui_appleTV.cpp (96%) rename Platformio/src/{ => device_appleTV}/gui_appleTV.h (100%) rename Platformio/src/{ => device_keyboard_ble}/device_keyboard_ble.cpp (98%) rename Platformio/src/{ => device_keyboard_ble}/device_keyboard_ble.h (100%) rename Platformio/src/{ => device_keyboard_mqtt}/device_keyboard_mqtt.cpp (97%) rename Platformio/src/{ => device_keyboard_mqtt}/device_keyboard_mqtt.h (100%) rename Platformio/src/{device_samsung.cpp => device_samsungTV/device_samsungTV.cpp} (99%) rename Platformio/src/{device_samsung.h => device_samsungTV/device_samsungTV.h} (100%) rename Platformio/src/{ => device_smarthome}/gui_smarthome.cpp (98%) rename Platformio/src/{ => device_smarthome}/gui_smarthome.h (100%) rename Platformio/src/{device_yamaha.cpp => device_yamahaAmp/device_yamahaAmp.cpp} (98%) rename Platformio/src/{device_yamaha.h => device_yamahaAmp/device_yamahaAmp.h} (100%) rename Platformio/src/{ => gui_general}/gui.cpp (96%) rename Platformio/src/{ => gui_general}/gui.h (93%) rename Platformio/src/{ => gui_general}/gui_irReceiver.cpp (97%) rename Platformio/src/{ => gui_general}/gui_irReceiver.h (100%) rename Platformio/src/{ => gui_general}/gui_numpad.cpp (98%) rename Platformio/src/{ => gui_general}/gui_numpad.h (100%) rename Platformio/src/{ => gui_general}/gui_settings.cpp (98%) rename Platformio/src/{ => gui_general}/gui_settings.h (100%) rename Platformio/src/{ => hardware}/battery.cpp (96%) rename Platformio/src/{ => hardware}/battery.h (100%) rename Platformio/src/{ => hardware}/infrared_receiver.cpp (99%) rename Platformio/src/{ => hardware}/infrared_receiver.h (100%) rename Platformio/src/{infrared.cpp => hardware/infrared_sender.cpp} (87%) rename Platformio/src/{infrared.h => hardware/infrared_sender.h} (100%) rename Platformio/src/{ => hardware}/keys.cpp (97%) rename Platformio/src/{ => hardware}/keys.h (100%) rename Platformio/src/{ => hardware}/mqtt.cpp (97%) rename Platformio/src/{ => hardware}/mqtt.h (100%) rename Platformio/src/{ => hardware}/sleep.cpp (96%) rename Platformio/src/{ => hardware}/sleep.h (100%) rename Platformio/src/{ => hardware}/tft.cpp (97%) rename Platformio/src/{ => hardware}/tft.h (100%) rename Platformio/src/{ => hardware}/user_led.cpp (86%) rename Platformio/src/{ => hardware}/user_led.h (100%) diff --git a/Platformio/src/commandHandler.cpp b/Platformio/src/commandHandler.cpp index e65ae6c..2d76561 100644 --- a/Platformio/src/commandHandler.cpp +++ b/Platformio/src/commandHandler.cpp @@ -1,12 +1,12 @@ #include #include -#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 commands; byte allDevsPowered = 0; diff --git a/Platformio/src/commandHandler.h b/Platformio/src/commandHandler.h index f4c8306..6f228ed 100644 --- a/Platformio/src/commandHandler.h +++ b/Platformio/src/commandHandler.h @@ -9,8 +9,8 @@ #include #include -#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. diff --git a/Platformio/src/gui_appleTV.cpp b/Platformio/src/device_appleTV/gui_appleTV.cpp similarity index 96% rename from Platformio/src/gui_appleTV.cpp rename to Platformio/src/device_appleTV/gui_appleTV.cpp index 387e014..f20ff7e 100644 --- a/Platformio/src/gui_appleTV.cpp +++ b/Platformio/src/device_appleTV/gui_appleTV.cpp @@ -1,8 +1,8 @@ #include // #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); diff --git a/Platformio/src/gui_appleTV.h b/Platformio/src/device_appleTV/gui_appleTV.h similarity index 100% rename from Platformio/src/gui_appleTV.h rename to Platformio/src/device_appleTV/gui_appleTV.h diff --git a/Platformio/src/device_keyboard_ble.cpp b/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp similarity index 98% rename from Platformio/src/device_keyboard_ble.cpp rename to Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp index ca09c56..2563934 100644 --- a/Platformio/src/device_keyboard_ble.cpp +++ b/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp @@ -1,8 +1,8 @@ #include #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 diff --git a/Platformio/src/device_keyboard_ble.h b/Platformio/src/device_keyboard_ble/device_keyboard_ble.h similarity index 100% rename from Platformio/src/device_keyboard_ble.h rename to Platformio/src/device_keyboard_ble/device_keyboard_ble.h diff --git a/Platformio/src/device_keyboard_mqtt.cpp b/Platformio/src/device_keyboard_mqtt/device_keyboard_mqtt.cpp similarity index 97% rename from Platformio/src/device_keyboard_mqtt.cpp rename to Platformio/src/device_keyboard_mqtt/device_keyboard_mqtt.cpp index 562540b..8895317 100644 --- a/Platformio/src/device_keyboard_mqtt.cpp +++ b/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 diff --git a/Platformio/src/device_keyboard_mqtt.h b/Platformio/src/device_keyboard_mqtt/device_keyboard_mqtt.h similarity index 100% rename from Platformio/src/device_keyboard_mqtt.h rename to Platformio/src/device_keyboard_mqtt/device_keyboard_mqtt.h diff --git a/Platformio/src/device_samsung.cpp b/Platformio/src/device_samsungTV/device_samsungTV.cpp similarity index 99% rename from Platformio/src/device_samsung.cpp rename to Platformio/src/device_samsungTV/device_samsungTV.cpp index 008359d..a3deb85 100644 --- a/Platformio/src/device_samsung.cpp +++ b/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 diff --git a/Platformio/src/device_samsung.h b/Platformio/src/device_samsungTV/device_samsungTV.h similarity index 100% rename from Platformio/src/device_samsung.h rename to Platformio/src/device_samsungTV/device_samsungTV.h diff --git a/Platformio/src/gui_smarthome.cpp b/Platformio/src/device_smarthome/gui_smarthome.cpp similarity index 98% rename from Platformio/src/gui_smarthome.cpp rename to Platformio/src/device_smarthome/gui_smarthome.cpp index 051d149..9f424c4 100644 --- a/Platformio/src/gui_smarthome.cpp +++ b/Platformio/src/device_smarthome/gui_smarthome.cpp @@ -1,8 +1,8 @@ #include // #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 diff --git a/Platformio/src/gui_smarthome.h b/Platformio/src/device_smarthome/gui_smarthome.h similarity index 100% rename from Platformio/src/gui_smarthome.h rename to Platformio/src/device_smarthome/gui_smarthome.h diff --git a/Platformio/src/device_yamaha.cpp b/Platformio/src/device_yamahaAmp/device_yamahaAmp.cpp similarity index 98% rename from Platformio/src/device_yamaha.cpp rename to Platformio/src/device_yamahaAmp/device_yamahaAmp.cpp index c4735eb..cbf6df4 100644 --- a/Platformio/src/device_yamaha.cpp +++ b/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"}); diff --git a/Platformio/src/device_yamaha.h b/Platformio/src/device_yamahaAmp/device_yamahaAmp.h similarity index 100% rename from Platformio/src/device_yamaha.h rename to Platformio/src/device_yamahaAmp/device_yamahaAmp.h diff --git a/Platformio/src/gui.cpp b/Platformio/src/gui_general/gui.cpp similarity index 96% rename from Platformio/src/gui.cpp rename to Platformio/src/gui_general/gui.cpp index 8d4590a..26263ab 100644 --- a/Platformio/src/gui.cpp +++ b/Platformio/src/gui_general/gui.cpp @@ -1,13 +1,13 @@ #include // #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 diff --git a/Platformio/src/gui.h b/Platformio/src/gui_general/gui.h similarity index 93% rename from Platformio/src/gui.h rename to Platformio/src/gui_general/gui.h index 9c82340..43aee4e 100644 --- a/Platformio/src/gui.h +++ b/Platformio/src/gui_general/gui.h @@ -2,7 +2,7 @@ #define __GUI_H__ #include -#include "tft.h" +#include "../hardware/tft.h" // LVGL declarations LV_IMG_DECLARE(high_brightness); diff --git a/Platformio/src/gui_irReceiver.cpp b/Platformio/src/gui_general/gui_irReceiver.cpp similarity index 97% rename from Platformio/src/gui_irReceiver.cpp rename to Platformio/src/gui_general/gui_irReceiver.cpp index f8e632d..9a9b441 100644 --- a/Platformio/src/gui_irReceiver.cpp +++ b/Platformio/src/gui_general/gui_irReceiver.cpp @@ -2,10 +2,10 @@ #include #include // #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; diff --git a/Platformio/src/gui_irReceiver.h b/Platformio/src/gui_general/gui_irReceiver.h similarity index 100% rename from Platformio/src/gui_irReceiver.h rename to Platformio/src/gui_general/gui_irReceiver.h diff --git a/Platformio/src/gui_numpad.cpp b/Platformio/src/gui_general/gui_numpad.cpp similarity index 98% rename from Platformio/src/gui_numpad.cpp rename to Platformio/src/gui_general/gui_numpad.cpp index 2dc4d1e..25a03c4 100644 --- a/Platformio/src/gui_numpad.cpp +++ b/Platformio/src/gui_general/gui_numpad.cpp @@ -1,7 +1,7 @@ #include // #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 diff --git a/Platformio/src/gui_numpad.h b/Platformio/src/gui_general/gui_numpad.h similarity index 100% rename from Platformio/src/gui_numpad.h rename to Platformio/src/gui_general/gui_numpad.h diff --git a/Platformio/src/gui_settings.cpp b/Platformio/src/gui_general/gui_settings.cpp similarity index 98% rename from Platformio/src/gui_settings.cpp rename to Platformio/src/gui_general/gui_settings.cpp index 5d4add9..30c2bef 100644 --- a/Platformio/src/gui_settings.cpp +++ b/Platformio/src/gui_general/gui_settings.cpp @@ -1,8 +1,8 @@ #include // #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; diff --git a/Platformio/src/gui_settings.h b/Platformio/src/gui_general/gui_settings.h similarity index 100% rename from Platformio/src/gui_settings.h rename to Platformio/src/gui_general/gui_settings.h diff --git a/Platformio/src/battery.cpp b/Platformio/src/hardware/battery.cpp similarity index 96% rename from Platformio/src/battery.cpp rename to Platformio/src/hardware/battery.cpp index 70638e1..5b85948 100644 --- a/Platformio/src/battery.cpp +++ b/Platformio/src/hardware/battery.cpp @@ -1,7 +1,7 @@ #include -#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. diff --git a/Platformio/src/battery.h b/Platformio/src/hardware/battery.h similarity index 100% rename from Platformio/src/battery.h rename to Platformio/src/hardware/battery.h diff --git a/Platformio/src/infrared_receiver.cpp b/Platformio/src/hardware/infrared_receiver.cpp similarity index 99% rename from Platformio/src/infrared_receiver.cpp rename to Platformio/src/hardware/infrared_receiver.cpp index 850b7e0..cd8cd6d 100644 --- a/Platformio/src/infrared_receiver.cpp +++ b/Platformio/src/hardware/infrared_receiver.cpp @@ -39,8 +39,8 @@ #include #include -#include "infrared_receiver.h" -#include "gui_irReceiver.h" +#include "hardware/infrared_receiver.h" +#include "gui_general/gui_irReceiver.h" bool irReceiverEnabled = false; diff --git a/Platformio/src/infrared_receiver.h b/Platformio/src/hardware/infrared_receiver.h similarity index 100% rename from Platformio/src/infrared_receiver.h rename to Platformio/src/hardware/infrared_receiver.h diff --git a/Platformio/src/infrared.cpp b/Platformio/src/hardware/infrared_sender.cpp similarity index 87% rename from Platformio/src/infrared.cpp rename to Platformio/src/hardware/infrared_sender.cpp index a90c206..52a9c0c 100644 --- a/Platformio/src/infrared.cpp +++ b/Platformio/src/hardware/infrared_sender.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "infrared.h" +#include "hardware/infrared_sender.h" IRsend IrSender(IR_LED, true); diff --git a/Platformio/src/infrared.h b/Platformio/src/hardware/infrared_sender.h similarity index 100% rename from Platformio/src/infrared.h rename to Platformio/src/hardware/infrared_sender.h diff --git a/Platformio/src/keys.cpp b/Platformio/src/hardware/keys.cpp similarity index 97% rename from Platformio/src/keys.cpp rename to Platformio/src/hardware/keys.cpp index 837114b..d1024d5 100644 --- a/Platformio/src/keys.cpp +++ b/Platformio/src/hardware/keys.cpp @@ -1,11 +1,11 @@ #include #include -#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 diff --git a/Platformio/src/keys.h b/Platformio/src/hardware/keys.h similarity index 100% rename from Platformio/src/keys.h rename to Platformio/src/hardware/keys.h diff --git a/Platformio/src/mqtt.cpp b/Platformio/src/hardware/mqtt.cpp similarity index 97% rename from Platformio/src/mqtt.cpp rename to Platformio/src/hardware/mqtt.cpp index bb9850b..6e98a2f 100644 --- a/Platformio/src/mqtt.cpp +++ b/Platformio/src/hardware/mqtt.cpp @@ -1,9 +1,9 @@ #include #include +#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; diff --git a/Platformio/src/mqtt.h b/Platformio/src/hardware/mqtt.h similarity index 100% rename from Platformio/src/mqtt.h rename to Platformio/src/hardware/mqtt.h diff --git a/Platformio/src/sleep.cpp b/Platformio/src/hardware/sleep.cpp similarity index 96% rename from Platformio/src/sleep.cpp rename to Platformio/src/hardware/sleep.cpp index 3c6134f..7b74080 100644 --- a/Platformio/src/sleep.cpp +++ b/Platformio/src/hardware/sleep.cpp @@ -1,14 +1,14 @@ #include #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; diff --git a/Platformio/src/sleep.h b/Platformio/src/hardware/sleep.h similarity index 100% rename from Platformio/src/sleep.h rename to Platformio/src/hardware/sleep.h diff --git a/Platformio/src/tft.cpp b/Platformio/src/hardware/tft.cpp similarity index 97% rename from Platformio/src/tft.cpp rename to Platformio/src/hardware/tft.cpp index 5c1a068..1bac427 100644 --- a/Platformio/src/tft.cpp +++ b/Platformio/src/hardware/tft.cpp @@ -1,7 +1,7 @@ #include #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(); diff --git a/Platformio/src/tft.h b/Platformio/src/hardware/tft.h similarity index 100% rename from Platformio/src/tft.h rename to Platformio/src/hardware/tft.h diff --git a/Platformio/src/user_led.cpp b/Platformio/src/hardware/user_led.cpp similarity index 86% rename from Platformio/src/user_led.cpp rename to Platformio/src/hardware/user_led.cpp index 8b142c0..6c1a2b0 100644 --- a/Platformio/src/user_led.cpp +++ b/Platformio/src/hardware/user_led.cpp @@ -1,5 +1,5 @@ #include -#include "user_led.h" +#include "hardware/user_led.h" void init_userled(void) { pinMode(USER_LED, OUTPUT); diff --git a/Platformio/src/user_led.h b/Platformio/src/hardware/user_led.h similarity index 100% rename from Platformio/src/user_led.h rename to Platformio/src/hardware/user_led.h diff --git a/Platformio/src/main.cpp b/Platformio/src/main.cpp index 38ad934..5cb0722 100644 --- a/Platformio/src/main.cpp +++ b/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() { diff --git a/Platformio/src/preferences_storage.cpp b/Platformio/src/preferences_storage.cpp index 347658b..b1822a4 100644 --- a/Platformio/src/preferences_storage.cpp +++ b/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;