rak10701 (rak wismeshtap) optimization (#5280)

* Improve the processing speed of virtual keyboards * Remove the disable GPS feature, as it would interfere with the normal use of TFT * Changed the default screen sleep time to 30s * Rename platform rak10701 -> rak wismeshtap * Fixed rak wismeshtap turned off gps caused the screen not to display * Reduce the size of the flash, otherwise uf2 will not work Co-authored-by: Daniel Cao <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Tom Fifield <[email protected]>
meshtastic · Nov 11, 2024 · 6eba278 · 6eba278
1 parent 9b4c260
commit 6eba278
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 6 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -29,7 +29,7 @@ default_envs = tbeam
 ;default_envs = rak4631
 ;default_envs = rak4631_eth_gw
 ;default_envs = rak2560
-;default_envs = rak10701
+;default_envs = rak_wismeshtap
 ;default_envs = wio-e5
 ;default_envs = radiomaster_900_bandit_nano
 ;default_envs = radiomaster_900_bandit_micro

diff --git a/src/input/TouchScreenBase.cpp b/src/input/TouchScreenBase.cpp
@@ -1,6 +1,10 @@
 #include "TouchScreenBase.h"
 #include "main.h"
 
+#if defined(RAK14014) && !defined(MESHTASTIC_EXCLUDE_CANNEDMESSAGES)
+#include "modules/CannedMessageModule.h"
+#endif
+
 #ifndef TIME_LONG_PRESS
 #define TIME_LONG_PRESS 400
 #endif
@@ -102,12 +106,30 @@ int32_t TouchScreenBase::runOnce()
     }
     _touchedOld = touched;
 
+#if defined RAK14014
+    // Speed up the processing speed of the keyboard in virtual keyboard mode
+    auto state = cannedMessageModule->getRunState();
+    if (state == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
+        if (_tapped) {
+            _tapped = false;
+            e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
+            LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y);
+        }
+    } else {
+        if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
+            _tapped = false;
+            e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
+            LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y);
+        }
+    }
+#else
     // fire TAP event when no 2nd tap occured within time
     if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
         _tapped = false;
         e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
         LOG_DEBUG("action TAP(%d/%d)", _last_x, _last_y);
     }
+#endif
 
     // fire LONG_PRESS event without the need for release
     if (touched && (time_t(millis()) - _start) > TIME_LONG_PRESS) {

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
@@ -473,7 +473,7 @@ void NodeDB::initConfigIntervals()
 
     config.display.screen_on_secs = default_screen_on_secs;
 
-#if defined(T_WATCH_S3) || defined(T_DECK)
+#if defined(T_WATCH_S3) || defined(T_DECK) || defined(RAK14014)
     config.power.is_power_saving = true;
     config.display.screen_on_secs = 30;
     config.power.wait_bluetooth_secs = 30;

diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
@@ -325,7 +325,9 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
 
             this->shift = !this->shift;
         } else if (keyTapped == "⌫") {
+#ifndef RAK14014
             this->highlight = keyTapped[0];
+#endif
 
             this->payload = 0x08;
 
@@ -341,7 +343,9 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
 
             validEvent = true;
         } else if (keyTapped == " ") {
+#ifndef RAK14014
             this->highlight = keyTapped[0];
+#endif
 
             this->payload = keyTapped[0];
 
@@ -361,7 +365,9 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
 
             this->shift = false;
         } else if (keyTapped != "") {
+#ifndef RAK14014
             this->highlight = keyTapped[0];
+#endif
 
             this->payload = this->shift ? keyTapped[0] : std::tolower(keyTapped[0]);
 
@@ -830,6 +836,11 @@ void CannedMessageModule::drawKeyboard(OLEDDisplay *display, OLEDDisplayUiState
 
             Letter updatedLetter = {letter.character, letter.width, xOffset, yOffset, cellWidth, cellHeight};
 
+#ifdef RAK14014 // Optimize the touch range of the virtual keyboard in the bottom row
+            if (outerIndex == outerSize - 1) {
+                updatedLetter.rectHeight = 240 - yOffset;
+            }
+#endif
             this->keyboard[this->charSet][outerIndex][innerIndex] = updatedLetter;
 
             float characterOffset = ((cellWidth / 2) - (letter.width / 2));

diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h
@@ -68,6 +68,10 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
 
     String drawWithCursor(String text, int cursor);
 
+#ifdef RAK14014
+    cannedMessageModuleRunState getRunState() const { return runState; }
+#endif
+
     /*
       -Override the wantPacket method. We need the Routing Messages to look for ACKs.
     */

diff --git a/variants/rak10701/platformio.ini → variants/rak_wismeshtap/platformio.ini b/variants/rak10701/platformio.ini → variants/rak_wismeshtap/platformio.ini
@@ -1,15 +1,18 @@
 ; The very slick RAK wireless RAK10701 Field Tester device.  Note you will have to flash to Arduino bootloader to use this firmware.  Be aware touch is not currently working.
-[env:rak10701]
+[env:rak_wismeshtap]
 extends = nrf52840_base
 board_level = extra
 board = wiscore_rak4631
-build_flags = ${nrf52840_base.build_flags} -Ivariants/rak10701 -D RAK_4631
+build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -D RAK_4631
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak10701> +<mesh/eth/> +<mesh/api/> +<mqtt/>
+  -DMESHTASTIC_EXCLUDE_WIFI=1
+  -DMESHTASTIC_EXCLUDE_EXTERNALNOTIFICATION=1
+  -DMESHTASTIC_EXCLUDE_WAYPOINT=1
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak_wismeshtap> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}

diff --git a/variants/rak10701/variant.cpp → variants/rak_wismeshtap/variant.cpp b/variants/rak10701/variant.cpp → variants/rak_wismeshtap/variant.cpp
diff --git a/variants/rak10701/variant.h → variants/rak_wismeshtap/variant.h b/variants/rak10701/variant.h → 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