From 1d35d0b6e03cc7b96432bf7b32b2a25fd3d60b27 Mon Sep 17 00:00:00 2001 From: KlausMu Date: Sat, 27 Jan 2024 09:25:43 +0100 Subject: [PATCH] reorganization of files and folder --- Platformio/platformio.ini | 2 +- .../{assets_appleTV.c => device_appleTV_assets.c} | 0 Platformio/src/device_appleTV/gui_appleTV.cpp | 3 +-- .../src/device_keyboard_ble/device_keyboard_ble.cpp | 2 +- .../{assets_smarthome.c => device_smarthome_assets.c} | 0 Platformio/src/device_smarthome/gui_smarthome.cpp | 3 +-- .../gui.cpp => gui_general_and_keys/gui_base.cpp} | 9 ++++----- .../gui.h => gui_general_and_keys/gui_base.h} | 0 .../gui_base_assets.c} | 0 .../gui_irReceiver.cpp | 3 +-- .../gui_irReceiver.h | 0 .../{gui_general => gui_general_and_keys}/gui_numpad.cpp | 3 +-- .../{gui_general => gui_general_and_keys}/gui_numpad.h | 0 .../gui_settings.cpp | 3 +-- .../{gui_general => gui_general_and_keys}/gui_settings.h | 0 .../src/{hardware => gui_general_and_keys}/keys.cpp | 2 +- Platformio/src/{hardware => gui_general_and_keys}/keys.h | 0 .../src/{gui_general => gui_general_and_keys}/lv_conf.h | 0 Platformio/src/hardware/battery.cpp | 4 ++-- Platformio/src/hardware/infrared_receiver.cpp | 2 +- Platformio/src/hardware/mqtt.cpp | 2 +- Platformio/src/hardware/sleep.cpp | 4 ++-- Platformio/src/main.cpp | 4 ++-- Platformio/src/preferences_storage.cpp | 2 +- 24 files changed, 21 insertions(+), 27 deletions(-) rename Platformio/src/device_appleTV/{assets_appleTV.c => device_appleTV_assets.c} (100%) rename Platformio/src/device_smarthome/{assets_smarthome.c => device_smarthome_assets.c} (100%) rename Platformio/src/{gui_general/gui.cpp => gui_general_and_keys/gui_base.cpp} (97%) rename Platformio/src/{gui_general/gui.h => gui_general_and_keys/gui_base.h} (100%) rename Platformio/src/{gui_general/assets_gui.c => gui_general_and_keys/gui_base_assets.c} (100%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_irReceiver.cpp (98%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_irReceiver.h (100%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_numpad.cpp (98%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_numpad.h (100%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_settings.cpp (99%) rename Platformio/src/{gui_general => gui_general_and_keys}/gui_settings.h (100%) rename Platformio/src/{hardware => gui_general_and_keys}/keys.cpp (99%) rename Platformio/src/{hardware => gui_general_and_keys}/keys.h (100%) rename Platformio/src/{gui_general => gui_general_and_keys}/lv_conf.h (100%) diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini index c3b5e59..0e9c492 100644 --- a/Platformio/platformio.ini +++ b/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 diff --git a/Platformio/src/device_appleTV/assets_appleTV.c b/Platformio/src/device_appleTV/device_appleTV_assets.c similarity index 100% rename from Platformio/src/device_appleTV/assets_appleTV.c rename to Platformio/src/device_appleTV/device_appleTV_assets.c diff --git a/Platformio/src/device_appleTV/gui_appleTV.cpp b/Platformio/src/device_appleTV/gui_appleTV.cpp index 3b65349..f2366e2 100644 --- a/Platformio/src/device_appleTV/gui_appleTV.cpp +++ b/Platformio/src/device_appleTV/gui_appleTV.cpp @@ -1,7 +1,6 @@ #include -// #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" diff --git a/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp b/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp index 2563934..1d5cfe3 100644 --- a/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp +++ b/Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp @@ -1,7 +1,7 @@ #include #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 diff --git a/Platformio/src/device_smarthome/assets_smarthome.c b/Platformio/src/device_smarthome/device_smarthome_assets.c similarity index 100% rename from Platformio/src/device_smarthome/assets_smarthome.c rename to Platformio/src/device_smarthome/device_smarthome_assets.c diff --git a/Platformio/src/device_smarthome/gui_smarthome.cpp b/Platformio/src/device_smarthome/gui_smarthome.cpp index 7ac5114..2c869c3 100644 --- a/Platformio/src/device_smarthome/gui_smarthome.cpp +++ b/Platformio/src/device_smarthome/gui_smarthome.cpp @@ -1,7 +1,6 @@ #include #include -// #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" diff --git a/Platformio/src/gui_general/gui.cpp b/Platformio/src/gui_general_and_keys/gui_base.cpp similarity index 97% rename from Platformio/src/gui_general/gui.cpp rename to Platformio/src/gui_general_and_keys/gui_base.cpp index 26263ab..1ebadf1 100644 --- a/Platformio/src/gui_general/gui.cpp +++ b/Platformio/src/gui_general_and_keys/gui_base.cpp @@ -1,11 +1,10 @@ #include -// #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" diff --git a/Platformio/src/gui_general/gui.h b/Platformio/src/gui_general_and_keys/gui_base.h similarity index 100% rename from Platformio/src/gui_general/gui.h rename to Platformio/src/gui_general_and_keys/gui_base.h diff --git a/Platformio/src/gui_general/assets_gui.c b/Platformio/src/gui_general_and_keys/gui_base_assets.c similarity index 100% rename from Platformio/src/gui_general/assets_gui.c rename to Platformio/src/gui_general_and_keys/gui_base_assets.c diff --git a/Platformio/src/gui_general/gui_irReceiver.cpp b/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp similarity index 98% rename from Platformio/src/gui_general/gui_irReceiver.cpp rename to Platformio/src/gui_general_and_keys/gui_irReceiver.cpp index 9a9b441..fe7dac4 100644 --- a/Platformio/src/gui_general/gui_irReceiver.cpp +++ b/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp @@ -1,11 +1,10 @@ #include #include #include -// #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; diff --git a/Platformio/src/gui_general/gui_irReceiver.h b/Platformio/src/gui_general_and_keys/gui_irReceiver.h similarity index 100% rename from Platformio/src/gui_general/gui_irReceiver.h rename to Platformio/src/gui_general_and_keys/gui_irReceiver.h diff --git a/Platformio/src/gui_general/gui_numpad.cpp b/Platformio/src/gui_general_and_keys/gui_numpad.cpp similarity index 98% rename from Platformio/src/gui_general/gui_numpad.cpp rename to Platformio/src/gui_general_and_keys/gui_numpad.cpp index 25a03c4..13a4ef8 100644 --- a/Platformio/src/gui_general/gui_numpad.cpp +++ b/Platformio/src/gui_general_and_keys/gui_numpad.cpp @@ -1,7 +1,6 @@ #include -// #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 diff --git a/Platformio/src/gui_general/gui_numpad.h b/Platformio/src/gui_general_and_keys/gui_numpad.h similarity index 100% rename from Platformio/src/gui_general/gui_numpad.h rename to Platformio/src/gui_general_and_keys/gui_numpad.h diff --git a/Platformio/src/gui_general/gui_settings.cpp b/Platformio/src/gui_general_and_keys/gui_settings.cpp similarity index 99% rename from Platformio/src/gui_general/gui_settings.cpp rename to Platformio/src/gui_general_and_keys/gui_settings.cpp index 30c2bef..4a1eab5 100644 --- a/Platformio/src/gui_general/gui_settings.cpp +++ b/Platformio/src/gui_general_and_keys/gui_settings.cpp @@ -1,8 +1,7 @@ #include -// #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; diff --git a/Platformio/src/gui_general/gui_settings.h b/Platformio/src/gui_general_and_keys/gui_settings.h similarity index 100% rename from Platformio/src/gui_general/gui_settings.h rename to Platformio/src/gui_general_and_keys/gui_settings.h diff --git a/Platformio/src/hardware/keys.cpp b/Platformio/src/gui_general_and_keys/keys.cpp similarity index 99% rename from Platformio/src/hardware/keys.cpp rename to Platformio/src/gui_general_and_keys/keys.cpp index d1024d5..108a8c5 100644 --- a/Platformio/src/hardware/keys.cpp +++ b/Platformio/src/gui_general_and_keys/keys.cpp @@ -1,6 +1,6 @@ #include #include -#include "hardware/keys.h" +#include "gui_general_and_keys/keys.h" #include "hardware/sleep.h" #include "hardware/infrared_sender.h" #include "hardware/mqtt.h" diff --git a/Platformio/src/hardware/keys.h b/Platformio/src/gui_general_and_keys/keys.h similarity index 100% rename from Platformio/src/hardware/keys.h rename to Platformio/src/gui_general_and_keys/keys.h diff --git a/Platformio/src/gui_general/lv_conf.h b/Platformio/src/gui_general_and_keys/lv_conf.h similarity index 100% rename from Platformio/src/gui_general/lv_conf.h rename to Platformio/src/gui_general_and_keys/lv_conf.h diff --git a/Platformio/src/hardware/battery.cpp b/Platformio/src/hardware/battery.cpp index 5b85948..679d335 100644 --- a/Platformio/src/hardware/battery.cpp +++ b/Platformio/src/hardware/battery.cpp @@ -1,7 +1,7 @@ #include #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. diff --git a/Platformio/src/hardware/infrared_receiver.cpp b/Platformio/src/hardware/infrared_receiver.cpp index cd8cd6d..a840694 100644 --- a/Platformio/src/hardware/infrared_receiver.cpp +++ b/Platformio/src/hardware/infrared_receiver.cpp @@ -40,7 +40,7 @@ #include #include "hardware/infrared_receiver.h" -#include "gui_general/gui_irReceiver.h" +#include "gui_general_and_keys/gui_irReceiver.h" bool irReceiverEnabled = false; diff --git a/Platformio/src/hardware/mqtt.cpp b/Platformio/src/hardware/mqtt.cpp index 6e98a2f..4632188 100644 --- a/Platformio/src/hardware/mqtt.cpp +++ b/Platformio/src/hardware/mqtt.cpp @@ -1,7 +1,7 @@ #include #include #include "hardware/mqtt.h" -#include "gui_general/gui.h" +#include "gui_general_and_keys/gui_base.h" #include "secrets.h" #include "commandHandler.h" diff --git a/Platformio/src/hardware/sleep.cpp b/Platformio/src/hardware/sleep.cpp index 7b74080..0d204bd 100644 --- a/Platformio/src/hardware/sleep.cpp +++ b/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" diff --git a/Platformio/src/main.cpp b/Platformio/src/main.cpp index b37ed8f..ff97405 100644 --- a/Platformio/src/main.cpp +++ b/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" diff --git a/Platformio/src/preferences_storage.cpp b/Platformio/src/preferences_storage.cpp index b1822a4..3bb9159 100644 --- a/Platformio/src/preferences_storage.cpp +++ b/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;