From ea483e4dc91f9aed3da772d74777fe2da2c0f89d Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 19 Apr 2021 11:26:58 +0200 Subject: [PATCH] Use custom [r/w]_mixSrcRaw in ExpoData as well. --- radio/src/datastructs.h | 2 +- radio/src/storage/yaml/yaml_datastructs_x10.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index c7dc781eb..c4afe3a9d 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -96,7 +96,7 @@ PACK(struct MixData { PACK(struct ExpoData { uint16_t mode:2; uint16_t scale:14; - uint16_t srcRaw:10 ENUM(MixSources); + uint16_t srcRaw:10 ENUM(MixSources) CUST(r_mixSrcRaw,w_mixSrcRaw); int16_t carryTrim:6; uint32_t chn:5; int32_t swtch:9 CUST(r_swtchSrc,w_swtchSrc); diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index d476bc22e..43fd4f620 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -423,7 +423,7 @@ static const struct YamlNode struct_ExpoData[] = { YAML_IDX, YAML_UNSIGNED( "mode", 2 ), YAML_UNSIGNED( "scale", 14 ), - YAML_ENUM("srcRaw", 10, enum_MixSources), + YAML_UNSIGNED_CUST( "srcRaw", 10, r_mixSrcRaw, w_mixSrcRaw ), YAML_SIGNED( "carryTrim", 6 ), YAML_UNSIGNED( "chn", 5 ), YAML_SIGNED_CUST( "swtch", 9, r_swtchSrc, w_swtchSrc ),