|
25 | 25 | */
|
26 | 26 |
|
27 | 27 | #include "py/runtime.h"
|
| 28 | +#include "microbithal.h" |
28 | 29 | #include "modmicrobit.h"
|
29 | 30 | #include "modaudio.h"
|
30 | 31 |
|
|
69 | 70 | #define SOUND_EFFECT_FX_VIBRATO (1)
|
70 | 71 | #define SOUND_EFFECT_FX_WARBLE (3)
|
71 | 72 |
|
72 |
| -// These default fx values are the same as used by MakeCode. |
73 |
| -#define SOUND_EFFECT_FX_VIBRATO_DEFAULT_PARAM (2) |
74 |
| -#define SOUND_EFFECT_FX_TREMOLO_DEFAULT_PARAM (3) |
75 |
| -#define SOUND_EFFECT_FX_WARBLE_DEFAULT_PARAM (2) |
76 |
| -#define SOUND_EFFECT_FX_VIBRATO_DEFAULT_STEPS (512) |
77 |
| -#define SOUND_EFFECT_FX_TREMOLO_DEFAULT_STEPS (900) |
78 |
| -#define SOUND_EFFECT_FX_WARBLE_DEFAULT_STEPS (700) |
79 |
| - |
80 | 73 | #define SOUND_EFFECT_DEFAULT_FREQ_START (500)
|
81 | 74 | #define SOUND_EFFECT_DEFAULT_FREQ_END (2500)
|
82 | 75 | #define SOUND_EFFECT_DEFAULT_DURATION (500)
|
@@ -125,15 +118,15 @@ static const soundeffect_attr_t soundeffect_attr_table[] = {
|
125 | 118 | };
|
126 | 119 |
|
127 | 120 | static const uint8_t fx_default_param[] = {
|
128 |
| - [SOUND_EFFECT_FX_VIBRATO] = SOUND_EFFECT_FX_VIBRATO_DEFAULT_PARAM, |
129 |
| - [SOUND_EFFECT_FX_TREMOLO] = SOUND_EFFECT_FX_TREMOLO_DEFAULT_PARAM, |
130 |
| - [SOUND_EFFECT_FX_WARBLE] = SOUND_EFFECT_FX_WARBLE_DEFAULT_PARAM, |
| 121 | + [SOUND_EFFECT_FX_VIBRATO] = MICROBIT_HAL_SFX_DEFAULT_VIBRATO_PARAM, |
| 122 | + [SOUND_EFFECT_FX_TREMOLO] = MICROBIT_HAL_SFX_DEFAULT_TREMOLO_PARAM, |
| 123 | + [SOUND_EFFECT_FX_WARBLE] = MICROBIT_HAL_SFX_DEFAULT_WARBLE_PARAM, |
131 | 124 | };
|
132 | 125 |
|
133 | 126 | static const uint16_t fx_default_steps[] = {
|
134 |
| - [SOUND_EFFECT_FX_VIBRATO] = SOUND_EFFECT_FX_VIBRATO_DEFAULT_STEPS, |
135 |
| - [SOUND_EFFECT_FX_TREMOLO] = SOUND_EFFECT_FX_TREMOLO_DEFAULT_STEPS, |
136 |
| - [SOUND_EFFECT_FX_WARBLE] = SOUND_EFFECT_FX_WARBLE_DEFAULT_STEPS, |
| 127 | + [SOUND_EFFECT_FX_VIBRATO] = MICROBIT_HAL_SFX_DEFAULT_VIBRATO_STEPS, |
| 128 | + [SOUND_EFFECT_FX_TREMOLO] = MICROBIT_HAL_SFX_DEFAULT_TREMOLO_STEPS, |
| 129 | + [SOUND_EFFECT_FX_WARBLE] = MICROBIT_HAL_SFX_DEFAULT_WARBLE_STEPS, |
137 | 130 | };
|
138 | 131 |
|
139 | 132 | const char *microbit_soundeffect_get_sound_expr_data(mp_obj_t self_in) {
|
|
0 commit comments