summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-10-23 16:00:47 (GMT)
committerKieran Cawthray <kieranc@gmail.com>2021-10-23 16:00:47 (GMT)
commitda97a94a0fc89a646f9a7ab9d1b9937164227d2f (patch)
treee2b0b23ab43ecbc22ee58966d66c8399a385e01b /src/drivers
parent411c10ec317464a79c353dc5c18b805cf4bdf7d0 (diff)
parent9538eb97166410ebc362addfb76ec54895491cd7 (diff)
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/Cst816s.cpp2
-rw-r--r--src/drivers/St7789.cpp9
2 files changed, 0 insertions, 11 deletions
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 49d6ed0..7fc8eca 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -20,8 +20,6 @@ Cst816S::Cst816S(TwiMaster& twiMaster, uint8_t twiAddress) : twiMaster {twiMaste
bool Cst816S::Init() {
nrf_gpio_cfg_output(PinMap::Cst816sReset);
- nrf_gpio_pin_set(PinMap::Cst816sReset);
- vTaskDelay(50);
nrf_gpio_pin_clear(PinMap::Cst816sReset);
vTaskDelay(5);
nrf_gpio_pin_set(PinMap::Cst816sReset);
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index 0f1dc02..4d81cf2 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -170,16 +170,7 @@ void St7789::Sleep() {
void St7789::Wakeup() {
nrf_gpio_cfg_output(pinDataCommand);
- // TODO why do we need to reset the controller?
- HardwareReset();
- SoftwareReset();
SleepOut();
- ColMod();
- MemoryDataAccessControl();
- ColumnAddressSet();
- RowAddressSet();
- DisplayInversionOn();
- NormalModeOn();
VerticalScrollStartAddress(verticalScrollingStartAddress);
DisplayOn();
NRF_LOG_INFO("[LCD] Wakeup")