Make FS hall sticks EXT3 EXT4 optional

As this breaks Companion model editing for now (see issue #758).
2021-09-19 13:49:47 +02:00
parent 4546f885ec
commit 68d9162cb4
7 changed files with 29 additions and 24 deletions
@@ -1067,23 +1067,23 @@ void getADC()
    uint16_t v;

 #if defined(FLYSKY_HALL_STICKS)
-    if (x < 4)
+    if (x < 4) {
      v = get_flysky_hall_adc_value(x) >> (1 - ANALOG_SCALE);
-    else
-      #if defined(RADIO_TX16S)
-        switch (x)
-        {
-            case EXT3:
-            case EXT4:
-                v = getAnalogValue(x-7) >> (1 - ANALOG_SCALE);
-                break;
-            default:
-                v = getAnalogValue(x) >> (1 - ANALOG_SCALE);
-                break;
-        }
-       #else
+    } else {
+      #if defined(FLYSKY_HALL_STICKS_EXT3_EXT4)
+      switch (x) {
+        case EXT3:
+        case EXT4:
+          v = getAnalogValue(x - 7) >> (1 - ANALOG_SCALE);
+          break;
+        default:
          v = getAnalogValue(x) >> (1 - ANALOG_SCALE);
-       #endif
+          break;
+      }
+      #else
+      v = getAnalogValue(x) >> (1 - ANALOG_SCALE);
+      #endif
+    }
 #else
    v = getAnalogValue(x) >> (1 - ANALOG_SCALE);
 #endif