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

Use full custom to cope with the strange trainer mode defs

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:01 +01:00
parent 61e837f0b7
commit bcc1f55b37
16 changed files with 64 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+1 -1
View File
@@ -396,7 +396,7 @@ PACK(struct TelemetrySensor {
*/
PACK(struct TrainerModuleData {
uint8_t mode ENUM(TrainerMode);
uint8_t mode CUST(r_trainerMode,w_trainerMode);
uint8_t channelsStart;
int8_t channelsCount; // 0=8 channels
int8_t frameLength;
radio/src/storage/yaml/yaml_datastructs_funcs.cpp
+36
View File
@@ -689,3 +689,39 @@ static bool w_vPitch(const YamlNode* node, uint32_t val, yaml_writer_func wf, vo
return wf(opaque, s, strlen(s));
}
const struct YamlIdStr enum_TrainerMode[] = {
#if defined(PCBNV14)
{ TRAINER_MODE_OFF, "OFF" },
#endif
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "SLAVE" },
#if defined(PCBTARANIS) || defined(PCBNV14)
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MASTER_SBUS_EXT" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MASTER_CPPM_EXT" },
#endif
#if defined(PCBTARANIS) || defined(AUX_SERIAL) || defined(AUX2_SERIAL)
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MASTER_BATT_COMP" },
#endif
{ TRAINER_MODE_MASTER_BLUETOOTH, "MASTER_BT" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "SLAVE_BT" },
{ TRAINER_MODE_MULTI, "MASTER_MULTI" },
{ 0, NULL }
};
static uint32_t r_trainerMode(const YamlNode* node, const char* val, uint8_t val_len)
{
return yaml_parse_enum(enum_TrainerMode, val, val_len);
}
static bool w_trainerMode(const YamlNode* node, uint32_t val,
yaml_writer_func wf, void* opaque)
{
const char* str = nullptr;
str = yaml_output_enum(val, enum_TrainerMode);
if (str) {
return wf(opaque, str, strlen(str));
}
return true;
}
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+2 -13
View File
@@ -242,17 +242,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_OFF, "MODE_OFF" },
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -666,7 +655,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -846,7 +835,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_t12.cpp
+2 -13
View File
@@ -235,17 +235,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -636,7 +625,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -819,7 +808,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_t8.cpp
+2 -13
View File
@@ -235,17 +235,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -636,7 +625,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -819,7 +808,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+2 -13
View File
@@ -235,17 +235,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -636,7 +625,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -819,7 +808,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+2 -13
View File
@@ -235,17 +235,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -636,7 +625,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -819,7 +808,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+2 -11
View File
@@ -263,15 +263,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -681,7 +672,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -861,7 +852,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 31
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+1 -9
View File
@@ -263,14 +263,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -680,7 +672,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
radio/src/storage/yaml/yaml_datastructs_x7.cpp
+2 -13
View File
@@ -235,17 +235,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -636,7 +625,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -819,7 +808,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+2 -13
View File
@@ -242,17 +242,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -644,7 +633,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -834,7 +823,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+2 -13
View File
@@ -281,17 +281,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -683,7 +672,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -874,7 +863,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+2 -13
View File
@@ -222,17 +222,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -621,7 +610,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -804,7 +793,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+2 -13
View File
@@ -230,17 +230,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -631,7 +620,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -814,7 +803,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+2 -13
View File
@@ -227,17 +227,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -628,7 +617,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -811,7 +800,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+2 -13
View File
@@ -229,17 +229,6 @@ const struct YamlIdStr enum_ModuleType[] = {
{ MODULE_TYPE_MAX, "TYPE_MAX" },
{ 0, NULL }
};
const struct YamlIdStr enum_TrainerMode[] = {
{ TRAINER_MODE_MASTER_TRAINER_JACK, "MODE_MASTER_TRAINER_JACK" },
{ TRAINER_MODE_SLAVE, "MODE_SLAVE" },
{ TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, "MODE_MASTER_SBUS_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, "MODE_MASTER_CPPM_EXTERNAL_MODULE" },
{ TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, "MODE_MASTER_BATTERY_COMPARTMENT" },
{ TRAINER_MODE_MASTER_BLUETOOTH, "MODE_MASTER_BLUETOOTH" },
{ TRAINER_MODE_SLAVE_BLUETOOTH, "MODE_SLAVE_BLUETOOTH" },
{ TRAINER_MODE_MULTI, "MODE_MULTI" },
{ 0, NULL }
};
//
// Structs last
@@ -632,7 +621,7 @@ static const struct YamlNode struct_ModuleData[] = {
YAML_END
};
static const struct YamlNode struct_TrainerModuleData[] = {
YAML_ENUM("mode", 8, enum_TrainerMode),
YAML_UNSIGNED_CUST( "mode", 8, r_trainerMode, w_trainerMode ),
YAML_UNSIGNED( "channelsStart", 8 ),
YAML_SIGNED( "channelsCount", 8 ),
YAML_SIGNED( "frameLength", 8 ),
@@ -815,7 +804,7 @@ static const struct YamlNode struct_PartialModel[] = {
YAML_END
};
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 32
#define MAX_RADIODATA_MODELDATA_PARTIALMODEL_STR_LEN 24
static const struct YamlNode __RadioData_root_node = YAML_ROOT( struct_RadioData );