Merge pull request #53 from sim1988son/main

Simpson: Enter long-press on the keypad, GPS skyview; the last position kept
while GPS duty-cycling sleeps.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

examples/companion_radio/ui-new/StatusScreen.h

@@ -2,6 +2,7 @@
 #include <helpers/ui/DisplayDriver.h>
 #include <helpers/ui/UIScreen.h>
 #include <Arduino.h>
+#include <math.h>
 #include "icons.h"
 #include "InfoKit.h"
 #include "PopupMenu.h"
@@ -167,8 +168,9 @@ private:
 #endif
     if (!loc) { row(d, f, rsv, "Receiver", "none"); return; }
     const bool fix = loc->isValid();
+    const bool sleeping = sensors.isGpsDutySleeping();
     if (f.place(lh + 5)) {   // the fix as a chip, satellites used / in view
-      const char* st = !on ? "OFF" : !fix ? "NO FIX" : (g && g->fix_mode == 2) ? "2D FIX" : "3D FIX";
+      const char* st = !on ? "OFF" : sleeping ? "SLEEP" : !fix ? "NO FIX" : (g && g->fix_mode == 2) ? "2D FIX" : "3D FIX";
       info::chip(d, 1, f.at, st, on && fix);
 #ifdef STATUS_HAS_SKY
       if (g) snprintf(a, sizeof(a), "%d/%d sats", skyview::usedCount(*g), g->count);
@@ -177,15 +179,17 @@ private:
       snprintf(a, sizeof(a), "%ld sats", loc->satellitesCount());
       d.drawTextRightAlign(d.width() - rsv - 2, f.at + 1, a);
     }
-    const long lat = loc->getLatitude(), lon = loc->getLongitude();
+    const long lat = fix ? loc->getLatitude() : lround(sensors.node_lat * 1000000.0);
+    const long lon = fix ? loc->getLongitude() : lround(sensors.node_lon * 1000000.0);
     // The driver reports 999 deg before a first fix (0,0 in the simulator).
     const bool known = labs(lat) <= 90000000L && (lat || lon);
     if (known) snprintf(a, sizeof(a), "%.5f\xc2\xb0%c", labs(lat) / 1e6, lat < 0 ? 'S' : 'N'); else strcpy(a, "-");
     row(d, f, rsv, fix ? "Lat" : "Lat (last)", a);
     if (known) snprintf(a, sizeof(a), "%.5f\xc2\xb0%c", labs(lon) / 1e6, lon < 0 ? 'W' : 'E'); else strcpy(a, "-");
     row(d, f, rsv, fix ? "Lon" : "Lon (last)", a);
