summaryrefslogtreecommitdiff
path: root/src/DisplayApp/DisplayApp.cpp
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2020-01-26 15:39:49 +0100
committerJF <jf@codingfield.com>2020-01-26 15:39:49 +0100
commit6491a7c3a0738d6e6ef3bf57da460f61298d1cd9 (patch)
treef720612013c3518b54ecd22ccfc5aef6917d3023 /src/DisplayApp/DisplayApp.cpp
parent640e8cd1febc679b976fb26225aec8d462a4c241 (diff)
Remove test code
Diffstat (limited to 'src/DisplayApp/DisplayApp.cpp')
-rw-r--r--src/DisplayApp/DisplayApp.cpp37
1 files changed, 2 insertions, 35 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 8795416c..ca139423 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -26,8 +26,7 @@ DisplayApp::DisplayApp(Pinetime::Drivers::St7789& lcd,
batteryController{batteryController},
bleController{bleController},
dateTimeController{dateTimeController},
- clockScreen{gfx},
- messageScreen{gfx} {
+ clockScreen{gfx} {
msgQueue = xQueueCreate(queueSize, itemSize);
currentScreen = &clockScreen;
}
@@ -61,25 +60,6 @@ uint32_t acc = 0;
uint32_t count = 0;
bool toggle = true;
void DisplayApp::Refresh() {
-#if 0
- uint32_t before = nrf_rtc_counter_get(portNRF_RTC_REG);
- if(toggle) {
- gfx.FillRectangle(0,0,240,240,0x0000);
- } else {
- gfx.FillRectangle(0,0,240,240,0xffff);
- }
- uint32_t after = nrf_rtc_counter_get(portNRF_RTC_REG);
-
- acc += (after - before);
- if((count % 10) == 0) {
- NRF_LOG_INFO("DRAW : %d ms", (uint32_t)(acc/10));
- acc = 0;
- }
- count++;
- toggle = !toggle;
-#endif
-
-#if 1
TickType_t queueTimeout;
switch (state) {
case States::Idle:
@@ -130,29 +110,16 @@ void DisplayApp::Refresh() {
break;
}
}
-#endif
}
void DisplayApp::RunningState() {
clockScreen.SetCurrentDateTime(dateTimeController.CurrentDateTime());
-// if(currentScreen != nullptr) {
-// currentScreen->Refresh(false);
-// }
-
if(currentScreen != nullptr) {
- currentScreen->Refresh(true);
- }
-
- if(screenState) {
- currentScreen = &clockScreen;
- } else {
- currentScreen = &messageScreen;
+ currentScreen->Refresh(false);
}
- screenState = !screenState;
}
-
void DisplayApp::IdleState() {
}