From 4daab2692692d47af24a9384eb0f402821527882 Mon Sep 17 00:00:00 2001 From: Avamander Date: Fri, 2 Oct 2020 21:49:55 +0300 Subject: [PATCH] Renamed displayapp/Screens to displayapp/screens --- src/CMakeLists.txt | 70 +++++++++---------- .../{Screens => screens}/ApplicationList.cpp | 0 .../{Screens => screens}/ApplicationList.h | 0 .../{Screens => screens}/BatteryIcon.cpp | 0 .../{Screens => screens}/BatteryIcon.h | 0 .../{Screens => screens}/BleIcon.cpp | 0 src/displayapp/{Screens => screens}/BleIcon.h | 0 .../{Screens => screens}/Brightness.cpp | 0 .../{Screens => screens}/Brightness.h | 0 src/displayapp/{Screens => screens}/Clock.cpp | 0 src/displayapp/{Screens => screens}/Clock.h | 0 .../{Screens => screens}/DropDownDemo.cpp | 0 .../{Screens => screens}/DropDownDemo.h | 0 .../{Screens => screens}/FirmwareUpdate.cpp | 0 .../{Screens => screens}/FirmwareUpdate.h | 0 .../FirmwareValidation.cpp | 0 .../{Screens => screens}/FirmwareValidation.h | 0 src/displayapp/{Screens => screens}/Gauge.cpp | 0 src/displayapp/{Screens => screens}/Gauge.h | 0 .../{Screens => screens}/InfiniPaint.cpp | 0 .../{Screens => screens}/InfiniPaint.h | 0 src/displayapp/{Screens => screens}/Label.cpp | 0 src/displayapp/{Screens => screens}/Label.h | 0 src/displayapp/{Screens => screens}/Meter.cpp | 0 src/displayapp/{Screens => screens}/Meter.h | 0 src/displayapp/{Screens => screens}/Modal.cpp | 0 src/displayapp/{Screens => screens}/Modal.h | 0 src/displayapp/{Screens => screens}/Music.cpp | 0 src/displayapp/{Screens => screens}/Music.h | 0 .../{Screens => screens}/Screen.cpp | 0 src/displayapp/{Screens => screens}/Screen.h | 0 .../{Screens => screens}/ScreenList.h | 0 src/displayapp/{Screens => screens}/Symbols.h | 0 .../{Screens => screens}/SystemInfo.cpp | 0 .../{Screens => screens}/SystemInfo.h | 0 src/displayapp/{Screens => screens}/Tab.cpp | 0 src/displayapp/{Screens => screens}/Tab.h | 0 src/displayapp/{Screens => screens}/Tile.cpp | 0 src/displayapp/{Screens => screens}/Tile.h | 0 src/libs/lvgl/src/lv_core/lv_obj.c | 2 +- 40 files changed, 36 insertions(+), 36 deletions(-) rename src/displayapp/{Screens => screens}/ApplicationList.cpp (100%) rename src/displayapp/{Screens => screens}/ApplicationList.h (100%) rename src/displayapp/{Screens => screens}/BatteryIcon.cpp (100%) rename src/displayapp/{Screens => screens}/BatteryIcon.h (100%) rename src/displayapp/{Screens => screens}/BleIcon.cpp (100%) rename src/displayapp/{Screens => screens}/BleIcon.h (100%) rename src/displayapp/{Screens => screens}/Brightness.cpp (100%) rename src/displayapp/{Screens => screens}/Brightness.h (100%) rename src/displayapp/{Screens => screens}/Clock.cpp (100%) rename src/displayapp/{Screens => screens}/Clock.h (100%) rename src/displayapp/{Screens => screens}/DropDownDemo.cpp (100%) rename src/displayapp/{Screens => screens}/DropDownDemo.h (100%) rename src/displayapp/{Screens => screens}/FirmwareUpdate.cpp (100%) rename src/displayapp/{Screens => screens}/FirmwareUpdate.h (100%) rename src/displayapp/{Screens => screens}/FirmwareValidation.cpp (100%) rename src/displayapp/{Screens => screens}/FirmwareValidation.h (100%) rename src/displayapp/{Screens => screens}/Gauge.cpp (100%) rename src/displayapp/{Screens => screens}/Gauge.h (100%) rename src/displayapp/{Screens => screens}/InfiniPaint.cpp (100%) rename src/displayapp/{Screens => screens}/InfiniPaint.h (100%) rename src/displayapp/{Screens => screens}/Label.cpp (100%) rename src/displayapp/{Screens => screens}/Label.h (100%) rename src/displayapp/{Screens => screens}/Meter.cpp (100%) rename src/displayapp/{Screens => screens}/Meter.h (100%) rename src/displayapp/{Screens => screens}/Modal.cpp (100%) rename src/displayapp/{Screens => screens}/Modal.h (100%) rename src/displayapp/{Screens => screens}/Music.cpp (100%) rename src/displayapp/{Screens => screens}/Music.h (100%) rename src/displayapp/{Screens => screens}/Screen.cpp (100%) rename src/displayapp/{Screens => screens}/Screen.h (100%) rename src/displayapp/{Screens => screens}/ScreenList.h (100%) rename src/displayapp/{Screens => screens}/Symbols.h (100%) rename src/displayapp/{Screens => screens}/SystemInfo.cpp (100%) rename src/displayapp/{Screens => screens}/SystemInfo.h (100%) rename src/displayapp/{Screens => screens}/Tab.cpp (100%) rename src/displayapp/{Screens => screens}/Tab.h (100%) rename src/displayapp/{Screens => screens}/Tile.cpp (100%) rename src/displayapp/{Screens => screens}/Tile.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 546ce813..9d03e904 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -324,23 +324,23 @@ list(APPEND IMAGE_FILES list(APPEND SOURCE_FILES logging/NrfLogger.cpp displayapp/DisplayApp.cpp - displayapp/Screens/Screen.cpp - displayapp/Screens/Clock.cpp - displayapp/Screens/Tile.cpp - displayapp/Screens/Meter.cpp - displayapp/Screens/Gauge.cpp - displayapp/Screens/InfiniPaint.cpp - displayapp/Screens/DropDownDemo.cpp - displayapp/Screens/Modal.cpp - displayapp/Screens/BatteryIcon.cpp - displayapp/Screens/BleIcon.cpp - displayapp/Screens/Brightness.cpp - displayapp/Screens/SystemInfo.cpp - displayapp/Screens/Label.cpp - displayapp/Screens/FirmwareUpdate.cpp - displayapp/Screens/Music.cpp - displayapp/Screens/FirmwareValidation.cpp - displayapp/Screens/ApplicationList.cpp + displayapp/screens/Screen.cpp + displayapp/screens/Clock.cpp + displayapp/screens/Tile.cpp + displayapp/screens/Meter.cpp + displayapp/screens/Gauge.cpp + displayapp/screens/InfiniPaint.cpp + displayapp/screens/DropDownDemo.cpp + displayapp/screens/Modal.cpp + displayapp/screens/BatteryIcon.cpp + displayapp/screens/BleIcon.cpp + displayapp/screens/Brightness.cpp + displayapp/screens/SystemInfo.cpp + displayapp/screens/Label.cpp + displayapp/screens/FirmwareUpdate.cpp + displayapp/screens/Music.cpp + displayapp/screens/FirmwareValidation.cpp + displayapp/screens/ApplicationList.cpp main.cpp drivers/St7789.cpp drivers/SpiNorFlash.cpp @@ -401,23 +401,23 @@ set(INCLUDE_FILES logging/NrfLogger.h displayapp/DisplayApp.h displayapp/TouchEvents.h - displayapp/Screens/Screen.h - displayapp/Screens/Clock.h - displayapp/Screens/Tile.h - displayapp/Screens/Meter.h - displayapp/Screens/Gauge.h - displayapp/Screens/InfiniPaint.h - displayapp/Screens/DropDownDemo.h - displayapp/Screens/Modal.h - displayapp/Screens/BatteryIcon.h - displayapp/Screens/BleIcon.cpp - displayapp/Screens/Brightness.h - displayapp/Screens/SystemInfo.h - displayapp/Screens/ScreenList.h - displayapp/Screens/Label.h - displayapp/Screens/FirmwareUpdate.h - displayapp/Screens/FirmwareValidation.h - displayapp/Screens/ApplicationList.h + displayapp/screens/Screen.h + displayapp/screens/Clock.h + displayapp/screens/Tile.h + displayapp/screens/Meter.h + displayapp/screens/Gauge.h + displayapp/screens/InfiniPaint.h + displayapp/screens/DropDownDemo.h + displayapp/screens/Modal.h + displayapp/screens/BatteryIcon.h + displayapp/screens/BleIcon.cpp + displayapp/screens/Brightness.h + displayapp/screens/SystemInfo.h + displayapp/screens/ScreenList.h + displayapp/screens/Label.h + displayapp/screens/FirmwareUpdate.h + displayapp/screens/FirmwareValidation.h + displayapp/screens/ApplicationList.h displayapp/Apps.h drivers/St7789.h drivers/SpiNorFlash.h @@ -453,7 +453,7 @@ set(INCLUDE_FILES displayapp/LittleVgl.h systemtask/SystemTask.h systemtask/SystemMonitor.h - displayapp/Screens/Symbols.h + displayapp/screens/Symbols.h drivers/TwiMaster.h ) diff --git a/src/displayapp/Screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp similarity index 100% rename from src/displayapp/Screens/ApplicationList.cpp rename to src/displayapp/screens/ApplicationList.cpp diff --git a/src/displayapp/Screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h similarity index 100% rename from src/displayapp/Screens/ApplicationList.h rename to src/displayapp/screens/ApplicationList.h diff --git a/src/displayapp/Screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp similarity index 100% rename from src/displayapp/Screens/BatteryIcon.cpp rename to src/displayapp/screens/BatteryIcon.cpp diff --git a/src/displayapp/Screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h similarity index 100% rename from src/displayapp/Screens/BatteryIcon.h rename to src/displayapp/screens/BatteryIcon.h diff --git a/src/displayapp/Screens/BleIcon.cpp b/src/displayapp/screens/BleIcon.cpp similarity index 100% rename from src/displayapp/Screens/BleIcon.cpp rename to src/displayapp/screens/BleIcon.cpp diff --git a/src/displayapp/Screens/BleIcon.h b/src/displayapp/screens/BleIcon.h similarity index 100% rename from src/displayapp/Screens/BleIcon.h rename to src/displayapp/screens/BleIcon.h diff --git a/src/displayapp/Screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp similarity index 100% rename from src/displayapp/Screens/Brightness.cpp rename to src/displayapp/screens/Brightness.cpp diff --git a/src/displayapp/Screens/Brightness.h b/src/displayapp/screens/Brightness.h similarity index 100% rename from src/displayapp/Screens/Brightness.h rename to src/displayapp/screens/Brightness.h diff --git a/src/displayapp/Screens/Clock.cpp b/src/displayapp/screens/Clock.cpp similarity index 100% rename from src/displayapp/Screens/Clock.cpp rename to src/displayapp/screens/Clock.cpp diff --git a/src/displayapp/Screens/Clock.h b/src/displayapp/screens/Clock.h similarity index 100% rename from src/displayapp/Screens/Clock.h rename to src/displayapp/screens/Clock.h diff --git a/src/displayapp/Screens/DropDownDemo.cpp b/src/displayapp/screens/DropDownDemo.cpp similarity index 100% rename from src/displayapp/Screens/DropDownDemo.cpp rename to src/displayapp/screens/DropDownDemo.cpp diff --git a/src/displayapp/Screens/DropDownDemo.h b/src/displayapp/screens/DropDownDemo.h similarity index 100% rename from src/displayapp/Screens/DropDownDemo.h rename to src/displayapp/screens/DropDownDemo.h diff --git a/src/displayapp/Screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp similarity index 100% rename from src/displayapp/Screens/FirmwareUpdate.cpp rename to src/displayapp/screens/FirmwareUpdate.cpp diff --git a/src/displayapp/Screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h similarity index 100% rename from src/displayapp/Screens/FirmwareUpdate.h rename to src/displayapp/screens/FirmwareUpdate.h diff --git a/src/displayapp/Screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp similarity index 100% rename from src/displayapp/Screens/FirmwareValidation.cpp rename to src/displayapp/screens/FirmwareValidation.cpp diff --git a/src/displayapp/Screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h similarity index 100% rename from src/displayapp/Screens/FirmwareValidation.h rename to src/displayapp/screens/FirmwareValidation.h diff --git a/src/displayapp/Screens/Gauge.cpp b/src/displayapp/screens/Gauge.cpp similarity index 100% rename from src/displayapp/Screens/Gauge.cpp rename to src/displayapp/screens/Gauge.cpp diff --git a/src/displayapp/Screens/Gauge.h b/src/displayapp/screens/Gauge.h similarity index 100% rename from src/displayapp/Screens/Gauge.h rename to src/displayapp/screens/Gauge.h diff --git a/src/displayapp/Screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp similarity index 100% rename from src/displayapp/Screens/InfiniPaint.cpp rename to src/displayapp/screens/InfiniPaint.cpp diff --git a/src/displayapp/Screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h similarity index 100% rename from src/displayapp/Screens/InfiniPaint.h rename to src/displayapp/screens/InfiniPaint.h diff --git a/src/displayapp/Screens/Label.cpp b/src/displayapp/screens/Label.cpp similarity index 100% rename from src/displayapp/Screens/Label.cpp rename to src/displayapp/screens/Label.cpp diff --git a/src/displayapp/Screens/Label.h b/src/displayapp/screens/Label.h similarity index 100% rename from src/displayapp/Screens/Label.h rename to src/displayapp/screens/Label.h diff --git a/src/displayapp/Screens/Meter.cpp b/src/displayapp/screens/Meter.cpp similarity index 100% rename from src/displayapp/Screens/Meter.cpp rename to src/displayapp/screens/Meter.cpp diff --git a/src/displayapp/Screens/Meter.h b/src/displayapp/screens/Meter.h similarity index 100% rename from src/displayapp/Screens/Meter.h rename to src/displayapp/screens/Meter.h diff --git a/src/displayapp/Screens/Modal.cpp b/src/displayapp/screens/Modal.cpp similarity index 100% rename from src/displayapp/Screens/Modal.cpp rename to src/displayapp/screens/Modal.cpp diff --git a/src/displayapp/Screens/Modal.h b/src/displayapp/screens/Modal.h similarity index 100% rename from src/displayapp/Screens/Modal.h rename to src/displayapp/screens/Modal.h diff --git a/src/displayapp/Screens/Music.cpp b/src/displayapp/screens/Music.cpp similarity index 100% rename from src/displayapp/Screens/Music.cpp rename to src/displayapp/screens/Music.cpp diff --git a/src/displayapp/Screens/Music.h b/src/displayapp/screens/Music.h similarity index 100% rename from src/displayapp/Screens/Music.h rename to src/displayapp/screens/Music.h diff --git a/src/displayapp/Screens/Screen.cpp b/src/displayapp/screens/Screen.cpp similarity index 100% rename from src/displayapp/Screens/Screen.cpp rename to src/displayapp/screens/Screen.cpp diff --git a/src/displayapp/Screens/Screen.h b/src/displayapp/screens/Screen.h similarity index 100% rename from src/displayapp/Screens/Screen.h rename to src/displayapp/screens/Screen.h diff --git a/src/displayapp/Screens/ScreenList.h b/src/displayapp/screens/ScreenList.h similarity index 100% rename from src/displayapp/Screens/ScreenList.h rename to src/displayapp/screens/ScreenList.h diff --git a/src/displayapp/Screens/Symbols.h b/src/displayapp/screens/Symbols.h similarity index 100% rename from src/displayapp/Screens/Symbols.h rename to src/displayapp/screens/Symbols.h diff --git a/src/displayapp/Screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp similarity index 100% rename from src/displayapp/Screens/SystemInfo.cpp rename to src/displayapp/screens/SystemInfo.cpp diff --git a/src/displayapp/Screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h similarity index 100% rename from src/displayapp/Screens/SystemInfo.h rename to src/displayapp/screens/SystemInfo.h diff --git a/src/displayapp/Screens/Tab.cpp b/src/displayapp/screens/Tab.cpp similarity index 100% rename from src/displayapp/Screens/Tab.cpp rename to src/displayapp/screens/Tab.cpp diff --git a/src/displayapp/Screens/Tab.h b/src/displayapp/screens/Tab.h similarity index 100% rename from src/displayapp/Screens/Tab.h rename to src/displayapp/screens/Tab.h diff --git a/src/displayapp/Screens/Tile.cpp b/src/displayapp/screens/Tile.cpp similarity index 100% rename from src/displayapp/Screens/Tile.cpp rename to src/displayapp/screens/Tile.cpp diff --git a/src/displayapp/Screens/Tile.h b/src/displayapp/screens/Tile.h similarity index 100% rename from src/displayapp/Screens/Tile.h rename to src/displayapp/screens/Tile.h diff --git a/src/libs/lvgl/src/lv_core/lv_obj.c b/src/libs/lvgl/src/lv_core/lv_obj.c index 510a8706..511e72db 100644 --- a/src/libs/lvgl/src/lv_core/lv_obj.c +++ b/src/libs/lvgl/src/lv_core/lv_obj.c @@ -163,7 +163,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy) LV_ASSERT_MEM(new_obj); if(new_obj == NULL) return NULL; - new_obj->par = NULL; /*Screens has no a parent*/ + new_obj->par = NULL; /*screens has no a parent*/ lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t)); /*Set the callbacks*/