-    if (fix) {
+    if (fix || (sensors.node_lat != 0.0 || sensors.node_lon != 0.0)) {
-      telemetry::altText(loc->getAltitude() / 1000.0f, imperial(), L1_INFO, a, sizeof(a));
+      const double altitude = fix ? loc->getAltitude() / 1000.0 : sensors.node_altitude;
+      telemetry::altText(altitude, imperial(), L1_INFO, a, sizeof(a));
       row(d, f, rsv, "Altitude", a);
     }
     if (g && fix) {

examples/companion_radio/ui-new/UITask.cpp

@@ -1097,6 +1097,12 @@ void UITask::pollSimpsonKeypad() {
 }
 
 void UITask::handleSimpsonKeypadKey(uint8_t key) {
+  if (key == SIMPSON_KEY_ENTER_LONG) {
+    if (_locked && !_unlock_kb) return;
+    enqueueKey(handleLongPress(KEY_ENTER));
+    return;
+  }
+
   if (checkDisplayOn(KEY_ENTER) == 0 || (_locked && !_unlock_kb)) return;
 
   const uint32_t auto_off = autoOffMillis();
@@ -1128,7 +1134,7 @@ void UITask::handleSimpsonKeypadKey(uint8_t key) {
       enqueueKey(KEY_RIGHT);
       break;
     case SIMPSON_KEY_ENTER:
-      enqueueKey(_unlock_kb ? KEY_KB_ENTER : KEY_ENTER);
+      enqueueKey((_unlock_kb || _kb.isVisible()) ? KEY_KB_ENTER : KEY_ENTER);
       break;
     case SIMPSON_KEY_BLUETOOTH:
       if (!_unlock_kb) gotoBluetoothHomePage();

solo/simpson/platformio.ini

@@ -1,31 +1,33 @@
-; Solo build for Simpson, sim1988son's DIY board: a ProMicro nRF52840 with
+; Solo build for Simpson, sim1988son's DIY board: a ProMicro nRF52840 with
-; a RA-01S radio, an ATGM336H GPS, a 1.3" SH1106 OLED and a 4x4 keypad on a
+; a RA-01S radio, an ATGM336H GPS, a 1.3" SH1106 OLED and a 4x4 keypad on a
-; PCF8574 (see docs/solo/hardware.md#simpson and its schematic there).
+; PCF8574 (see docs/solo/hardware.md#simpson and its schematic there).
-; The _solo_dual suffix is what the release workflow builds.
+; The _solo_dual suffix is what the release workflow builds.
-[env:Simpson_companion_solo_dual]
+[env:Simpson_companion_solo_dual]
-extends = Simpson
+extends = Simpson
-board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
+board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
-board_upload.maximum_size = 712704
+board_upload.maximum_size = 712704
-build_unflags = ${Simpson.build_unflags} -Ofast -D OFFLINE_QUEUE_SIZE=256
+build_unflags = ${Simpson.build_unflags} -Ofast -D OFFLINE_QUEUE_SIZE=256
-build_flags = ${Simpson.build_flags}
+build_flags = ${Simpson.build_flags}
-  -I examples/companion_radio/ui-new
+  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
+  -D BLE_PIN_CODE=123456
-  -D DUAL_SERIAL=1
+  -D DUAL_SERIAL=1
-  -D OFFLINE_QUEUE_SIZE=128
+  -D MESHCORE_VERSION='"2.0.1"'
-  -D DISPLAY_CLASS=SH1106Display
+  -D OFFLINE_QUEUE_SIZE=128
-  -D FIRMWARE_SOLO_BUILD=1
+  -D DISPLAY_CLASS=SH1106Display
-  -D UI_SENSORS_PAGE=1
+  -D FIRMWARE_SOLO_BUILD=1
-  -Os
+  -D UI_SENSORS_PAGE=1
-build_src_filter = ${Simpson.build_src_filter}
+  -D GPS_SKYVIEW 
-  +<helpers/nrf52/SerialBLEInterface.cpp>
+  -Os
-  +<helpers/ui/SH1106Display.cpp>
+build_src_filter = ${Simpson.build_src_filter}
-  +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/SH1106Display.cpp>
-  +<helpers/ui/GenericVibration.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
+  +<helpers/ui/buzzer.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/GenericVibration.cpp>
-lib_deps = ${Simpson.lib_deps}
+  +<../examples/companion_radio/*.cpp>
-  adafruit/RTClib @ ^2.1.3
+  +<../examples/companion_radio/ui-new/*.cpp>
-  densaugeo/base64 @ ~1.4.0
+lib_deps = ${Simpson.lib_deps}
+  adafruit/RTClib @ ^2.1.3
+  densaugeo/base64 @ ~1.4.0

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -950,6 +950,11 @@ void EnvironmentSensorManager::gpsDutyCycleLoop() {
   // awake -- back to sleep once we have a fix, or once we've waited long
   // enough that one isn't coming this cycle
   if (_location->isValid() || (int32_t)(now - _gps_duty_phase_until) >= 0) {
+    if (_location->isValid()) {
+      node_lat = ((double)_location->getLatitude()) / 1000000.0;
+      node_lon = ((double)_location->getLongitude()) / 1000000.0;
+      node_altitude = ((double)_location->getAltitude()) / 1000.0;
+    }
     stop_gps();
     _gps_duty_phase_until = now + gps_duty_sleep_sec * 1000UL;
   }

variants/simpson/SimpsonKeypad.cpp

@@ -1,70 +1,92 @@
-#include "SimpsonKeypad.h"
+#include "SimpsonKeypad.h"
-
+
-#include <Wire.h>
+static const uint32_t SIMPSON_LONG_PRESS_MS = 1200;
-
+
-namespace {
+#include <Wire.h>
-char control_keymap[19] = {
+
-  SIMPSON_KEY_CANCEL, SIMPSON_KEY_UP, 0, SIMPSON_KEY_BLUETOOTH,
+namespace {
-  SIMPSON_KEY_LEFT, SIMPSON_KEY_ENTER, SIMPSON_KEY_RIGHT, SIMPSON_KEY_BRIGHTNESS_UP,
+char control_keymap[19] = {
-  SIMPSON_KEY_SYMBOLS, SIMPSON_KEY_DOWN, 0, SIMPSON_KEY_BRIGHTNESS_DOWN,
+  SIMPSON_KEY_CANCEL, SIMPSON_KEY_UP, 0, SIMPSON_KEY_BLUETOOTH,
-  SIMPSON_KEY_MESSAGES, 0, SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
+  SIMPSON_KEY_LEFT, SIMPSON_KEY_ENTER, SIMPSON_KEY_RIGHT, SIMPSON_KEY_BRIGHTNESS_UP,
-};
+  SIMPSON_KEY_SYMBOLS, SIMPSON_KEY_DOWN, 0, SIMPSON_KEY_BRIGHTNESS_DOWN,
-
+  SIMPSON_KEY_MESSAGES, 0, SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
-char alphabet_keymap[19] = {
+};
-  ',', 'A', 'D', SIMPSON_KEY_BLUETOOTH,
+
-  'G', 'J', 'M', SIMPSON_KEY_BRIGHTNESS_UP,
+char alphabet_keymap[19] = {
-  'P', 'T', 'W', SIMPSON_KEY_BRIGHTNESS_DOWN,
+  ',', 'A', 'D', SIMPSON_KEY_BLUETOOTH,
-  SIMPSON_KEY_BACKSPACE, ' ', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
+  'G', 'J', 'M', SIMPSON_KEY_BRIGHTNESS_UP,
-};
+  'P', 'T', 'W', SIMPSON_KEY_BRIGHTNESS_DOWN,
-
+  SIMPSON_KEY_BACKSPACE, ' ', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
-char numeric_keymap[19] = {
+};
-  '1', '2', '3', SIMPSON_KEY_BLUETOOTH,
+
-  '4', '5', '6', SIMPSON_KEY_BRIGHTNESS_UP,
+char numeric_keymap[19] = {
-  '7', '8', '9', SIMPSON_KEY_BRIGHTNESS_DOWN,
+  '1', '2', '3', SIMPSON_KEY_BLUETOOTH,
-  SIMPSON_KEY_BACKSPACE, '0', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
+  '4', '5', '6', SIMPSON_KEY_BRIGHTNESS_UP,
-};
+  '7', '8', '9', SIMPSON_KEY_BRIGHTNESS_DOWN,
-}
+  SIMPSON_KEY_BACKSPACE, '0', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
-
+};
-bool SimpsonKeypad::begin() {
+}
-  if (!_keypad.begin()) return false;
+
-  _keypad.setKeyPadMode(I2C_KEYPAD_4x4);
+bool SimpsonKeypad::begin() {
-  _keypad.setDebounceThreshold(50);
+  if (!_keypad.begin()) return false;
-  loadModeMap();
+  _keypad.setKeyPadMode(I2C_KEYPAD_4x4);
-  _ready = true;
+  _keypad.setDebounceThreshold(50);
-  return true;
+  loadModeMap();
-}
+  _ready = true;
-
+  return true;
-void SimpsonKeypad::loadModeMap() {
+}
-  switch (_mode) {
+
-    case SIMPSON_KEYPAD_CONTROL:
+void SimpsonKeypad::loadModeMap() {
-      _keypad.loadKeyMap(control_keymap);
+  switch (_mode) {
-      break;
+    case SIMPSON_KEYPAD_CONTROL:
-    case SIMPSON_KEYPAD_ABC:
+      _keypad.loadKeyMap(control_keymap);
-    case SIMPSON_KEYPAD_ABC_UPPER:
+      break;
-      _keypad.loadKeyMap(alphabet_keymap);
+    case SIMPSON_KEYPAD_ABC:
-      break;
+    case SIMPSON_KEYPAD_ABC_UPPER:
-    case SIMPSON_KEYPAD_NUMERIC:
+      _keypad.loadKeyMap(alphabet_keymap);
-      _keypad.loadKeyMap(numeric_keymap);
+      break;
-      break;
+    case SIMPSON_KEYPAD_NUMERIC:
-  }
+      _keypad.loadKeyMap(numeric_keymap);
-}
+      break;
-
+  }
-uint8_t SimpsonKeypad::poll() {
+}
-  if (!_ready) return SIMPSON_KEY_NONE;
+
-
+uint8_t SimpsonKeypad::poll() {
-  uint8_t key = _keypad.getChar();
+  if (!_ready) return SIMPSON_KEY_NONE;
-  if (key == I2C_KEYPAD_THRESHOLD) return SIMPSON_KEY_NONE;
+
-  if (key == SIMPSON_KEY_NONE) {
+  uint8_t key = _keypad.getChar();
-    _last_key = SIMPSON_KEY_NONE;
+  if (key == I2C_KEYPAD_THRESHOLD) return SIMPSON_KEY_NONE;
-    return SIMPSON_KEY_NONE;
+  if (key == SIMPSON_KEY_NONE) {
-  }
+    if (_last_key == SIMPSON_KEY_ENTER && !_enter_long_sent) {
-  if (key == _last_key) return SIMPSON_KEY_NONE;
+      _last_key = SIMPSON_KEY_NONE;
-  _last_key = key;
+      _enter_pressed_at = 0;
-
+      return SIMPSON_KEY_ENTER;
-  if (key == SIMPSON_KEY_FN) {
+    }
-    _mode = static_cast<SimpsonKeypadMode>((_mode + 1) % 4);
+    _last_key = SIMPSON_KEY_NONE;
-    loadModeMap();
+    _enter_pressed_at = 0;
-    return SIMPSON_KEY_MODE_CHANGED;
+    _enter_long_sent = false;
-  }
+    return SIMPSON_KEY_NONE;
-  return key;
+  }
-}
+  if (key == SIMPSON_KEY_ENTER && _last_key == SIMPSON_KEY_ENTER) {
+    if (!_enter_long_sent && millis() - _enter_pressed_at >= SIMPSON_LONG_PRESS_MS) {
+      _enter_long_sent = true;
+      return SIMPSON_KEY_ENTER_LONG;
+    }
+    return SIMPSON_KEY_NONE;
+  }
+  if (key == _last_key) return SIMPSON_KEY_NONE;
+  _last_key = key;
+
+  if (key == SIMPSON_KEY_ENTER) {
+    _enter_pressed_at = millis();
+    _enter_long_sent = false;
+    return SIMPSON_KEY_NONE;
+  }
+
+  if (key == SIMPSON_KEY_FN) {
+    _mode = static_cast<SimpsonKeypadMode>((_mode + 1) % 4);
+    loadModeMap();
+    return SIMPSON_KEY_MODE_CHANGED;
+  }
+  return key;
+}

variants/simpson/SimpsonKeypad.h

@@ -1,49 +1,52 @@
-#pragma once
+#pragma once
-
+
-#include <Arduino.h>
+#include <Arduino.h>
-#include <I2CKeyPad.h>
+#include <I2CKeyPad.h>
-
+
-#ifndef SIMPSON_KEYPAD_ADDR
+#ifndef SIMPSON_KEYPAD_ADDR
-  #define SIMPSON_KEYPAD_ADDR 0x20
+  #define SIMPSON_KEYPAD_ADDR 0x20
-#endif
+#endif
-
+
-enum SimpsonKeypadMode : uint8_t {
+enum SimpsonKeypadMode : uint8_t {
-  SIMPSON_KEYPAD_CONTROL,
+  SIMPSON_KEYPAD_CONTROL,
-  SIMPSON_KEYPAD_ABC,
+  SIMPSON_KEYPAD_ABC,
-  SIMPSON_KEYPAD_ABC_UPPER,
+  SIMPSON_KEYPAD_ABC_UPPER,
-  SIMPSON_KEYPAD_NUMERIC
+  SIMPSON_KEYPAD_NUMERIC
-};
+};
-
+
-enum SimpsonKeypadKey : uint8_t {
+enum SimpsonKeypadKey : uint8_t {
-  SIMPSON_KEY_NONE = 0,
+  SIMPSON_KEY_NONE = 0,
-  SIMPSON_KEY_CANCEL = 1,
+  SIMPSON_KEY_CANCEL = 1,
-  SIMPSON_KEY_UP,
+  SIMPSON_KEY_UP,
-  SIMPSON_KEY_BLUETOOTH,
+  SIMPSON_KEY_BLUETOOTH,
-  SIMPSON_KEY_LEFT,
+  SIMPSON_KEY_LEFT,
-  SIMPSON_KEY_ENTER,
+  SIMPSON_KEY_ENTER,
-  SIMPSON_KEY_RIGHT,
+  SIMPSON_KEY_RIGHT,
-  SIMPSON_KEY_BRIGHTNESS_UP,
+  SIMPSON_KEY_BRIGHTNESS_UP,
-  SIMPSON_KEY_SYMBOLS,
+  SIMPSON_KEY_SYMBOLS,
-  SIMPSON_KEY_DOWN,
+  SIMPSON_KEY_DOWN,
-  SIMPSON_KEY_BRIGHTNESS_DOWN,
+  SIMPSON_KEY_BRIGHTNESS_DOWN,
-  SIMPSON_KEY_MESSAGES,
+  SIMPSON_KEY_MESSAGES,
-  SIMPSON_KEY_FN,
+  SIMPSON_KEY_FN,
-  SIMPSON_KEY_GPS,
+  SIMPSON_KEY_GPS,
-  SIMPSON_KEY_BACKSPACE,
+  SIMPSON_KEY_BACKSPACE,
-  SIMPSON_KEY_MODE_CHANGED
+  SIMPSON_KEY_MODE_CHANGED,
-};
+  SIMPSON_KEY_ENTER_LONG
-
+};
-class SimpsonKeypad {
+
-  I2CKeyPad _keypad;
+class SimpsonKeypad {
-  SimpsonKeypadMode _mode = SIMPSON_KEYPAD_CONTROL;
+  I2CKeyPad _keypad;
-  uint8_t _last_key = SIMPSON_KEY_NONE;
+  SimpsonKeypadMode _mode = SIMPSON_KEYPAD_CONTROL;
-  bool _ready = false;
+  uint8_t _last_key = SIMPSON_KEY_NONE;
-
+  uint32_t _enter_pressed_at = 0;
-  void loadModeMap();
+  bool _enter_long_sent = false;
-
+  bool _ready = false;
-public:
+
-  SimpsonKeypad() : _keypad(SIMPSON_KEYPAD_ADDR, &Wire) {}
+  void loadModeMap();
-  bool begin();
+
-  uint8_t poll();
+public:
-  SimpsonKeypadMode mode() const { return _mode; }
+  SimpsonKeypad() : _keypad(SIMPSON_KEYPAD_ADDR, &Wire) {}
-};
+  bool begin();
+  uint8_t poll();
+  SimpsonKeypadMode mode() const { return _mode; }
+};

variants/simpson/platformio.ini

@@ -1,22 +1,23 @@
-[Simpson]
+[Simpson]
-extends = Promicro
+extends = Promicro
-build_unflags = -D PIN_GPS_RX=3 -D PIN_GPS_TX=4 -D ENV_INCLUDE_AHTX0=1 -D ENV_INCLUDE_BME280=1 -D ENV_INCLUDE_BMP280=1 -D ENV_INCLUDE_INA3221=1 -D ENV_INCLUDE_INA219=1 -D ENV_INCLUDE_INA226=1
+build_unflags = -D PIN_GPS_RX=3 -D PIN_GPS_TX=4 -D ENV_INCLUDE_AHTX0=1 -D ENV_INCLUDE_BME280=1 -D ENV_INCLUDE_BMP280=1 -D ENV_INCLUDE_INA3221=1 -D ENV_INCLUDE_INA219=1 -D ENV_INCLUDE_INA226=1
-build_flags = ${Promicro.build_flags}
+build_flags = ${Promicro.build_flags}
-  -I variants/simpson
+  -I variants/simpson
-  -D SIMPSON
+  -D SIMPSON
-  -D PIN_BUZZER=0
+  -D PIN_BUZZER=0
-  -D PIN_GPS_TX=3
+  -D PIN_GPS_TX=3
-  -D PIN_GPS_RX=4
+  -D PIN_GPS_RX=4
-  -D PIN_VIBRATION=1
+  -D PIN_VIBRATION=1
-  -D ADC_MULTIPLIER=1.71
+  -D ADC_MULTIPLIER=1.71
-  -D SIMPSON_KEYPAD_ADDR=0x20
+  -D SIMPSON_KEYPAD_ADDR=0x20
-  -D DISPLAY_ROTATION=2
+  -D DISPLAY_ROTATION=2
-  -D ENV_SKIP_GPS_DETECT
+  -D ENV_INCLUDE_GPS=1
-build_src_filter = ${nrf52_base.build_src_filter}
+  -D ENV_SKIP_GPS_DETECT
-  +<helpers/sensors>
+build_src_filter = ${nrf52_base.build_src_filter}
-  +<../variants/simpson>
+  +<helpers/sensors>
-  +<../variants/promicro/target.cpp>
+  +<../variants/simpson>
-  +<../variants/promicro/PromicroBoard.cpp>
+  +<../variants/promicro/target.cpp>
-lib_deps = ${Promicro.lib_deps}
+  +<../variants/promicro/PromicroBoard.cpp>
-  adafruit/Adafruit SH110X @ ^2.1.13
+lib_deps = ${Promicro.lib_deps}
-  RobTillaart/I2CKeyPad @ ^0.5.2
+  adafruit/Adafruit SH110X @ ^2.1.13
+  RobTillaart/I2CKeyPad @ ^0.5.2