Revert "Merge upstream"

This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.

2 files changed, 19 insertions, 16 deletions

diff --git a/src/components/brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp
index 6c52467..8ad987d 100644
--- a/src/components/brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
@@ -1,13 +1,13 @@
 #include "BrightnessController.h"
 #include <hal/nrf_gpio.h>
 #include "displayapp/screens/Symbols.h"
-#include "drivers/PinMap.h"
+
 using namespace Pinetime::Controllers;
 
 void BrightnessController::Init() {
-  nrf_gpio_cfg_output(PinMap::LcdBacklightLow);
-  nrf_gpio_cfg_output(PinMap::LcdBacklightMedium);
-  nrf_gpio_cfg_output(PinMap::LcdBacklightHigh);
+  nrf_gpio_cfg_output(pinLcdBacklight1);
+  nrf_gpio_cfg_output(pinLcdBacklight2);
+  nrf_gpio_cfg_output(pinLcdBacklight3);
   Set(level);
 }
 
@@ -16,24 +16,24 @@ void BrightnessController::Set(BrightnessController::Levels level) {
   switch (level) {
     default:
     case Levels::High:
-      nrf_gpio_pin_clear(PinMap::LcdBacklightLow);
-      nrf_gpio_pin_clear(PinMap::LcdBacklightMedium);
-      nrf_gpio_pin_clear(PinMap::LcdBacklightHigh);
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_clear(pinLcdBacklight2);
+      nrf_gpio_pin_clear(pinLcdBacklight3);
       break;
     case Levels::Medium:
-      nrf_gpio_pin_clear(PinMap::LcdBacklightLow);
-      nrf_gpio_pin_clear(PinMap::LcdBacklightMedium);
-      nrf_gpio_pin_set(PinMap::LcdBacklightHigh);
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_clear(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
       break;
     case Levels::Low:
-      nrf_gpio_pin_clear(PinMap::LcdBacklightLow);
-      nrf_gpio_pin_set(PinMap::LcdBacklightMedium);
-      nrf_gpio_pin_set(PinMap::LcdBacklightHigh);
+      nrf_gpio_pin_clear(pinLcdBacklight1);
+      nrf_gpio_pin_set(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
       break;
     case Levels::Off:
-      nrf_gpio_pin_set(PinMap::LcdBacklightLow);
-      nrf_gpio_pin_set(PinMap::LcdBacklightMedium);
-      nrf_gpio_pin_set(PinMap::LcdBacklightHigh);
+      nrf_gpio_pin_set(pinLcdBacklight1);
+      nrf_gpio_pin_set(pinLcdBacklight2);
+      nrf_gpio_pin_set(pinLcdBacklight3);
       break;
   }
 }
diff --git a/src/components/brightness/BrightnessController.h b/src/components/brightness/BrightnessController.h
index 0d7ac2f..c47158a 100644
--- a/src/components/brightness/BrightnessController.h
+++ b/src/components/brightness/BrightnessController.h
@@ -22,6 +22,9 @@ namespace Pinetime {
       const char* ToString();
 
     private:
+      static constexpr uint8_t pinLcdBacklight1 = 14;
+      static constexpr uint8_t pinLcdBacklight2 = 22;
+      static constexpr uint8_t pinLcdBacklight3 = 23;
       Levels level = Levels::High;
       Levels backupLevel = Levels::High;
     };