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

nrf5/drivers/softpwm: Renaming pwm_init to softpwm_init to not collide on symbol name with pwm_init in nrf52 machine PWM object.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-05-17 19:49:41 +02:00 committed by glennrub
parent 2584684e06
commit 234c9f3688
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nrf5/drivers/softpwm.c
View File

@ -79,7 +79,7 @@ static const pwm_events OFF_EVENTS = {
#define active_events MP_STATE_PORT(pwm_active_events)
#define pending_events MP_STATE_PORT(pwm_pending_events)
void pwm_init(void) {
void softpwm_init(void) {
active_events = &OFF_EVENTS;
pending_events = NULL;
}

2
nrf5/drivers/softpwm.h
View File

@ -1,7 +1,7 @@
#ifndef __MICROPY_INCLUDED_LIB_PWM_H__
#define __MICROPY_INCLUDED_LIB_PWM_H__
void pwm_init(void);
void softpwm_init(void);
void pwm_start(void);
void pwm_stop(void);

2
nrf5/modules/music/modmusic.c
View File

@ -77,7 +77,7 @@ extern uint32_t ticks;
STATIC uint32_t start_note(const char *note_str, size_t note_len, const pin_obj_t *pin);
void microbit_music_init0(void) {
pwm_init();
softpwm_init();
ticker_init(microbit_music_tick);
ticker_start();
pwm_start();