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

Add files via upload

Browse Source 
keypad improvements
This commit is contained in:
SimpSon
2026-10-22 21:58:30 +02:00
committed by GitHub
parent 615e71b98d
commit b416b4dd13
3 changed files with 167 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/simpson/SimpsonKeypad.cpp
+92 -70
View File
@@ -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
+52 -49
View File
@@ -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
+23 -22
View File
@@ -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