From 682aabacec4a1195b0099cd57d3d681d64fcbe4b Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 25 Oct 2021 12:27:28 +0200
Subject: [PATCH] WiP logical switches

---
 radio/src/datastructs.h                                       | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp  | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp   | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp    | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp  | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp   | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp  | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp    | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp   | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp   | 4 ++--
 .../src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp  | 4 ++--
 .../src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp | 4 ++--
 radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp | 4 ++--
 .../src/storage/conversions/yaml/yaml_datastructs_xlites.cpp  | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_nv14.cpp              | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_t12.cpp               | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_t8.cpp                | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_tlite.cpp             | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_tx12.cpp              | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x10.cpp               | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x12s.cpp              | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x7.cpp                | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x9d.cpp               | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x9e.cpp               | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x9lite.cpp            | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_x9lites.cpp           | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_xlite.cpp             | 4 ++--
 radio/src/storage/yaml/yaml_datastructs_xlites.cpp            | 4 ++--
 29 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 25df0cc93..72709b784 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -132,8 +132,8 @@ PACK(struct LogicalSwitchData {
   uint8_t  func ENUM(LogicalSwitchesFunctions);
   int32_t  v1:10;
   int32_t  v3:10;
-  int32_t  andsw:9;      // TODO rename to xswtch
-  uint32_t andswtype:1;  // TODO rename to xswtchType (AND / OR)
+  int32_t  andsw:9 CUST(r_swtchSrc,w_swtchSrc); // TODO rename to xswtch
+  uint32_t andswtype:1 SKIP;  // TODO rename to xswtchType (AND / OR)
   uint32_t spare:2 SKIP; // anything else needed?
   int16_t  v2;
   uint8_t  delay;
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
index 3e74004aa..b9da91c53 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_nv14.cpp
@@ -523,8 +523,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t12.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_t8.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tlite.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp
index d0ac1fea4..7871c3131 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_tx12.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
index 9b75f76bc..d1f4606ef 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x10.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
index 799be0adb..7c66dc58e 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x12s.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x7.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp
index 07ee3dfab..6d794b55a 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9d.cpp
@@ -501,8 +501,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp
index bad636fc7..0fd22eba4 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9e.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp
index 4a1e45244..4b8536d6d 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lite.cpp
@@ -478,8 +478,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp
index 4c1cbd3e4..32229c287 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_x9lites.cpp
@@ -488,8 +488,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp
index 7f3878770..f83978aab 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlite.cpp
@@ -485,8 +485,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp
index b9fe7315e..c6ddd9ec9 100644
--- a/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp
+++ b/radio/src/storage/conversions/yaml/yaml_datastructs_xlites.cpp
@@ -489,8 +489,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index 3e74004aa..b9da91c53 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -523,8 +523,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
index d0ac1fea4..7871c3131 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
index 9b75f76bc..d1f4606ef 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
index 799be0adb..7c66dc58e 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp
index 9d499655a..b73889039 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp
@@ -493,8 +493,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
index 07ee3dfab..6d794b55a 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
@@ -501,8 +501,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
index bad636fc7..0fd22eba4 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
@@ -540,8 +540,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
index 4a1e45244..4b8536d6d 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
@@ -478,8 +478,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
index 4c1cbd3e4..32229c287 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
@@ -488,8 +488,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
index 7f3878770..f83978aab 100644
--- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
@@ -485,8 +485,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
index b9fe7315e..c6ddd9ec9 100644
--- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
@@ -489,8 +489,8 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
   YAML_ENUM("func", 8, enum_LogicalSwitchesFunctions),
   YAML_SIGNED( "v1", 10 ),
   YAML_SIGNED( "v3", 10 ),
-  YAML_SIGNED( "andsw", 9 ),
-  YAML_UNSIGNED( "andswtype", 1 ),
+  YAML_SIGNED_CUST( "andsw", 9, r_swtchSrc, w_swtchSrc ),
+  YAML_PADDING( 1 ),
   YAML_PADDING( 2 ),
   YAML_SIGNED( "v2", 16 ),
   YAML_UNSIGNED( "delay", 8 ),