feat(bw): Add inverted edit option for rotary encoder (#4401)

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
3djc
2023-12-11 12:16:27 +10:00
committed by GitHub
co-authored by Peter Feerick
parent 912fd93014
commit f80ee2973c
36 changed files with 97 additions and 65 deletions
+2 -2
View File
@@ -530,8 +530,8 @@ void GeneralSetupPanel::on_faimode_CB_stateChanged(int)
void GeneralSetupPanel::populateRotEncModeCB() void GeneralSetupPanel::populateRotEncModeCB()
{ {
QComboBox * b = ui->rotEncMode_CB; QComboBox * b = ui->rotEncMode_CB;
QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate") }; QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate"), tr("Normal, Edit Inverted") };
int itemCount = 4; int itemCount = 5;
if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) { if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) {
itemCount = 2; itemCount = 2;
+4 -4
View File
@@ -117,7 +117,7 @@ static inline void check_struct()
CHKSIZE(TrainerData, 16); CHKSIZE(TrainerData, 16);
#if defined(PCBXLITES) #if defined(PCBXLITES)
CHKSIZE(RadioData, 872); CHKSIZE(RadioData, 873);
CHKSIZE(ModelData, 6265); CHKSIZE(ModelData, 6265);
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
CHKSIZE(RadioData, 870); CHKSIZE(RadioData, 870);
@@ -150,14 +150,14 @@ static inline void check_struct()
CHKSIZE(ModelData, 6706); CHKSIZE(ModelData, 6706);
#elif defined(PCBHORUS) #elif defined(PCBHORUS)
#if defined(PCBX10) #if defined(PCBX10)
CHKSIZE(RadioData, 836); CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15607); CHKSIZE(ModelData, 15607);
#else #else
CHKSIZE(RadioData, 836); CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15607); CHKSIZE(ModelData, 15607);
#endif #endif
#elif defined(PCBNV14) #elif defined(PCBNV14)
CHKSIZE(RadioData, 836); CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15463); CHKSIZE(ModelData, 15463);
#endif #endif
+5 -1
View File
@@ -930,8 +930,12 @@ PACK(struct RadioData {
char ownerRegistrationID[PXX2_LEN_REGISTRATION_ID]; char ownerRegistrationID[PXX2_LEN_REGISTRATION_ID];
#if defined(ROTARY_ENCODER_NAVIGATION) && !defined(USE_HATS_AS_KEYS)
CUST_ATTR(rotEncDirection, r_rotEncDirection, nullptr); CUST_ATTR(rotEncDirection, r_rotEncDirection, nullptr);
NOBACKUP(uint8_t rotEncMode:2); NOBACKUP(uint8_t rotEncMode:3);
#else
NOBACKUP(uint8_t rotEncModeSpare:3 SKIP);
#endif
NOBACKUP(int8_t uartSampleMode:2); // See UartSampleModes NOBACKUP(int8_t uartSampleMode:2); // See UartSampleModes
+1 -1
View File
@@ -757,7 +757,7 @@ void menuRadioSetup(event_t event)
CHECK_INCDEC_GENVAR(event, CHECK_INCDEC_GENVAR(event,
reusableBuffer.generalSettings.rotaryEncoderMode, reusableBuffer.generalSettings.rotaryEncoderMode,
ROTARY_ENCODER_MODE_NORMAL, ROTARY_ENCODER_MODE_NORMAL,
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT); ROTARY_ENCODER_MODE_LAST);
} else if (reusableBuffer.generalSettings.rotaryEncoderMode != } else if (reusableBuffer.generalSettings.rotaryEncoderMode !=
g_eeGeneral.rotEncMode) { g_eeGeneral.rotEncMode) {
g_eeGeneral.rotEncMode = g_eeGeneral.rotEncMode =
+1 -1
View File
@@ -673,7 +673,7 @@ void menuRadioSetup(event_t event)
CHECK_INCDEC_GENVAR(event, CHECK_INCDEC_GENVAR(event,
reusableBuffer.generalSettings.rotaryEncoderMode, reusableBuffer.generalSettings.rotaryEncoderMode,
ROTARY_ENCODER_MODE_NORMAL, ROTARY_ENCODER_MODE_NORMAL,
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT); ROTARY_ENCODER_MODE_LAST);
} else if (reusableBuffer.generalSettings.rotaryEncoderMode != } else if (reusableBuffer.generalSettings.rotaryEncoderMode !=
g_eeGeneral.rotEncMode) { g_eeGeneral.rotEncMode) {
g_eeGeneral.rotEncMode = g_eeGeneral.rotEncMode =
+14 -6
View File
@@ -51,9 +51,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
const CheckIncDecStops &stops) const CheckIncDecStops &stops)
{ {
int newval = val; int newval = val;
event_t evt_rot_inc = EVT_ROTARY_RIGHT;
event_t evt_rot_dec = EVT_ROTARY_LEFT;
#if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT) {
evt_rot_inc = EVT_ROTARY_LEFT;
evt_rot_dec = EVT_ROTARY_RIGHT;
}
#endif
if (s_editMode > 0) { if (s_editMode > 0) {
if (event == EVT_ROTARY_RIGHT || event == EVT_KEY_FIRST(KEY_PLUS) || if (event == evt_rot_inc || event == EVT_KEY_FIRST(KEY_PLUS) ||
event == EVT_KEY_REPT(KEY_PLUS)) { event == EVT_KEY_REPT(KEY_PLUS)) {
if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -70,7 +78,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
newval = val; newval = val;
AUDIO_KEY_ERROR(); AUDIO_KEY_ERROR();
} }
} else if (event == EVT_ROTARY_LEFT || event == EVT_KEY_FIRST(KEY_MINUS) || } else if (event == evt_rot_dec || event == EVT_KEY_FIRST(KEY_MINUS) ||
event == EVT_KEY_REPT(KEY_MINUS)) { event == EVT_KEY_REPT(KEY_MINUS)) {
if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -375,8 +383,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
do { do {
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode >= if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) { g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
} else { } else {
INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
@@ -417,8 +425,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
do { do {
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode >= if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) { g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
} else { } else {
DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
+14 -6
View File
@@ -51,9 +51,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
const CheckIncDecStops &stops) const CheckIncDecStops &stops)
{ {
int newval = val; int newval = val;
event_t evt_rot_inc = EVT_ROTARY_RIGHT;
event_t evt_rot_dec = EVT_ROTARY_LEFT;
#if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT) {
evt_rot_inc = EVT_ROTARY_LEFT;
evt_rot_dec = EVT_ROTARY_RIGHT;
}
#endif
if (s_editMode > 0) { if (s_editMode > 0) {
if (event == EVT_ROTARY_RIGHT || event == EVT_KEY_FIRST(KEY_PLUS) || if (event == evt_rot_inc || event == EVT_KEY_FIRST(KEY_PLUS) ||
event == EVT_KEY_REPT(KEY_PLUS)) { event == EVT_KEY_REPT(KEY_PLUS)) {
if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -70,7 +78,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
newval = val; newval = val;
AUDIO_KEY_ERROR(); AUDIO_KEY_ERROR();
} }
} else if (event == EVT_ROTARY_LEFT || event == EVT_KEY_FIRST(KEY_MINUS) || } else if (event == evt_rot_dec || event == EVT_KEY_FIRST(KEY_MINUS) ||
event == EVT_KEY_REPT(KEY_MINUS)) { event == EVT_KEY_REPT(KEY_MINUS)) {
if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -407,8 +415,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
do { do {
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode >= if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) { g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
} else { } else {
INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
@@ -449,8 +457,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
do { do {
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
if (g_eeGeneral.rotEncMode >= if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) { g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
} else { } else {
DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1); DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
+3 -1
View File
@@ -76,7 +76,9 @@ enum RotaryEncoderMode {
ROTARY_ENCODER_MODE_NORMAL, ROTARY_ENCODER_MODE_NORMAL,
ROTARY_ENCODER_MODE_INVERT_BOTH, ROTARY_ENCODER_MODE_INVERT_BOTH,
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM, ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM,
ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT,
ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT,
ROTARY_ENCODER_MODE_LAST = ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT
}; };
#endif #endif
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -359,7 +360,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -283,7 +283,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 48 ), YAML_PADDING( 48 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -370,8 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "blOffBright", 7 ), YAML_UNSIGNED( "blOffBright", 7 ),
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_PADDING( 3 ),
YAML_UNSIGNED( "rotEncMode", 2 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_UNSIGNED( "stickDeadZone", 3 ), YAML_UNSIGNED( "stickDeadZone", 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -375,10 +375,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "blOffBright", 7 ), YAML_UNSIGNED( "blOffBright", 7 ),
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ),
YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_SIGNED( "uartSampleMode", 2 ),
YAML_UNSIGNED( "stickDeadZone", 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
YAML_STRING("selectedTheme", 26), YAML_STRING("selectedTheme", 26),
YAML_UNSIGNED( "radioThemesDisabled", 1 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ),
@@ -157,6 +157,10 @@ const struct YamlIdStr enum_SwashType[] = {
}; };
const struct YamlIdStr enum_SwitchSources[] = { const struct YamlIdStr enum_SwitchSources[] = {
{ SWSRC_NONE, "NONE" }, { SWSRC_NONE, "NONE" },
{ SWSRC_TrimT7Down, "TrimT7Down" },
{ SWSRC_TrimT7Up, "TrimT7Up" },
{ SWSRC_TrimT8Down, "TrimT8Down" },
{ SWSRC_TrimT8Up, "TrimT8Up" },
{ SWSRC_ON, "ON" }, { SWSRC_ON, "ON" },
{ SWSRC_ONE, "ONE" }, { SWSRC_ONE, "ONE" },
{ SWSRC_TELEMETRY_STREAMING, "TELEMETRY_STREAMING" }, { SWSRC_TELEMETRY_STREAMING, "TELEMETRY_STREAMING" },
@@ -272,7 +276,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +362,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "backlightColor", 8 ), YAML_UNSIGNED( "backlightColor", 8 ),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "backlightColor", 8 ), YAML_UNSIGNED( "backlightColor", 8 ),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -291,7 +291,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 48 ), YAML_PADDING( 48 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -377,7 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -291,7 +291,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 48 ), YAML_PADDING( 48 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -377,7 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -358,8 +359,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_PADDING( 8 ), YAML_PADDING( 8 ),
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_PADDING( 3 ),
YAML_UNSIGNED( "rotEncMode", 2 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -359,7 +360,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "backlightColor", 8 ), YAML_UNSIGNED( "backlightColor", 8 ),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
YAML_UNSIGNED( "rotEncMode", 2 ), YAML_UNSIGNED( "rotEncMode", 3 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
@@ -274,7 +274,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
YAML_ENUM("func", 6, enum_Functions), YAML_ENUM("func", 6, enum_Functions),
YAML_CUSTOM("def",r_customFn,w_customFn), YAML_CUSTOM("def",r_customFn,w_customFn),
YAML_PADDING( 64 ), YAML_PADDING( 64 ),
YAML_PADDING( 8 ), YAML_PADDING( 1 ),
YAML_PADDING( 7 ),
YAML_END YAML_END
}; };
static const struct YamlNode struct_RadioData[] = { static const struct YamlNode struct_RadioData[] = {
@@ -360,8 +361,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_PADDING( 8 ), YAML_PADDING( 8 ),
YAML_STRING("bluetoothName", 10), YAML_STRING("bluetoothName", 10),
YAML_STRING("ownerRegistrationID", 8), YAML_STRING("ownerRegistrationID", 8),
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), YAML_PADDING( 3 ),
YAML_UNSIGNED( "rotEncMode", 2 ),
YAML_SIGNED( "uartSampleMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ),
YAML_PADDING( 3 ), YAML_PADDING( 3 ),
YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "audioMuteEnable", 1 ),
+1 -1
View File
@@ -166,7 +166,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "正常","反向" #define TR_ROTARY_ENC_OPT "正常","反向"
#else #else
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -178,7 +178,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invertován" #define TR_ROTARY_ENC_OPT "Normal","Invertován"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Invertován","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Invertován","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -173,7 +173,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invers" #define TR_ROTARY_ENC_OPT "Normal","Invers"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Invers","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Invers","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -168,7 +168,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -170,7 +170,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -166,7 +166,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -177,7 +177,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -175,7 +175,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inversé" #define TR_ROTARY_ENC_OPT "Normal","Inversé"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inversé","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inversé","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -174,7 +174,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "רגיל","הפוך" #define TR_ROTARY_ENC_OPT "רגיל","הפוך"
#else #else
#define TR_ROTARY_ENC_OPT "רגיל","הפוך","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "רגיל","הפוך","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -171,7 +171,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normale","Invertito" #define TR_ROTARY_ENC_OPT "Normale","Invertito"
#else #else
#define TR_ROTARY_ENC_OPT "Normale","Invertito","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normale","Invertito","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -170,7 +170,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "標準","リバース" #define TR_ROTARY_ENC_OPT "標準","リバース"
#else #else
#define TR_ROTARY_ENC_OPT "標準","リバース","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "標準","リバース","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -167,7 +167,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -166,7 +166,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted" #define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -173,7 +173,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invert" #define TR_ROTARY_ENC_OPT "Normal","Invert"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Invert","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Invert","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -172,7 +172,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Норм","Перевер" #define TR_ROTARY_ENC_OPT "Норм","Перевер"
#else #else
#define TR_ROTARY_ENC_OPT "Норм","Перевер","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Норм","Перевер","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)
+1 -1
View File
@@ -173,7 +173,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverterad" #define TR_ROTARY_ENC_OPT "Normal","Inverterad"
#else #else
#define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#define TR_ON_ONE_SWITCHES "PÅ","Ett" #define TR_ON_ONE_SWITCHES "PÅ","Ett"
+1 -1
View File
@@ -171,7 +171,7 @@
#if defined(COLORLCD) #if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "正常","反向" #define TR_ROTARY_ENC_OPT "正常","反向"
#else #else
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A" #define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
#endif #endif
#if defined(IMU) #if defined(IMU)