diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-26 16:07:18 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-26 16:07:18 +0000 |
| commit | 43122c320bce6e03a37fda1d230f5c467338c85c (patch) | |
| tree | 1ec9a2525f00014e96d1609fadf205480d39035a /stm/boards | |
| parent | 4273498cb8825b51d701fdcb48ce530cc15487ef (diff) | |
| parent | 34f66023d4277a82a433aa5b57eef4a80b6c1a60 (diff) | |
| download | micropython-43122c320bce6e03a37fda1d230f5c467338c85c.tar.gz micropython-43122c320bce6e03a37fda1d230f5c467338c85c.zip | |
Merge pull request #325 from dhylands/led
Update LED configuration
Diffstat (limited to 'stm/boards')
| -rw-r--r-- | stm/boards/NETDUINO_PLUS_2/mpconfigboard.h | 19 | ||||
| -rw-r--r-- | stm/boards/PYBOARD3/mpconfigboard.h | 21 | ||||
| -rw-r--r-- | stm/boards/PYBOARD4/mpconfigboard.h | 20 | ||||
| -rw-r--r-- | stm/boards/STM32F4DISC/mpconfigboard.h | 19 |
4 files changed, 26 insertions, 53 deletions
diff --git a/stm/boards/NETDUINO_PLUS_2/mpconfigboard.h b/stm/boards/NETDUINO_PLUS_2/mpconfigboard.h index 2c0e4b74c0..9bc5149ecf 100644 --- a/stm/boards/NETDUINO_PLUS_2/mpconfigboard.h +++ b/stm/boards/NETDUINO_PLUS_2/mpconfigboard.h @@ -25,21 +25,14 @@ #define USRSW_PRESSED (1) /* LED */ -#define PYB_LED1_PORT (GPIOA) // Blue LED -#define PYB_LED1_PIN (GPIO_Pin_10) - -#define PYB_LED2_PORT (GPIOC) // White LED (aka Power) -#define PYB_LED2_PIN (GPIO_Pin_13) - -#define PYB_LED3_PORT (GPIOA) // Same as Led(1) -#define PYB_LED3_PIN (GPIO_Pin_10) - -#define PYB_LED4_PORT (GPIOC) // Same as Led(2) -#define PYB_LED4_PIN (GPIO_Pin_13) +#define PYB_LED1 (pin_A10) // Blue LED +#define PYB_LED2 (pin_C13) // White LED (aka Power) +#define PYB_LED3 (pin_A10) // Same as Led(1) +#define PYB_LED4 (pin_C13) // Same as Led(2) #define PYB_OTYPE (GPIO_OType_PP) -#define PYB_LED_ON(port, pin) (port->BSRRL = pin) -#define PYB_LED_OFF(port, pin) (port->BSRRH = pin) +#define PYB_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask) +#define PYB_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask) #define HSE_VALUE (25000000) diff --git a/stm/boards/PYBOARD3/mpconfigboard.h b/stm/boards/PYBOARD3/mpconfigboard.h index 88573e2b16..29e23eaab6 100644 --- a/stm/boards/PYBOARD3/mpconfigboard.h +++ b/stm/boards/PYBOARD3/mpconfigboard.h @@ -21,19 +21,12 @@ #define USRSW_PRESSED (0) /* LED */ -#define PYB_LED1_PORT (GPIOA) -#define PYB_LED1_PIN (GPIO_Pin_8) +#define PYB_LED1 (pin_A8) // R1 - red +#define PYB_LED2 (pin_A10) // R2 - red +#define PYB_LED3 (pin_C4) // G1 - green +#define PYB_LED4 (pin_C5) // G2 - green -#define PYB_LED2_PORT (GPIOA) -#define PYB_LED2_PIN (GPIO_Pin_10) +#define PYB_OTYPE (GPIO_OType_PP) -#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) +#define PYB_LED_ON(pin) (pin->gpio->BSRRH = pin->pin_mask) +#define PYB_LED_OFF(pin) (pin->gpio->BSRRL = pin->pin_mask) diff --git a/stm/boards/PYBOARD4/mpconfigboard.h b/stm/boards/PYBOARD4/mpconfigboard.h index 88c3944312..8bc8ee2ae6 100644 --- a/stm/boards/PYBOARD4/mpconfigboard.h +++ b/stm/boards/PYBOARD4/mpconfigboard.h @@ -21,19 +21,13 @@ #define USRSW_PRESSED (0) /* 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_LED1 (pin_A13) // red +#define PYB_LED2 (pin_A14) // green +#define PYB_LED3 (pin_A15) // yellow +#define PYB_LED4 (pin_B4) // blue #define PYB_OTYPE (GPIO_OType_PP) -#define PYB_LED_ON(port, pin) (port->BSRRL = pin) -#define PYB_LED_OFF(port, pin) (port->BSRRH = pin) +#define PYB_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask) +#define PYB_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask) + diff --git a/stm/boards/STM32F4DISC/mpconfigboard.h b/stm/boards/STM32F4DISC/mpconfigboard.h index 1e26f730ec..b463c90ad3 100644 --- a/stm/boards/STM32F4DISC/mpconfigboard.h +++ b/stm/boards/STM32F4DISC/mpconfigboard.h @@ -21,20 +21,13 @@ #define USRSW_PRESSED (1) /* 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_LED1 (pin_D14) // red +#define PYB_LED2 (pin_D12) // green +#define PYB_LED3 (pin_D13) // orange +#define PYB_LED4 (pin_D15) // blue #define PYB_OTYPE (GPIO_OType_PP) -#define PYB_LED_ON(port, pin) (port->BSRRL = pin) -#define PYB_LED_OFF(port, pin) (port->BSRRH = pin) +#define PYB_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask) +#define PYB_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask) |