piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(firmware): bw navigation and string issues resulting from #7383 (#7569)

Browse Source
This commit is contained in:
philmoz
2026-07-19 17:54:56 +10:00
committed by GitHub
parent e184cf3976
commit a6c1397dc0
27 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/CMakeLists.txt
+1 -5
View File
@@ -147,12 +147,8 @@ AddHWGenTarget(${HW_DESC_JSON} simu_keys simu_keys.inc)
AddHWGenTarget(${HW_DESC_JSON} simu_switches simu_switches.inc)
AddHWGenTarget(${HW_DESC_JSON} hal_keys_lock hal_keys_lock.h)
add_custom_target(hal_keys_lock_hdr DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/hal_keys_lock.h)
if(TARGET board)
add_dependencies(board hal_keys_lock_hdr)
endif()
add_dependencies(board hal_settings hal_keys hal_adc_inputs stm32_keys stm32_switches stm32_adc_inputs stm32_pwm_inputs yaml_inputs lua_inputs lua_mixsrc lua_keys)
add_dependencies(board hal_settings hal_keys hal_keys_lock hal_adc_inputs stm32_keys stm32_switches stm32_adc_inputs stm32_pwm_inputs yaml_inputs lua_inputs lua_mixsrc lua_keys)
add_dependencies(board_bl hal_settings hal_keys stm32_keys)
radio/src/boards/generic_stm32/CMakeLists.txt
+2 -2
View File
@@ -24,10 +24,10 @@ set(BOARD_LIB_SRC
add_library(minimal_board_lib OBJECT EXCLUDE_FROM_ALL ${MINIMAL_BOARD_LIB_SRC})
add_dependencies(minimal_board_lib stm32_keys)
add_dependencies(minimal_board_lib hal_keys_lock_hdr)
add_dependencies(minimal_board_lib hal_keys_lock)
add_library(board_lib OBJECT EXCLUDE_FROM_ALL ${BOARD_LIB_SRC})
add_dependencies(board_lib minimal_board_lib hal_keys_lock_hdr)
add_dependencies(board_lib minimal_board_lib hal_keys_lock)
if(DEBUG)
target_compile_definitions(board_lib PRIVATE DEBUG)
radio/src/datastructs_private.h
+3 -6
View File
@@ -1154,6 +1154,8 @@ PACK(struct RadioData {
NOBACKUP(int16_t disablePwrOnOffHaptic:1);
NOBACKUP(uint8_t modelQuickSelect:1);
NOBACKUP(uint8_t oneLogPerDay:1);
NOBACKUP(uint8_t keyLockEnabled:1);
#if defined(COLORLCD)
NOBACKUP(uint8_t labelSingleSelect:1); // 0 = multi-select, 1 = single select labels
@@ -1162,16 +1164,11 @@ PACK(struct RadioData {
// Radio level tabs control (global settings)
NOBACKUP(uint8_t modelSelectLayout:2);
NOBACKUP(uint8_t radioThemesDisabled:1);
NOBACKUP(uint8_t oneLogPerDay:1);
NOBACKUP(uint8_t keyLockEnabled:1);
NOBACKUP(uint8_t spare:7 SKIP);
#elif LCD_W == 128
uint8_t invertLCD:1; // Invert B&W LCD display
NOBACKUP(uint8_t oneLogPerDay:1);
NOBACKUP(uint8_t keyLockEnabled:1);
NOBACKUP(uint8_t spare:4 SKIP);
#else
NOBACKUP(uint8_t oneLogPerDay:1);
NOBACKUP(uint8_t keyLockEnabled:1);
NOBACKUP(uint8_t spare:5 SKIP);
#endif
radio/src/gui/128x64/radio_setup.cpp
+3 -1
View File
@@ -229,6 +229,8 @@ void menuRadioSetup(event_t event)
CASE_BACKLIGHT(0)
CASE_BACKLIGHT(BACKLIGHT_WARNING_ROW(LABEL(0)))
CASE_BACKLIGHT(0)
CASE_KEY_LOCK(0)
0, // One log per day
CASE_SPLASH_PARAM(0)
CASE_PWR_BUTTON_PRESS(0)
CASE_PWR_BUTTON_PRESS(0)
@@ -630,7 +632,7 @@ void menuRadioSetup(event_t event)
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
case ITEM_RADIO_SETUP_KEY_LOCK: {
static char lbl[24];
static char lbl[45];
const char* k1 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY1);
const char* k2 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY2);
snprintf(lbl, sizeof(lbl), STR_KEY_LOCK_FMT,
radio/src/gui/212x64/radio_setup.cpp
+1 -1
View File
@@ -623,7 +623,7 @@ void menuRadioSetup(event_t event)
#if defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
case ITEM_RADIO_SETUP_KEY_LOCK: {
static char lbl[24];
static char lbl[45];
const char* k1 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY1);
const char* k2 = keysGetLabel((EnumKeys)KEYS_LOCK_KEY2);
snprintf(lbl, sizeof(lbl), STR_KEY_LOCK_FMT,
radio/src/keys.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "edgetx_types.h"
#include "hal/key_driver.h"
#if !defined(BOOT) && !defined(SIMU)
#if !defined(BOOT)
#include "hal_keys_lock.h"
#endif
radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+1 -1
View File
@@ -383,9 +383,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/storage/yaml/yaml_datastructs_c14.cpp
+3 -2
View File
@@ -451,13 +451,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_f16.cpp
+3 -2
View File
@@ -452,13 +452,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_gx12.cpp
+1 -1
View File
@@ -407,9 +407,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
+3 -2
View File
@@ -442,13 +442,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+3 -2
View File
@@ -449,13 +449,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_pa01.cpp
+3 -2
View File
@@ -475,13 +475,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+3 -2
View File
@@ -449,13 +449,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
+3 -2
View File
@@ -442,13 +442,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_st16.cpp
+3 -2
View File
@@ -475,13 +475,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_t15.cpp
+3 -2
View File
@@ -460,13 +460,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
+3 -2
View File
@@ -475,13 +475,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_t20.cpp
+1 -1
View File
@@ -392,9 +392,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/storage/yaml/yaml_datastructs_t22.cpp
+3 -2
View File
@@ -475,13 +475,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+1 -1
View File
@@ -392,9 +392,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/storage/yaml/yaml_datastructs_tx15.cpp
+3 -2
View File
@@ -475,13 +475,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_tx16smk3.cpp
+3 -2
View File
@@ -476,13 +476,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+3 -2
View File
@@ -451,13 +451,14 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL),
YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+1 -1
View File
@@ -383,9 +383,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+1 -1
View File
@@ -388,9 +388,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_SIGNED( "disablePwrOnOffHaptic", 1 ),
YAML_UNSIGNED( "modelQuickSelect", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_UNSIGNED( "oneLogPerDay", 1 ),
YAML_UNSIGNED( "keyLockEnabled", 1 ),
YAML_UNSIGNED( "invertLCD", 1 ),
YAML_PADDING( 4 ),
YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
YAML_END
radio/src/targets/simu/CMakeLists.txt
+1 -1
View File
@@ -47,7 +47,7 @@ add_library(simu_drivers OBJECT EXCLUDE_FROM_ALL
${SIMU_DRIVERS}
)
add_dependencies(simu_drivers simu_keys simu_switches hal_settings hal_keys hal_adc_inputs lua_inputs lua_mixsrc lua_keys yaml_inputs)
add_dependencies(simu_drivers simu_keys simu_switches hal_settings hal_keys hal_keys_lock hal_adc_inputs lua_inputs lua_mixsrc lua_keys yaml_inputs)
get_property(SIMU_SRC_OPTIONS
TARGET radiolib_native