diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 27dbb47e8..f2cd1fc32 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -65,7 +65,7 @@ PACK(struct CurveRef { uint8_t type; - int8_t value; + int8_t value CUST(in_read_weight,in_write_weight); }); PACK(struct MixData { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp index 4936c811a..1b12702e3 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp @@ -466,7 +466,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp index d065a249e..5d02e2cd7 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp index 43b07da31..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp index 43b07da31..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp index 09608077f..366acd3da 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp index 0e95111d0..db2bd42cb 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp @@ -483,7 +483,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp index 1e0fd3c3c..41e00722f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp @@ -483,7 +483,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp index 43b07da31..3b7452e96 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp index 5445b5043..5241e7d00 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp @@ -439,7 +439,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp index ae5bf6bda..aeaed279f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp @@ -478,7 +478,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp index a8ea493b9..d65fb41ac 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp @@ -416,7 +416,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp index 1cda4c30a..903bf0b7f 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp @@ -426,7 +426,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp index 6ced4bee2..f42f55783 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp @@ -423,7 +423,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp index 424cdee76..fc0febc7d 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp @@ -427,7 +427,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp index f3eedf17f..4a655962a 100644 --- a/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/conversions/yaml/yaml_datastructs_zorro.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 1f82453b4..48572ca88 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -465,7 +465,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index ac75e20f6..a0da3fdaf 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index 0724e41b4..70ae1f57e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index 0724e41b4..70ae1f57e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index 7a2170a79..30485f8c3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -437,7 +437,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index 4adc3b16f..731f46515 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index 71343a40c..2db86eb85 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -486,7 +486,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index f5de5f1cf..40b01a388 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -484,7 +484,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index 0724e41b4..70ae1f57e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index aab9477a0..baa86f46d 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -439,7 +439,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index fb382c0b9..927510ceb 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -478,7 +478,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index 9609d2638..ad3a9be0e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -416,7 +416,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index 09070865c..24fac20a7 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -426,7 +426,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 24e913aed..3478f6852 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -423,7 +423,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index c3a35cd86..a9a7479bb 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -427,7 +427,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = { diff --git a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp index fbd0b0c19..476bb6093 100644 --- a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp @@ -431,7 +431,7 @@ static const struct YamlNode struct_TimerData[] = { }; static const struct YamlNode struct_CurveRef[] = { YAML_UNSIGNED( "type", 8 ), - YAML_SIGNED( "value", 8 ), + YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ), YAML_END }; static const struct YamlNode struct_MixData[] = {