From b850470783e039bab37bee07fa545df3c07b6c86 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 13 Dec 2018 08:15:00 +0100
Subject: [PATCH] Extra union added

---
 radio/src/datastructs.h              | 15 ++++++++++++---
 radio/src/gui/128x64/model_setup.cpp |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 44eb39f6a..1010276fe 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -406,9 +406,18 @@ PACK(struct ModuleData {
   int8_t  rfProtocol:4;
   uint8_t channelsStart;
   int8_t  channelsCount; // 0=8 channels
-  uint8_t failsafeMode:4;  // only 3 bits used
-  uint8_t subType:3;
-  uint8_t invertedSerial:1; // telemetry serial inverted from standard
+  union {
+    struct {
+      uint8_t failsafeMode:4;  // only 3 bits used
+      uint8_t subType:3;
+      uint8_t invertedSerial:1; // telemetry serial inverted from standard
+    };
+    struct {
+      uint8_t failsafeMode:4;  // only 3 bits used
+      uint8_t freq:2;
+      uint8_t region:2;
+    } r9m;
+  };
   int16_t failsafeChannels[MAX_OUTPUT_CHANNELS];
   union {
     struct {
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 67fa85ef6..20118ad8c 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1232,7 +1232,7 @@ void menuModelSetup(event_t event)
       case ITEM_MODEL_EXTERNAL_MODULE_FREQ:
       {
         uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
-        uint8_t frequency = BF_GET(g_model.moduleData[moduleIdx].subType, 2, 1);
+        uint8_t frequency = BF_GET(g_model.moduleData[moduleIdx].r9m.freq, 2, 1);
         lcdDrawTextAlignedLeft(y, STR_FREQUENCY);
         lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9MFLEX_FREQ, frequency, LEFT | attr);
         if (attr)