STM32F103x fixes.

diff --git a/keyboard/stm32_f103_onekey/Makefile b/keyboard/stm32_f103_onekey/Makefile
index 89e58144fb7343382bd4e1107865211381e77041..79ca4238d52d0293509e058463ceee7263f775e8 100644 (file)
--- a/keyboard/stm32_f103_onekey/Makefile
+++ b/keyboard/stm32_f103_onekey/Makefile
@@ -20,9 +20,9 @@ endif
 CONFIG_H = config.h
 
 # GENERIC STM32F103C8T6 board - stm32duino bootloader
-# OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000
-# MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-# BOARD = GENERIC_STM32_F103
+OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000
+MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
+BOARD = GENERIC_STM32_F103
 
 # GENERIC STM32F103C8T6 board - no bootloader (programmer over serial or SWD)
 # OPT_DEFS =
@@ -30,9 +30,9 @@ CONFIG_H = config.h
 # BOARD = GENERIC_STM32_F103
 
 # MAPLE MINI
-OPT_DEFS = -DCORTEX_VTOR_INIT=0x5000
-MCU_LDSCRIPT = STM32F103xE_maplemini_bootloader
-BOARD = MAPLEMINI_STM32_F103
+# OPT_DEFS = -DCORTEX_VTOR_INIT=0x5000
+# MCU_LDSCRIPT = STM32F103xE_maplemini_bootloader
+# BOARD = MAPLEMINI_STM32_F103
 
 ## chip/board settings
 # the next two should match the directories in

diff --git a/keyboard/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h b/keyboard/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h
index ef7318eef09e1aab538fab2db872af1ea984bf54..7253e7782634bf4e4c327598eaa4ba29f21b0b10 100644 (file)
--- a/keyboard/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h
+++ b/keyboard/stm32_f103_onekey/boards/GENERIC_STM32_F103/board.h
@@ -143,7 +143,7 @@
 /*\r
 #define usb_lld_connect_bus(usbp) palClearPad(GPIOB, GPIOB_USB_DISC)\r
 */\r
-#define usb_lld_connect_bus(usbp)\r
+#define usb_lld_connect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_INPUT);\r
 \r
 /*\r
  * USB bus de-activation macro, required by the USB driver.\r
@@ -151,7 +151,7 @@
 /*\r
 #define usb_lld_disconnect_bus(usbp) palSetPad(GPIOB, GPIOB_USB_DISC)\r
 */\r
-#define usb_lld_disconnect_bus(usbp)\r
+#define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12);\r
 \r
 #if !defined(_FROM_ASM_)\r
 #ifdef __cplusplus\r

diff --git a/keyboard/stm32_f103_onekey/led.c b/keyboard/stm32_f103_onekey/led.c
index 3c86963c98070d3ec5b155f621a80c5bd34d1208..f5c55f7d9baf3d9a410bce4b03f836c6c2318e5e 100644 (file)
--- a/keyboard/stm32_f103_onekey/led.c
+++ b/keyboard/stm32_f103_onekey/led.c
@@ -24,23 +24,20 @@ void led_set(uint8_t usb_led)
     if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
        /* generic STM32F103C8T6 board */
 #ifdef BOARD_GENERIC_STM32_F103
-        palSetPadMode(GPIOC, 13, PAL_MODE_OUTPUT_PUSHPULL);
         palClearPad(GPIOC, 13);
 #endif
         /* Maple Mini */
 #ifdef BOARD_MAPLEMINI_STM32_F103
-        palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
         palSetPad(GPIOB, 1);
 #endif
     } else {
-        // Hi-Z
        /* generic STM32F103C8T6 board */
 #ifdef BOARD_GENERIC_STM32_F103
-        palSetPadMode(GPIOC, 13, PAL_MODE_INPUT);
+       palSetPad(GPIOC, 13);
 #endif
         /* Maple Mini */
 #ifdef BOARD_MAPLEMINI_STM32_F103
-        palSetPadMode(GPIOB, 1, PAL_MODE_INPUT);
+        palClearPad(GPIOB,1);
 #endif
     }
 }

diff --git a/keyboard/stm32_f103_onekey/matrix.c b/keyboard/stm32_f103_onekey/matrix.c
index d7a9cc3a5ca7ef24b762e0137403aa14558313e9..ea9d8d057b1c0cf1bc4d3ef6350c7fd84adf0d3d 100644 (file)
--- a/keyboard/stm32_f103_onekey/matrix.c
+++ b/keyboard/stm32_f103_onekey/matrix.c
@@ -63,8 +63,8 @@ uint8_t matrix_cols(void)
 
 /* Maple Mini */
 #ifdef BOARD_MAPLEMINI_STM32_F103
-#define LED_ON()    do { palClearPad(GPIOB, 1) ;} while (0)
-#define LED_OFF()   do { palSetPad(GPIOB, 1); } while (0)
+#define LED_ON()    do { palSetPad(GPIOB, 1) ;} while (0)
+#define LED_OFF()   do { palClearPad(GPIOB, 1); } while (0)
 #define LED_TGL()   do { palTogglePad(GPIOB, 1); } while (0)
 #endif