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

Use symbolic indexes for calibration data

Browse Source 
Resolves #1083
This commit is contained in:
Raphael Coeffic
2021-11-26 17:31:57 +01:00
parent 5d5ceb4d88
commit 06c04c852a
32 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs_private.h
+2 -1
View File
@@ -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);
radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp
+12
View File
@@ -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<YamlTreeWalker*>(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<YamlTreeWalker*>(user);
radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_funcs.cpp
+20
View File
@@ -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<YamlTreeWalker*>(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;
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_t12.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_t8.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x7.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+1 -1
View File
@@ -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 ),
radio/src/storage/yaml/yaml_defs.h
+5
View File
@@ -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