1
0
Fork 0

Renamed displayapp/Screens to displayapp/screens

This commit is contained in:
Avamander 2020-10-02 21:49:55 +03:00
parent e3fb2f0b89
commit 4daab26926
40 changed files with 36 additions and 36 deletions

View file

@ -324,23 +324,23 @@ list(APPEND IMAGE_FILES
list(APPEND SOURCE_FILES list(APPEND SOURCE_FILES
logging/NrfLogger.cpp logging/NrfLogger.cpp
displayapp/DisplayApp.cpp displayapp/DisplayApp.cpp
displayapp/Screens/Screen.cpp displayapp/screens/Screen.cpp
displayapp/Screens/Clock.cpp displayapp/screens/Clock.cpp
displayapp/Screens/Tile.cpp displayapp/screens/Tile.cpp
displayapp/Screens/Meter.cpp displayapp/screens/Meter.cpp
displayapp/Screens/Gauge.cpp displayapp/screens/Gauge.cpp
displayapp/Screens/InfiniPaint.cpp displayapp/screens/InfiniPaint.cpp
displayapp/Screens/DropDownDemo.cpp displayapp/screens/DropDownDemo.cpp
displayapp/Screens/Modal.cpp displayapp/screens/Modal.cpp
displayapp/Screens/BatteryIcon.cpp displayapp/screens/BatteryIcon.cpp
displayapp/Screens/BleIcon.cpp displayapp/screens/BleIcon.cpp
displayapp/Screens/Brightness.cpp displayapp/screens/Brightness.cpp
displayapp/Screens/SystemInfo.cpp displayapp/screens/SystemInfo.cpp
displayapp/Screens/Label.cpp displayapp/screens/Label.cpp
displayapp/Screens/FirmwareUpdate.cpp displayapp/screens/FirmwareUpdate.cpp
displayapp/Screens/Music.cpp displayapp/screens/Music.cpp
displayapp/Screens/FirmwareValidation.cpp displayapp/screens/FirmwareValidation.cpp
displayapp/Screens/ApplicationList.cpp displayapp/screens/ApplicationList.cpp
main.cpp main.cpp
drivers/St7789.cpp drivers/St7789.cpp
drivers/SpiNorFlash.cpp drivers/SpiNorFlash.cpp
@ -401,23 +401,23 @@ set(INCLUDE_FILES
logging/NrfLogger.h logging/NrfLogger.h
displayapp/DisplayApp.h displayapp/DisplayApp.h
displayapp/TouchEvents.h displayapp/TouchEvents.h
displayapp/Screens/Screen.h displayapp/screens/Screen.h
displayapp/Screens/Clock.h displayapp/screens/Clock.h
displayapp/Screens/Tile.h displayapp/screens/Tile.h
displayapp/Screens/Meter.h displayapp/screens/Meter.h
displayapp/Screens/Gauge.h displayapp/screens/Gauge.h
displayapp/Screens/InfiniPaint.h displayapp/screens/InfiniPaint.h
displayapp/Screens/DropDownDemo.h displayapp/screens/DropDownDemo.h
displayapp/Screens/Modal.h displayapp/screens/Modal.h
displayapp/Screens/BatteryIcon.h displayapp/screens/BatteryIcon.h
displayapp/Screens/BleIcon.cpp displayapp/screens/BleIcon.cpp
displayapp/Screens/Brightness.h displayapp/screens/Brightness.h
displayapp/Screens/SystemInfo.h displayapp/screens/SystemInfo.h
displayapp/Screens/ScreenList.h displayapp/screens/ScreenList.h
displayapp/Screens/Label.h displayapp/screens/Label.h
displayapp/Screens/FirmwareUpdate.h displayapp/screens/FirmwareUpdate.h
displayapp/Screens/FirmwareValidation.h displayapp/screens/FirmwareValidation.h
displayapp/Screens/ApplicationList.h displayapp/screens/ApplicationList.h
displayapp/Apps.h displayapp/Apps.h
drivers/St7789.h drivers/St7789.h
drivers/SpiNorFlash.h drivers/SpiNorFlash.h
@ -453,7 +453,7 @@ set(INCLUDE_FILES
displayapp/LittleVgl.h displayapp/LittleVgl.h
systemtask/SystemTask.h systemtask/SystemTask.h
systemtask/SystemMonitor.h systemtask/SystemMonitor.h
displayapp/Screens/Symbols.h displayapp/screens/Symbols.h
drivers/TwiMaster.h drivers/TwiMaster.h
) )

View file

@ -163,7 +163,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
LV_ASSERT_MEM(new_obj); LV_ASSERT_MEM(new_obj);
if(new_obj == NULL) return NULL; 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)); lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t));
/*Set the callbacks*/ /*Set the callbacks*/