djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmhal: Make a HW config option for LED4 being controlled by PWM.

Browse Source
This commit is contained in:
Damien George 2015-02-22 17:54:07 +00:00
parent 8bdbc20e74
commit 2e5704d101
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stmhal/boards/PYBV10/mpconfigboard.h
View File

@ -40,6 +40,7 @@
#define MICROPY_HW_LED2 (pin_A14) // green
#define MICROPY_HW_LED3 (pin_A15) // yellow
#define MICROPY_HW_LED4 (pin_B4) // blue
#define MICROPY_HW_LED4_PWM (1)
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)

1
stmhal/boards/PYBV4/mpconfigboard.h
View File

@ -39,6 +39,7 @@
#define MICROPY_HW_LED2 (pin_A14) // green
#define MICROPY_HW_LED3 (pin_A15) // yellow
#define MICROPY_HW_LED4 (pin_B4) // blue
#define MICROPY_HW_LED4_PWM (1)
#define MICROPY_HW_LED_OTYPE (GPIO_MODE_OUTPUT_PP)
#define MICROPY_HW_LED_ON(pin) (pin->gpio->BSRRL = pin->pin_mask)
#define MICROPY_HW_LED_OFF(pin) (pin->gpio->BSRRH = pin->pin_mask)

25
stmhal/led.c
View File

@ -36,6 +36,11 @@
#if defined(MICROPY_HW_LED1)
// default is to not PWM LED4
#if !defined(MICROPY_HW_LED4_PWM)
#define MICROPY_HW_LED4_PWM (0)
#endif
/// \moduleref pyb
/// \class LED - LED object
///
@ -78,7 +83,7 @@ void led_init(void) {
HAL_GPIO_Init(led_pin->gpio, &GPIO_InitStructure);
}
#if defined(PYBV4) || defined(PYBV10)
#if MICROPY_HW_LED4_PWM
// LED4 (blue) is on PB4 which is TIM3_CH1
// we use PWM on this channel to fade the LED
@ -102,15 +107,14 @@ void led_init(void) {
// start PWM
TIM_CCxChannelCmd(TIM3, TIM_CHANNEL_1, TIM_CCx_ENABLE);
#endif
#endif
}
void led_state(pyb_led_t led, int state) {
if (led < 1 || led > NUM_LEDS) {
return;
}
#if defined(PYBV4) || defined(PYBV10)
if (led == 4) {
if (MICROPY_HW_LED4_PWM && led == 4) {
if (state) {
TIM3->CCR1 = 0xffff;
} else {
@ -118,7 +122,6 @@ void led_state(pyb_led_t led, int state) {
}
return;
}
#endif
const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
//printf("led_state(%d,%d)\n", led, state);
if (state == 0) {
@ -135,8 +138,7 @@ void led_toggle(pyb_led_t led) {
return;
}
#if defined(PYBV4) || defined(PYBV10)
if (led == 4) {
if (MICROPY_HW_LED4_PWM && led == 4) {
if (TIM3->CCR1 == 0) {
TIM3->CCR1 = 0xffff;
} else {
@ -144,7 +146,6 @@ void led_toggle(pyb_led_t led) {
}
return;
}
#endif
// toggle the output data register to toggle the LED state
const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
@ -156,15 +157,13 @@ int led_get_intensity(pyb_led_t led) {
return 0;
}
#if defined(PYBV4) || defined(PYBV10)
if (led == 4) {
if (MICROPY_HW_LED4_PWM && led == 4) {
mp_uint_t i = (TIM3->CCR1 * 255 + (USBD_CDC_POLLING_INTERVAL*1000) - 2) / ((USBD_CDC_POLLING_INTERVAL*1000) - 1);
if (i > 255) {
i = 255;
}
return i;
}
#endif
const pin_obj_t *led_pin = pyb_led_obj[led - 1].led_pin;
GPIO_TypeDef *gpio = led_pin->gpio;
@ -180,8 +179,7 @@ int led_get_intensity(pyb_led_t led) {
}
void led_set_intensity(pyb_led_t led, mp_int_t intensity) {
#if defined(PYBV4) || defined(PYBV10)
if (led == 4) {
if (MICROPY_HW_LED4_PWM && led == 4) {
// set intensity using PWM pulse width
if (intensity < 0) {
intensity = 0;
@ -193,7 +191,6 @@ void led_set_intensity(pyb_led_t led, mp_int_t intensity) {
TIM3->CCR1 = intensity;
return;
}
#endif
// intensity not supported for this LED; just turn it on/off
led_state(led, intensity > 0);