fix(el18): Switch ADC channel and direction (#3779)

EdgeTX · Jul 25, 2023 · 51b4341 · 51b4341
1 parent e79768b
commit 51b4341
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
@@ -110,9 +110,9 @@
 #define ADC_GPIO_PIN_POT1               LL_GPIO_PIN_6      // PA.06 VRA
 #define ADC_GPIO_PIN_POT2               LL_GPIO_PIN_4      // PC.04 VRB
 #define ADC_GPIO_PIN_SWA                LL_GPIO_PIN_1      // PB.01
-#define ADC_GPIO_PIN_SWB                LL_GPIO_PIN_8      // PF.08
+#define ADC_GPIO_PIN_SWB                LL_GPIO_PIN_10     // PF.10
 #define ADC_GPIO_PIN_SWC                LL_GPIO_PIN_0      // PB.00
-#define ADC_GPIO_PIN_SWD                LL_GPIO_PIN_10     // PF.10
+#define ADC_GPIO_PIN_SWD                LL_GPIO_PIN_8      // PF.08
 #define ADC_GPIO_PIN_SWE                LL_GPIO_PIN_0      // PC.00
 #define ADC_GPIO_PIN_SWF                LL_GPIO_PIN_1      // PC.01
 #define ADC_GPIO_PIN_SWG                LL_GPIO_PIN_2      // PC.02
@@ -136,9 +136,9 @@
 #define ADC_CHANNEL_POT1                LL_ADC_CHANNEL_6   // ADC12_IN6  -> ADC1_IN6
 #define ADC_CHANNEL_POT2                LL_ADC_CHANNEL_14  // ADC12_IN14 -> ADC1_IN14
 #define ADC_CHANNEL_SWA                 LL_ADC_CHANNEL_9   // ADC12_IN9  -> ADC1_IN9
-#define ADC_CHANNEL_SWB                 LL_ADC_CHANNEL_6   // ADC3_IN6   -> ADC3_IN6
+#define ADC_CHANNEL_SWB                 LL_ADC_CHANNEL_8   // ADC3_IN8   -> ADC3_IN8
 #define ADC_CHANNEL_SWC                 LL_ADC_CHANNEL_8   // ADC12_IN8  -> ADC1_IN8
-#define ADC_CHANNEL_SWD                 LL_ADC_CHANNEL_8   // ADC3_IN8   -> ADC3_IN8
+#define ADC_CHANNEL_SWD                 LL_ADC_CHANNEL_6   // ADC3_IN6   -> ADC3_IN6
 #define ADC_CHANNEL_SWE                 LL_ADC_CHANNEL_10  // ADC123_IN10-> ADC1_IN10
 #define ADC_CHANNEL_SWF                 LL_ADC_CHANNEL_11  // ADC123_IN11-> ADC1_IN11
 #define ADC_CHANNEL_SWG                 LL_ADC_CHANNEL_12  // ADC123_IN12-> ADC1_IN12
@@ -167,10 +167,10 @@
 
 #define ADC_DIRECTION                                                   \
     { 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/,           \
-      -1 /*POT1*/, 0 /*POT2*/, 0 /*SWA*/, 0 /*SWB*/, 0 /*SWC*/,         \
-      0 /*SWD*/, 0 /*SWE*/, -1 /*SWF*/,  -1 /*SWG*/, 0 /*SWH*/,         \
-      0 /*TX_VOLTAGE*/, 0 /*TX_VBAT*/                                   \
-      }
+      -1 /*POT1*/, 0 /*POT2*/, 0 /*TX_VOLTAGE*/, 0 /*TX_VBAT*/,		\
+      0 /*SWA*/, 0 /*SWB*/, 0 /*SWC*/, 0 /*SWD*/, 0 /*SWE*/,		\
+      -1 /*SWF*/,  -1 /*SWG*/, 0 /*SWH*/				\
+    }
 
 // Power
 #define PWR_RCC_AHB1Periph              RCC_AHB1Periph_GPIOI