summaryrefslogtreecommitdiff
path: root/src/DisplayApp/DisplayApp.cpp
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2020-01-19 19:47:49 +0100
committerJF <jf@codingfield.com>2020-01-19 19:47:49 +0100
commitb4bd41cd562f89bcd320ac0985e9b33c766babe1 (patch)
treee64c79bd4f61452c93ee45b75aa26bbf8252d731 /src/DisplayApp/DisplayApp.cpp
parent9dc4e32e36eb1167ee241cdf8027089cad593cf1 (diff)
Implement the SPI driver using DMA.
Diffstat (limited to 'src/DisplayApp/DisplayApp.cpp')
-rw-r--r--src/DisplayApp/DisplayApp.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 3b7007af..29c75fa8 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -31,8 +31,8 @@ DisplayApp::DisplayApp(Controllers::Battery &batteryController,
batteryController{batteryController},
bleController{bleController},
dateTimeController{dateTimeController},
- clockScreen{*(gfx.get())}/*,
- messageScreen{*(gfx.get())}*/ {
+ clockScreen{*(gfx.get())},
+ messageScreen{*(gfx.get())} {
msgQueue = xQueueCreate(queueSize, itemSize);
currentScreen = &clockScreen;
}
@@ -121,16 +121,20 @@ void DisplayApp::Refresh() {
void DisplayApp::RunningState() {
clockScreen.SetCurrentDateTime(dateTimeController.CurrentDateTime());
+// if(currentScreen != nullptr) {
+// currentScreen->Refresh(false);
+// }
+
if(currentScreen != nullptr) {
- currentScreen->Refresh(false);
+ currentScreen->Refresh(true);
}
-// if(screenState) {
-// currentScreen = &clockScreen;
-// } else {
-// currentScreen = &messageScreen;
-// }
-// screenState = !screenState;
+ if(screenState) {
+ currentScreen = &clockScreen;
+ } else {
+ currentScreen = &messageScreen;
+ }
+ screenState = !screenState;
}
@@ -153,7 +157,7 @@ void DisplayApp::OnTouchEvent() {
auto info = touchPanel.GetTouchInfo();
if(info.isTouch) {
- lcd->FillRectangle(info.x-10, info.y-10, 20,20, pointColor);
+ gfx->FillRectangle(info.x-10, info.y-10, 20,20, pointColor);
pointColor+=10;
}
}