From 1d69c79942622eddb531406cabaed77d73bb4c40 Mon Sep 17 00:00:00 2001
From: ZephyrLabs <65145081+ZephyrLabs@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:46:36 +0530
Subject: Addition of new files in MakeList

added Paddle.cpp and Paddle.h
---
 src/displayapp/DisplayApp.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/displayapp/DisplayApp.cpp')

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index efc042b7..c0963243 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -11,6 +11,7 @@
 #include "displayapp/screens/FirmwareValidation.h"
 #include "displayapp/screens/Gauge.h"
 #include "displayapp/screens/InfiniPaint.h"
+#include "displayapp/screens/paddle.h"
 #include "displayapp/screens/Meter.h"
 #include "displayapp/screens/Music.h"
 #include "displayapp/screens/Notifications.h"
@@ -203,6 +204,7 @@ void DisplayApp::RunningState() {
       case Apps::Meter: currentScreen.reset(new Screens::Meter(this)); break;
       case Apps::Gauge: currentScreen.reset(new Screens::Gauge(this)); break;
       case Apps::Paint: currentScreen.reset(new Screens::InfiniPaint(this, lvgl)); break;
+      case Apps::Paddle: currentScreen.reset(new Screens::Paddle(this, lvgl)); break;
       case Apps::Brightness : currentScreen.reset(new Screens::Brightness(this, brightnessController)); break;
       case Apps::Music : currentScreen.reset(new Screens::Music(this, systemTask.nimble().music())); break;
       case Apps::FirmwareValidation: currentScreen.reset(new Screens::FirmwareValidation(this, validator)); break;
-- 
cgit v1.2.3-70-g09d2


From 91b37f8de0993497552f91d5b4c318ed59ca305a Mon Sep 17 00:00:00 2001
From: ZephyrLabs <65145081+ZephyrLabs@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:04:37 +0530
Subject: Update DisplayApp.cpp

added Paddle header and paddle app screen
---
 src/displayapp/DisplayApp.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/displayapp/DisplayApp.cpp')

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index c0963243..d9bcfef3 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -277,3 +277,4 @@ void DisplayApp::SetFullRefresh(DisplayApp::FullRefreshDirections direction) {
 void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
   touchMode = mode;
 }
+
-- 
cgit v1.2.3-70-g09d2


From 09a94ee2b842e7a865cfaa1f04ba4db29879b1ea Mon Sep 17 00:00:00 2001
From: ZephyrLabs <65145081+ZephyrLabs@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:17:22 +0530
Subject: Update DisplayApp.cpp

fixed file typo
---
 src/displayapp/DisplayApp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp/DisplayApp.cpp')

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index d9bcfef3..72823193 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -11,7 +11,7 @@
 #include "displayapp/screens/FirmwareValidation.h"
 #include "displayapp/screens/Gauge.h"
 #include "displayapp/screens/InfiniPaint.h"
-#include "displayapp/screens/paddle.h"
+#include "displayapp/screens/Paddle.h"
 #include "displayapp/screens/Meter.h"
 #include "displayapp/screens/Music.h"
 #include "displayapp/screens/Notifications.h"
-- 
cgit v1.2.3-70-g09d2