diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F405xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F405xx.py
index 0b5b83be34..54bc597abe 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F405xx.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F405xx.py
@@ -962,3 +962,23 @@ AltFunction_map = {
 	"PH9:I2C3_SMBA"     	:	4,
 	"PH9:TIM12_CH2"     	:	9,
 }
+ADC1_map = {
+	# format is PIN : ADC1_CHAN
+	# extracted from tabula-addfunc-F405.csv
+	"PA0"	:	0,
+	"PA1"	:	1,
+	"PA2"	:	2,
+	"PA3"	:	3,
+	"PA4"	:	4,
+	"PA5"	:	5,
+	"PA6"	:	6,
+	"PA7"	:	7,
+	"PB0"	:	8,
+	"PB1"	:	9,
+	"PC0"	:	10,
+	"PC1"	:	11,
+	"PC2"	:	12,
+	"PC3"	:	13,
+	"PC4"	:	14,
+	"PC5"	:	15,
+}
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
index 25950cc43e..d66d177048 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
@@ -670,3 +670,23 @@ AltFunction_map = {
 	"PH0:EVENTOUT"      	:	15,
 	"PH1:EVENTOUT"      	:	15,
 }
+ADC1_map = {
+	# format is PIN : ADC1_CHAN
+	# extracted from tabula-addfunc-F412RG.csv
+	"PA0"	:	0,
+	"PA1"	:	1,
+	"PA2"	:	2,
+	"PA3"	:	3,
+	"PA4"	:	4,
+	"PA5"	:	5,
+	"PA6"	:	6,
+	"PA7"	:	7,
+	"PB0"	:	8,
+	"PB1"	:	9,
+	"PC0"	:	10,
+	"PC1"	:	11,
+	"PC2"	:	12,
+	"PC3"	:	13,
+	"PC4"	:	14,
+	"PC5"	:	15,
+}
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F427xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F427xx.py
index 25a5352983..fa2943d1e2 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F427xx.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F427xx.py
@@ -737,3 +737,23 @@ AltFunction_map = {
 	"PH9:TIM12_CH2"     	:	9,
 }
 
+ADC1_map = {
+	# format is PIN : ADC1_CHAN
+	# extracted from tabula-addfunc-F427.csv
+	"PA0"	:	0,
+	"PA1"	:	1,
+	"PA2"	:	2,
+	"PA3"	:	3,
+	"PA4"	:	4,
+	"PA5"	:	5,
+	"PA6"	:	6,
+	"PA7"	:	7,
+	"PB0"	:	8,
+	"PB1"	:	9,
+	"PC0"	:	10,
+	"PC1"	:	11,
+	"PC2"	:	12,
+	"PC3"	:	13,
+	"PC4"	:	14,
+	"PC5"	:	15,
+}
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/addfunc_parse.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/addfunc_parse.py
new file mode 100755
index 0000000000..4f5ebc5a46
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/addfunc_parse.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+'''
+create additional functions ADC table, used for mapping analog pins to ADC channel numbers
+
+Currently only extracts ADC1 channels
+
+This assumes a csv file extracted from the datasheet using tablula:
+
+ https://github.com/tabulapdf/tabula
+'''
+
+import sys, csv, os
+
+def is_pin(str):
+    '''see if a string is a valid pin name'''
+    if len(str) < 3:
+        return False
+    if str[0] != 'P':
+        return False
+    if str[1] not in "ABCDEFGH":
+        return False
+    try:
+        p = int(str[2:])
+        if p < 0 or p > 15:
+            return False
+        return True
+    except ValueError:
+        return False
+
+def parse_adc_table(fname, table):
+    csvt = csv.reader(open(fname,'rb'))
+    i = 0
+    for row in csvt:
+        for col in row:
+            if is_pin(col) and row[-1].startswith('ADC1'):
+                chan = row[-1]
+                chan = chan.replace('\r', '')
+                chan = chan.replace(' ', '')
+                chan = chan.split('/')
+                chan = chan[0]
+                chan = chan.split(',')
+                chan = chan[0]
+                a = chan.split('_')
+                if len(a) != 2:
+                    continue
+                chan_num = a[1]
+                if chan_num.startswith('IN'):
+                    chan_num = chan_num[2:]
+                try:
+                    chan_num = int(chan_num)
+                except Exception:
+                    continue
+                table[col] = chan_num
+
+table = {}
+
+if len(sys.argv) != 2:
+    print("Error: expected 1 CSV file")
+    sys.exit(1)
+
+parse_adc_table(sys.argv[1], table)
+
+sys.stdout.write("ADC1_map = {\n");
+sys.stdout.write('\t# format is PIN : ADC1_CHAN\n')
+sys.stdout.write('\t# extracted from %s\n' % os.path.basename(sys.argv[1]))
+for k in sorted(table.keys()):
+    s = '"' + k + '"'
+    sys.stdout.write('\t%-4s\t:\t%s,\n' % (s, table[k]))
+sys.stdout.write("}\n");