summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHierophect <hierophect@gmail.com>2019-07-19 15:09:45 -0400
committerHierophect <hierophect@gmail.com>2019-07-19 15:09:45 -0400
commit10b9ca5a92d876e6a3f0e6fb2fb0c2b317c5046a (patch)
tree58c45e6d9d119daa020999061a89820c3ccfe99e
parent734012aa8b12b06dccfb576bc1d3fd8489404ad4 (diff)
pin selection cleanup, tinyUSB update
m---------lib/tinyusb0
-rw-r--r--ports/stm32f4/peripherals/stm32f4/pins.h4
-rw-r--r--ports/stm32f4/supervisor/port.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/tinyusb b/lib/tinyusb
-Subproject 0848c462b3e431a9da42e96537d2b597a457963
+Subproject ed6fa460e9a885bb84a6f1588763ea5fb3f4df4
diff --git a/ports/stm32f4/peripherals/stm32f4/pins.h b/ports/stm32f4/peripherals/stm32f4/pins.h
index 0a8a0c3dc..8a7401c96 100644
--- a/ports/stm32f4/peripherals/stm32f4/pins.h
+++ b/ports/stm32f4/peripherals/stm32f4/pins.h
@@ -65,8 +65,8 @@ extern const mp_obj_type_t mcu_pin_type;
#define NO_PIN 0xff
// Choose based on chip
-//#ifdef STM32F412ZG
+#ifdef STM32F412Zx
#include "stm32f412zg/pins.h"
-//#endif
+#endif
#endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PINS_H__
diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c
index 0a0e08fdf..04c98ab90 100644
--- a/ports/stm32f4/supervisor/port.c
+++ b/ports/stm32f4/supervisor/port.c
@@ -184,8 +184,6 @@
#define LED2_Pin GPIO_PIN_1
#define LED2_GPIO_Port GPIOE
-UART_HandleTypeDef huart2;
-
/*
#include "shared-module/gamepad/__init__.h"
#include "common-hal/microcontroller/Pin.h"