From b4bd41cd562f89bcd320ac0985e9b33c766babe1 Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Sun, 19 Jan 2020 19:47:49 +0100
Subject: Implement the SPI driver using DMA.

---
 src/DisplayApp/DisplayApp.cpp | 24 ++++++++++++++----------
 src/DisplayApp/DisplayApp.h   |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/DisplayApp')

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;
   }
 }
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 5fb8f6f8..eabfe099 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -57,8 +57,8 @@ namespace Pinetime {
 
         Screens::Clock clockScreen;
         Screens::Screen* currentScreen = nullptr;
-//        Screens::Message messageScreen;
-//        bool screenState = false;
+        Screens::Message messageScreen;
+        bool screenState = false;
         static constexpr uint8_t pinSpiSck = 2;
         static constexpr uint8_t pinSpiMosi = 3;
         static constexpr uint8_t pinSpiMiso = 4;
-- 
cgit v1.2.3-70-g09d2