feat(radio): optional key lock feature (#7383)
This commit is contained in:
@@ -87,6 +87,7 @@ enum {
|
||||
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE)
|
||||
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE)
|
||||
CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP)
|
||||
CASE_KEY_LOCK(ITEM_RADIO_SETUP_KEY_LOCK)
|
||||
ITEM_RADIO_ONE_LOG_PER_DAY,
|
||||
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
|
||||
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED)
|
||||
@@ -228,7 +229,6 @@ void menuRadioSetup(event_t event)
|
||||
CASE_BACKLIGHT(0)
|
||||
CASE_BACKLIGHT(BACKLIGHT_WARNING_ROW(LABEL(0)))
|
||||
CASE_BACKLIGHT(0)
|
||||
0,
|
||||
CASE_SPLASH_PARAM(0)
|
||||
CASE_PWR_BUTTON_PRESS(0)
|
||||
CASE_PWR_BUTTON_PRESS(0)
|
||||
@@ -628,6 +628,20 @@ void menuRadioSetup(event_t event)
|
||||
break;
|
||||
}
|
||||
|
||||
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
|
||||
case ITEM_RADIO_SETUP_KEY_LOCK: {
|
||||
static char lbl[24];
|
||||
const char* k1 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY1);
|
||||
const char* k2 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY2);
|
||||
snprintf(lbl, sizeof(lbl), STR_KEY_LOCK_FMT,
|
||||
k1 ? k1 : "?", k2 ? k2 : "?");
|
||||
lcdDrawTextAlignedLeft(y, lbl);
|
||||
g_eeGeneral.keyLockEnabled =
|
||||
editCheckBox(g_eeGeneral.keyLockEnabled, LCD_W - 9, y, nullptr, attr, event);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
case ITEM_RADIO_SETUP_DISABLE_SPLASH:
|
||||
{
|
||||
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
|
||||
|
||||
@@ -90,6 +90,7 @@ enum MenuRadioSetupItems {
|
||||
ITEM_RADIO_SETUP_BACKLIGHT_SOURCE,
|
||||
ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE,
|
||||
ITEM_RADIO_SETUP_FLASH_BEEP,
|
||||
CASE_KEY_LOCK(ITEM_RADIO_SETUP_KEY_LOCK)
|
||||
ITEM_RADIO_ONE_LOG_PER_DAY,
|
||||
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
|
||||
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED)
|
||||
@@ -235,6 +236,7 @@ void menuRadioSetup(event_t event)
|
||||
BACKLIGHT_WARNING_ROW(LABEL(0)), // backlight control override warning
|
||||
0, // flash beep
|
||||
0,
|
||||
CASE_KEY_LOCK(0) // key lock
|
||||
CASE_SPLASH_PARAM(0) // disable splash
|
||||
CASE_PWR_BUTTON_PRESS(0) // pwr on speed
|
||||
CASE_PWR_BUTTON_PRESS(0) // pwr off speed
|
||||
@@ -619,6 +621,20 @@ void menuRadioSetup(event_t event)
|
||||
break;
|
||||
}
|
||||
|
||||
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
|
||||
case ITEM_RADIO_SETUP_KEY_LOCK: {
|
||||
static char lbl[24];
|
||||
const char* k1 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY1);
|
||||
const char* k2 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY2);
|
||||
snprintf(lbl, sizeof(lbl), STR_KEY_LOCK_FMT,
|
||||
k1 ? k1 : "?", k2 ? k2 : "?");
|
||||
lcdDrawTextAlignedLeft(y, lbl);
|
||||
g_eeGeneral.keyLockEnabled =
|
||||
editCheckBox(g_eeGeneral.keyLockEnabled, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
case ITEM_RADIO_SETUP_DISABLE_SPLASH:
|
||||
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
|
||||
if (SPLASH_NEEDED()) {
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "pagegroup.h"
|
||||
#include "qmpagechoice.h"
|
||||
#include "radio_tools.h"
|
||||
#include "toggleswitch.h"
|
||||
|
||||
#define SET_DIRTY() storageDirty(EE_GENERAL)
|
||||
|
||||
@@ -87,6 +88,18 @@ QMKeyShortcutsPage::QMKeyShortcutsPage():
|
||||
{
|
||||
auto qmPages = QuickMenu::menuPageNames(false);
|
||||
|
||||
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
|
||||
static char keyLockLabel[45];
|
||||
const char* k1 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY1);
|
||||
const char* k2 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY2);
|
||||
snprintf(keyLockLabel, sizeof(keyLockLabel), STR_KEY_LOCK_FMT,
|
||||
k1 ? k1 : "?", k2 ? k2 : "?");
|
||||
setupLine(keyLockLabel, [=](Window* parent, coord_t x, coord_t y) {
|
||||
new ToggleSwitch(parent, {x, y, 0, 0},
|
||||
GET_SET_DEFAULT(g_eeGeneral.keyLockEnabled));
|
||||
});
|
||||
#endif
|
||||
|
||||
setupLine(STR_SHORT_PRESS, nullptr);
|
||||
addKey(EVT_KEY_BREAK(KEY_SYS), qmPages, "SYS");
|
||||
addKey(EVT_KEY_BREAK(KEY_MODEL), qmPages, "MDL");
|
||||
|
||||
@@ -47,6 +47,12 @@
|
||||
#define CASE_BACKLIGHT(x)
|
||||
#endif
|
||||
|
||||
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
|
||||
#define CASE_KEY_LOCK(x) x,
|
||||
#else
|
||||
#define CASE_KEY_LOCK(x)
|
||||
#endif
|
||||
|
||||
#if defined(RTCLOCK)
|
||||
#define CASE_RTCLOCK(x) x,
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user