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

nrf5/modules/music: Including mphal.h before config guard in modmusic.c. Also changed name on config guard to MICROPY_PY_MUSIC. Missing PWM functions during linkage will show up if PWM module has not not configured.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-05-08 22:03:33 +02:00
parent 24e902aa8f
commit a84ed760b5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,14 +24,15 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if MICROPY_PY_MACHINE_SOFT_PWM || MICROPY_PY_MACHINE_HW_PWM #include "py/mphal.h"
#if MICROPY_PY_MUSIC
// #include "microbitobj.h" // #include "microbitobj.h"
// #include "microbitmusic.h" // #include "microbitmusic.h"
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/mphal.h"
#include "modmusic.h" #include "modmusic.h"
#include "musictunes.h" #include "musictunes.h"
#include "drivers/pwm.h" #include "drivers/pwm.h"
@ -495,4 +496,4 @@ const mp_obj_module_t music_module = {
.globals = (mp_obj_dict_t*)&microbit_music_locals_dict, .globals = (mp_obj_dict_t*)&microbit_music_locals_dict,
}; };
#endif // MICROPY_PY_MACHINE_SOFT_PWM || MICROPY_PY_MACHINE_HW_PWM #endif // MICROPY_PY_MUSIC