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

feat: Model level ADC Jitter filter option (#1363)

Browse Source 
* ADC Filter - On/off state configurable at the model level

* Updated YAML configuration to match change from ADC Filter feature commit

* Companion changes to support ADC jitter filter to be a model configuration item.

* Renamed jitterFilter field to noJitterFilter.

This better describes the semantic, which is inverted.

* Updated after review

* Re-run generate-yaml

* Changed ADC Jitter filter control on Model to be tri state.
Off, On or use the radio setting

* Adde NOBACKUP() to the added field

* Re-generate yaml_datastructs

* Making the default state to use radio setting/Global value

* Updated after review:
Changing to more consistent naming across firmware and companion.

* Reverted  files that was accidently added to the commit.

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
Stephen Mose Aaskov
2022-01-26 20:54:23 +10:00
committed by GitHub
co-authored by Peter Feerick
parent 09980bf640
commit c3c8a2e3f1
66 changed files with 334 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+2 -2
View File
@@ -154,7 +154,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["bluetoothBaudrate"] = rhs.bluetoothBaudrate;
node["bluetoothMode"] = bluetoothModeLut << rhs.bluetoothMode;
node["countryCode"] = rhs.countryCode;
node["jitterFilter"] = (int)rhs.jitterFilter;
node["noJitterFilter"] = (int)rhs.noJitterFilter;
node["disableRtcWarning"] = (int)rhs.rtcCheckDisable; // TODO: verify
node["keysBacklight"] = (int)rhs.keysBacklight;
node["imperial"] = rhs.imperial;
@@ -314,7 +314,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["bluetoothBaudrate"] >> rhs.bluetoothBaudrate;
node["bluetoothMode"] >> bluetoothModeLut >> rhs.bluetoothMode;
node["countryCode"] >> rhs.countryCode;
node["jitterFilter"] >> rhs.jitterFilter;
node["noJitterFilter"] >> rhs.noJitterFilter;
node["disableRtcWarning"] >> rhs.rtcCheckDisable; // TODO: verify
node["keysBacklight"] >> rhs.keysBacklight;
node["imperial"] >> rhs.imperial;
companion/src/firmwares/edgetx/yaml_modeldata.cpp
+9 -1
View File
@@ -71,6 +71,12 @@ static const YamlLookupTable potsWarningModeLut = {
{ 2, "WARN_AUTO" },
};
static const YamlLookupTable jitterFilterLut = {
{ 0, "GLOBAL" },
{ 1, "OFF" },
{ 2, "ON" },
};
struct YamlTrim {
int mode = 0;
int ref = 0;
@@ -236,7 +242,7 @@ struct YamlSwitchWarningState {
default:
continue;
}
states |= ((uint64_t)value << (index * MASK_LEN));
enabled |= (1 << index);
}
@@ -811,6 +817,7 @@ Node convert<ModelData>::encode(const ModelData& rhs)
node["thrTrimSw"] = rhs.thrTrimSwitch;
node["potsWarnMode"] = potsWarningModeLut << rhs.potsWarningMode;
node["jitterFilter"] = jitterFilterLut << rhs.jitterFilter;
YamlPotsWarnEnabled potsWarnEnabled(&rhs.potsWarnEnabled[CPN_MAX_POTS + CPN_MAX_SLIDERS]);
node["potsWarnEnabled"] = potsWarnEnabled.value;
@@ -990,6 +997,7 @@ bool convert<ModelData>::decode(const Node& node, ModelData& rhs)
node["thrTrimSw"] >> rhs.thrTrimSwitch;
node["potsWarnMode"] >> potsWarningModeLut >> rhs.potsWarningMode;
node["jitterFilter"] >> jitterFilterLut >> rhs.jitterFilter;
YamlPotsWarnEnabled potsWarnEnabled;
node["potsWarnEnabled"] >> potsWarnEnabled.value;
companion/src/firmwares/generalsettings.h
+1 -1
View File
@@ -210,7 +210,7 @@ class GeneralSettings {
unsigned int sticksGain;
unsigned int rotarySteps;
unsigned int countryCode;
bool jitterFilter;
bool noJitterFilter;
bool rtcCheckDisable;
bool keysBacklight;
unsigned int imperial;
companion/src/firmwares/modeldata.h
+1
View File
@@ -121,6 +121,7 @@ class ModelData {
int trimInc; // Trim Increments
unsigned int trimsDisplay;
bool disableThrottleWarning;
unsigned int jitterFilter; // Added in EdgeTx 2.7 (#870)
unsigned int beepANACenter; // 1<<0->A1.. 1<<6->A7
companion/src/firmwares/opentx/opentxeeprom.cpp
+1 -1
View File
@@ -3082,7 +3082,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
internalField.Append(new UnsignedField<1>(this, generalData.imperial));
if (version >= 218) {
internalField.Append(new BoolField<1>(this, generalData.jitterFilter));
internalField.Append(new BoolField<1>(this, generalData.noJitterFilter));
internalField.Append(new BoolField<1>(this, generalData.disableRssiPoweroffAlarm));
internalField.Append(new UnsignedField<2>(this, generalData.usbMode));
internalField.Append(new UnsignedField<2>(this, generalData.jackMode));
companion/src/generaledit/hardware.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
if (firmware->getCapability(HasADCJitterFilter)) {
addLabel(tr("ADC Filter"), row, 0);
AutoCheckBox *filterEnable = new AutoCheckBox(this);
filterEnable->setField(generalSettings.jitterFilter, this, true);
filterEnable->setField(generalSettings.noJitterFilter, this, true);
addParams(row, filterEnable);
}
companion/src/modeledit/setup.cpp
+14
View File
@@ -1346,6 +1346,11 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
ui->gfEnabled->hide();
}
if (!firmware->getCapability(HasADCJitterFilter))
{
ui->jitterFilter->hide();
}
// Beep Center checkboxes
prevFocus = ui->trimsDisplay;
int analogs = CPN_MAX_STICKS + getBoardCapability(board, Board::Pots) + getBoardCapability(board, Board::Sliders);
@@ -1590,6 +1595,7 @@ void SetupPanel::update()
ui->extendedTrims->setChecked(model->extendedTrims);
ui->displayText->setChecked(model->displayChecklist);
ui->gfEnabled->setChecked(!model->noGlobalFunctions);
ui->jitterFilter->setCurrentIndex(model->jitterFilter);
updateBeepCenter();
updateStartupSwitches();
@@ -1741,6 +1747,14 @@ void SetupPanel::on_gfEnabled_toggled(bool checked)
emit modified();
}
void SetupPanel::on_jitterFilter_currentIndexChanged(int index)
{
if (!lock) {
model->jitterFilter = ui->jitterFilter->currentIndex();
emit modified();
}
}
void SetupPanel::on_throttleTrim_toggled(bool checked)
{
model->thrTrim = checked;
companion/src/modeledit/setup.h
+1
View File
@@ -204,6 +204,7 @@ class SetupPanel : public ModelPanel
void onItemModelAboutToBeUpdated();
void onItemModelUpdateComplete();
void onModuleUpdateItemModels();
void on_jitterFilter_currentIndexChanged(int index);
private:
Ui::Setup *ui;
companion/src/modeledit/setup.ui
+39
View File
@@ -537,6 +537,45 @@
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLabel" name="label_jitterFilter">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>ADC filter</string>
</property>
</widget>
</item>
<item row="2" column="5">
<widget class="QComboBox" name="jitterFilter">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Global</string>
</property>
</item>
<item>
<property name="text">
<string>Off</string>
</property>
</item>
<item>
<property name="text">
<string>On</string>
</property>
</item>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="editText">
<property name="sizePolicy">
radio/src/dataconstants.h
+7
View File
@@ -908,4 +908,11 @@ enum UartSampleModes {
#define PXX2_LEN_RX_NAME 8
#define PXX2_MAX_RECEIVERS_PER_MODULE 3
// A model On/Off setting that can also take a global value
enum ModelOverridableEnable {
OVERRIDE_VALUE_GLOBAL,
OVERRIDE_VALUE_OFF,
OVERRIDE_VALUE_ON
};
#endif // _DATACONSTANTS_H_
radio/src/datastructs.h
+9 -9
View File
@@ -42,7 +42,7 @@ static inline void check_struct()
CHKSIZE(CurveRef, 2);
/* Difference between Taranis/Horus is LEN_EXPOMIX_NAME */
/* LEN_FUNCTION_NAME is the difference in CustomFunctionData */
/* LEN_xFUNCTION_NAME is the difference in CustomFunctionData */
CHKSIZE(VarioData, 5);
@@ -117,29 +117,29 @@ static inline void check_struct()
#if defined(PCBXLITES)
CHKSIZE(RadioData, 860);
CHKSIZE(ModelData, 6159);
CHKSIZE(ModelData, 6160);
#elif defined(PCBXLITE)
CHKSIZE(RadioData, 858);
CHKSIZE(ModelData, 6159);
CHKSIZE(ModelData, 6160);
#elif defined(RADIO_TPRO)
CHKSIZE(RadioData, 841);
CHKSIZE(ModelData, 6184);
CHKSIZE(ModelData, 6185);
#elif defined(PCBX7)
CHKSIZE(RadioData, 864);
CHKSIZE(ModelData, 6159);
CHKSIZE(ModelData, 6160);
#elif defined(PCBX9E)
CHKSIZE(RadioData, 954);
CHKSIZE(ModelData, 6611);
CHKSIZE(ModelData, 6612);
#elif defined(PCBX9D) || defined(PCBX9DP)
CHKSIZE(RadioData, 896);
CHKSIZE(ModelData, 6603);
CHKSIZE(ModelData, 6604);
#elif defined(PCBHORUS)
#if defined(PCBX10)
CHKSIZE(RadioData, 921);
CHKSIZE(ModelData, 11023);
CHKSIZE(ModelData, 11024);
#else
CHKSIZE(RadioData, 903);
CHKSIZE(ModelData, 11021);
CHKSIZE(ModelData, 11022);
#endif
#endif
radio/src/datastructs_private.h
+5 -1
View File
@@ -646,6 +646,7 @@ PACK(struct ModelData {
uint8_t extendedLimits:1;
uint8_t extendedTrims:1;
uint8_t throttleReversed:1;
BeepANACenter beepANACenter;
MixData mixData[MAX_MIXERS] NO_IDX;
LimitData limitData[MAX_OUTPUT_CHANNELS];
@@ -676,6 +677,9 @@ PACK(struct ModelData {
uint8_t thrTrimSw:3;
uint8_t potsWarnMode:2 ENUM(PotsWarnMode);
NOBACKUP(uint8_t jitterFilter:2 ENUM(ModelOverridableEnable));
uint8_t spare2:6 SKIP;
ModuleData moduleData[NUM_MODULES];
int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
TrainerModuleData trainerData;
@@ -885,7 +889,7 @@ PACK(struct RadioData {
NOBACKUP(int8_t pwrOnSpeed:3);
NOBACKUP(int8_t pwrOffSpeed:3);
NOBACKUP(uint8_t imperial:1);
NOBACKUP(uint8_t jitterFilter:1); /* 0 - active */
NOBACKUP(uint8_t noJitterFilter:1); /* 0 - Jitter filter active */
NOBACKUP(uint8_t disableRssiPoweroffAlarm:1);
NOBACKUP(uint8_t USBMode:2);
NOBACKUP(uint8_t jackMode:2);
radio/src/gui/128x64/model_setup.cpp
+9 -2
View File
@@ -96,7 +96,7 @@ enum MenuModelSetupItems {
#endif
ITEM_MODEL_SETUP_BEEP_CENTER,
ITEM_MODEL_SETUP_USE_GLOBAL_FUNCTIONS,
ITEM_MODEL_SETUP_USE_JITTER_FILTER,
#if defined(PXX2)
ITEM_MODEL_SETUP_REGISTRATION_ID,
#endif
@@ -444,6 +444,8 @@ void menuModelSetup(event_t event)
NUM_STICKS + NUM_POTS + NUM_SLIDERS - 1, // Center beeps
0, // Global functions
0, // ADC Jitter filter
REGISTRATION_ID_ROWS
@@ -906,11 +908,16 @@ void menuModelSetup(event_t event)
}
break;
case ITEM_MODEL_SETUP_USE_GLOBAL_FUNCTIONS:
case ITEM_MODEL_SETUP_USE_GLOBAL_FUNCTIONS:
lcdDrawTextAlignedLeft(y, STR_USE_GLOBAL_FUNCS);
drawCheckBox(MODEL_SETUP_2ND_COLUMN, y, !g_model.noGlobalFunctions, attr);
if (attr) g_model.noGlobalFunctions = !checkIncDecModel(event, !g_model.noGlobalFunctions, 0, 1);
break;
case ITEM_MODEL_SETUP_USE_JITTER_FILTER:
g_model.jitterFilter = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_JITTER_FILTER, STR_ADCFILTERVALUES, g_model.jitterFilter, 0, 2, attr, event);
break;
#if defined(HARDWARE_INTERNAL_MODULE)
case ITEM_MODEL_SETUP_INTERNAL_MODULE_LABEL:
radio/src/gui/212x64/model_setup.cpp
+7
View File
@@ -85,6 +85,7 @@ enum MenuModelSetupItems {
#endif
ITEM_MODEL_SETUP_BEEP_CENTER,
ITEM_MODEL_SETUP_USE_GLOBAL_FUNCTIONS,
ITEM_MODEL_SETUP_USE_JITTER_FILTER,
#if defined(PXX2)
ITEM_MODEL_SETUP_REGISTRATION_ID,
#endif
@@ -383,6 +384,8 @@ void menuModelSetup(event_t event)
0, // Global functions
0, // ADC Jitter filter
REGISTRATION_ID_ROWS
LABEL(InternalModule),
@@ -832,6 +835,10 @@ void menuModelSetup(event_t event)
if (attr) g_model.noGlobalFunctions = !checkIncDecModel(event, !g_model.noGlobalFunctions, 0, 1);
break;
case ITEM_MODEL_SETUP_USE_JITTER_FILTER:
g_model.jitterFilter = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_JITTER_FILTER, STR_ADCFILTERVALUES, g_model.jitterFilter, 0, 2, attr, event);
break;
case ITEM_MODEL_SETUP_INTERNAL_MODULE_LABEL:
lcdDrawTextAlignedLeft(y, STR_INTERNALRF);
break;
radio/src/gui/colorlcd/model_setup.cpp
+7
View File
@@ -1626,6 +1626,13 @@ void ModelSetupPage::build(FormWindow * window)
new CheckBox(window, grid.getFieldSlot(), GET_SET_INVERTED(g_model.noGlobalFunctions));
grid.nextLine();
{
// Model ADC jitter filter
new StaticText(window, grid.getLabelSlot(), STR_JITTER_FILTER, 0, COLOR_THEME_PRIMARY1);
new Choice(window, grid.getFieldSlot(), STR_ADCFILTERVALUES, 0, 2, GET_SET_DEFAULT(g_model.jitterFilter));
grid.nextLine();
}
// Internal module
{
new Subtitle(window, grid.getLineSlot(), TR_INTERNALRF, 0, COLOR_THEME_PRIMARY1);
radio/src/gui/colorlcd/radio_hardware.cpp
+1 -1
View File
@@ -407,7 +407,7 @@ void RadioHardwarePage::build(FormWindow * window)
// ADC filter
new StaticText(window, grid.getLabelSlot(), STR_JITTER_FILTER, 0, COLOR_THEME_PRIMARY1);
new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.jitterFilter));
new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.noJitterFilter));
grid.nextLine();
// Debugs
radio/src/gui/common/stdlcd/radio_hardware.cpp
+1 -3
View File
@@ -122,7 +122,6 @@ enum {
#if defined(AUX_SERIAL)
ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE,
#endif
ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_HARDWARE_RAS,
#if defined(SPORT_UPDATE_PWR_GPIO)
@@ -618,9 +617,8 @@ void menuRadioHardware(event_t event)
}
break;
#endif
case ITEM_RADIO_HARDWARE_JITTER_FILTER:
g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event);
g_eeGeneral.noJitterFilter = 1 - editCheckBox(1 - g_eeGeneral.noJitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event);
break;
case ITEM_RADIO_HARDWARE_RAS:
radio/src/opentx.cpp
+17 -3
View File
@@ -1142,10 +1142,24 @@ void getADC()
// * <out> = s_anaFilt[x]
uint32_t previous = s_anaFilt[x] / JITTER_ALPHA;
uint32_t diff = (v > previous) ? (v - previous) : (previous - v);
if (!g_eeGeneral.jitterFilter && diff < (10*ANALOG_MULTIPLIER)) { // g_eeGeneral.jitterFilter is inverted, 0 - active
// Combine ADC jitter filter setting form radio and model.
// 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) {
// 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;
}
if (useJitterFilter && diff < (10*ANALOG_MULTIPLIER)) {
// apply jitter filter
s_anaFilt[x] = (s_anaFilt[x] - previous) + v;
}
else {
// use unfiltered value
s_anaFilt[x] = v * JITTER_ALPHA;
@@ -2111,7 +2125,7 @@ uint32_t pwrCheck()
msg = STR_USB_STILL_CONNECTED;
msg_len = sizeof(TR_USB_STILL_CONNECTED);
}
event_t evt = getEvent(false);
SET_WARNING_INFO(msg, msg_len, 0);
DISPLAY_WARNING(evt);
@@ -2169,7 +2183,7 @@ uint32_t pwrCheck()
LED_ERROR_END();
return e_power_on;
}
#endif // COLORLCD
}
radio/src/storage/conversions/datastructs_218.h
+1 -1
View File
@@ -586,7 +586,7 @@ PACK(struct RadioData_v218 {
uint8_t bluetoothMode:4;
uint8_t countryCode;
uint8_t imperial:1;
uint8_t jitterFilter:1; /* 0 - active */
uint8_t noJitterFilter:1; /* 0 - Jitter filter active */
uint8_t disableRssiPoweroffAlarm:1;
uint8_t USBMode:2;
uint8_t spareExtraArm:3;
radio/src/storage/conversions/yaml/datastructs_220.h
+1 -1
View File
@@ -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 jitterFilter:1); /* 0 - active */
NOBACKUP(uint8_t noJitterFilter:1); /* 0 - Jitter filter active */
NOBACKUP(uint8_t disableRssiPoweroffAlarm:1);
NOBACKUP(uint8_t USBMode:2);
NOBACKUP(uint8_t jackMode:2);
radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
+1 -1
View File
@@ -408,7 +408,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
+1 -1
View File
@@ -425,7 +425,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
+1 -1
View File
@@ -425,7 +425,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp
+1 -1
View File
@@ -384,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp
+1 -1
View File
@@ -423,7 +423,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp
+1 -1
View File
@@ -364,7 +364,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp
+1 -1
View File
@@ -372,7 +372,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp
+1 -1
View File
@@ -369,7 +369,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp
+1 -1
View File
@@ -371,7 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+9 -1
View File
@@ -246,6 +246,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -407,7 +413,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -850,6 +856,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_t12.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_t8.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+9 -1
View File
@@ -244,6 +244,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -386,7 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -825,6 +831,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+9 -1
View File
@@ -269,6 +269,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -428,7 +434,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -871,6 +877,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+9 -1
View File
@@ -267,6 +267,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -426,7 +432,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -869,6 +875,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x7.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+9 -1
View File
@@ -243,6 +243,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -385,7 +391,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -834,6 +840,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+9 -1
View File
@@ -282,6 +282,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -424,7 +430,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -873,6 +879,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+9 -1
View File
@@ -223,6 +223,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -365,7 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -804,6 +810,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+9 -1
View File
@@ -231,6 +231,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -373,7 +379,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -814,6 +820,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+9 -1
View File
@@ -228,6 +228,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -370,7 +376,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -811,6 +817,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+9 -1
View File
@@ -230,6 +230,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -372,7 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -815,6 +821,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_zorro.cpp
+9 -1
View File
@@ -236,6 +236,12 @@ const struct YamlIdStr enum_PotsWarnMode[] = {
{ POTS_WARN_AUTO, "WARN_AUTO" },
{ 0, NULL }
};
const struct YamlIdStr enum_ModelOverridableEnable[] = {
{ OVERRIDE_VALUE_GLOBAL, "GLOBAL" },
{ OVERRIDE_VALUE_OFF, "OFF" },
{ OVERRIDE_VALUE_ON, "ON" },
{ 0, NULL }
};
const struct YamlIdStr enum_FailsafeModes[] = {
{ FAILSAFE_NOT_SET, "NOT_SET" },
{ FAILSAFE_HOLD, "HOLD" },
@@ -378,7 +384,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "pwrOnSpeed", 3 ),
YAML_SIGNED( "pwrOffSpeed", 3 ),
YAML_UNSIGNED( "imperial", 1 ),
YAML_UNSIGNED( "jitterFilter", 1 ),
YAML_UNSIGNED( "noJitterFilter", 1 ),
YAML_UNSIGNED( "disableRssiPoweroffAlarm", 1 ),
YAML_UNSIGNED( "USBMode", 2 ),
YAML_UNSIGNED( "jackMode", 2 ),
@@ -819,6 +825,8 @@ static const struct YamlNode struct_ModelData[] = {
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_ENUM("potsWarnMode", 2, enum_PotsWarnMode),
YAML_ENUM("jitterFilter", 2, enum_ModelOverridableEnable),
YAML_PADDING( 6 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
YAML_ARRAY("failsafeChannels", 16, 32, struct_signed_16, NULL),
YAML_STRUCT("trainerData", 40, struct_TrainerModuleData, NULL),
radio/src/translations.cpp
+1
View File
@@ -95,6 +95,7 @@ ISTR(PPM_POL);
ISTR(SBUS_INVERSION_VALUES);
ISTR(SPORT_MODES);
ISTR(FSGROUPS);
ISTR(ADCFILTERVALUES);
#if defined(PCBSKY9X) && defined(REVX)
ISTR(VOUTPUT_TYPE);
radio/src/translations.h
+1
View File
@@ -198,6 +198,7 @@ extern const char STR_VFORMULAS[];
extern const char STR_VPREC[];
extern const char STR_VCELLINDEX[];
extern const char STR_TOUCH_PANEL[];
extern const char STR_ADCFILTERVALUES[];
extern const char STR_BLUETOOTH[];
extern const char STR_BLUETOOTH_DISC[];
radio/src/translations/cn.h.txt
+3
View File
@@ -110,6 +110,9 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "标准\0 " "自定义"
#define LEN_ADCFILTERVALUES "\002"
#define TR_ADCFILTERVALUES "全局""禁用" "开启"
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/cz.h.txt
+3
View File
@@ -114,6 +114,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Rastr-X\0""Volná-XY"
#define LEN_ADCFILTERVALUES "\008"
#define TR_ADCFILTERVALUES "Globální""Vyp\0 ""Zap\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/de.h.txt
+3
View File
@@ -115,6 +115,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES " Nur Y "" X und Y" //"Standard""Custom\0"
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Aus\0 ""Ein\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/en.h.txt
+3
View File
@@ -115,6 +115,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Standard""Custom\0"
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/es.h.txt
+3
View File
@@ -115,6 +115,9 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "Normal""Custom"
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/fi.h.txt
+3
View File
@@ -115,6 +115,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Standard""Custom\0"
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/fr.h.txt
+3
View File
@@ -115,6 +115,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Standard""Libre\0"
#define LEN_ADCFILTERVALUES "\007"
#define TR_ADCFILTERVALUES "Globale""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/it.h.txt
+3
View File
@@ -119,6 +119,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Fisso\0 ""Modific."
#define LEN_ADCFILTERVALUES "\007"
#define TR_ADCFILTERVALUES "Globali""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/nl.h.txt
+3
View File
@@ -116,6 +116,9 @@
#define LEN_CURVE_TYPES "\011"
#define TR_CURVE_TYPES "Standaard""Custom\0 "
#define LEN_ADCFILTERVALUES "\007"
#define TR_ADCFILTERVALUES "Globale""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/pl.h.txt
+3
View File
@@ -116,6 +116,9 @@
#define LEN_CURVE_TYPES "\010" /*8 decimal*/
#define TR_CURVE_TYPES "Standard""Własny\0 "
#define LEN_ADCFILTERVALUES "\008"
#define TR_ADCFILTERVALUES "Globalne""WYŁ\0 ""ZAŁ\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/pt.h.txt
+3
View File
@@ -118,6 +118,9 @@
#define LEN_CURVE_TYPES "\010"
#define TR_CURVE_TYPES "Standard""Custom\0"
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Off\0 ""On\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/se.h.txt
+3
View File
@@ -118,6 +118,9 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "Normal""Egen\0 "
#define LEN_ADCFILTERVALUES "\006"
#define TR_ADCFILTERVALUES "Global""Av\0 ""På\0 "
#define LEN_RETA123 "\001"
#if defined(PCBX10)
radio/src/translations/tw.h.txt
+3
View File
@@ -110,6 +110,9 @@
#define LEN_CURVE_TYPES "\006"
#define TR_CURVE_TYPES "標準\0 " "自定義"
#define LEN_ADCFILTERVALUES "\002"
#define TR_ADCFILTERVALUES "全局""禁用" "开启"
#define LEN_RETA123 "\001"
#if defined(PCBX10)