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

Fixed padding bits

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-10 11:06:59 +01:00
parent d747072e1e
commit 1ccf6be019
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+3 -3
View File
@@ -440,7 +440,7 @@ PACK(struct ModuleData {
int8_t optionValue;
uint8_t receiverTelemetryOff:1;
uint8_t receiverHigherChannels:1;
uint8_t spare:6;
uint8_t spare:6 SKIP;
} multi);
NOBACKUP(struct {
uint8_t power:2; // 0=10 mW, 1=100 mW, 2=500 mW, 3=1W
@@ -647,7 +647,7 @@ PACK(struct ModelData {
NOBACKUP(RssiAlarmData rssiAlarms);
uint8_t spare1:3;
uint8_t spare1:3 SKIP;
uint8_t thrTrimSw:3;
uint8_t potsWarnMode:2;
@@ -737,7 +737,7 @@ PACK(struct TrainerData {
});
#if defined(COLORLCD)
#define SPLASH_MODE uint8_t splashSpares:3
#define SPLASH_MODE uint8_t splashSpares:3 SKIP
#else
#define SPLASH_MODE int8_t splashMode:3
#endif
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+3 -3
View File
@@ -304,7 +304,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "telemetryBaudrate", 3 ),
YAML_UNSIGNED( "splashSpares", 3 ),
YAML_PADDING( 3 ),
YAML_SIGNED( "hapticMode", 2 ),
YAML_SIGNED( "switchesDelay", 8 ),
YAML_UNSIGNED( "lightAutoOff", 8 ),
@@ -534,7 +534,7 @@ static const struct YamlNode struct_anonymous_6[] = {
YAML_SIGNED( "optionValue", 8 ),
YAML_UNSIGNED( "receiverTelemetryOff", 1 ),
YAML_UNSIGNED( "receiverHigherChannels", 1 ),
YAML_UNSIGNED( "spare", 6 ),
YAML_PADDING( 6 ),
YAML_END
};
static const struct YamlNode struct_anonymous_7[] = {
@@ -752,7 +752,7 @@ static const struct YamlNode struct_ModelData[] = {
YAML_STRUCT("varioData", 40, struct_VarioData, NULL),
YAML_UNSIGNED( "rssiSource", 8 ),
YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL),
YAML_UNSIGNED( "spare1", 3 ),
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_UNSIGNED( "potsWarnMode", 2 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+3 -3
View File
@@ -305,7 +305,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "telemetryBaudrate", 3 ),
YAML_UNSIGNED( "splashSpares", 3 ),
YAML_PADDING( 3 ),
YAML_SIGNED( "hapticMode", 2 ),
YAML_SIGNED( "switchesDelay", 8 ),
YAML_UNSIGNED( "lightAutoOff", 8 ),
@@ -535,7 +535,7 @@ static const struct YamlNode struct_anonymous_6[] = {
YAML_SIGNED( "optionValue", 8 ),
YAML_UNSIGNED( "receiverTelemetryOff", 1 ),
YAML_UNSIGNED( "receiverHigherChannels", 1 ),
YAML_UNSIGNED( "spare", 6 ),
YAML_PADDING( 6 ),
YAML_END
};
static const struct YamlNode struct_anonymous_7[] = {
@@ -753,7 +753,7 @@ static const struct YamlNode struct_ModelData[] = {
YAML_STRUCT("varioData", 40, struct_VarioData, NULL),
YAML_UNSIGNED( "rssiSource", 8 ),
YAML_STRUCT("rssiAlarms", 16, struct_RssiAlarmData, NULL),
YAML_UNSIGNED( "spare1", 3 ),
YAML_PADDING( 3 ),
YAML_UNSIGNED( "thrTrimSw", 3 ),
YAML_UNSIGNED( "potsWarnMode", 2 ),
YAML_ARRAY("moduleData", 232, 2, struct_ModuleData, NULL),