diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat
index 95690d23169b21..abef3ecea738a4 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary/hwdef.dat
@@ -71,7 +71,7 @@ PF13 VDD_5V_SENS ADC2 SCALE(2) ANALOG(18)
 
 # And the analog input for airspeed (rarely used these days).
 PF3 PRESSURE_SENS ADC3 SCALE(2) ANALOG(8)
-PC3 FMU_SERVORAIL_VCC_SENS ADC3 SCALE(3) ANALOG(9)
+PC3_C FMU_SERVORAIL_VCC_SENS ADC3 SCALE(3) ANALOG(9)
 
 # CAN config
 PE10 GPIOCAN1_TERM OUTPUT HIGH
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py
index d255d5861d8f31..bf16a34fe47398 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32H757xx.py
@@ -1278,24 +1278,26 @@
 
 ADC1_map = {
     # format is PIN : ADC1_CHAN
-    "PF11"  :   2,
-    "PA6"	:	3,
-    "PC4"	:	4,
-    "PB1"	:	5,
-    "PF12"  :   6,
-    "PA7"	:	7,
-    "PC5"	:	8,
-    "PB0"	:	9,
+#	"PA0_C"	:	0,	# The _C pins are not yet supported
+#	"PA1_C"	:	1,	# The _C pins are not yet supported
+	"PF11"  :   2,
+	"PA6"	:	3,
+	"PC4"	:	4,
+	"PB1"	:	5,
+	"PF12"  :   6,
+	"PA7"	:	7,
+	"PC5"	:	8,
+	"PB0"	:	9,
 	"PC0"	:	10,
 	"PC1"	:	11,
 	"PC2"	:	12,
-    "PC3"	:	13,
-    "PA2"	:	14,
-    "PA3"	:	15,
-    "PA0"	:	16,
-    "PA1"	:	17,
-    "PA4"	:	18,
-    "PA5"	:	19,
+	"PC3"	:	13,
+	"PA2"	:	14,
+	"PA3"	:	15,
+	"PA0"	:	16,
+	"PA1"	:	17,
+	"PA4"	:	18,
+	"PA5"	:	19,
     "PF11"  :   2,
 	"PF12"  :   6,
     "PF3"   :   5,
@@ -1303,15 +1305,45 @@
 
 ADC2_map = {
 	# format is PIN : ADC2_CHAN
+#	"PA0_C"	:	0,	# The _C pins are not yet supported
+#	"PA1_C"	:	1,	# The _C pins are not yet supported
 	"PF13"  :   2,
+	"PA6"	:	3,
+	"PC4"	:	4,
 	"PB1"	:	5,
 	"PF14"  :   6,
+	"PA7"	:	7,
+	"PC5"	:	8,
+	"PB0"	:	9,
+	"PC0"   :   10,
+	"PC1"	:	11,
+	"PC2"	:	12,
+	"PC3"	:	13,
+	"PA2"	:	14,
+	"PA3"	:	15,
+	# ADC2_INP16 not implemented on this chip
+	# ADC2_INP17 not implemented on this chip
+	"PA4"	:	18,
+	"PA5"	:	19,
 }
 
 ADC3_map = {
 	# format is PIN : ADC3_CHAN
-	"PC3"   :   1,
-	"PF3"	:   5,
+#	"PC2_C"	:	0,	# The _C pins are not yet supported
+#	"PC3_C" :   1,	# The _C pins are not yet supported
+	"PF9"   :   2,
+	"PF7"   :   3,
 	"PF5"   :   4,
+	"PF3"	:   5,
+	"PF10"	:   6,
+	"PF8"	:   7,
+	"PF6"   :   8,
 	"PF4"   :   9,
+	"PC0"   :   10,
+	"PC1"	:	11,
+	"PC2"	:	12,
+	"PH2"	:	13,
+	"PH3"	:	14,
+	"PH4"	:	15,
+	"PH5"	:	16,
 }