From 9a0c65cf044c1dd668f5a5bb77a0988a5b9c022d Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 26 Nov 2021 08:54:50 +0100 Subject: [PATCH 1/4] Fix YAML for all GVAR adjustements custom functions --- .../yaml/yaml_datastructs_funcs.cpp | 12 ++++++---- .../storage/yaml/yaml_datastructs_funcs.cpp | 23 +++++++++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp index 8bcb460ec..c61ad6645 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp @@ -724,21 +724,20 @@ const char* _func_failsafe_lookup[] = { }; // used in read routine as well +extern const char* _func_sound_lookup[]; const char* _func_sound_lookup[] = { "Bp1","Bp2","Bp3","Wrn1","Wrn2", "Chee","Rata","Tick","Sirn","Ring", "SciF","Robt","Chrp","Tada","Crck","Alrm" }; +extern const uint8_t _func_sound_lookup_size = 16; // force external linkage -extern const uint8_t _func_sound_lookup_size = sizeof(_func_sound_lookup); - extern const char* _adjust_gvar_mode_lookup[]; const char* _adjust_gvar_mode_lookup[] = { "Cst", "Src", "GVar", "IncDec" }; - -extern const uint8_t _adjust_gvar_mode_lookup_size = sizeof(_adjust_gvar_mode_lookup); +extern const uint8_t _adjust_gvar_mode_lookup_size = 4; bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, yaml_writer_func wf, void* opaque) @@ -827,10 +826,15 @@ bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, break; case FUNC_ADJUST_GVAR: + str = yaml_unsigned2str(CFN_GVAR_INDEX(cfn)); // GVAR index + if (!wf(opaque, str, strlen(str))) return false; + if (!wf(opaque,",",1)) return false; + // output CFN_GVAR_MODE str = _adjust_gvar_mode_lookup[CFN_GVAR_MODE(cfn)]; if (!wf(opaque, str, strlen(str))) return false; if (!wf(opaque,",",1)) return false; + // output param switch(CFN_GVAR_MODE(cfn)) { case FUNC_ADJUST_GVAR_CONSTANT: diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index a37842d20..8de104abe 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -1174,7 +1174,16 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs, CFN_PARAM(cfn) = yaml_str2uint(val, l_sep); break; - case FUNC_ADJUST_GVAR: + case FUNC_ADJUST_GVAR: { + + CFN_GVAR_INDEX(cfn) = yaml_str2int_ref(val, l_sep); + if (val_len == 0 || val[0] != ',') return; + val++; val_len--; + + // find "," and cut val_len + sep = (const char *)memchr(val, ',', val_len); + l_sep = sep ? sep - val : val_len; + // parse CFN_GVAR_MODE for (int i=0; i < yaml_conv_220::_adjust_gvar_mode_lookup_size; i++) { if (!strncmp(yaml_conv_220::_adjust_gvar_mode_lookup[i],val,l_sep)) { @@ -1182,12 +1191,14 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs, break; } } + val += l_sep; val_len -= l_sep; if (val_len == 0 || val[0] != ',') return; val++; val_len--; // find "," and cut val_len sep = (const char *)memchr(val, ',', val_len); l_sep = sep ? sep - val : val_len; + // output param switch(CFN_GVAR_MODE(cfn)) { case FUNC_ADJUST_GVAR_CONSTANT: @@ -1203,7 +1214,9 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs, CFN_PARAM(cfn) = gvar - MIXSRC_FIRST_GVAR; } } break; - } break; + } + + } break; default: eat_comma = false; @@ -1333,10 +1346,15 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, break; case FUNC_ADJUST_GVAR: + str = yaml_unsigned2str(CFN_GVAR_INDEX(cfn)); // GVAR index + if (!wf(opaque, str, strlen(str))) return false; + if (!wf(opaque,",",1)) return false; + // output CFN_GVAR_MODE str = yaml_conv_220::_adjust_gvar_mode_lookup[CFN_GVAR_MODE(cfn)]; if (!wf(opaque, str, strlen(str))) return false; if (!wf(opaque,",",1)) return false; + // output param switch(CFN_GVAR_MODE(cfn)) { case FUNC_ADJUST_GVAR_CONSTANT: @@ -1351,6 +1369,7 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, if (!w_mixSrcRaw(nullptr, CFN_PARAM(cfn) + MIXSRC_FIRST_GVAR, wf, opaque)) return false; break; } + break; default: add_comma = false; From 5d5ceb4d881c75861b04349167eeb6139827dd48 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 26 Nov 2021 13:28:40 +0100 Subject: [PATCH 2/4] Fix SET_TIMER function Resolves #1130 --- .../conversions/yaml/yaml_datastructs_funcs.cpp | 3 +++ .../src/storage/yaml/yaml_datastructs_funcs.cpp | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp index c61ad6645..ba9164672 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp @@ -811,6 +811,9 @@ bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, // Tmr1,Tmr2,Tmr3 str = _func_reset_param_lookup[CFN_TIMER_INDEX(cfn)]; if (!wf(opaque, str, strlen(str))) return false; + if (!wf(opaque,",",1)) return false; + str = yaml_unsigned2str(CFN_PARAM(cfn)); + if (!wf(opaque, str, strlen(str))) return false; break; case FUNC_SET_FAILSAFE: diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index 8de104abe..5b67ef0d1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -1150,7 +1150,20 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs, && val[2] == 'r' && val[3] >= '1' && val[3] <= '3') { + CFN_TIMER_INDEX(cfn) = val[3] - '1'; + + val += 4; val_len -= 4; + if (val_len == 0 || val[0] != ',') return; + val++; val_len--; + + CFN_PARAM(cfn) = yaml_str2uint_ref(val, val_len); + if (val_len == 0 || val[0] != ',') return; + val++; val_len--; + + eat_comma = false; + } else { + return; } break; @@ -1331,6 +1344,9 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, // Tmr1,Tmr2,Tmr3 str = yaml_conv_220::_func_reset_param_lookup[CFN_TIMER_INDEX(cfn)]; if (!wf(opaque, str, strlen(str))) return false; + if (!wf(opaque,",",1)) return false; + str = yaml_unsigned2str(CFN_PARAM(cfn)); + if (!wf(opaque, str, strlen(str))) return false; break; case FUNC_SET_FAILSAFE: From 06c04c852a84ddf7551ba9930ccd8f18a408e46f Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 26 Nov 2021 17:31:57 +0100 Subject: [PATCH 3/4] Use symbolic indexes for calibration data Resolves #1083 --- radio/src/datastructs_private.h | 3 ++- .../yaml/yaml_datastructs_funcs.cpp | 12 +++++++++++ .../yaml/yaml_datastructs_nv14.cpp | 2 +- .../conversions/yaml/yaml_datastructs_t12.cpp | 2 +- .../conversions/yaml/yaml_datastructs_t8.cpp | 2 +- .../yaml/yaml_datastructs_tlite.cpp | 2 +- .../yaml/yaml_datastructs_tx12.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x10.cpp | 2 +- .../yaml/yaml_datastructs_x12s.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x7.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x9d.cpp | 2 +- .../conversions/yaml/yaml_datastructs_x9e.cpp | 2 +- .../yaml/yaml_datastructs_x9lite.cpp | 2 +- .../yaml/yaml_datastructs_x9lites.cpp | 2 +- .../yaml/yaml_datastructs_xlite.cpp | 2 +- .../yaml/yaml_datastructs_xlites.cpp | 2 +- .../storage/yaml/yaml_datastructs_funcs.cpp | 20 +++++++++++++++++++ .../storage/yaml/yaml_datastructs_nv14.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_t12.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_t8.cpp | 2 +- .../storage/yaml/yaml_datastructs_tlite.cpp | 2 +- .../storage/yaml/yaml_datastructs_tx12.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_x10.cpp | 2 +- .../storage/yaml/yaml_datastructs_x12s.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_x7.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_x9d.cpp | 2 +- .../src/storage/yaml/yaml_datastructs_x9e.cpp | 2 +- .../storage/yaml/yaml_datastructs_x9lite.cpp | 2 +- .../storage/yaml/yaml_datastructs_x9lites.cpp | 2 +- .../storage/yaml/yaml_datastructs_xlite.cpp | 2 +- .../storage/yaml/yaml_datastructs_xlites.cpp | 2 +- radio/src/storage/yaml/yaml_defs.h | 5 +++++ 32 files changed, 67 insertions(+), 29 deletions(-) diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 82025d0a4..e8c4e5419 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -749,6 +749,7 @@ PACK(struct StepsCalibData { #endif PACK(struct CalibData { + CUST_IDX(calib, r_calib, w_calib); int16_t mid; int16_t spanNeg; int16_t spanPos; @@ -837,7 +838,7 @@ PACK(struct RadioData { // Real attributes NOBACKUP(uint8_t version); NOBACKUP(uint16_t variant SKIP); - CalibData calib[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS + STORAGE_NUM_MOUSE_ANALOGS]; + CalibData calib[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS + STORAGE_NUM_MOUSE_ANALOGS] NO_IDX; NOBACKUP(uint16_t chkSum SKIP); N_HORUS_FIELD(int8_t currModel); N_HORUS_FIELD(uint8_t contrast); diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp index ba9164672..1da071392 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp @@ -262,6 +262,18 @@ uint8_t select_sensor_cfg(void* user, uint8_t* data, uint32_t bitoffs) return 5; } +#define r_calib nullptr + +static bool w_calib(void* user, yaml_writer_func wf, void* opaque) +{ + auto tw = reinterpret_cast(user); + uint16_t idx = tw->getElmts(); + + const char* str = + yaml_output_enum(idx + MIXSRC_Rud, enum_MixSources); + return str ? wf(opaque, str, strlen(str)) : true; +} + bool sw_write(void* user, yaml_writer_func wf, void* opaque) { auto tw = reinterpret_cast(user); diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp index 940b5a3da..50cca5960 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp @@ -286,7 +286,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp index aa600ddd4..4c83f6ca7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp index aa600ddd4..4c83f6ca7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp index aa600ddd4..4c83f6ca7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp index 8603219d8..3ca25ac59 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp index f7d199a5c..8e16a09d7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp @@ -307,7 +307,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp index 82c6bad7d..c181173ed 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp @@ -307,7 +307,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp index aa600ddd4..4c83f6ca7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp index e5a64dadb..f2360da6e 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp @@ -283,7 +283,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp index 23fdb4339..ec7c90672 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp @@ -322,7 +322,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp index bb18434b3..b907b94f2 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp @@ -263,7 +263,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp index 56641780a..08b21279b 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp @@ -271,7 +271,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp index ba53ebcc7..09a40757f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp @@ -268,7 +268,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp index 491f7e014..8de74acaa 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp @@ -270,7 +270,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index 5b67ef0d1..d50fcea39 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -451,6 +451,26 @@ static uint8_t select_sensor_cfg(void* user, uint8_t* data, uint32_t bitoffs) return yaml_conv_220::select_sensor_cfg(user, data, bitoffs); } +static uint32_t r_calib(void* user, const char* val, uint8_t val_len) +{ + (void)user; + + uint32_t sw = yaml_parse_enum(enum_MixSources, val, val_len); + if (sw >= MIXSRC_Rud) return sw - MIXSRC_Rud; + + return (uint32_t)yaml_str2int(val, val_len); +} + +static bool w_calib(void* user, yaml_writer_func wf, void* opaque) +{ + auto tw = reinterpret_cast(user); + uint16_t idx = tw->getElmts(); + + const char* str = + yaml_output_enum(idx + MIXSRC_Rud, enum_MixSources); + return str ? wf(opaque, str, strlen(str)) : true; +} + static uint32_t sw_read(void* user, const char* val, uint8_t val_len) { (void)user; diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 28a32ad4e..c4a2f4757 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -286,7 +286,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index 35622e44d..68eb593a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index 35622e44d..68eb593a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index 35622e44d..68eb593a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index 25357a3a4..9b8a1c83a 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index c1fdd5cb3..f1d906645 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -309,7 +309,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 8574486e8..deb37890c 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -307,7 +307,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index 35622e44d..68eb593a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -276,7 +276,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index 0be048a3f..c1e27bfc0 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -283,7 +283,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index 6a811f5a0..7672ec929 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -322,7 +322,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index bda4c59c6..8deb84a22 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -263,7 +263,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index d16c3bd75..2705097a3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -271,7 +271,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index fc4795fb4..521e3600f 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -268,7 +268,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index 9fba51c9c..016ead533 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -270,7 +270,7 @@ const struct YamlIdStr enum_TelemetrySensorType[] = { // static const struct YamlNode struct_CalibData[] = { - YAML_IDX, + YAML_IDX_CUST("calib",r_calib,w_calib), YAML_SIGNED( "mid", 16 ), YAML_SIGNED( "spanNeg", 16 ), YAML_SIGNED( "spanPos", 16 ), diff --git a/radio/src/storage/yaml/yaml_defs.h b/radio/src/storage/yaml/yaml_defs.h index 2f5c0e874..54c275745 100644 --- a/radio/src/storage/yaml/yaml_defs.h +++ b/radio/src/storage/yaml/yaml_defs.h @@ -52,6 +52,10 @@ int _dummy_##tag[0] _yaml_attribute("raw:YAML_ARRAY(" _yaml_note( \ #tag) ", 0, 4, " _yaml_note(elmt_type) ", " _yaml_note(fcn) ")") +#define CUST_IDX(tag, read, write) \ + int _dummy_##tag[0] _yaml_attribute("raw:YAML_IDX_CUST(" _yaml_note( \ + #tag) "," _yaml_note(read) "," _yaml_note(write) ")") + #else #define ENUM(label) @@ -64,6 +68,7 @@ #define ARRAY(elmt_size, elmt_type, fcn) #define CUST_ATTR(tag, read, write) #define CUST_ARRAY(tag, elmt_type, fcn) +#define CUST_IDX(tag, read, write) #endif From 521996df4a54f50c52c1f2549abc7fd24cf0ee7b Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 26 Nov 2021 18:00:50 +0100 Subject: [PATCH 4/4] Fixed X10 conversion tests --- radio/src/tests/conversions.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp index 60289cde9..181a9ad2e 100644 --- a/radio/src/tests/conversions.cpp +++ b/radio/src/tests/conversions.cpp @@ -289,13 +289,13 @@ TEST(Conversions, ConversionX10From23) EXPECT_EQ(221, g_eeGeneral.version); - EXPECT_EQ(100, g_eeGeneral.calib[9].spanNeg); - EXPECT_EQ(500, g_eeGeneral.calib[9].mid); - EXPECT_EQ(900, g_eeGeneral.calib[9].spanPos); + EXPECT_EQ(100, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_LEFT].spanNeg); + EXPECT_EQ(500, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_LEFT].mid); + EXPECT_EQ(900, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_LEFT].spanPos); - EXPECT_EQ(200, g_eeGeneral.calib[10].spanNeg); - EXPECT_EQ(400, g_eeGeneral.calib[10].mid); - EXPECT_EQ(600, g_eeGeneral.calib[10].spanPos); + EXPECT_EQ(200, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_RIGHT].spanNeg); + EXPECT_EQ(400, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_RIGHT].mid); + EXPECT_EQ(600, g_eeGeneral.calib[CALIBRATED_SLIDER_REAR_RIGHT].spanPos); EXPECT_EQ(-23, g_eeGeneral.vBatMin); EXPECT_EQ(8, g_eeGeneral.speakerVolume);