Use full custom to cope with the strange trainer mode defs

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
@@ -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 );