diff --git a/radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp b/radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp index 6859a558d..aaab3f771 100644 --- a/radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp @@ -338,7 +338,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_ENUM("antennaMode", 2, enum_AntennaModes), YAML_UNSIGNED( "disableRtcWarning", 1 ), YAML_UNSIGNED( "keysBacklight", 1 ), - YAML_SIGNED( "rotEncDirection", 1 ), + YAML_PADDING( 1 ), YAML_ENUM("internalModule", 8, enum_ModuleType), YAML_STRUCT("trainer", 128, struct_TrainerData, NULL), YAML_UNSIGNED( "view", 8 ), @@ -406,8 +406,11 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 8 ), YAML_STRING("bluetoothName", 10), YAML_STRING("ownerRegistrationID", 8), + YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr), + YAML_UNSIGNED( "rotEncMode", 2 ), YAML_SIGNED( "uartSampleMode", 2 ), - YAML_PADDING( 6 ), + YAML_PADDING( 3 ), + YAML_PADDING( 1 ), YAML_END }; static const struct YamlNode struct_unsigned_8[] = { @@ -430,6 +433,8 @@ static const struct YamlNode struct_TimerData[] = { YAML_UNSIGNED( "minuteBeep", 1 ), YAML_UNSIGNED( "persistent", 2 ), YAML_SIGNED( "countdownStart", 2 ), + YAML_UNSIGNED( "showElapsed", 1 ), + YAML_PADDING( 7 ), YAML_STRING("name", 3), YAML_END }; @@ -568,14 +573,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 +592,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 +601,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 +613,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,43 +627,39 @@ 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[] = { - YAML_UNSIGNED( "bindPower", 3 ), - YAML_UNSIGNED( "runPower", 3 ), - YAML_UNSIGNED( "emi", 1 ), +static const struct YamlNode struct_anonymous_10[] = { + YAML_UNSIGNED( "emi", 2 ), YAML_UNSIGNED( "telemetry", 1 ), - YAML_UNSIGNED( "failsafeTimeout", 16 ), - YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL), - YAML_UNSIGNED( "mode", 2 ), - YAML_UNSIGNED( "reserved", 6 ), + YAML_UNSIGNED( "phyMode", 3 ), + YAML_UNSIGNED( "reserved", 2 ), 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", 8, 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 +700,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 +767,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[] = { @@ -806,7 +807,7 @@ static const struct YamlNode struct_TelemetryScreenData[] = { static const struct YamlNode struct_ModelData[] = { YAML_CUSTOM("semver",nullptr,w_semver), YAML_STRUCT("header", 96, struct_ModelHeader, NULL), - YAML_ARRAY("timers", 88, 3, struct_TimerData, NULL), + YAML_ARRAY("timers", 96, 3, struct_TimerData, NULL), YAML_UNSIGNED( "telemetryProtocol", 3 ), YAML_UNSIGNED( "thrTrim", 1 ), YAML_UNSIGNED( "noGlobalFunctions", 1 ), @@ -858,7 +859,7 @@ static const struct YamlNode struct_ModelData[] = { }; static const struct YamlNode struct_PartialModel[] = { YAML_STRUCT("header", 96, struct_ModelHeader, NULL), - YAML_ARRAY("timers", 88, 3, struct_TimerData, NULL), + YAML_ARRAY("timers", 96, 3, struct_TimerData, NULL), YAML_END };