From f7d63602b11209b9a900b454034f1bc2353c576b Mon Sep 17 00:00:00 2001 From: KlausMu Date: Sun, 28 Jan 2024 18:21:14 +0100 Subject: [PATCH] some files renamed for better understandability --- Platformio/src/device_appleTV/gui_appleTV.cpp | 4 ++-- Platformio/src/device_keyboard_ble/device_keyboard_ble.cpp | 2 +- Platformio/src/device_smarthome/gui_smarthome.cpp | 4 ++-- .../src/gui_general_and_keys/{gui_base.cpp => guiBase.cpp} | 4 ++-- .../src/gui_general_and_keys/{gui_base.h => guiBase.h} | 6 +++--- .../{gui_base_assets.c => guiBase_assets.c} | 0 .../{gui_registry.cpp => guiRegistry.cpp} | 2 +- .../gui_general_and_keys/{gui_registry.h => guiRegistry.h} | 6 +++--- Platformio/src/gui_general_and_keys/gui_irReceiver.cpp | 4 ++-- Platformio/src/gui_general_and_keys/gui_numpad.cpp | 4 ++-- Platformio/src/gui_general_and_keys/gui_settings.cpp | 4 ++-- Platformio/src/hardware/battery.cpp | 2 +- Platformio/src/hardware/mqtt.cpp | 2 +- Platformio/src/hardware/sleep.cpp | 2 +- Platformio/src/main.cpp | 2 +- Platformio/src/preferences_storage.cpp | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) rename Platformio/src/gui_general_and_keys/{gui_base.cpp => guiBase.cpp} (98%) rename Platformio/src/gui_general_and_keys/{gui_base.h => guiBase.h} (84%) rename Platformio/src/gui_general_and_keys/{gui_base_assets.c => guiBase_assets.c} (100%) rename Platformio/src/gui_general_and_keys/{gui_registry.cpp => guiRegistry.cpp} (97%) rename Platformio/src/gui_general_and_keys/{gui_registry.h => guiRegistry.h} (93%) diff --git a/Platformio/src/device_appleTV/gui_appleTV.cpp b/Platformio/src/device_appleTV/gui_appleTV.cpp index f24695d..c167194 100644 --- a/Platformio/src/device_appleTV/gui_appleTV.cpp +++ b/Platformio/src/device_appleTV/gui_appleTV.cpp @@ -1,7 +1,7 @@ #include #include "device_appleTV/device_appleTV.h" -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.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 90328ed..d1da02e 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_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.h" #include "hardware/battery.h" #ifdef ENABLE_KEYBOARD_BLE diff --git a/Platformio/src/device_smarthome/gui_smarthome.cpp b/Platformio/src/device_smarthome/gui_smarthome.cpp index e94d704..8fcdfc3 100644 --- a/Platformio/src/device_smarthome/gui_smarthome.cpp +++ b/Platformio/src/device_smarthome/gui_smarthome.cpp @@ -1,7 +1,7 @@ #include #include -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.h" #include "hardware/tft.h" #include "device_smarthome/device_smarthome.h" #include "commandHandler.h" diff --git a/Platformio/src/gui_general_and_keys/gui_base.cpp b/Platformio/src/gui_general_and_keys/guiBase.cpp similarity index 98% rename from Platformio/src/gui_general_and_keys/gui_base.cpp rename to Platformio/src/gui_general_and_keys/guiBase.cpp index e1a5100..fd8724c 100644 --- a/Platformio/src/gui_general_and_keys/gui_base.cpp +++ b/Platformio/src/gui_general_and_keys/guiBase.cpp @@ -1,8 +1,8 @@ #include #include "hardware/tft.h" #include "hardware/sleep.h" -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.h" lv_obj_t* panel; lv_color_t color_primary = lv_color_hex(0x303030); // gray diff --git a/Platformio/src/gui_general_and_keys/gui_base.h b/Platformio/src/gui_general_and_keys/guiBase.h similarity index 84% rename from Platformio/src/gui_general_and_keys/gui_base.h rename to Platformio/src/gui_general_and_keys/guiBase.h index c276f95..dbd0bf0 100644 --- a/Platformio/src/gui_general_and_keys/gui_base.h +++ b/Platformio/src/gui_general_and_keys/guiBase.h @@ -1,5 +1,5 @@ -#ifndef __GUI_BASE_H__ -#define __GUI_BASE_H__ +#ifndef __GUIBASE_H__ +#define __GUIBASE_H__ #include #include "../hardware/tft.h" @@ -19,4 +19,4 @@ extern byte currentScreen; // Current screen that is shown void init_gui(void); void gui_loop(void); -#endif /*__GUI_BASE_H__*/ +#endif /*__GUIBASE_H__*/ diff --git a/Platformio/src/gui_general_and_keys/gui_base_assets.c b/Platformio/src/gui_general_and_keys/guiBase_assets.c similarity index 100% rename from Platformio/src/gui_general_and_keys/gui_base_assets.c rename to Platformio/src/gui_general_and_keys/guiBase_assets.c diff --git a/Platformio/src/gui_general_and_keys/gui_registry.cpp b/Platformio/src/gui_general_and_keys/guiRegistry.cpp similarity index 97% rename from Platformio/src/gui_general_and_keys/gui_registry.cpp rename to Platformio/src/gui_general_and_keys/guiRegistry.cpp index 4a8f2d9..a49d3d4 100644 --- a/Platformio/src/gui_general_and_keys/gui_registry.cpp +++ b/Platformio/src/gui_general_and_keys/guiRegistry.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "gui_registry.h" +#include "guiregistry.h" // https://stackoverflow.com/questions/840501/how-do-function-pointers-in-c-work struct gui_functions { diff --git a/Platformio/src/gui_general_and_keys/gui_registry.h b/Platformio/src/gui_general_and_keys/guiRegistry.h similarity index 93% rename from Platformio/src/gui_general_and_keys/gui_registry.h rename to Platformio/src/gui_general_and_keys/guiRegistry.h index 19f0161..f2f22b1 100644 --- a/Platformio/src/gui_general_and_keys/gui_registry.h +++ b/Platformio/src/gui_general_and_keys/guiRegistry.h @@ -1,5 +1,5 @@ -#ifndef __GUI_REGISTRY_H__ -#define __GUI_REGISTRY_H__ +#ifndef __GUIREGISTRY_H__ +#define __GUIREGISTRY_H__ /* If you want to create a new GUI for the touch screen, then @@ -26,4 +26,4 @@ void register_gui(init_gui_tab a_init_gui_tab, init_gui_pageIndicator a_gui_page void create_gui_tabs_from_gui_registry(lv_obj_t* tabview); void create_gui_pageIndicators_from_gui_registry(lv_obj_t* panel); -#endif /*__GUI_REGISTRY_H__*/ +#endif /*__GUIREGISTRY_H__*/ diff --git a/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp b/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp index d73d130..c2fae2f 100644 --- a/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp +++ b/Platformio/src/gui_general_and_keys/gui_irReceiver.cpp @@ -4,8 +4,8 @@ #include "hardware/tft.h" #include "hardware/sleep.h" #include "hardware/infrared_receiver.h" -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.h" lv_obj_t* menuBoxToggle; lv_obj_t* menuBoxMessages; diff --git a/Platformio/src/gui_general_and_keys/gui_numpad.cpp b/Platformio/src/gui_general_and_keys/gui_numpad.cpp index c34d11a..d7589f3 100644 --- a/Platformio/src/gui_general_and_keys/gui_numpad.cpp +++ b/Platformio/src/gui_general_and_keys/gui_numpad.cpp @@ -1,7 +1,7 @@ #include #include "hardware/tft.h" -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.h" #include "commandHandler.h" // Virtual Keypad Event handler diff --git a/Platformio/src/gui_general_and_keys/gui_settings.cpp b/Platformio/src/gui_general_and_keys/gui_settings.cpp index 347a4f9..cdbace1 100644 --- a/Platformio/src/gui_general_and_keys/gui_settings.cpp +++ b/Platformio/src/gui_general_and_keys/gui_settings.cpp @@ -1,8 +1,8 @@ #include #include "hardware/tft.h" #include "hardware/sleep.h" -#include "gui_general_and_keys/gui_base.h" -#include "gui_general_and_keys/gui_registry.h" +#include "gui_general_and_keys/guiBase.h" +#include "gui_general_and_keys/guiRegistry.h" lv_obj_t* objBattSettingsVoltage; lv_obj_t* objBattSettingsPercentage; diff --git a/Platformio/src/hardware/battery.cpp b/Platformio/src/hardware/battery.cpp index 679d335..283f0e2 100644 --- a/Platformio/src/hardware/battery.cpp +++ b/Platformio/src/hardware/battery.cpp @@ -1,6 +1,6 @@ #include #include "hardware/battery.h" -#include "gui_general_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.h" #include "gui_general_and_keys/gui_settings.h" void init_battery(void) { diff --git a/Platformio/src/hardware/mqtt.cpp b/Platformio/src/hardware/mqtt.cpp index 4632188..7ab3ea9 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_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.h" #include "secrets.h" #include "commandHandler.h" diff --git a/Platformio/src/hardware/sleep.cpp b/Platformio/src/hardware/sleep.cpp index 0d204bd..b68c428 100644 --- a/Platformio/src/hardware/sleep.cpp +++ b/Platformio/src/hardware/sleep.cpp @@ -6,7 +6,7 @@ #include "hardware/infrared_sender.h" #include "hardware/infrared_receiver.h" #include "hardware/battery.h" -#include "gui_general_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.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 2b8a075..0bf8c0e 100644 --- a/Platformio/src/main.cpp +++ b/Platformio/src/main.cpp @@ -17,7 +17,7 @@ #include "device_keyboard_mqtt/device_keyboard_mqtt.h" #include "device_keyboard_ble/device_keyboard_ble.h" #include "gui_general_and_keys/keys.h" -#include "gui_general_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.h" #include "gui_general_and_keys/gui_irReceiver.h" #include "gui_general_and_keys/gui_settings.h" #include "gui_general_and_keys/gui_numpad.h" diff --git a/Platformio/src/preferences_storage.cpp b/Platformio/src/preferences_storage.cpp index 3bb9159..74c6313 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_and_keys/gui_base.h" +#include "gui_general_and_keys/guiBase.h" #include "commandHandler.h" Preferences preferences;