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

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
+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()];
-1
View File
@@ -13,7 +13,6 @@ build_flags = ${Simpson.build_flags}
-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
-1
View File
@@ -11,7 +11,6 @@ build_flags = ${Promicro.build_flags}
-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>