reorganization of files and folder

Platformio/platformio.ini

@@ -30,7 +30,7 @@ build_flags =
 	-D DISABLE_ALL_LIBRARY_WARNINGS=1 ; for TFT_eSPI
 	-D USE_NIMBLE=1 ; for BLE Keyboard
 	-D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-	-D LV_CONF_PATH=../../../../src/gui_general/lv_conf.h
+	-D LV_CONF_PATH=../../../../src/gui_general_and_keys/lv_conf.h
 	; The following lines replace the TFT_eSPI User_setup.h-file
 	-D USER_SETUP_LOADED=1
 	-D ILI9341_DRIVER=1

Platformio/src/device_appleTV/gui_appleTV.cpp

@@ -1,7 +1,6 @@
 #include <lvgl.h>
-// #include "assets.c"
 #include "device_appleTV/device_appleTV.h"
-#include "gui_general/gui.h"
+#include "gui_general_and_keys/gui_base.h"
 #include "hardware/tft.h"
 #include "commandHandler.h"
 

Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp

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

Platformio/src/device_smarthome/gui_smarthome.cpp

@@ -1,7 +1,6 @@
 #include <string>
 #include <lvgl.h>
-// #include "assets.c"
-#include "gui_general/gui.h"
+#include "gui_general_and_keys/gui_base.h"
 #include "hardware/tft.h"
 #include "device_smarthome/device_smarthome.h"
 #include "commandHandler.h"

Platformio/src/gui_general_and_keys/gui_base.cpp

@@ -1,11 +1,10 @@
 #include <lvgl.h>
-// #include "assets.c"
 #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 "gui_general_and_keys/gui_base.h"
+#include "gui_general_and_keys/gui_irReceiver.h"
+#include "gui_general_and_keys/gui_numpad.h"
+#include "gui_general_and_keys/gui_settings.h"
 #include "device_appleTV/gui_appleTV.h"
 #include "device_smarthome/gui_smarthome.h"
 

Platformio/src/gui_general_and_keys/gui_irReceiver.cpp

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

Platformio/src/gui_general_and_keys/gui_numpad.cpp

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

Platformio/src/gui_general_and_keys/gui_settings.cpp

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

Platformio/src/gui_general_and_keys/keys.cpp

@@ -1,6 +1,6 @@
 #include <map>
 #include <string.h>
-#include "hardware/keys.h"
+#include "gui_general_and_keys/keys.h"
 #include "hardware/sleep.h"
 #include "hardware/infrared_sender.h"
 #include "hardware/mqtt.h"

Platformio/src/hardware/battery.cpp

@@ -1,7 +1,7 @@
 #include <Arduino.h>
 #include "hardware/battery.h"
-#include "gui_general/gui.h"
-#include "gui_general/gui_settings.h"
+#include "gui_general_and_keys/gui_base.h"
+#include "gui_general_and_keys/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

@@ -40,7 +40,7 @@
 #include <IRutils.h>
 
 #include "hardware/infrared_receiver.h"
-#include "gui_general/gui_irReceiver.h"
+#include "gui_general_and_keys/gui_irReceiver.h"
 
 bool irReceiverEnabled = false;
 

Platformio/src/hardware/mqtt.cpp

@@ -1,7 +1,7 @@
 #include <PubSubClient.h>
 #include <lvgl.h>
 #include "hardware/mqtt.h"
-#include "gui_general/gui.h"
+#include "gui_general_and_keys/gui_base.h"
 #include "secrets.h"
 #include "commandHandler.h"
 

Platformio/src/hardware/sleep.cpp

@@ -3,11 +3,11 @@
 #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 "gui_general_and_keys/gui_base.h"
+#include "gui_general_and_keys/keys.h"
 #include "preferences_storage.h"
 #include "commandHandler.h"
 

Platformio/src/main.cpp

@@ -7,7 +7,6 @@
 #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"
@@ -17,7 +16,8 @@
 #include "device_smarthome/device_smarthome.h"
 #include "device_keyboard_mqtt/device_keyboard_mqtt.h"
 #include "device_keyboard_ble/device_keyboard_ble.h"
-#include "gui_general/gui.h"
+#include "gui_general_and_keys/keys.h"
+#include "gui_general_and_keys/gui_base.h"
 #include "preferences_storage.h"
 #include "commandHandler.h"
 

Platformio/src/preferences_storage.cpp

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