Merge remote-tracking branch 'origin/main' into bitmap-read-2

5 files changed, 27 insertions, 27 deletions

diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c
index 293b19b05..95619ca95 100644
--- a/shared-bindings/audiomixer/Mixer.c
+++ b/shared-bindings/audiomixer/Mixer.c
@@ -112,9 +112,9 @@ STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_ar
     self->base.type = &audiomixer_mixer_type;
     common_hal_audiomixer_mixer_construct(self, voice_count, args[ARG_buffer_size].u_int, bits_per_sample, args[ARG_samples_signed].u_bool, channel_count, sample_rate);
 
-    for(int v=0; v<voice_count; v++){
-    	self->voice[v] = audiomixer_mixervoice_type.make_new(&audiomixer_mixervoice_type, 0, 0, NULL);
-    	common_hal_audiomixer_mixervoice_set_parent(self->voice[v], self);
+    for (int v = 0; v < voice_count; v++) {
+        self->voice[v] = audiomixer_mixervoice_type.make_new(&audiomixer_mixervoice_type, 0, 0, NULL);
+        common_hal_audiomixer_mixervoice_set_parent(self->voice[v], self);
     }
     self->voice_tuple = mp_obj_new_tuple(self->voice_count, self->voice);
 
@@ -280,7 +280,7 @@ STATIC const mp_rom_map_elem_t audiomixer_mixer_locals_dict_table[] = {
     // Properties
     { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audiomixer_mixer_playing_obj) },
     { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&audiomixer_mixer_sample_rate_obj) },
-	{ MP_ROM_QSTR(MP_QSTR_voice), MP_ROM_PTR(&audiomixer_mixer_voice_obj) }
+    { MP_ROM_QSTR(MP_QSTR_voice), MP_ROM_PTR(&audiomixer_mixer_voice_obj) }
 };
 STATIC MP_DEFINE_CONST_DICT(audiomixer_mixer_locals_dict, audiomixer_mixer_locals_dict_table);
 
@@ -298,6 +298,6 @@ const mp_obj_type_t audiomixer_mixer_type = {
     { &mp_type_type },
     .name = MP_QSTR_Mixer,
     .make_new = audiomixer_mixer_make_new,
-    .locals_dict = (mp_obj_dict_t*)&audiomixer_mixer_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&audiomixer_mixer_locals_dict,
     .protocol = &audiomixer_mixer_proto,
 };
diff --git a/shared-bindings/audiomixer/Mixer.h b/shared-bindings/audiomixer/Mixer.h
index a99e1bf62..88592a1cb 100644
--- a/shared-bindings/audiomixer/Mixer.h
+++ b/shared-bindings/audiomixer/Mixer.h
@@ -34,20 +34,20 @@
 extern const mp_obj_type_t audiomixer_mixer_type;
 extern const mp_obj_type_t audiomixer_mixervoice_type;
 
-void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t* self,
-                                           uint8_t voice_count,
-                                           uint32_t buffer_size,
-                                           uint8_t bits_per_sample,
-                                           bool samples_signed,
-                                           uint8_t channel_count,
-                                           uint32_t sample_rate);
+void common_hal_audiomixer_mixer_construct(audiomixer_mixer_obj_t *self,
+    uint8_t voice_count,
+    uint32_t buffer_size,
+    uint8_t bits_per_sample,
+    bool samples_signed,
+    uint8_t channel_count,
+    uint32_t sample_rate);
 
-void common_hal_audiomixer_mixer_deinit(audiomixer_mixer_obj_t* self);
-bool common_hal_audiomixer_mixer_deinited(audiomixer_mixer_obj_t* self);
+void common_hal_audiomixer_mixer_deinit(audiomixer_mixer_obj_t *self);
+bool common_hal_audiomixer_mixer_deinited(audiomixer_mixer_obj_t *self);
 
-bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t* self);
-uint32_t common_hal_audiomixer_mixer_get_sample_rate(audiomixer_mixer_obj_t* self);
-uint8_t common_hal_audiomixer_mixer_get_channel_count(audiomixer_mixer_obj_t* self);
-uint8_t common_hal_audiomixer_mixer_get_bits_per_sample(audiomixer_mixer_obj_t* self);
+bool common_hal_audiomixer_mixer_get_playing(audiomixer_mixer_obj_t *self);
+uint32_t common_hal_audiomixer_mixer_get_sample_rate(audiomixer_mixer_obj_t *self);
+uint8_t common_hal_audiomixer_mixer_get_channel_count(audiomixer_mixer_obj_t *self);
+uint8_t common_hal_audiomixer_mixer_get_bits_per_sample(audiomixer_mixer_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOMIXER_MIXER_H
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index af00e1055..c519f7ac4 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -117,7 +117,7 @@ STATIC mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-	float level = mp_obj_get_float(args[ARG_level].u_obj);
+    float level = mp_obj_get_float(args[ARG_level].u_obj);
 
     if (level > 1 || level < 0) {
         mp_raise_ValueError(translate("level must be between 0 and 1"));
@@ -170,5 +170,5 @@ const mp_obj_type_t audiomixer_mixervoice_type = {
     { &mp_type_type },
     .name = MP_QSTR_MixerVoice,
     .make_new = audiomixer_mixervoice_make_new,
-    .locals_dict = (mp_obj_dict_t*)&audiomixer_mixervoice_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&audiomixer_mixervoice_locals_dict,
 };
diff --git a/shared-bindings/audiomixer/MixerVoice.h b/shared-bindings/audiomixer/MixerVoice.h
index 83098bc9d..bce463276 100644
--- a/shared-bindings/audiomixer/MixerVoice.h
+++ b/shared-bindings/audiomixer/MixerVoice.h
@@ -36,12 +36,12 @@ extern const mp_obj_type_t audiomixer_mixer_type;
 extern const mp_obj_type_t audiomixer_mixervoice_type;
 
 void common_hal_audiomixer_mixervoice_construct(audiomixer_mixervoice_obj_t *self);
-void common_hal_audiomixer_mixervoice_set_parent(audiomixer_mixervoice_obj_t* self, audiomixer_mixer_obj_t *parent);
-void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t* self, mp_obj_t sample, bool loop);
-void common_hal_audiomixer_mixervoice_stop(audiomixer_mixervoice_obj_t* self);
-float common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t* self);
-void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t* self, float gain);
+void common_hal_audiomixer_mixervoice_set_parent(audiomixer_mixervoice_obj_t *self, audiomixer_mixer_obj_t *parent);
+void common_hal_audiomixer_mixervoice_play(audiomixer_mixervoice_obj_t *self, mp_obj_t sample, bool loop);
+void common_hal_audiomixer_mixervoice_stop(audiomixer_mixervoice_obj_t *self);
+float common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self);
+void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, float gain);
 
-bool common_hal_audiomixer_mixervoice_get_playing(audiomixer_mixervoice_obj_t* self);
+bool common_hal_audiomixer_mixervoice_get_playing(audiomixer_mixervoice_obj_t *self);
 
 #endif /* SHARED_BINDINGS_AUDIOMIXER_MIXERVOICE_H_ */
diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c
index 1146bb798..9d0bf676f 100644
--- a/shared-bindings/audiomixer/__init__.c
+++ b/shared-bindings/audiomixer/__init__.c
@@ -44,5 +44,5 @@ STATIC MP_DEFINE_CONST_DICT(audiomixer_module_globals, audiomixer_module_globals
 
 const mp_obj_module_t audiomixer_module = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&audiomixer_module_globals,
+    .globals = (mp_obj_dict_t *)&audiomixer_module_globals,
 };