WaveSentry

Author: bmorcelli

.github/workflows/main.yml

@@ -72,6 +72,7 @@
             - { env: "Marauder-Mini"              }
             - { env: "Awok-Mini"                  }
             - { env: "Awok-Touch"                 }
+            - { env: "WaveSentry-R1"              }
             - { env: "Phantom_S024R"              }
             - { env: "elecrow-24B"                }
             - { env: "elecrow-28B"                }

README.md

@@ -86,6 +86,7 @@ Things that needs to be done in next updates
 ## Latest Changelog
 * 2.6.5:
      * [x] Added possibility to order by "Latest update"
+     * [x] Port to OpenSourceSRDLabs [WaveSentry and WaveSentry Pro ](https://opensourcesdrlab.com/products/aifw-wavesentry-esp32?VariantsId=10331)
 * 2.6.4:
      * [x] Fixed CYD 3243S035R touchscreen rotation
      * [x] Fixed Marauder V7 screen issues

boards/marauder-v4og/interface.cpp

@@ -5,12 +5,26 @@
 
 CYD28_TouchR touch(320, 240);
 
+#ifdef WAVESENTRY
+#include <RotaryEncoder.h>
+RotaryEncoder *encoder = nullptr;
+IRAM_ATTR void checkPosition() { encoder->tick(); }
+#endif
+
 /***************************************************************************************
 ** Function name: _setup_gpio()
 ** Location: main.cpp
 ** Description:   initial setup for the device
 ***************************************************************************************/
-void _setup_gpio() { pinMode(TFT_BL, OUTPUT); }
+void _setup_gpio() {
+    pinMode(TFT_BL, OUTPUT);
+#ifdef WAVESENTRY
+    pinMode(ENCODER_KEY, INPUT);
+    encoder = new RotaryEncoder(ENCODER_INA, ENCODER_INB, RotaryEncoder::LatchMode::TWO03);
+    attachInterrupt(digitalPinToInterrupt(ENCODER_INA), checkPosition, CHANGE);
+    attachInterrupt(digitalPinToInterrupt(ENCODER_INB), checkPosition, CHANGE);
+#endif
+}
 
 /***************************************************************************************
 ** Function name: _post_setup_gpio()
@@ -59,8 +73,8 @@ void _setBrightness(uint8_t brightval) {
 ** Handles the variables PrevPress, NextPress, SelPress, AnyKeyPress and EscPress
 **********************************************************************/
 void InputHandler(void) {
-    static long tm = millis();
-    if (millis() - tm > 300 || LongPress) { // don´t allow multiple readings in less than 200ms
+    static unsigned long tm = millis();
+    if (millis() - tm > 200 || LongPress) { // don´t allow multiple readings in less than 200ms
         if (touch.touched()) {
             auto t = touch.getPointScaled();
             t = touch.getPointScaled();
@@ -91,6 +105,41 @@ void InputHandler(void) {
             touchHeatMap(touchPoint);
         } else touchPoint.pressed = false;
     }
+
+#ifdef WAVESENTRY
+    static int posDifference = 0;
+    static int lastPos = 0;
+    bool sel = !BTN_ACT;
+
+    int newPos = encoder->getPosition();
+    if (newPos != lastPos) {
+        posDifference += (newPos - lastPos);
+        lastPos = newPos;
+    }
+
+    if (millis() - tm < 200 && !LongPress) return;
+
+    sel = digitalRead(ENCODER_KEY);
+
+    if (posDifference != 0 || sel == BTN_ACT) {
+        if (!wakeUpScreen()) AnyKeyPress = true;
+        else return;
+    }
+    if (posDifference > 0) {
+        PrevPress = true;
+        posDifference--;
+    }
+    if (posDifference < 0) {
+        NextPress = true;
+        posDifference++;
+    }
+
+    if (sel == BTN_ACT) {
+        posDifference = 0;
+        SelPress = true;
+        tm = millis();
+    }
+#endif
 }
 
 /*********************************************************************

boards/marauder-v4og/platformio.ini

@@ -92,3 +92,16 @@ build_flags =
 	-DPART_16MB=1
 build_unflags =
 	-DPART_04MB=1
+
+[env:WaveSentry-R1]
+extends = env:Marauder-v4-OG
+build_flags =
+	${env:Marauder-v4-OG.build_flags}
+	-D WAVESENTRY=1
+	-D ENCODER_INA=2
+	-D ENCODER_INB=14
+	-D ENCODER_KEY=0
+	-D HAS_ENCODER=1
+lib_deps =
+	${env.lib_deps}
+	mathertel/RotaryEncoder @1.5.3

platformio.ini

@@ -65,6 +65,8 @@ default_envs =
 	;Awok-Touch
 	;Phantom_S024R
 	;smoochiee-board
+	;WaveSentry-R1
+
 build_cache_dir = .pio/buildcache
 cache_dir = .pio/cache
 boards_dir = boards/_jsonfiles

src/mykeyboard.cpp

@@ -4,8 +4,8 @@
 #include "settings.h"
 #include <globals.h>
 
-const int max_FM_size = tftWidth / (LW * FM) - 1;
-const int max_FP_size = tftWidth / (LW)-2;
+int max_FM_size = tftWidth / (LW * FM) - 1;
+int max_FP_size = tftWidth / (LW)-2;
 
 // QWERTY KEYSET
 const int qwerty_keyboard_width = 12;
@@ -736,14 +736,18 @@ String generalKeyboard(
 #endif
 
 #if defined(HAS_ENCODER) // T-Embed and T-LoRa-Pager
+#ifndef HAS_TOUCH
             LongPress = true;
-            if (check(SelPress) || selection_made) {
+#endif
+            // WaveSentry has Encoder and Touchscreen
+            // if touchscreen is pressed, ignore encoder input
+            if ((check(SelPress) || selection_made) && touchPoint.pressed == false) {
                 LongPress = false;
                 selection_made = true;
             } else {
                 /* NEXT "Btn" to move forward on th X axis (to the right) */
                 // if ESC is pressed while NEXT or PREV is received, then we navigate on the Y axis instead
-                if (check(NextPress)) {
+                if (check(NextPress) && touchPoint.pressed == false) {
                     if (EscPress) {
                         y++;
                     } else if ((x >= buttons_number - 1 && y <= -1) || (x >= KeyboardWidth - 1 && y >= 0)) {
@@ -764,7 +768,7 @@ String generalKeyboard(
                     redraw = true;
                 }
                 /* PREV "Btn" to move backwards on th X axis (to the left) */
-                if (check(PrevPress)) {
+                if (check(PrevPress) && touchPoint.pressed == false) {
                     if (EscPress) {
                         y--;
                     } else if (x <= 0) {
@@ -822,6 +826,8 @@ String generalKeyboard(
 /// This calls the QUERTY keyboard. Returns the user typed strings, return the ASCII ESC character
 /// if the operation was cancelled
 String keyboard(String current_text, int max_size, String textbox_title) {
+    max_FM_size = tftWidth / (LW * FM) - 1;
+    max_FP_size = tftWidth / (LW)-2;
     return generalKeyboard<qwerty_keyboard_height, qwerty_keyboard_width>(
         current_text, max_size, textbox_title, qwerty_keyset
     );