From 442d0b0dad9e75df8eb9f0e24fdcf5b629246a11 Mon Sep 17 00:00:00 2001 From: Matthew Colvin Date: Wed, 11 Oct 2023 16:20:05 -0500 Subject: [PATCH] move some pages that are specific out of the "core" folder --- .../{core => UIs/BasicRefactored}/page/DisplaySettings.cpp | 0 .../{core => UIs/BasicRefactored}/page/DisplaySettings.hpp | 0 .../{core => UIs/BasicRefactored}/page/SettingsPage.cpp | 0 .../{core => UIs/BasicRefactored}/page/SettingsPage.hpp | 0 .../{core => UIs/BasicRefactored}/screen/HomeScreen.cpp | 0 .../{core => UIs/BasicRefactored}/screen/HomeScreen.hpp | 0 Platformio/platformio.ini | 4 +++- 7 files changed, 3 insertions(+), 1 deletion(-) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/page/DisplaySettings.cpp (100%) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/page/DisplaySettings.hpp (100%) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/page/SettingsPage.cpp (100%) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/page/SettingsPage.hpp (100%) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/screen/HomeScreen.cpp (100%) rename Platformio/OmoteUI/{core => UIs/BasicRefactored}/screen/HomeScreen.hpp (100%) diff --git a/Platformio/OmoteUI/core/page/DisplaySettings.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp similarity index 100% rename from Platformio/OmoteUI/core/page/DisplaySettings.cpp rename to Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp diff --git a/Platformio/OmoteUI/core/page/DisplaySettings.hpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp similarity index 100% rename from Platformio/OmoteUI/core/page/DisplaySettings.hpp rename to Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp diff --git a/Platformio/OmoteUI/core/page/SettingsPage.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp similarity index 100% rename from Platformio/OmoteUI/core/page/SettingsPage.cpp rename to Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp diff --git a/Platformio/OmoteUI/core/page/SettingsPage.hpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.hpp similarity index 100% rename from Platformio/OmoteUI/core/page/SettingsPage.hpp rename to Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.hpp diff --git a/Platformio/OmoteUI/core/screen/HomeScreen.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/screen/HomeScreen.cpp similarity index 100% rename from Platformio/OmoteUI/core/screen/HomeScreen.cpp rename to Platformio/OmoteUI/UIs/BasicRefactored/screen/HomeScreen.cpp diff --git a/Platformio/OmoteUI/core/screen/HomeScreen.hpp b/Platformio/OmoteUI/UIs/BasicRefactored/screen/HomeScreen.hpp similarity index 100% rename from Platformio/OmoteUI/core/screen/HomeScreen.hpp rename to Platformio/OmoteUI/UIs/BasicRefactored/screen/HomeScreen.hpp diff --git a/Platformio/platformio.ini b/Platformio/platformio.ini index a54539d..64ae617 100644 --- a/Platformio/platformio.ini +++ b/Platformio/platformio.ini @@ -40,13 +40,15 @@ build_flags = ; ------------- Includes ------------------------------------ -I OmoteUI -I OmoteUI/core - -I OmoteUI/core/interfaces -I OmoteUI/core/screen -I OmoteUI/core/widget -I OmoteUI/core/page -I OmoteUI/UIs -I OmoteUI/UIs/Basic -I OmoteUI/UIs/BasicRefactored + -I OmoteUI/UIs/BasicRefactored/screen + -I OmoteUI/UIs/BasicRefactored/page + -I OmoteUI/UIs/BasicRefactored/widget -I HAL -I HAL/HardwareModules