Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 28 insertions, 0 deletions

diff --git a/src/components/brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp
index 78c461d..0d8f366 100644
--- a/src/components/brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
@@ -1,5 +1,6 @@
 #include "BrightnessController.h"
 #include <hal/nrf_gpio.h>
+#include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Controllers;
 
@@ -68,3 +69,30 @@ void BrightnessController::Restore() {
   Set(backupLevel);
 }
 
+void BrightnessController::Step() {
+  switch(level) {
+    case Levels::Low: Set(Levels::Medium); break;
+    case Levels::Medium: Set(Levels::High); break;
+    case Levels::High: Set(Levels::Low); break;
+    default: break;
+  }
+}
+
+const char* BrightnessController::GetIcon() {
+  switch(level) {    
+    case Levels::Medium: return Applications::Screens::Symbols::brightnessMedium;
+    case Levels::High: return Applications::Screens::Symbols::brightnessHigh;
+    default: break;
+  }
+  return Applications::Screens::Symbols::brightnessLow;
+}
+
+const char* BrightnessController::ToString() {
+  switch(level) {
+    case Levels::Off: return "Off";
+    case Levels::Low: return "Low";    
+    case Levels::Medium: return "Medium";    
+    case Levels::High: return "High";
+    default : return "???";
+  }
+}
\ No newline at end of file