From a1e7d7072229b1ca48b6b4274ba464ea9d9301e6 Mon Sep 17 00:00:00 2001 From: Stephen Mose Aaskov Date: Wed, 16 Mar 2022 09:07:26 +0100 Subject: [PATCH] chore: Clean up some issues introduced in #1363 * Clean up some errors introduced in PR #1363 - Cleaning up bad YAML definitions - Reverted renaming of 'jitterfilter' radio setting in storage/conversions/yaml/ files * Add a custom attribute to allow for backward compatibility * Prevent custom attributes without a 'write' function to output a tag * companion - read but don't write old name Co-authored-by: Raphael Coeffic Co-authored-by: Peter Feerick --- .../firmwares/edgetx/yaml_generalsettings.cpp | 3 ++- radio/src/dataconstants.h | 6 +++--- radio/src/datastructs.h | 16 ++++++++-------- radio/src/datastructs_private.h | 10 ++++++---- radio/src/opentx.cpp | 6 +++--- .../storage/conversions/yaml/datastructs_220.h | 2 +- .../conversions/yaml/yaml_datastructs_nv14.cpp | 2 +- .../conversions/yaml/yaml_datastructs_t12.cpp | 2 +- .../conversions/yaml/yaml_datastructs_t8.cpp | 2 +- .../conversions/yaml/yaml_datastructs_tlite.cpp | 2 +- .../conversions/yaml/yaml_datastructs_tx12.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x10.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x12s.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x7.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x9d.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x9e.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x9lite.cpp | 2 +- .../yaml/yaml_datastructs_x9lites.cpp | 2 +- .../conversions/yaml/yaml_datastructs_xlite.cpp | 2 +- .../conversions/yaml/yaml_datastructs_xlites.cpp | 2 +- .../conversions/yaml/yaml_datastructs_zorro.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_funcs.cpp | 7 +++++++ radio/src/storage/yaml/yaml_datastructs_nv14.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_t12.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_t8.cpp | 12 ++++++------ .../src/storage/yaml/yaml_datastructs_tlite.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_tpro.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_tx12.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_x10.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_x12s.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_x7.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_x9d.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_datastructs_x9e.cpp | 12 ++++++------ .../src/storage/yaml/yaml_datastructs_x9lite.cpp | 12 ++++++------ .../storage/yaml/yaml_datastructs_x9lites.cpp | 12 ++++++------ .../src/storage/yaml/yaml_datastructs_xlite.cpp | 12 ++++++------ .../src/storage/yaml/yaml_datastructs_xlites.cpp | 12 ++++++------ .../src/storage/yaml/yaml_datastructs_zorro.cpp | 12 ++++++------ radio/src/storage/yaml/yaml_tree_walker.cpp | 2 +- 39 files changed, 142 insertions(+), 132 deletions(-) diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp index 71e6f4503..1d8624ac9 100644 --- a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp +++ b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp @@ -359,7 +359,8 @@ bool convert::decode(const Node& node, GeneralSettings& rhs) node["bluetoothBaudrate"] >> rhs.bluetoothBaudrate; node["bluetoothMode"] >> bluetoothModeLut >> rhs.bluetoothMode; node["countryCode"] >> rhs.countryCode; - node["noJitterFilter"] >> rhs.noJitterFilter; + node["jitterFilter"] >> rhs.noJitterFilter; // PR1363 : read old name and + node["noJitterFilter"] >> rhs.noJitterFilter; // new, but don't write old node["disableRtcWarning"] >> rhs.rtcCheckDisable; // TODO: verify node["keysBacklight"] >> rhs.keysBacklight; node["imperial"] >> rhs.imperial; diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index f68d9dff5..1d5e00e20 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -910,9 +910,9 @@ enum UartSampleModes { // A model On/Off setting that can also take a global value enum ModelOverridableEnable { - OVERRIDE_VALUE_GLOBAL, - OVERRIDE_VALUE_OFF, - OVERRIDE_VALUE_ON + OVERRIDE_GLOBAL, + OVERRIDE_OFF, + OVERRIDE_ON }; #endif // _DATACONSTANTS_H_ diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index de1fc764e..4f3a3fd18 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -117,29 +117,29 @@ static inline void check_struct() #if defined(PCBXLITES) CHKSIZE(RadioData, 860); - CHKSIZE(ModelData, 6162); + CHKSIZE(ModelData, 6161); #elif defined(PCBXLITE) CHKSIZE(RadioData, 858); - CHKSIZE(ModelData, 6162); + CHKSIZE(ModelData, 6161); #elif defined(RADIO_TPRO) CHKSIZE(RadioData, 841); - CHKSIZE(ModelData, 6187); + CHKSIZE(ModelData, 6186); #elif defined(PCBX7) CHKSIZE(RadioData, 864); - CHKSIZE(ModelData, 6162); + CHKSIZE(ModelData, 6161); #elif defined(PCBX9E) CHKSIZE(RadioData, 954); - CHKSIZE(ModelData, 6614); + CHKSIZE(ModelData, 6613); #elif defined(PCBX9D) || defined(PCBX9DP) CHKSIZE(RadioData, 896); - CHKSIZE(ModelData, 6606); + CHKSIZE(ModelData, 6605); #elif defined(PCBHORUS) #if defined(PCBX10) CHKSIZE(RadioData, 921); - CHKSIZE(ModelData, 11026); + CHKSIZE(ModelData, 11025); #else CHKSIZE(RadioData, 903); - CHKSIZE(ModelData, 11024); + CHKSIZE(ModelData, 11023); #endif #endif diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index ab92a87f0..603c428bd 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -679,12 +679,10 @@ PACK(struct ModelData { NOBACKUP(RssiAlarmData rssiAlarms); - uint8_t spare1:3 SKIP; uint8_t thrTrimSw:3; uint8_t potsWarnMode:2 ENUM(PotsWarnMode); - NOBACKUP(uint8_t jitterFilter:2 ENUM(ModelOverridableEnable)); - uint8_t spare2:6 SKIP; + uint8_t spare1:1 SKIP; ModuleData moduleData[NUM_MODULES]; int16_t failsafeChannels[MAX_OUTPUT_CHANNELS]; @@ -891,15 +889,19 @@ PACK(struct RadioData { NOBACKUP(uint32_t globalTimer); NOBACKUP(uint8_t bluetoothBaudrate:4); NOBACKUP(uint8_t bluetoothMode:4 ENUM(BluetoothModes)); + NOBACKUP(uint8_t countryCode:2); NOBACKUP(int8_t pwrOnSpeed:3); NOBACKUP(int8_t pwrOffSpeed:3); - NOBACKUP(uint8_t imperial:1); + + CUST_ATTR(jitterFilter, r_jitterFilter, nullptr); NOBACKUP(uint8_t noJitterFilter:1); /* 0 - Jitter filter active */ + NOBACKUP(uint8_t imperial:1); NOBACKUP(uint8_t disableRssiPoweroffAlarm:1); NOBACKUP(uint8_t USBMode:2); NOBACKUP(uint8_t jackMode:2); NOBACKUP(uint8_t sportUpdatePower:1 SKIP); + NOBACKUP(char ttsLanguage[2]); NOBACKUP(int8_t beepVolume:4 CUST(r_5pos,w_5pos)); NOBACKUP(int8_t wavVolume:4 CUST(r_5pos,w_5pos)); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 5d7fef658..125a35503 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1135,12 +1135,12 @@ void getADC() // Model can override (on or off) or use setting from radio setup. // Model setting is active when 1, radio setting is active when 0 uint8_t useJitterFilter = 0; - if (g_model.jitterFilter == OVERRIDE_VALUE_GLOBAL) { + if (g_model.jitterFilter == OVERRIDE_GLOBAL) { // Use radio setting - which is inverted useJitterFilter = !g_eeGeneral.noJitterFilter; } else { // Enable if value is "On", disable if "Off" - useJitterFilter = (g_model.jitterFilter == OVERRIDE_VALUE_ON)?1:0; + useJitterFilter = (g_model.jitterFilter == OVERRIDE_ON)?1:0; } if (useJitterFilter && diff < (10*ANALOG_MULTIPLIER)) { @@ -1814,7 +1814,7 @@ void opentxInit() runFatalErrorScreen(STR_NO_SDCARD); } #endif - + #if defined(AUTOUPDATE) sportStopSendByteLoop(); if (f_stat(AUTOUPDATE_FILENAME, nullptr) == FR_OK) { diff --git a/radio/src/storage/conversions/yaml/datastructs_220.h b/radio/src/storage/conversions/yaml/datastructs_220.h index 88842561f..958c19bdb 100644 --- a/radio/src/storage/conversions/yaml/datastructs_220.h +++ b/radio/src/storage/conversions/yaml/datastructs_220.h @@ -864,7 +864,7 @@ PACK(struct RadioData { NOBACKUP(int8_t pwrOnSpeed:3); NOBACKUP(int8_t pwrOffSpeed:3); NOBACKUP(uint8_t imperial:1); - NOBACKUP(uint8_t noJitterFilter:1); /* 0 - Jitter filter active */ + NOBACKUP(uint8_t jitterFilter:1); /* 0 - Jitter filter active */ NOBACKUP(uint8_t disableRssiPoweroffAlarm:1); NOBACKUP(uint8_t USBMode:2); NOBACKUP(uint8_t jackMode:2); diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp index 382f2c85a..1b12702e3 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp @@ -408,7 +408,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp index 3a630dc2d..5d02e2cd7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp index d88c8cd22..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp index d88c8cd22..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp index 02aeb53e0..366acd3da 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp index e8ea27688..db2bd42cb 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp @@ -425,7 +425,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp index 5871df751..41e00722f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp @@ -425,7 +425,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp index d88c8cd22..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp index 8b8c0e3cb..5241e7d00 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp @@ -384,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp index 4524053e3..aeaed279f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp @@ -423,7 +423,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp index b0808c4d7..d65fb41ac 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp @@ -364,7 +364,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp index 500b5aabc..903bf0b7f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp @@ -372,7 +372,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp index 3f0e1a9fc..f42f55783 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp @@ -369,7 +369,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp index c099f20b4..fc0febc7d 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp @@ -371,7 +371,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp index 05ebd5bb8..4a655962a 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp @@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), YAML_UNSIGNED( "imperial", 1 ), - YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "jitterFilter", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index e9d88f726..68c15bcd4 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -1719,3 +1719,10 @@ bool w_channelsCount(const YamlNode* node, uint32_t val, yaml_writer_func wf, vo { return yaml_conv_220::w_channelsCount(node, val, wf, opaque); } + +static void r_jitterFilter(void* user, uint8_t* data, uint32_t bitoffs, + const char* val, uint8_t val_len) +{ + uint32_t i = yaml_str2uint(val, val_len); + yaml_put_bits(data, i, bitoffs, 1); +} diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index e25ba5baa..0f849ff67 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -247,9 +247,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -412,8 +412,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -862,11 +863,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index 627c470d0..8b2e6f73f 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index 61550025a..2bf9a7048 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index 61550025a..2bf9a7048 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index 0b8776e5b..0d54e72e6 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -245,9 +245,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -391,8 +391,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -837,11 +838,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index 57cc62758..21e4c4f29 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 2b663f620..a5a436a49 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -270,9 +270,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -433,8 +433,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -883,11 +884,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 56f315b47..396932e15 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -268,9 +268,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -431,8 +431,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -881,11 +882,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index 61550025a..2bf9a7048 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index 8616e716b..154b6fae2 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -244,9 +244,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -390,8 +390,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -846,11 +847,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_UNSIGNED_CUST( "voltsSource", 8, r_tele_sensor, w_tele_sensor ), YAML_UNSIGNED_CUST( "altitudeSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index ff83b6b90..3b61f7f51 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -283,9 +283,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -429,8 +429,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -885,11 +886,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_UNSIGNED_CUST( "voltsSource", 8, r_tele_sensor, w_tele_sensor ), YAML_UNSIGNED_CUST( "altitudeSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index e10bb4cc6..17513ae76 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -224,9 +224,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -370,8 +370,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -816,11 +817,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index 9fdf8a2dc..63740f7c0 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -232,9 +232,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -378,8 +378,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -826,11 +827,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 818d2f41b..50ab1f38a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -229,9 +229,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -375,8 +375,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -823,11 +824,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index e3ef655f3..5d4037bdd 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -231,9 +231,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -377,8 +377,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -827,11 +828,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp index 49564eace..3f72c9327 100644 --- a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp @@ -237,9 +237,9 @@ const struct YamlIdStr enum_PotsWarnMode[] = { { 0, NULL } }; const struct YamlIdStr enum_ModelOverridableEnable[] = { - { OVERRIDE_VALUE_GLOBAL, "GLOBAL" }, - { OVERRIDE_VALUE_OFF, "OFF" }, - { OVERRIDE_VALUE_ON, "ON" }, + { OVERRIDE_GLOBAL, "GLOBAL" }, + { OVERRIDE_OFF, "OFF" }, + { OVERRIDE_ON, "ON" }, { 0, NULL } }; const struct YamlIdStr enum_FailsafeModes[] = { @@ -383,8 +383,9 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "countryCode", 2 ), YAML_SIGNED( "pwrOnSpeed", 3 ), YAML_SIGNED( "pwrOffSpeed", 3 ), - YAML_UNSIGNED( "imperial", 1 ), + YAML_CUSTOM("jitterFilter",r_jitterFilter,nullptr), YAML_UNSIGNED( "noJitterFilter", 1 ), + YAML_UNSIGNED( "imperial", 1 ), YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ), YAML_UNSIGNED( "USBMode", 2 ), YAML_UNSIGNED( "jackMode", 2 ), @@ -831,11 +832,10 @@ static const struct YamlNode struct_ModelData[] = { YAML_STRUCT("varioData", 40, struct_VarioData, NULL), YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ), YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL), - YAML_PADDING( 3 ), YAML_UNSIGNED( "thrTrimSw", 3 ), YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode), YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable), - YAML_PADDING( 6 ), + YAML_PADDING( 1 ), YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL), YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL), YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL), diff --git a/radio/src/storage/yaml/yaml_tree_walker.cpp b/radio/src/storage/yaml/yaml_tree_walker.cpp index 7f2c806da..3324b4a66 100644 --- a/radio/src/storage/yaml/yaml_tree_walker.cpp +++ b/radio/src/storage/yaml/yaml_tree_walker.cpp @@ -141,8 +141,8 @@ static bool yaml_output_attr(void* user, uint8_t* ptr, uint32_t bit_ofs, void* opaque) { if (node->type == YDT_NONE) return false; - if (node->type == YDT_PADDING) return true; + if (node->type == YDT_CUSTOM && !node->u._cust_attr.write) return true; // output tag if (!wf(opaque, node->tag, node->tag_len)) return false;