4 files changed, 13 insertions, 6 deletions
diff --git a/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
index c99eb1a00..28874f9c6 100644
--- a/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
@@ -16,5 +16,3 @@ MCU_PACKAGE = LQFP144
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F412_fs.ld
-
-CIRCUITPY_USB_HID = 1
diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
index a2e1da101..4436f04b7 100644
--- a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
@@ -2,7 +2,9 @@ USB_VID = 0x239A
 USB_PID = 0x8071
 USB_PRODUCT = "Thunderpack STM32F411"
 USB_MANUFACTURER = "Jeremy Gillick"
-USB_DEVICES = "CDC,MSC"
+
+# Turn off HID devices
+CIRCUITPY_USB_HID = 0
 
 LONGINT_IMPL = NONE
 
diff --git a/ports/stm/common-hal/supervisor/Runtime.c b/ports/stm/common-hal/supervisor/Runtime.c
index ea663f897..974f26cec 100755
--- a/ports/stm/common-hal/supervisor/Runtime.c
+++ b/ports/stm/common-hal/supervisor/Runtime.c
@@ -28,10 +28,10 @@
 #include "shared-bindings/supervisor/Runtime.h"
 #include "supervisor/serial.h"
 
-bool common_hal_get_serial_connected(void) {
+bool common_hal_supervisor_runtime_get_serial_connected(void) {
     return (bool) serial_connected();
 }
 
-bool common_hal_get_serial_bytes_available(void) {
-  return (bool) serial_bytes_available();
+bool common_hal_supervisor_runtime_get_serial_bytes_available(void) {
+    return (bool) serial_bytes_available();
 }
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index bcecaa517..fe257fc50 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -8,6 +8,7 @@ ifeq ($(MCU_VARIANT),STM32F405xx)
 	CIRCUITPY_FRAMEBUFFERIO ?= 1
 	CIRCUITPY_RGBMATRIX ?= 1
 	CIRCUITPY_SDIOIO ?= 1
+	# Number of USB endpoint pairs.
 	USB_NUM_EP = 4
 endif
 
@@ -23,6 +24,8 @@ ifeq ($(MCU_SERIES),F4)
 	CIRCUITPY_RTC ?= 0
 	CIRCUITPY_USB_MIDI ?= 0
 	CIRCUITPY_USB_HID ?= 0
+
+	USB_NUM_EP = 4
 endif
 
 ifeq ($(MCU_SERIES),H7)
@@ -40,6 +43,8 @@ ifeq ($(MCU_SERIES),H7)
 	CIRCUITPY_RTC ?= 0
 	CIRCUITPY_USB_HID ?= 0
 	CIRCUITPY_USB_MIDI ?= 0
+
+	USB_NUM_EP = 9
 endif
 
 ifeq ($(MCU_SERIES),F7)
@@ -56,4 +61,6 @@ ifeq ($(MCU_SERIES),F7)
 	CIRCUITPY_RTC ?= 0
 	CIRCUITPY_USB_HID ?= 0
 	CIRCUITPY_USB_MIDI ?= 0
+
+	USB_NUM_EP = 6
 endif