Skip to content

Commit b4cc68e

Browse files
dpgeorgedpgeorge
committed
stmhal/led: Refactor LED to use mp_hal_pin_output() init function.
As part of this patch the MICROPY_HW_LED_OTYPE setting is removed because it is now unused (all boards anyway had this as OUTPUT_PP).
1 parent d49d81b commit b4cc68e

18 files changed

Lines changed: 35 additions & 61 deletions

File tree

‎stmhal/boards/ESPRUINO_PICO/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,5 @@
6666
#define MICROPY_HW_LED2 (pin_B12) // green
6767
#define MICROPY_HW_LED3 (pin_B12) // green
6868
#define MICROPY_HW_LED4 (pin_B12) // green
69-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
70-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
71-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
69+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
70+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))

‎stmhal/boards/HYDRABUS/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@
6969
#define MICROPY_HW_LED2 (pin_A4) // same as LED1
7070
#define MICROPY_HW_LED3 (pin_A4) // same as LED1
7171
#define MICROPY_HW_LED4 (pin_A4) // same as LED1
72-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
73-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
74-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
72+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
73+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
7574

7675
// SD card detect switch (not used, always on)
7776
#define MICROPY_HW_SDCARD_DETECT_PIN (pin_A8)

‎stmhal/boards/LIMIFROG/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ void LIMIFROG_board_early_init(void);
6363

6464
// LEDs
6565
#define MICROPY_HW_LED1 (pin_C3) // red
66-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
67-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRR = pin->pin_mask)
68-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRR = pin->pin_mask<<16)
66+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
67+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
6968

7069
// USB config
7170
// #define MICROPY_HW_USB_OTG_ID_PIN (pin_C12) // This is not the official ID Pin which should be PA10

‎stmhal/boards/NETDUINO_PLUS_2/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ void NETDUINO_PLUS_2_board_early_init(void);
6464
#define MICROPY_HW_LED2 (pin_C13) // White LED (aka Power)
6565
#define MICROPY_HW_LED3 (pin_A10) // Same as Led(1)
6666
#define MICROPY_HW_LED4 (pin_C13) // Same as Led(2)
67-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
68-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
69-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
67+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
68+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
7069

7170
// USB VBUS detect pin
7271
#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)

‎stmhal/boards/NUCLEO_F401RE/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,5 @@
5454

5555
// LEDs
5656
#define MICROPY_HW_LED1 (pin_A5) // Green LD2 LED on Nucleo
57-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
58-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
59-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
57+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
58+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))

‎stmhal/boards/NUCLEO_F411RE/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,5 @@
6565

6666
// LEDs
6767
#define MICROPY_HW_LED1 (pin_A5) // Green LD2 LED on Nucleo
68-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
69-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
70-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
68+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
69+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))

‎stmhal/boards/OLIMEX_E407/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171

7272
// LEDs
7373
#define MICROPY_HW_LED1 (pin_C13)
74-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
75-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRH = pin->pin_mask)
76-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRL = pin->pin_mask)
74+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
75+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
7776

7877
// SD card detect switch
7978
#define MICROPY_HW_SDCARD_DETECT_PIN (pin_C11)

‎stmhal/boards/PYBLITEV10/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@
7373
#define MICROPY_HW_LED4 (pin_B4) // blue
7474
#define MICROPY_HW_LED3_PWM { TIM2, 2, TIM_CHANNEL_1, GPIO_AF1_TIM2 }
7575
#define MICROPY_HW_LED4_PWM { TIM3, 3, TIM_CHANNEL_1, GPIO_AF2_TIM3 }
76-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
77-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
78-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
76+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
77+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
7978

8079
// SD card detect switch
8180
#define MICROPY_HW_SDCARD_DETECT_PIN (pin_B5)

‎stmhal/boards/PYBV10/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@
8484
#define MICROPY_HW_LED4 (pin_B4) // blue
8585
#define MICROPY_HW_LED3_PWM { TIM2, 2, TIM_CHANNEL_1, GPIO_AF1_TIM2 }
8686
#define MICROPY_HW_LED4_PWM { TIM3, 3, TIM_CHANNEL_1, GPIO_AF2_TIM3 }
87-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
88-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
89-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
87+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
88+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
9089

9190
// SD card detect switch
9291
#define MICROPY_HW_SDCARD_DETECT_PIN (pin_A8)

‎stmhal/boards/PYBV11/mpconfigboard.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@
8484
#define MICROPY_HW_LED4 (pin_B4) // blue
8585
#define MICROPY_HW_LED3_PWM { TIM2, 2, TIM_CHANNEL_1, GPIO_AF1_TIM2 }
8686
#define MICROPY_HW_LED4_PWM { TIM3, 3, TIM_CHANNEL_1, GPIO_AF2_TIM3 }
87-
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
88-
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
89-
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)
87+
#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
88+
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
9089

9190
// SD card detect switch
9291
#define MICROPY_HW_SDCARD_DETECT_PIN (pin_A8)

0 commit comments

Comments
 (0)