Glenn Ruben Bakke
|
db0fa6aafb
|
nrf5/modules/music: Updating pitch method to also use configured pin from mpconfigboard.h if set, in the case of lacking kwarg for pin. Also removing some commented out arguments to remove some confusion in the argument list. Done for both play() and pitch().
|
2017-06-02 21:18:28 +02:00 |
|
Glenn Ruben Bakke
|
d5acc13d5e
|
nrf5/modules/music: Correct parameter checking of pin argument to deside whether to use MUSIC_PIN define or throw an error. If MUSIC_PIN define is configured the pin argument to music module play() can be elided.
|
2017-06-02 21:06:36 +02:00 |
|
Glenn Ruben Bakke
|
aba5fcbf0f
|
nrf5/main: Move initializaton of modmusic to the module itself. Upon init of the module, the hardware, pwm and ticker will be started. Could be moved back to main if pwm or ticker should be shared among more modules and have to be initialized more global.
|
2017-05-25 00:25:14 +02:00 |
|
Glenn Ruben Bakke
|
aa9ad6be01
|
nrf5/modules/music: Update ticker and modmusic to share global ticks counter as a volatile variable. Use Timer1 hardware peripheral instead of instance 0. Timer0 is not free if used in combination with a bluetooth stack. Update IRQ priority to levels that are compatible in use with a bluetooth stack for both nrf51 and nrf52. Apply nrf51 PAN fixes for Timer1 instead of original Timer0.
|
2017-05-25 00:25:14 +02:00 |
|
Glenn Ruben Bakke
|
234c9f3688
|
nrf5/drivers/softpwm: Renaming pwm_init to softpwm_init to not collide on symbol name with pwm_init in nrf52 machine PWM object.
|
2017-05-18 23:11:41 +02:00 |
|
Glenn Ruben Bakke
|
6330fd4f31
|
nrf5/modules/music: Expose public init function for music module.
|
2017-05-18 23:11:41 +02:00 |
|
Glenn Ruben Bakke
|
d412241143
|
nrf5/modules/music: Update modmusic to use updated includes. Add extern ticks. Add function which implements initialization of pwm and ticker, register ticker callback, and start the pwm and ticker. This corresponds to microbit port main.cpp init.
|
2017-05-18 23:11:41 +02:00 |
|
Glenn Ruben Bakke
|
54656044f7
|
nrf5: Syncing code with upstream master and converting all module and method tables to use MP_ROM macros. Also adding explicit casting of local dicts to (mp_obj_dict_t*).
|
2017-05-09 22:54:58 +02:00 |
|
Glenn Ruben Bakke
|
d3509517f5
|
nrf5/modules/music: Adding config guard in musictunes.c and adding import of mphal.h.
|
2017-05-08 22:05:23 +02:00 |
|
Glenn Ruben Bakke
|
a84ed760b5
|
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.
|
2017-05-08 22:03:33 +02:00 |
|
Glenn Ruben Bakke
|
c3ccef800d
|
nrf5/modules/music: Backing up progress in music module.
|
2017-05-08 21:22:53 +02:00 |
|
Glenn Ruben Bakke
|
311ae77dc0
|
nrf5/modules/music: Backing up progress in modmusic.
|
2017-05-04 00:18:05 +02:00 |
|
Glenn Ruben Bakke
|
a7f10336e1
|
nrf5/modules/music: backing up porting progress in modmusic.c.
|
2017-05-02 22:40:31 +02:00 |
|
Glenn Ruben Bakke
|
d170ca5d03
|
nrf5/modules/music: Commenting out backend function calls in modmusic.c to make module compile for now.
|
2017-05-02 21:50:54 +02:00 |
|
Glenn Ruben Bakke
|
57442c2b25
|
nrf5/modules/music: Updating music module to use pin_obj_t instad of microbit_pin_obj_t. Update include to drivers/pwm.h to resolve some undefined functions.
|
2017-05-02 01:09:59 +02:00 |
|
Glenn Ruben Bakke
|
10e6b4309b
|
nrf5/modules/music: Removing c++ extern definition. Updating include list in modmusic.c. Removing module name from module struct.
|
2017-05-01 19:55:43 +02:00 |
|
Glenn Ruben Bakke
|
01441c8f59
|
nrf5/modules/music: Removing include of modmicrobit.h in musictunes.c.
|
2017-05-01 19:52:40 +02:00 |
|
Glenn Ruben Bakke
|
e766c7ebbe
|
nrf5/modules/music: Adding header to expose extern structs defined in musictunes.c
|
2017-05-01 19:51:47 +02:00 |
|
Glenn Ruben Bakke
|
eedd9eabe9
|
nrf5/modules/music: Renaming microbitmusic files to modmusic/music.
|
2017-05-01 19:11:44 +02:00 |
|
Glenn Ruben Bakke
|
20bdb7dc90
|
nrf5/modules/music: Renaming microbit module to music.
|
2017-05-01 19:08:36 +02:00 |
|