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, 4 insertions, 0 deletions

diff --git a/src/components/brightness/BrightnessController.h b/src/components/brightness/BrightnessController.h
index b8354ec..efff7e8 100644
--- a/src/components/brightness/BrightnessController.h
+++ b/src/components/brightness/BrightnessController.h
@@ -13,10 +13,14 @@ namespace Pinetime {
       Levels Level() const;
       void Lower();
       void Higher();
+      void Step();
 
       void Backup();
       void Restore();
 
+      const char* GetIcon();
+      const char* ToString();
+
     private:
       static constexpr uint8_t pinLcdBacklight1 = 14;
       static constexpr uint8_t pinLcdBacklight2 = 22;