From b3e6da75148fcb54fdb5fe02f6bdc7d7d3905e98 Mon Sep 17 00:00:00 2001
From: hubmartin <hub.martin@gmail.com>
Date: Tue, 3 Aug 2021 20:40:27 +0200
Subject: [PATCH] Cleanup, set Pinetime as default

---
 src/components/battery/BatteryController.cpp |  1 +
 src/components/battery/BatteryController.h   |  1 -
 src/drivers/PinMap.h                         | 58 ++++++--------------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index d543ccd9..e2fce7f3 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -1,4 +1,5 @@
 #include "BatteryController.h"
+#include "drivers/PinMap.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_saadc.h>
 #include <algorithm>
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 993ef6c5..5c7fa1f4 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -3,7 +3,6 @@
 #include <drivers/include/nrfx_saadc.h>
 #include <array>
 #include <numeric>
-#include <drivers/PinMap.h>
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/drivers/PinMap.h b/src/drivers/PinMap.h
index 117cf11f..c8b091f1 100644
--- a/src/drivers/PinMap.h
+++ b/src/drivers/PinMap.h
@@ -2,61 +2,37 @@
 
 namespace Pinetime {
   namespace PinMap {
-    #define WATCH_P8
+    
     #ifdef WATCH_P8
+      // COLMI P8
       static constexpr uint8_t Charging = 19;
       static constexpr uint8_t Cst816sReset = 13;
       static constexpr uint8_t Button = 17;
     #else
+      // Pinetime
       static constexpr uint8_t Charging = 12;
       static constexpr uint8_t Cst816sReset = 10;
       static constexpr uint8_t Button = 13;      
     #endif
 
-       static constexpr uint8_t Cst816sIrq = 28;
-       static constexpr uint8_t PowerPresent = 19;
+    static constexpr uint8_t Cst816sIrq = 28;
+    static constexpr uint8_t PowerPresent = 19;
 
-       static constexpr uint8_t Motor = 16;
+    static constexpr uint8_t Motor = 16;
 
-       static constexpr uint8_t LcdBacklight1 = 14;
-       static constexpr uint8_t LcdBacklight2 = 22;
-       static constexpr uint8_t LcdBacklight3 = 23;
+    static constexpr uint8_t LcdBacklight1 = 14;
+    static constexpr uint8_t LcdBacklight2 = 22;
+    static constexpr uint8_t LcdBacklight3 = 23;
 
-       static constexpr uint8_t SpiSck = 2;
-       static constexpr uint8_t SpiMosi = 3;
-       static constexpr uint8_t SpiMiso = 4;
+    static constexpr uint8_t SpiSck = 2;
+    static constexpr uint8_t SpiMosi = 3;
+    static constexpr uint8_t SpiMiso = 4;
 
-       static constexpr uint8_t SpiFlashCsn = 5;
-       static constexpr uint8_t SpiLcdCsn = 25;
-       static constexpr uint8_t LcdDataCommand = 18;
-
-       static constexpr uint8_t TwiScl = 7;
-       static constexpr uint8_t TwiSda = 6;
+    static constexpr uint8_t SpiFlashCsn = 5;
+    static constexpr uint8_t SpiLcdCsn = 25;
+    static constexpr uint8_t LcdDataCommand = 18;
 
+    static constexpr uint8_t TwiScl = 7;
+    static constexpr uint8_t TwiSda = 6;
   }
 }
-
-
-#ifdef WATCH_P8
-
-// BatteryController.h
-#define PINMAP_CHARGING_PIN 19
-
-// Cst816s.h
-#define PINMAP_CST816S_RESET_PIN 13
-
-// SystemTask.h
-#define PINMAP_BUTTON_PIN 17
-
-#else
-
-// BatteryController.h
-#define PINMAP_CHARGING_PIN 12
-
-// Cst816s.h
-#define PINMAP_CST816S_RESET_PIN 10
-
-// SystemTask.h
-#define PINMAP_BUTTON_PIN 13
-
-#endif
\ No newline at end of file