summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--stm/Makefile2
-rw-r--r--stm/led.c55
-rw-r--r--stm/main.c1
-rw-r--r--stm/mpconfigport.h57
-rw-r--r--stm/rtc.c1
-rw-r--r--stm/usb.c14
-rw-r--r--stm/usb.h1
-rw-r--r--stm/usrsw.c1
8 files changed, 74 insertions, 58 deletions
diff --git a/stm/Makefile b/stm/Makefile
index f7e5eb6129..ab69109583 100644
--- a/stm/Makefile
+++ b/stm/Makefile
@@ -13,7 +13,7 @@ ECHO = @echo
CMSIS=cmsis
STMSRC=lib
-#STMOTGSRC=lib-otg
+#STMOTGSRC=usbhost
FATFSSRC=fatfs
CC3KSRC=cc3k
DFU=../tools/dfu.py
diff --git a/stm/led.c b/stm/led.c
index 3c1a93e70f..96fac58e2e 100644
--- a/stm/led.c
+++ b/stm/led.c
@@ -14,61 +14,6 @@
#define PYB_LED_3 (3)
#define PYB_LED_4 (4)
-#if defined(PYBOARD)
- #define PYB_LED1_PORT (GPIOA)
- #define PYB_LED1_PIN (GPIO_Pin_8)
-
- #define PYB_LED2_PORT (GPIOA)
- #define PYB_LED2_PIN (GPIO_Pin_10)
-
- #define PYB_LED3_PORT (GPIOC)
- #define PYB_LED3_PIN (GPIO_Pin_4)
-
- #define PYB_LED4_PORT (GPIOC)
- #define PYB_LED4_PIN (GPIO_Pin_5)
-
- #define PYB_OTYPE (GPIO_OType_OD)
-
- #define PYB_LED_ON(port, pin) (port->BSRRH = pin)
- #define PYB_LED_OFF(port, pin) (port->BSRRL = pin)
-
-#elif defined(PYBOARD4)
- #define PYB_LED1_PORT (GPIOA)
- #define PYB_LED1_PIN (GPIO_Pin_13)
-
- #define PYB_LED2_PORT (GPIOA)
- #define PYB_LED2_PIN (GPIO_Pin_14)
-
- #define PYB_LED3_PORT (GPIOA)
- #define PYB_LED3_PIN (GPIO_Pin_15)
-
- #define PYB_LED4_PORT (GPIOB)
- #define PYB_LED4_PIN (GPIO_Pin_4)
-
- #define PYB_OTYPE (GPIO_OType_PP)
-
- #define PYB_LED_ON(port, pin) (port->BSRRL = pin)
- #define PYB_LED_OFF(port, pin) (port->BSRRH = pin)
-
-#elif defined(STM32F4DISC)
- #define PYB_LED1_PORT (GPIOD)
- #define PYB_LED1_PIN (GPIO_Pin_14)
-
- #define PYB_LED2_PORT (GPIOD)
- #define PYB_LED2_PIN (GPIO_Pin_12)
-
- #define PYB_LED3_PORT (GPIOD)
- #define PYB_LED3_PIN (GPIO_Pin_15)
-
- #define PYB_LED4_PORT (GPIOD)
- #define PYB_LED4_PIN (GPIO_Pin_13)
-
- #define PYB_OTYPE (GPIO_OType_PP)
-
- #define PYB_LED_ON(port, pin) (port->BSRRL = pin)
- #define PYB_LED_OFF(port, pin) (port->BSRRH = pin)
-#endif
-
void led_init(void) {
/* GPIO structure */
GPIO_InitTypeDef GPIO_InitStructure;
diff --git a/stm/main.c b/stm/main.c
index 20d4278264..92c3772d5f 100644
--- a/stm/main.c
+++ b/stm/main.c
@@ -876,6 +876,7 @@ soft_reset:
//pyb_usbh_init();
//rt_store_name(qstr_from_str("u_p"), rt_make_function_n(0, pyb_usbh_process));
//rt_store_name(qstr_from_str("u_c"), rt_make_function_n(0, pyb_usbh_connect));
+ //rt_store_name(qstr_from_str("u_i"), rt_make_function_n(0, pyb_usbh_info));
if (first_soft_reset) {
#if MICROPY_HW_HAS_MMA7660
diff --git a/stm/mpconfigport.h b/stm/mpconfigport.h
index 6a1856e521..2851c1ad12 100644
--- a/stm/mpconfigport.h
+++ b/stm/mpconfigport.h
@@ -48,6 +48,25 @@ machine_float_t machine_sqrt(machine_float_t x);
#define USRSW_EXTI_LINE (EXTI_Line13)
#define USRSW_EXTI_IRQN (EXTI15_10_IRQn)
#define USRSW_EXTI_EDGE (EXTI_Trigger_Rising)
+
+ /* LED */
+ #define PYB_LED1_PORT (GPIOA)
+ #define PYB_LED1_PIN (GPIO_Pin_8)
+
+ #define PYB_LED2_PORT (GPIOA)
+ #define PYB_LED2_PIN (GPIO_Pin_10)
+
+ #define PYB_LED3_PORT (GPIOC)
+ #define PYB_LED3_PIN (GPIO_Pin_4)
+
+ #define PYB_LED4_PORT (GPIOC)
+ #define PYB_LED4_PIN (GPIO_Pin_5)
+
+ #define PYB_OTYPE (GPIO_OType_OD)
+
+ #define PYB_LED_ON(port, pin) (port->BSRRH = pin)
+ #define PYB_LED_OFF(port, pin) (port->BSRRL = pin)
+
#elif defined (PYBOARD4)
#define MICROPY_HW_HAS_SWITCH (1)
#define MICROPY_HW_HAS_SDCARD (1)
@@ -69,6 +88,25 @@ machine_float_t machine_sqrt(machine_float_t x);
#define USRSW_EXTI_LINE (EXTI_Line3)
#define USRSW_EXTI_IRQN (EXTI15_10_IRQn)
#define USRSW_EXTI_EDGE (EXTI_Trigger_Rising)
+
+ /* LED */
+ #define PYB_LED1_PORT (GPIOA)
+ #define PYB_LED1_PIN (GPIO_Pin_13)
+
+ #define PYB_LED2_PORT (GPIOA)
+ #define PYB_LED2_PIN (GPIO_Pin_14)
+
+ #define PYB_LED3_PORT (GPIOA)
+ #define PYB_LED3_PIN (GPIO_Pin_15)
+
+ #define PYB_LED4_PORT (GPIOB)
+ #define PYB_LED4_PIN (GPIO_Pin_4)
+
+ #define PYB_OTYPE (GPIO_OType_PP)
+
+ #define PYB_LED_ON(port, pin) (port->BSRRL = pin)
+ #define PYB_LED_OFF(port, pin) (port->BSRRH = pin)
+
#elif defined (STM32F4DISC)
#define MICROPY_HW_HAS_SWITCH (1)
#define MICROPY_HW_HAS_SDCARD (0)
@@ -90,6 +128,25 @@ machine_float_t machine_sqrt(machine_float_t x);
#define USRSW_EXTI_LINE (EXTI_Line0)
#define USRSW_EXTI_IRQN (EXTI0_IRQn)
#define USRSW_EXTI_EDGE (EXTI_Trigger_Falling)
+
+ /* LED */
+ #define PYB_LED1_PORT (GPIOD)
+ #define PYB_LED1_PIN (GPIO_Pin_14)
+
+ #define PYB_LED2_PORT (GPIOD)
+ #define PYB_LED2_PIN (GPIO_Pin_12)
+
+ #define PYB_LED3_PORT (GPIOD)
+ #define PYB_LED3_PIN (GPIO_Pin_15)
+
+ #define PYB_LED4_PORT (GPIOD)
+ #define PYB_LED4_PIN (GPIO_Pin_13)
+
+ #define PYB_OTYPE (GPIO_OType_PP)
+
+ #define PYB_LED_ON(port, pin) (port->BSRRL = pin)
+ #define PYB_LED_OFF(port, pin) (port->BSRRH = pin)
+
#endif
#define STM32F40_41xxx
diff --git a/stm/rtc.c b/stm/rtc.c
index 9adfd3a7ad..2dbb2c0aa1 100644
--- a/stm/rtc.c
+++ b/stm/rtc.c
@@ -3,7 +3,6 @@
#include "misc.h"
#include "mpconfig.h"
-#include "mpconfigport.h"
#include "qstr.h"
#include "obj.h"
#include "rtc.h"
diff --git a/stm/usb.c b/stm/usb.c
index 89cc1df33f..769e6a53aa 100644
--- a/stm/usb.c
+++ b/stm/usb.c
@@ -153,4 +153,18 @@ mp_obj_t pyb_usbh_connect(void) {
return mp_const_none;
}
+mp_obj_t pyb_usbh_info(void) {
+ printf("GOTGCTL:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GOTGCTL);
+ printf("GOTGINT:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GOTGINT);
+ printf("GAHBCFG:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GAHBCFG);
+ printf("GUSBCFG:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GUSBCFG);
+ printf("GRSTCTL:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GRSTCTL);
+ printf("GINTSTS:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GINTSTS);
+ printf("GINTMSK:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GINTMSK);
+ //printf("GRXSTSR:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GRXSTSR);
+ //printf("GRXSTSP:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GRXSTSP);
+ //printf("GRXFSIZ:%08x\n", (unsigned int)USB_OTG_dev.regs.GREGS->GRXFSIZ);
+ return mp_const_none;
+}
+
#endif // USE_HOST_MODE
diff --git a/stm/usb.h b/stm/usb.h
index 1e634c2def..68954af636 100644
--- a/stm/usb.h
+++ b/stm/usb.h
@@ -10,3 +10,4 @@ void usb_hid_send_report(uint8_t *buf); // 4 bytes for mouse: ?, x, y, ?
void pyb_usbh_init(void);
mp_obj_t pyb_usbh_process(void);
mp_obj_t pyb_usbh_connect(void);
+mp_obj_t pyb_usbh_info(void);
diff --git a/stm/usrsw.c b/stm/usrsw.c
index 2aa21eef82..162cecfcf0 100644
--- a/stm/usrsw.c
+++ b/stm/usrsw.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "mpconfig.h"
-#include "mpconfigport.h"
#include "qstr.h"
#include "obj.h"
#include "usrsw.h"
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-28 07:51:47 +0000