Convert Spi and GFX to C++.

1 files changed, 12 insertions, 3 deletions

diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 08ecede..0fb6baf 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -1,18 +1,27 @@
 #pragma once
 #include <FreeRTOS.h>
 #include <task.h>
-#include <drivers/st7789.h>
+#include <drivers/St7789.h>
+#include <drivers/SpiMaster.h>
+#include <Components/Gfx/Gfx.h>
+#include <bits/unique_ptr.h>
+
+extern const FONT_INFO lCD_70ptFontInfo;
 
 namespace Pinetime {
   namespace Applications {
     class DisplayApp {
       public:
         void Start();
+
       private:
         TaskHandle_t taskHandle;
         static void Process(void* instance);
-        void gfx_initialization();
-
+        void InitHw();
+        Pinetime::Drivers::SpiMaster spi;
+        std::unique_ptr<Drivers::St7789> lcd;
+        std::unique_ptr<Components::Gfx> gfx;
+        const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
     };
   }
 }