From 7d983f6fa84884d9dedacd738d6259a4d6787a6c Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 17 Jul 2022 18:59:21 +1000 Subject: [PATCH] chore(yaml): PR#2064 didn't regenerate files (#2133) --- .../storage/yaml/yaml_datastructs_nv14.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_t12.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_t8.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_tlite.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_tpro.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_tx12.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_x10.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_x12s.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_x7.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_x9d.cpp | 76 +++++++++---------- .../src/storage/yaml/yaml_datastructs_x9e.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_x9lite.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_x9lites.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_xlite.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_xlites.cpp | 76 +++++++++---------- .../storage/yaml/yaml_datastructs_zorro.cpp | 76 +++++++++---------- 16 files changed, 608 insertions(+), 608 deletions(-) diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 8f7886af3..24f6e3dc0 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -601,14 +601,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -620,7 +620,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -629,7 +629,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -641,13 +641,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -655,7 +655,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -666,32 +666,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -737,61 +737,61 @@ static const struct YamlNode struct_string_32[] = { YAML_STRING("val", 4), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -804,7 +804,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_WidgetPersistentData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index 2700c6c8c..7d6cea5c3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index 6859a558d..2c7432054 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index 6859a558d..2c7432054 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index c09d9b7c1..cb80626a5 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -574,14 +574,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -593,7 +593,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -602,7 +602,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -614,13 +614,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -628,7 +628,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -639,32 +639,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -705,61 +705,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -772,7 +772,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index 638e60cef..a75335d90 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 6a246c030..98cd5e44b 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -625,14 +625,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -644,7 +644,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -653,7 +653,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -665,13 +665,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -679,7 +679,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -690,32 +690,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -761,61 +761,61 @@ static const struct YamlNode struct_string_32[] = { YAML_STRING("val", 4), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -828,7 +828,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_WidgetPersistentData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 22ee67bf1..b06ae1d44 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -623,14 +623,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -642,7 +642,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -651,7 +651,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -663,13 +663,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -677,7 +677,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -688,32 +688,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -759,61 +759,61 @@ static const struct YamlNode struct_string_32[] = { YAML_STRING("val", 4), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -826,7 +826,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_WidgetPersistentData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index 6859a558d..2c7432054 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index 653bf6a83..5f9f3cec7 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -576,14 +576,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -595,7 +595,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -604,7 +604,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -616,13 +616,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -630,7 +630,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -641,32 +641,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -712,61 +712,61 @@ static const struct YamlNode struct_string_32[] = { YAML_STRING("val", 4), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -779,7 +779,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index 67623a95a..0fcc29345 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -615,14 +615,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -634,7 +634,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -643,7 +643,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -655,13 +655,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -669,7 +669,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -680,32 +680,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -751,61 +751,61 @@ static const struct YamlNode struct_string_32[] = { YAML_STRING("val", 4), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -818,7 +818,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index adf23742f..b47c9de97 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -553,14 +553,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -572,7 +572,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -581,7 +581,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -593,13 +593,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -607,7 +607,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -618,32 +618,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -684,61 +684,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -751,7 +751,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index e36f38eff..de3cbed44 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -563,14 +563,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -582,7 +582,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -591,7 +591,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -603,13 +603,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -617,7 +617,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -628,32 +628,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -694,61 +694,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -761,7 +761,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 87cb71577..3ae0a7c5b 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -560,14 +560,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -579,7 +579,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -588,7 +588,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -600,13 +600,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -614,7 +614,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -625,32 +625,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -691,61 +691,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -758,7 +758,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index 856a541f4..c89c63753 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -564,14 +564,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -583,7 +583,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -592,7 +592,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -604,13 +604,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -618,7 +618,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -629,32 +629,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -695,61 +695,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -762,7 +762,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp index 027a7463c..af5b6fa0f 100644 --- a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp @@ -568,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = { YAML_SIGNED( "critical", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_5[] = { +static const struct YamlNode struct_PpmModule[] = { YAML_SIGNED( "delay", 6 ), YAML_UNSIGNED( "pulsePol", 1 ), YAML_UNSIGNED( "outputType", 1 ), YAML_SIGNED( "frameLength", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_6[] = { +static const struct YamlNode struct_anonymous_5[] = { YAML_PADDING( 8 ), YAML_UNSIGNED( "disableTelemetry", 1 ), YAML_UNSIGNED( "disableMapping", 1 ), @@ -587,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = { YAML_SIGNED( "optionValue", 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_7[] = { +static const struct YamlNode struct_anonymous_6[] = { YAML_UNSIGNED( "power", 2 ), YAML_PADDING( 2 ), YAML_UNSIGNED( "receiverTelemetryOff", 1 ), @@ -596,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 8 ), YAML_END }; -static const struct YamlNode struct_anonymous_8[] = { +static const struct YamlNode struct_anonymous_7[] = { YAML_PADDING( 6 ), YAML_UNSIGNED( "noninverted", 1 ), YAML_PADDING( 1 ), @@ -608,13 +608,13 @@ static const struct YamlNode struct_string_64[] = { YAML_STRING("val", 8), YAML_END }; -static const struct YamlNode struct_anonymous_9[] = { +static const struct YamlNode struct_anonymous_8[] = { YAML_UNSIGNED( "receivers", 7 ), YAML_UNSIGNED( "racingMode", 1 ), YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_10[] = { +static const struct YamlNode struct_anonymous_9[] = { YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL), YAML_UNSIGNED( "mode", 3 ), YAML_UNSIGNED( "rfPower", 1 ), @@ -622,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = { YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_11[] = { +static const struct YamlNode struct_anonymous_10[] = { YAML_UNSIGNED( "bindPower", 3 ), YAML_UNSIGNED( "runPower", 3 ), YAML_UNSIGNED( "emi", 1 ), @@ -633,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "reserved", 6 ), YAML_END }; -static const struct YamlNode struct_anonymous_12[] = { +static const struct YamlNode struct_anonymous_11[] = { YAML_UNSIGNED( "raw12bits", 1 ), YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_PADDING( 4 ), YAML_END }; -static const struct YamlNode struct_anonymous_13[] = { +static const struct YamlNode struct_anonymous_12[] = { YAML_UNSIGNED( "telemetryBaudrate", 3 ), YAML_END }; -static const struct YamlNode struct_anonymous_14[] = { +static const struct YamlNode struct_anonymous_13[] = { YAML_UNSIGNED( "flags", 8 ), YAML_END }; static const struct YamlNode union_anonymous_4_elmts[] = { YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL), - YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL), - YAML_STRUCT("multi", 24, struct_anonymous_6, NULL), - YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL), - YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL), - YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL), - YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL), - YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL), - YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL), - YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL), - YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL), + YAML_STRUCT("ppm", 16, struct_PpmModule, NULL), + YAML_STRUCT("multi", 24, struct_anonymous_5, NULL), + YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL), + YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL), + YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL), + YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL), + YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL), + YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL), + YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL), + YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL), YAML_END }; static const struct YamlNode struct_ModuleData[] = { @@ -699,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = { YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL), YAML_END }; -static const struct YamlNode union_anonymous_15_elmts[] = { +static const struct YamlNode union_anonymous_14_elmts[] = { YAML_UNSIGNED( "id", 16 ), YAML_UNSIGNED( "persistentValue", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_17[] = { +static const struct YamlNode struct_anonymous_16[] = { YAML_UNSIGNED( "physID", 5 ), YAML_UNSIGNED( "rxIndex", 3 ), YAML_END }; -static const struct YamlNode union_anonymous_16_elmts[] = { - YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL), +static const struct YamlNode union_anonymous_15_elmts[] = { + YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL), YAML_UNSIGNED( "instance", 8 ), YAML_ENUM("formula", 8, enum_TelemetrySensorFormula), YAML_END }; -static const struct YamlNode struct_anonymous_19[] = { +static const struct YamlNode struct_anonymous_18[] = { YAML_UNSIGNED( "ratio", 16 ), YAML_SIGNED( "offset", 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_20[] = { +static const struct YamlNode struct_anonymous_19[] = { YAML_UNSIGNED( "source", 8 ), YAML_UNSIGNED( "index", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode struct_anonymous_21[] = { +static const struct YamlNode struct_anonymous_20[] = { YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL), YAML_END }; -static const struct YamlNode struct_anonymous_22[] = { +static const struct YamlNode struct_anonymous_21[] = { YAML_UNSIGNED( "source", 8 ), YAML_PADDING( 24 ), YAML_END }; -static const struct YamlNode struct_anonymous_23[] = { +static const struct YamlNode struct_anonymous_22[] = { YAML_UNSIGNED( "gps", 8 ), YAML_UNSIGNED( "alt", 8 ), YAML_PADDING( 16 ), YAML_END }; -static const struct YamlNode union_anonymous_18_elmts[] = { - YAML_STRUCT("custom", 32, struct_anonymous_19, NULL), - YAML_STRUCT("cell", 32, struct_anonymous_20, NULL), - YAML_STRUCT("calc", 32, struct_anonymous_21, NULL), - YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL), - YAML_STRUCT("dist", 32, struct_anonymous_23, NULL), +static const struct YamlNode union_anonymous_17_elmts[] = { + YAML_STRUCT("custom", 32, struct_anonymous_18, NULL), + YAML_STRUCT("cell", 32, struct_anonymous_19, NULL), + YAML_STRUCT("calc", 32, struct_anonymous_20, NULL), + YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL), + YAML_STRUCT("dist", 32, struct_anonymous_22, NULL), YAML_UNSIGNED( "param", 32 ), YAML_END }; static const struct YamlNode struct_TelemetrySensor[] = { YAML_IDX, - YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1), - YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2), + YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1), + YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2), YAML_STRING("label", 4), YAML_UNSIGNED( "subId", 8 ), YAML_ENUM("type", 1, enum_TelemetrySensorType), @@ -766,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = { YAML_UNSIGNED( "persistent", 1 ), YAML_UNSIGNED( "onlyPositive", 1 ), YAML_PADDING( 1 ), - YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg), + YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg), YAML_END }; static const struct YamlNode struct_FrSkyBarData[] = {