Renamed DisplayApp/ to displayapp/

This commit is contained in:
Avamander 2020-10-02 21:46:41 +03:00
parent 30c261028e
commit e3fb2f0b89
100 changed files with 70 additions and 70 deletions

View File

@ -292,55 +292,55 @@ set(LVGL_SRC
) )
list(APPEND IMAGE_FILES list(APPEND IMAGE_FILES
DisplayApp/Icons/battery/os_battery_error.c displayapp/Icons/battery/os_battery_error.c
DisplayApp/Icons/battery/os_battery_100.c displayapp/Icons/battery/os_battery_100.c
DisplayApp/Icons/battery/os_battery_090.c displayapp/Icons/battery/os_battery_090.c
DisplayApp/Icons/battery/os_battery_080.c displayapp/Icons/battery/os_battery_080.c
DisplayApp/Icons/battery/os_battery_070.c displayapp/Icons/battery/os_battery_070.c
DisplayApp/Icons/battery/os_battery_060.c displayapp/Icons/battery/os_battery_060.c
DisplayApp/Icons/battery/os_battery_050.c displayapp/Icons/battery/os_battery_050.c
DisplayApp/Icons/battery/os_battery_040.c displayapp/Icons/battery/os_battery_040.c
DisplayApp/Icons/battery/os_battery_030.c displayapp/Icons/battery/os_battery_030.c
DisplayApp/Icons/battery/os_battery_020.c displayapp/Icons/battery/os_battery_020.c
DisplayApp/Icons/battery/os_battery_010.c displayapp/Icons/battery/os_battery_010.c
DisplayApp/Icons/battery/os_battery_005.c displayapp/Icons/battery/os_battery_005.c
DisplayApp/Icons/battery/os_batterycharging_100.c displayapp/Icons/battery/os_batterycharging_100.c
DisplayApp/Icons/battery/os_batterycharging_090.c displayapp/Icons/battery/os_batterycharging_090.c
DisplayApp/Icons/battery/os_batterycharging_080.c displayapp/Icons/battery/os_batterycharging_080.c
DisplayApp/Icons/battery/os_batterycharging_070.c displayapp/Icons/battery/os_batterycharging_070.c
DisplayApp/Icons/battery/os_batterycharging_060.c displayapp/Icons/battery/os_batterycharging_060.c
DisplayApp/Icons/battery/os_batterycharging_050.c displayapp/Icons/battery/os_batterycharging_050.c
DisplayApp/Icons/battery/os_batterycharging_040.c displayapp/Icons/battery/os_batterycharging_040.c
DisplayApp/Icons/battery/os_batterycharging_030.c displayapp/Icons/battery/os_batterycharging_030.c
DisplayApp/Icons/battery/os_batterycharging_020.c displayapp/Icons/battery/os_batterycharging_020.c
DisplayApp/Icons/battery/os_batterycharging_010.c displayapp/Icons/battery/os_batterycharging_010.c
DisplayApp/Icons/battery/os_batterycharging_005.c displayapp/Icons/battery/os_batterycharging_005.c
DisplayApp/Icons/bluetooth/os_bt_connected.c displayapp/Icons/bluetooth/os_bt_connected.c
DisplayApp/Icons/bluetooth/os_bt_disconnected.c displayapp/Icons/bluetooth/os_bt_disconnected.c
) )
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
@ -370,9 +370,9 @@ list(APPEND SOURCE_FILES
FreeRTOS/port_cmsis_systick.c FreeRTOS/port_cmsis_systick.c
FreeRTOS/port_cmsis.c FreeRTOS/port_cmsis.c
DisplayApp/LittleVgl.cpp displayapp/LittleVgl.cpp
DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c displayapp/Fonts/jetbrains_mono_extrabold_compressed.c
DisplayApp/Fonts/jetbrains_mono_bold_20.c displayapp/Fonts/jetbrains_mono_bold_20.c
systemtask/SystemTask.cpp systemtask/SystemTask.cpp
drivers/TwiMaster.cpp drivers/TwiMaster.cpp
@ -399,26 +399,26 @@ list(APPEND GRAPHICS_SOURCE_FILES
set(INCLUDE_FILES set(INCLUDE_FILES
logging/Logger.h logging/Logger.h
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
drivers/SpiMaster.h drivers/SpiMaster.h
@ -450,10 +450,10 @@ set(INCLUDE_FILES
libs/date/includes/date/julian.h libs/date/includes/date/julian.h
libs/date/includes/date/ptz.h libs/date/includes/date/ptz.h
libs/date/includes/date/tz_private.h libs/date/includes/date/tz_private.h
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

@ -43,13 +43,13 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver
} }
void DisplayApp::Start() { void DisplayApp::Start() {
if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 512, this, 0, &taskHandle)) if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM); APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
} }
void DisplayApp::Process(void *instance) { void DisplayApp::Process(void *instance) {
auto *app = static_cast<DisplayApp *>(instance); auto *app = static_cast<DisplayApp *>(instance);
NRF_LOG_INFO("DisplayApp task started!"); NRF_LOG_INFO("displayapp task started!");
app->InitHw(); app->InitHw();
// Send a dummy notification to unlock the lvgl display driver for the first iteration // Send a dummy notification to unlock the lvgl display driver for the first iteration

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB