diff options
author | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
---|---|---|
committer | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
commit | b9e56843a29672b2befa65bf036f6db21078291f (patch) | |
tree | c2fa91e352127c09abd0f9b4959cd1f47d628ea8 /src/drivers/Cst816s.cpp | |
parent | cdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff) | |
parent | 3eb73774a39e255cd4b5de76441a59f1525a989c (diff) |
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to 'src/drivers/Cst816s.cpp')
-rw-r--r-- | src/drivers/Cst816s.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp index b8f8e45d..1ff163b0 100644 --- a/src/drivers/Cst816s.cpp +++ b/src/drivers/Cst816s.cpp @@ -3,6 +3,7 @@ #include <legacy/nrf_drv_gpiote.h> #include <nrfx_log.h> #include <task.h> +#include "drivers/PinMap.h" using namespace Pinetime::Drivers; @@ -18,12 +19,12 @@ Cst816S::Cst816S(TwiMaster& twiMaster, uint8_t twiAddress) : twiMaster {twiMaste } void Cst816S::Init() { - nrf_gpio_cfg_output(pinReset); - nrf_gpio_pin_set(pinReset); + nrf_gpio_cfg_output(PinMap::Cst816sReset); + nrf_gpio_pin_set(PinMap::Cst816sReset); vTaskDelay(50); - nrf_gpio_pin_clear(pinReset); + nrf_gpio_pin_clear(PinMap::Cst816sReset); vTaskDelay(5); - nrf_gpio_pin_set(pinReset); + nrf_gpio_pin_set(PinMap::Cst816sReset); vTaskDelay(50); // Wake the touchpanel up @@ -80,9 +81,9 @@ Cst816S::TouchInfos Cst816S::GetTouchInfo() { } void Cst816S::Sleep() { - nrf_gpio_pin_clear(pinReset); + nrf_gpio_pin_clear(PinMap::Cst816sReset); vTaskDelay(5); - nrf_gpio_pin_set(pinReset); + nrf_gpio_pin_set(PinMap::Cst816sReset); vTaskDelay(50); static constexpr uint8_t sleepValue = 0x03; twiMaster.Write(twiAddress, 0xA5, &sleepValue, 1); |