From 6159f9444e42d7e555455419414b5f7e8fefe44d Mon Sep 17 00:00:00 2001 From: Daniel Cao Date: Sun, 10 Nov 2024 01:21:07 +0800 Subject: [PATCH] Fixed rak wismeshtap turned off gps caused the screen not to display --- src/ButtonThread.cpp | 3 --- variants/rak_wismeshtap/variant.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp index 6279a09cc..0ea1309cc 100644 --- a/src/ButtonThread.cpp +++ b/src/ButtonThread.cpp @@ -165,8 +165,6 @@ int32_t ButtonThread::runOnce() LOG_BUTTON("Mulitipress! %hux", multipressClickCount); switch (multipressClickCount) { #if HAS_GPS -#ifndef RAK14014 // The power supply of the GPS of RAK14014 cannot be turned off. Once turned off, the screen will not be - // used，They are the same power source // 3 clicks: toggle GPS case 3: if (!config.device.disable_triple_click && (gps != nullptr)) { @@ -176,7 +174,6 @@ int32_t ButtonThread::runOnce() } break; #endif -#endif #if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo // 4 clicks: toggle backlight case 4: diff --git a/variants/rak_wismeshtap/variant.h b/variants/rak_wismeshtap/variant.h index c263796ee..19eb841fe 100644 --- a/variants/rak_wismeshtap/variant.h +++ b/variants/rak_wismeshtap/variant.h @@ -243,7 +243,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG // Therefore must be 1 to keep peripherals powered // Power is on the controllable 3V3_S rail // #define PIN_GPS_RESET (34) -#define PIN_GPS_EN PIN_3V3_EN +// #define PIN_GPS_EN PIN_3V3_EN #define PIN_GPS_PPS (17) // Pulse per second input from the GPS #define GPS_RX_PIN PIN_SERIAL1_RX