Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-01 10:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(simpson): PR #53 follow-up - LF endings, no MESHCORE_VERSION, a long Enter wakes the screen first

Browse Source 
The keypad files came back with CRLF endings; MESHCORE_VERSION is the
MeshCore base on the splash (1.18.0), not the Solo version, which comes
from the tag; ENV_INCLUDE_GPS is already set by the ProMicro base. A long
Enter with the screen off acted on the dark screen: it now only wakes it,
like every other key, and restarts the screen-off timer.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-23 22:33:33 +02:00
co-authored by Claude Opus 5.5
parent 0cb28480ff
commit a67b0fa025
5 changed files with 204 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/UITask.cpp
+6 -6
View File
@@ -1097,17 +1097,17 @@ void UITask::pollSimpsonKeypad() {
} }
void UITask::handleSimpsonKeypadKey(uint8_t key) { void UITask::handleSimpsonKeypadKey(uint8_t key) {
if (key == SIMPSON_KEY_ENTER_LONG) { // A key that only woke the display does nothing else, a long Enter too.
if (_locked && !_unlock_kb) return;
enqueueKey(handleLongPress(KEY_ENTER));
return;
}
if (checkDisplayOn(KEY_ENTER) == 0 || (_locked && !_unlock_kb)) return; if (checkDisplayOn(KEY_ENTER) == 0 || (_locked && !_unlock_kb)) return;
const uint32_t auto_off = autoOffMillis(); const uint32_t auto_off = autoOffMillis();
if (auto_off > 0) _auto_off = millis() + auto_off; if (auto_off > 0) _auto_off = millis() + auto_off;
if (key == SIMPSON_KEY_ENTER_LONG) {
enqueueKey(handleLongPress(KEY_ENTER));
return;
}
if (key == SIMPSON_KEY_MODE_CHANGED) { if (key == SIMPSON_KEY_MODE_CHANGED) {
static const char* const modes[] = { "Ctl", "abc", "ABC", "123" }; static const char* const modes[] = { "Ctl", "abc", "ABC", "123" };
_kb.input_mode_hint = modes[_simpson_keypad.mode()]; _kb.input_mode_hint = modes[_simpson_keypad.mode()];
solo/simpson/platformio.ini
+32 -33
View File
@@ -1,33 +1,32 @@
; 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 MESHCORE_VERSION='"2.0.1"' -D OFFLINE_QUEUE_SIZE=128
-D OFFLINE_QUEUE_SIZE=128 -D DISPLAY_CLASS=SH1106Display
-D DISPLAY_CLASS=SH1106Display -D FIRMWARE_SOLO_BUILD=1
-D FIRMWARE_SOLO_BUILD=1 -D UI_SENSORS_PAGE=1
-D UI_SENSORS_PAGE=1 -D GPS_SKYVIEW
-D GPS_SKYVIEW -Os
-Os build_src_filter = ${Simpson.build_src_filter}
build_src_filter = ${Simpson.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp>
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/ui/SH1106Display.cpp>
+<helpers/ui/SH1106Display.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/buzzer.cpp>
+<helpers/ui/buzzer.cpp> +<helpers/ui/GenericVibration.cpp>
+<helpers/ui/GenericVibration.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> lib_deps = ${Simpson.lib_deps}
lib_deps = ${Simpson.lib_deps} adafruit/RTClib @ ^2.1.3
adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0
densaugeo/base64 @ ~1.4.0
variants/simpson/SimpsonKeypad.cpp
+92 -92
View File
@@ -1,92 +1,92 @@
#include "SimpsonKeypad.h" #include "SimpsonKeypad.h"
static const uint32_t SIMPSON_LONG_PRESS_MS = 1200; static const uint32_t SIMPSON_LONG_PRESS_MS = 1200;
#include <Wire.h> #include <Wire.h>
namespace { namespace {
char control_keymap[19] = { char control_keymap[19] = {
SIMPSON_KEY_CANCEL, SIMPSON_KEY_UP, 0, SIMPSON_KEY_BLUETOOTH, SIMPSON_KEY_CANCEL, SIMPSON_KEY_UP, 0, SIMPSON_KEY_BLUETOOTH,
SIMPSON_KEY_LEFT, SIMPSON_KEY_ENTER, SIMPSON_KEY_RIGHT, SIMPSON_KEY_BRIGHTNESS_UP, 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_SYMBOLS, SIMPSON_KEY_DOWN, 0, SIMPSON_KEY_BRIGHTNESS_DOWN,
SIMPSON_KEY_MESSAGES, 0, SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0 SIMPSON_KEY_MESSAGES, 0, SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
}; };
char alphabet_keymap[19] = { char alphabet_keymap[19] = {
',', 'A', 'D', SIMPSON_KEY_BLUETOOTH, ',', 'A', 'D', SIMPSON_KEY_BLUETOOTH,
'G', 'J', 'M', SIMPSON_KEY_BRIGHTNESS_UP, 'G', 'J', 'M', SIMPSON_KEY_BRIGHTNESS_UP,
'P', 'T', 'W', SIMPSON_KEY_BRIGHTNESS_DOWN, 'P', 'T', 'W', SIMPSON_KEY_BRIGHTNESS_DOWN,
SIMPSON_KEY_BACKSPACE, ' ', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0 SIMPSON_KEY_BACKSPACE, ' ', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
}; };
char numeric_keymap[19] = { char numeric_keymap[19] = {
'1', '2', '3', SIMPSON_KEY_BLUETOOTH, '1', '2', '3', SIMPSON_KEY_BLUETOOTH,
'4', '5', '6', SIMPSON_KEY_BRIGHTNESS_UP, '4', '5', '6', SIMPSON_KEY_BRIGHTNESS_UP,
'7', '8', '9', SIMPSON_KEY_BRIGHTNESS_DOWN, '7', '8', '9', SIMPSON_KEY_BRIGHTNESS_DOWN,
SIMPSON_KEY_BACKSPACE, '0', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0 SIMPSON_KEY_BACKSPACE, '0', SIMPSON_KEY_FN, SIMPSON_KEY_GPS, 0, 0, 0
}; };
} }
bool SimpsonKeypad::begin() { bool SimpsonKeypad::begin() {
if (!_keypad.begin()) return false; if (!_keypad.begin()) return false;
_keypad.setKeyPadMode(I2C_KEYPAD_4x4); _keypad.setKeyPadMode(I2C_KEYPAD_4x4);
_keypad.setDebounceThreshold(50); _keypad.setDebounceThreshold(50);
loadModeMap(); loadModeMap();
_ready = true; _ready = true;
return true; return true;
} }
void SimpsonKeypad::loadModeMap() { void SimpsonKeypad::loadModeMap() {
switch (_mode) { switch (_mode) {
case SIMPSON_KEYPAD_CONTROL: case SIMPSON_KEYPAD_CONTROL:
_keypad.loadKeyMap(control_keymap); _keypad.loadKeyMap(control_keymap);
break; break;
case SIMPSON_KEYPAD_ABC: case SIMPSON_KEYPAD_ABC:
case SIMPSON_KEYPAD_ABC_UPPER: case SIMPSON_KEYPAD_ABC_UPPER:
_keypad.loadKeyMap(alphabet_keymap); _keypad.loadKeyMap(alphabet_keymap);
break; break;
case SIMPSON_KEYPAD_NUMERIC: case SIMPSON_KEYPAD_NUMERIC:
_keypad.loadKeyMap(numeric_keymap); _keypad.loadKeyMap(numeric_keymap);
break; break;
} }
} }
uint8_t SimpsonKeypad::poll() { uint8_t SimpsonKeypad::poll() {
if (!_ready) return SIMPSON_KEY_NONE; if (!_ready) return SIMPSON_KEY_NONE;
uint8_t key = _keypad.getChar(); uint8_t key = _keypad.getChar();
if (key == I2C_KEYPAD_THRESHOLD) return SIMPSON_KEY_NONE; if (key == I2C_KEYPAD_THRESHOLD) return SIMPSON_KEY_NONE;
if (key == SIMPSON_KEY_NONE) { if (key == SIMPSON_KEY_NONE) {
if (_last_key == SIMPSON_KEY_ENTER && !_enter_long_sent) { if (_last_key == SIMPSON_KEY_ENTER && !_enter_long_sent) {
_last_key = SIMPSON_KEY_NONE; _last_key = SIMPSON_KEY_NONE;
_enter_pressed_at = 0; _enter_pressed_at = 0;
return SIMPSON_KEY_ENTER; return SIMPSON_KEY_ENTER;
} }
_last_key = SIMPSON_KEY_NONE; _last_key = SIMPSON_KEY_NONE;
_enter_pressed_at = 0; _enter_pressed_at = 0;
_enter_long_sent = false; _enter_long_sent = false;
return SIMPSON_KEY_NONE; return SIMPSON_KEY_NONE;
} }
if (key == SIMPSON_KEY_ENTER && _last_key == SIMPSON_KEY_ENTER) { if (key == SIMPSON_KEY_ENTER && _last_key == SIMPSON_KEY_ENTER) {
if (!_enter_long_sent && millis() - _enter_pressed_at >= SIMPSON_LONG_PRESS_MS) { if (!_enter_long_sent && millis() - _enter_pressed_at >= SIMPSON_LONG_PRESS_MS) {
_enter_long_sent = true; _enter_long_sent = true;
return SIMPSON_KEY_ENTER_LONG; return SIMPSON_KEY_ENTER_LONG;
} }
return SIMPSON_KEY_NONE; return SIMPSON_KEY_NONE;
} }
if (key == _last_key) return SIMPSON_KEY_NONE; if (key == _last_key) return SIMPSON_KEY_NONE;
_last_key = key; _last_key = key;
if (key == SIMPSON_KEY_ENTER) { if (key == SIMPSON_KEY_ENTER) {
_enter_pressed_at = millis(); _enter_pressed_at = millis();
_enter_long_sent = false; _enter_long_sent = false;
return SIMPSON_KEY_NONE; return SIMPSON_KEY_NONE;
} }
if (key == SIMPSON_KEY_FN) { if (key == SIMPSON_KEY_FN) {
_mode = static_cast<SimpsonKeypadMode>((_mode + 1) % 4); _mode = static_cast<SimpsonKeypadMode>((_mode + 1) % 4);
loadModeMap(); loadModeMap();
return SIMPSON_KEY_MODE_CHANGED; return SIMPSON_KEY_MODE_CHANGED;
} }
return key; return key;
} }
variants/simpson/SimpsonKeypad.h
+52 -52
View File
@@ -1,52 +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 SIMPSON_KEY_ENTER_LONG
}; };
class SimpsonKeypad { class SimpsonKeypad {
I2CKeyPad _keypad; I2CKeyPad _keypad;
SimpsonKeypadMode _mode = SIMPSON_KEYPAD_CONTROL; SimpsonKeypadMode _mode = SIMPSON_KEYPAD_CONTROL;
uint8_t _last_key = SIMPSON_KEY_NONE; uint8_t _last_key = SIMPSON_KEY_NONE;
uint32_t _enter_pressed_at = 0; uint32_t _enter_pressed_at = 0;
bool _enter_long_sent = false; bool _enter_long_sent = false;
bool _ready = false; bool _ready = false;
void loadModeMap(); void loadModeMap();
public: public:
SimpsonKeypad() : _keypad(SIMPSON_KEYPAD_ADDR, &Wire) {} SimpsonKeypad() : _keypad(SIMPSON_KEYPAD_ADDR, &Wire) {}
bool begin(); bool begin();
uint8_t poll(); uint8_t poll();
SimpsonKeypadMode mode() const { return _mode; } SimpsonKeypadMode mode() const { return _mode; }
}; };
variants/simpson/platformio.ini
+22 -23
View File
@@ -1,23 +1,22 @@
[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_INCLUDE_GPS=1 -D ENV_SKIP_GPS_DETECT
-D ENV_SKIP_GPS_DETECT build_src_filter = ${nrf52_base.build_src_filter}
build_src_filter = ${nrf52_base.build_src_filter} +<helpers/sensors>
+<helpers/sensors> +<../variants/simpson>
+<../variants/simpson> +<../variants/promicro/target.cpp>
+<../variants/promicro/target.cpp> +<../variants/promicro/PromicroBoard.cpp>
+<../variants/promicro/PromicroBoard.cpp> lib_deps = ${Promicro.lib_deps}
lib_deps = ${Promicro.lib_deps} adafruit/Adafruit SH110X @ ^2.1.13
adafruit/Adafruit SH110X @ ^2.1.13 RobTillaart/I2CKeyPad @ ^0.5.2
RobTillaart/I2CKeyPad @ ^0.5.2