From 3da2aee1fff20f7d23793f4874a8baa12e84d035 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 24 Oct 2021 13:39:44 +0200 Subject: [PATCH] Sensor type & formula --- radio/src/dataconstants.h | 18 ++++++------- radio/src/datastructs.h | 4 +-- radio/src/myeeprom.h | 4 +-- .../yaml/yaml_datastructs_nv14.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_t12.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_t8.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_tlite.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_tx12.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_x10.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_x12s.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_x7.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_x9d.cpp | 26 ++++++++++++++----- .../conversions/yaml/yaml_datastructs_x9e.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_x9lite.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_x9lites.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_xlite.cpp | 26 ++++++++++++++----- .../yaml/yaml_datastructs_xlites.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_nv14.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_t12.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_t8.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_tlite.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_tx12.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_x10.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_x12s.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_x7.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_x9d.cpp | 26 ++++++++++++++----- .../src/storage/yaml/yaml_datastructs_x9e.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_x9lite.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_x9lites.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_xlite.cpp | 26 ++++++++++++++----- .../storage/yaml/yaml_datastructs_xlites.cpp | 26 ++++++++++++++----- 31 files changed, 545 insertions(+), 209 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 2b86fc013..3e21fd581 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -834,7 +834,7 @@ enum Functions { #if defined(DEBUG) FUNC_TEST, // should remain the last before MAX as not added in Companion #endif - FUNC_MAX + FUNC_MAX SKIP }; enum TimerModes { @@ -844,8 +844,8 @@ enum TimerModes { TMRMODE_THR, TMRMODE_THR_REL, TMRMODE_THR_START, - TMRMODE_COUNT, - TMRMODE_MAX = TMRMODE_COUNT - 1 + TMRMODE_COUNT SKIP, + TMRMODE_MAX SKIP = TMRMODE_COUNT - 1 }; enum CountDownModes { @@ -855,7 +855,7 @@ enum CountDownModes { #if defined(HAPTIC) COUNTDOWN_HAPTIC, #endif - COUNTDOWN_COUNT + COUNTDOWN_COUNT SKIP }; enum ResetFunctionParam { @@ -866,8 +866,8 @@ enum ResetFunctionParam { FUNC_RESET_TELEMETRY, FUNC_RESET_PARAM_FIRST_TELEM, FUNC_RESET_PARAM_LAST_TELEM = FUNC_RESET_PARAM_FIRST_TELEM + MAX_TELEMETRY_SENSORS, - FUNC_RESET_PARAMS_COUNT, - FUNC_RESET_PARAM_LAST = FUNC_RESET_PARAMS_COUNT-1, + FUNC_RESET_PARAMS_COUNT SKIP, + FUNC_RESET_PARAM_LAST SKIP = FUNC_RESET_PARAMS_COUNT-1, }; enum AdjustGvarFunctionParam { @@ -882,9 +882,9 @@ enum BluetoothModes { BLUETOOTH_TELEMETRY, BLUETOOTH_TRAINER, #if defined(PCBX9E) - BLUETOOTH_MAX=BLUETOOTH_TELEMETRY + BLUETOOTH_MAX SKIP = BLUETOOTH_TELEMETRY #else - BLUETOOTH_MAX=BLUETOOTH_TRAINER + BLUETOOTH_MAX SKIP = BLUETOOTH_TRAINER #endif }; @@ -892,7 +892,7 @@ enum UartSampleModes { UART_SAMPLE_MODE_NORMAL = 0, UART_SAMPLE_MODE_ONEBIT, - UART_SAMPLE_MODE_MAX = UART_SAMPLE_MODE_ONEBIT + UART_SAMPLE_MODE_MAX SKIP = UART_SAMPLE_MODE_ONEBIT }; // PXX2 constants diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index abcb55c1a..3e1f8c182 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -370,11 +370,11 @@ PACK(struct TelemetrySensor { uint8_t rxIndex:3; // 1 bit for module index, 2 bits for receiver index }) frskyInstance); uint8_t instance; - NOBACKUP(uint8_t formula); + NOBACKUP(uint8_t formula ENUM(TelemetrySensorFormula)); } NAME(id2) FUNC(select_id2); char label[TELEM_LABEL_LEN]; // user defined label uint8_t subId; - uint8_t type:1; // 0=custom / 1=calculated + uint8_t type:1 ENUM(TelemetrySensorType); // 0=custom / 1=calculated // user can choose what unit to display each value in uint8_t spare1:1 SKIP; uint8_t unit:6; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index c100995c1..e0fa5c2e2 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -228,7 +228,7 @@ enum TelemetrySensorFormula TELEM_FORMULA_CELL, TELEM_FORMULA_CONSUMPTION, TELEM_FORMULA_DIST, - TELEM_FORMULA_LAST = TELEM_FORMULA_DIST + TELEM_FORMULA_LAST SKIP = TELEM_FORMULA_DIST }; enum SwashType { @@ -237,7 +237,7 @@ enum SwashType { SWASH_TYPE_120X, SWASH_TYPE_140, SWASH_TYPE_90, - SWASH_TYPE_MAX = SWASH_TYPE_90 + SWASH_TYPE_MAX SKIP = SWASH_TYPE_90 }; #define TRIM_EXTENDED_MAX 500 diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp index d4a57d1f1..71701b2e9 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -184,7 +180,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -251,6 +246,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -708,7 +720,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -752,7 +764,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp index dd3c4b6f6..0eeb776c8 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp index 60fce7da6..257354dad 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -195,7 +191,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -272,6 +267,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp index c2432874a..137208462 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -195,7 +191,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -272,6 +267,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp index be2995d3d..0b9970996 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -181,7 +177,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -251,6 +246,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -686,7 +698,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -730,7 +742,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp index f1e5cc9bb..8bc031c56 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -193,7 +189,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -290,6 +285,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp index 3686cf595..90f31bfee 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -173,7 +169,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -231,6 +226,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -658,7 +670,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -702,7 +714,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp index 310d01f92..132ce7937 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -175,7 +171,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -239,6 +234,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -668,7 +680,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -712,7 +724,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp index b68bdd4b4..866ede311 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -175,7 +171,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -236,6 +231,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -665,7 +677,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -709,7 +721,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp index d5d2b4903..58628036f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -238,6 +233,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -669,7 +681,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -713,7 +725,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index d4a57d1f1..71701b2e9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -184,7 +180,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -251,6 +246,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -708,7 +720,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -752,7 +764,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index dd3c4b6f6..0eeb776c8 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 60fce7da6..257354dad 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -195,7 +191,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -272,6 +267,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index c2432874a..137208462 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -94,8 +92,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -195,7 +191,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -272,6 +267,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index fd87f2472..c2574a294 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -244,6 +239,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -673,7 +685,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -717,7 +729,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index be2995d3d..0b9970996 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -181,7 +177,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -251,6 +246,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -686,7 +698,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -730,7 +742,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index f1e5cc9bb..8bc031c56 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -193,7 +189,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -290,6 +285,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -725,7 +737,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -769,7 +781,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index 3686cf595..90f31bfee 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -173,7 +169,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -231,6 +226,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -658,7 +670,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -702,7 +714,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index 310d01f92..132ce7937 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -175,7 +171,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -239,6 +234,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -668,7 +680,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -712,7 +724,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index b68bdd4b4..866ede311 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -175,7 +171,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -236,6 +231,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -665,7 +677,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -709,7 +721,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index d5d2b4903..58628036f 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -38,7 +38,6 @@ const struct YamlIdStr enum_BluetoothModes[] = { { BLUETOOTH_OFF, "OFF" }, { BLUETOOTH_TELEMETRY, "TELEMETRY" }, { BLUETOOTH_TRAINER, "TRAINER" }, - { BLUETOOTH_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_Functions[] = { @@ -67,7 +66,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_BACKLIGHT, "BACKLIGHT" }, { FUNC_SCREENSHOT, "SCREENSHOT" }, { FUNC_RACING_MODE, "RACING_MODE" }, - { FUNC_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_UartModes[] = { @@ -87,8 +85,6 @@ const struct YamlIdStr enum_TimerModes[] = { { TMRMODE_THR, "THR" }, { TMRMODE_THR_REL, "THR_REL" }, { TMRMODE_THR_START, "THR_START" }, - { TMRMODE_COUNT, "COUNT" }, - { TMRMODE_MAX, "MAX" }, { 0, NULL } }; const struct YamlIdStr enum_MixerMultiplex[] = { @@ -177,7 +173,6 @@ const struct YamlIdStr enum_SwashType[] = { { SWASH_TYPE_120X, "TYPE_120X" }, { SWASH_TYPE_140, "TYPE_140" }, { SWASH_TYPE_90, "TYPE_90" }, - { SWASH_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; const struct YamlIdStr enum_SwitchSources[] = { @@ -238,6 +233,23 @@ const struct YamlIdStr enum_ModuleType[] = { { MODULE_TYPE_MAX, "TYPE_MAX" }, { 0, NULL } }; +const struct YamlIdStr enum_TelemetrySensorFormula[] = { + { TELEM_FORMULA_ADD, "FORMULA_ADD" }, + { TELEM_FORMULA_AVERAGE, "FORMULA_AVERAGE" }, + { TELEM_FORMULA_MIN, "FORMULA_MIN" }, + { TELEM_FORMULA_MAX, "FORMULA_MAX" }, + { TELEM_FORMULA_MULTIPLY, "FORMULA_MULTIPLY" }, + { TELEM_FORMULA_TOTALIZE, "FORMULA_TOTALIZE" }, + { TELEM_FORMULA_CELL, "FORMULA_CELL" }, + { TELEM_FORMULA_CONSUMPTION, "FORMULA_CONSUMPTION" }, + { TELEM_FORMULA_DIST, "FORMULA_DIST" }, + { 0, NULL } +}; +const struct YamlIdStr enum_TelemetrySensorType[] = { + { TELEM_TYPE_CUSTOM, "TYPE_CUSTOM" }, + { TELEM_TYPE_CALCULATED, "TYPE_CALCULATED" }, + { 0, NULL } +}; // // Structs last @@ -669,7 +681,7 @@ static const struct YamlNode struct_anonymous_14[] = { static const struct YamlNode union_anonymous_13_elmts[] = { YAML_STRUCT("frskyInstance", 8, struct_anonymous_14, NULL), YAML_UNSIGNED( "instance", 8 ), - YAML_UNSIGNED( "formula", 8 ), + YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; static const struct YamlNode struct_anonymous_16[] = { @@ -713,7 +725,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNION("id2", 8, union_anonymous_13_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), - YAML_UNSIGNED( "type", 1 ), + YAML_ENUM("type", 1, enum_TelemetrySensorType), YAML_PADDING( 1 ), YAML_UNSIGNED( "unit", 6 ), YAML_UNSIGNED( "prec", 2 ),