From 5f2fb4386c806329b319552524ad4b956388a241 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 26 Oct 2021 10:25:32 +0200
Subject: [PATCH] Align with changes on main branch

See #942
---
 radio/src/dataconstants.h                        | 2 ++
 radio/src/storage/yaml/yaml_datastructs_nv14.cpp | 1 +
 radio/src/storage/yaml/yaml_datastructs_x10.cpp  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index 3e21fd581..de960f1de 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -830,7 +830,9 @@ enum Functions {
   FUNC_BACKLIGHT,
   FUNC_SCREENSHOT,
   FUNC_RACING_MODE,
+#if defined(COLORLCD)
   FUNC_DISABLE_TOUCH,
+#endif
 #if defined(DEBUG)
   FUNC_TEST, // should remain the last before MAX as not added in Companion
 #endif
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index b9da91c53..d9d97a1d6 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -66,6 +66,7 @@ const struct YamlIdStr enum_Functions[] = {
   {  FUNC_BACKLIGHT, "BACKLIGHT"  },
   {  FUNC_SCREENSHOT, "SCREENSHOT"  },
   {  FUNC_RACING_MODE, "RACING_MODE"  },
+  {  FUNC_DISABLE_TOUCH, "DISABLE_TOUCH"  },
   {  0, NULL  }
 };
 const struct YamlIdStr enum_UartModes[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
index d1f4606ef..9d689f2d3 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -66,6 +66,7 @@ const struct YamlIdStr enum_Functions[] = {
   {  FUNC_BACKLIGHT, "BACKLIGHT"  },
   {  FUNC_SCREENSHOT, "SCREENSHOT"  },
   {  FUNC_RACING_MODE, "RACING_MODE"  },
+  {  FUNC_DISABLE_TOUCH, "DISABLE_TOUCH"  },
   {  0, NULL  }
 };
 const struct YamlIdStr enum_UartModes[] = {