From f0374fde9987c159838fc35baa48e201abded8f2 Mon Sep 17 00:00:00 2001 From: KlausMu Date: Mon, 25 Mar 2024 22:11:53 +0100 Subject: [PATCH] renamed scene__defaultKeys to scene__default --- Platformio/src/applicationInternal/gui/guiBase.cpp | 2 +- Platformio/src/applicationInternal/gui/guiRegistry.cpp | 2 +- Platformio/src/applicationInternal/scenes/sceneHandler.cpp | 2 +- Platformio/src/applicationInternal/scenes/sceneRegistry.cpp | 2 +- Platformio/src/main.cpp | 2 +- .../src/scenes/{scene__defaultKeys.cpp => scene__default.cpp} | 2 +- .../src/scenes/{scene__defaultKeys.h => scene__default.h} | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename Platformio/src/scenes/{scene__defaultKeys.cpp => scene__default.cpp} (99%) rename Platformio/src/scenes/{scene__defaultKeys.h => scene__default.h} (100%) diff --git a/Platformio/src/applicationInternal/gui/guiBase.cpp b/Platformio/src/applicationInternal/gui/guiBase.cpp index 750e6f7..1ded520 100644 --- a/Platformio/src/applicationInternal/gui/guiBase.cpp +++ b/Platformio/src/applicationInternal/gui/guiBase.cpp @@ -4,7 +4,7 @@ #include "applicationInternal/gui/guiMemoryOptimizer.h" // for changing to scene Selection gui #include "applicationInternal/commandHandler.h" -#include "scenes/scene__defaultKeys.h" +#include "scenes/scene__default.h" lv_color_t color_primary = lv_color_hex(0x303030); // gray lv_obj_t* MemoryUsageLabel = NULL; diff --git a/Platformio/src/applicationInternal/gui/guiRegistry.cpp b/Platformio/src/applicationInternal/gui/guiRegistry.cpp index fa9f8e5..29acd28 100644 --- a/Platformio/src/applicationInternal/gui/guiRegistry.cpp +++ b/Platformio/src/applicationInternal/gui/guiRegistry.cpp @@ -6,7 +6,7 @@ #include "guiRegistry.h" #include "applicationInternal/gui/guiBase.h" #include "applicationInternal/hardware/hardwarePresenter.h" -#include "scenes/scene__defaultKeys.h" +#include "scenes/scene__default.h" // ------------------------------------------------------------------------------------ // this is a map of the registered_guis that can be accessed by name diff --git a/Platformio/src/applicationInternal/scenes/sceneHandler.cpp b/Platformio/src/applicationInternal/scenes/sceneHandler.cpp index 18cd5dd..b846e44 100644 --- a/Platformio/src/applicationInternal/scenes/sceneHandler.cpp +++ b/Platformio/src/applicationInternal/scenes/sceneHandler.cpp @@ -4,7 +4,7 @@ #include "applicationInternal/scenes/sceneRegistry.h" #include "applicationInternal/hardware/hardwarePresenter.h" #include "applicationInternal/commandHandler.h" -#include "scenes/scene__defaultKeys.h" +#include "scenes/scene__default.h" void handleScene(uint16_t command, commandData commandData, std::string additionalPayload = "") { diff --git a/Platformio/src/applicationInternal/scenes/sceneRegistry.cpp b/Platformio/src/applicationInternal/scenes/sceneRegistry.cpp index 22b3950..c1be9d8 100644 --- a/Platformio/src/applicationInternal/scenes/sceneRegistry.cpp +++ b/Platformio/src/applicationInternal/scenes/sceneRegistry.cpp @@ -4,7 +4,7 @@ #include "applicationInternal/scenes/sceneRegistry.h" #include "applicationInternal/hardware/hardwarePresenter.h" // scenes -#include "scenes/scene__defaultKeys.h" +#include "scenes/scene__default.h" // If useSceneGUIlist == true, then a scene is active and we are not in the main_gui_list (with the scene selector as first gui). // In that case, we try to use the scene specific gui list, if the scene defined one. diff --git a/Platformio/src/main.cpp b/Platformio/src/main.cpp index 2f93580..839d394 100644 --- a/Platformio/src/main.cpp +++ b/Platformio/src/main.cpp @@ -25,7 +25,7 @@ #include "applicationInternal/keys.h" #include "applicationInternal/gui/guiStatusUpdate.h" // register scenes -#include "scenes/scene__defaultKeys.h" +#include "scenes/scene__default.h" #include "scenes/scene_allOff.h" #include "scenes/scene_TV.h" #include "scenes/scene_fireTV.h" diff --git a/Platformio/src/scenes/scene__defaultKeys.cpp b/Platformio/src/scenes/scene__default.cpp similarity index 99% rename from Platformio/src/scenes/scene__defaultKeys.cpp rename to Platformio/src/scenes/scene__default.cpp index 4ea8105..6228df3 100644 --- a/Platformio/src/scenes/scene__defaultKeys.cpp +++ b/Platformio/src/scenes/scene__default.cpp @@ -5,7 +5,7 @@ // devices #include "devices/AVreceiver/device_yamahaAmp/device_yamahaAmp.h" // scenes -#include "scene__defaultKeys.h" +#include "scene__default.h" #include "scenes/scene_allOff.h" #include "scenes/scene_TV.h" #include "scenes/scene_fireTV.h" diff --git a/Platformio/src/scenes/scene__defaultKeys.h b/Platformio/src/scenes/scene__default.h similarity index 100% rename from Platformio/src/scenes/scene__defaultKeys.h rename to Platformio/src/scenes/scene__default.h