diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index d307497d7..fba828f07 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -117,7 +117,7 @@ static inline void check_struct() CHKSIZE(TrainerData, 16); #if defined(PCBXLITES) - CHKSIZE(RadioData, 873); + CHKSIZE(RadioData, 872); CHKSIZE(ModelData, 6265); #elif defined(PCBXLITE) CHKSIZE(RadioData, 870); @@ -150,14 +150,14 @@ static inline void check_struct() CHKSIZE(ModelData, 6706); #elif defined(PCBHORUS) #if defined(PCBX10) - CHKSIZE(RadioData, 837); + CHKSIZE(RadioData, 836); CHKSIZE(ModelData, 15607); #else - CHKSIZE(RadioData, 837); + CHKSIZE(RadioData, 836); CHKSIZE(ModelData, 15607); #endif #elif defined(PCBNV14) - CHKSIZE(RadioData, 837); + CHKSIZE(RadioData, 836); CHKSIZE(ModelData, 15463); #endif diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 30ab1e7d4..6536f30f4 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -883,7 +883,7 @@ PACK(struct RadioData { NOBACKUP(int8_t beepLength:3 CUST(r_5pos,w_5pos)); NOBACKUP(int8_t hapticStrength:3 CUST(r_5pos,w_5pos)); NOBACKUP(uint8_t gpsFormat:1); - NOBACKUP(uint8_t __spare2:1 SKIP); + NOBACKUP(uint8_t audioMuteEnable:1); NOBACKUP(uint8_t speakerPitch CUST(r_spPitch,w_spPitch)); NOBACKUP(int8_t speakerVolume CUST(r_vol,w_vol)); NOBACKUP(int8_t vBatMin CUST(r_vbat_min,w_vbat_min)); @@ -945,8 +945,6 @@ PACK(struct RadioData { NOBACKUP(uint8_t stickDeadZoneSpare:3 SKIP); #endif - NOBACKUP(uint8_t audioMuteEnable:1); - #if defined(IMU) NOBACKUP(int8_t imuMax); NOBACKUP(int8_t imuOffset); diff --git a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp index 7647f5f2b..94d0bae31 100644 --- a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp @@ -319,7 +319,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -363,7 +363,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 69593f617..ac8ba87a2 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -330,7 +330,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -374,7 +374,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_UNSIGNED( "stickDeadZone", 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_STRING("selectedTheme", 26), YAML_UNSIGNED( "radioThemesDisabled", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp index 04e0931bd..35f9c7be2 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp @@ -334,7 +334,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -378,7 +378,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_UNSIGNED( "stickDeadZone", 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_STRING("selectedTheme", 26), YAML_UNSIGNED( "radioThemesDisabled", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t20.cpp b/radio/src/storage/yaml/yaml_datastructs_t20.cpp index 7119dec89..d0403f317 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t20.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t20.cpp @@ -323,7 +323,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -365,7 +365,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index dcd42bed7..98ed23937 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -319,7 +319,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -361,7 +361,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 438ce26a8..dc3b42cc9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -336,7 +336,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -381,7 +381,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_SIGNED( "imuMax", 8 ), YAML_SIGNED( "imuOffset", 8 ), YAML_STRING("selectedTheme", 26), diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 438ce26a8..dc3b42cc9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -336,7 +336,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -381,7 +381,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_SIGNED( "imuMax", 8 ), YAML_SIGNED( "imuOffset", 8 ), YAML_STRING("selectedTheme", 26), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index ac8c8c28d..51841800a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -319,7 +319,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -362,7 +362,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index f62fd2c80..b971db5d1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -319,7 +319,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -363,7 +363,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index b1e7537c8..8f3d474c6 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -319,7 +319,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -361,7 +361,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "rotEncMode", 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED( "radioGFDisabled", 1 ), YAML_UNSIGNED( "radioTrainerDisabled", 1 ), YAML_UNSIGNED( "modelHeliDisabled", 1 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index 49bb5fa46..9246802ae 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -321,7 +321,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED_CUST( "beepLength", 3, r_5pos, w_5pos ), YAML_SIGNED_CUST( "hapticStrength", 3, r_5pos, w_5pos ), YAML_UNSIGNED( "gpsFormat", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_UNSIGNED_CUST( "speakerPitch", 8, r_spPitch, w_spPitch ), YAML_SIGNED_CUST( "speakerVolume", 8, r_vol, w_vol ), YAML_SIGNED_CUST( "vBatMin", 8, r_vbat_min, w_vbat_min ), @@ -364,7 +364,6 @@ static const struct YamlNode struct_RadioData[] = { YAML_PADDING( 3 ), YAML_SIGNED( "uartSampleMode", 2 ), YAML_PADDING( 3 ), - YAML_UNSIGNED( "audioMuteEnable", 1 ), YAML_SIGNED( "imuMax", 8 ), YAML_SIGNED( "imuOffset", 8 ), YAML_UNSIGNED( "radioGFDisabled", 1 ),