From cdf99b08f42c3826a8608d756bc7cda0a476ed98 Mon Sep 17 00:00:00 2001
From: Mark Russell <mruss660@gmail.com>
Date: Thu, 16 Sep 2021 16:12:20 -0400
Subject: Revert "Merge upstream"

This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
---
 src/drivers/Cst816s.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/drivers/Cst816s.cpp')

diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 1ff163b0..b8f8e45d 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -3,7 +3,6 @@
 #include <legacy/nrf_drv_gpiote.h>
 #include <nrfx_log.h>
 #include <task.h>
-#include "drivers/PinMap.h"
 
 using namespace Pinetime::Drivers;
 
@@ -19,12 +18,12 @@ Cst816S::Cst816S(TwiMaster& twiMaster, uint8_t twiAddress) : twiMaster {twiMaste
 }
 
 void Cst816S::Init() {
-  nrf_gpio_cfg_output(PinMap::Cst816sReset);
-  nrf_gpio_pin_set(PinMap::Cst816sReset);
+  nrf_gpio_cfg_output(pinReset);
+  nrf_gpio_pin_set(pinReset);
   vTaskDelay(50);
-  nrf_gpio_pin_clear(PinMap::Cst816sReset);
+  nrf_gpio_pin_clear(pinReset);
   vTaskDelay(5);
-  nrf_gpio_pin_set(PinMap::Cst816sReset);
+  nrf_gpio_pin_set(pinReset);
   vTaskDelay(50);
 
   // Wake the touchpanel up
@@ -81,9 +80,9 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() {
 }
 
 void Cst816S::Sleep() {
-  nrf_gpio_pin_clear(PinMap::Cst816sReset);
+  nrf_gpio_pin_clear(pinReset);
   vTaskDelay(5);
-  nrf_gpio_pin_set(PinMap::Cst816sReset);
+  nrf_gpio_pin_set(pinReset);
   vTaskDelay(50);
   static constexpr uint8_t sleepValue = 0x03;
   twiMaster.Write(twiAddress, 0xA5, &sleepValue, 1);
-- 
cgit v1.2.3-70-g09d2