Fixed case of some CosmicUnicorn variables

feature/stellar_unicorn
ZodiusInfuser 2023-05-30 10:25:33 +01:00
rodzic ae252fbc6e
commit bd4238945d
2 zmienionych plików z 25 dodań i 25 usunięć

Wyświetl plik

@ -131,20 +131,20 @@ const mp_obj_type_t CosmicUnicorn_type = {
#endif #endif
/***** Globals Table *****/ /***** Globals Table *****/
STATIC const mp_map_elem_t Cosmic_globals_table[] = { STATIC const mp_map_elem_t cosmic_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cosmic) }, { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cosmic) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_Channel), (mp_obj_t)&Channel_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_Channel), (mp_obj_t)&Channel_type },
{ MP_OBJ_NEW_QSTR(MP_QSTR_CosmicUnicorn), (mp_obj_t)&CosmicUnicorn_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_CosmicUnicorn), (mp_obj_t)&CosmicUnicorn_type },
}; };
STATIC MP_DEFINE_CONST_DICT(mp_module_Cosmic_globals, Cosmic_globals_table); STATIC MP_DEFINE_CONST_DICT(mp_module_cosmic_globals, cosmic_globals_table);
/***** Module Definition *****/ /***** Module Definition *****/
const mp_obj_module_t Cosmic_user_cmodule = { const mp_obj_module_t cosmic_user_cmodule = {
.base = { &mp_type_module }, .base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&mp_module_Cosmic_globals, .globals = (mp_obj_dict_t*)&mp_module_cosmic_globals,
}; };
#if MICROPY_VERSION <= 70144 #if MICROPY_VERSION <= 70144
MP_REGISTER_MODULE(MP_QSTR_cosmic, Cosmic_user_cmodule, MODULE_Cosmic_ENABLED); MP_REGISTER_MODULE(MP_QSTR_cosmic, cosmic_user_cmodule, MODULE_COSMIC_ENABLED);
#else #else
MP_REGISTER_MODULE(MP_QSTR_cosmic, Cosmic_user_cmodule); MP_REGISTER_MODULE(MP_QSTR_cosmic, cosmic_user_cmodule);
#endif #endif

Wyświetl plik

@ -341,7 +341,7 @@ mp_obj_t Channel_play_tone(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
/***** Variables Struct *****/ /***** Variables Struct *****/
typedef struct _CosmicUnicorn_obj_t { typedef struct _CosmicUnicorn_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
CosmicUnicorn* Cosmic; CosmicUnicorn* cosmic;
} _CosmicUnicorn_obj_t; } _CosmicUnicorn_obj_t;
typedef struct _ModPicoGraphics_obj_t { typedef struct _ModPicoGraphics_obj_t {
@ -388,12 +388,12 @@ mp_obj_t CosmicUnicorn_make_new(const mp_obj_type_t *type, size_t n_args, size_t
} }
CosmicUnicorn *Cosmic = m_new_class(CosmicUnicorn); CosmicUnicorn *cosmic = m_new_class(CosmicUnicorn);
Cosmic->init(); cosmic->init();
self = m_new_obj_with_finaliser(_CosmicUnicorn_obj_t); self = m_new_obj_with_finaliser(_CosmicUnicorn_obj_t);
self->base.type = &CosmicUnicorn_type; self->base.type = &CosmicUnicorn_type;
self->Cosmic = Cosmic; self->cosmic = cosmic;
return MP_OBJ_FROM_PTR(self); return MP_OBJ_FROM_PTR(self);
} }
@ -402,7 +402,7 @@ mp_obj_t CosmicUnicorn_make_new(const mp_obj_type_t *type, size_t n_args, size_t
/***** Destructor ******/ /***** Destructor ******/
mp_obj_t CosmicUnicorn___del__(mp_obj_t self_in) { mp_obj_t CosmicUnicorn___del__(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
m_del_class(CosmicUnicorn, self->Cosmic); m_del_class(CosmicUnicorn, self->cosmic);
return mp_const_none; return mp_const_none;
} }
@ -410,7 +410,7 @@ mp_obj_t CosmicUnicorn___del__(mp_obj_t self_in) {
/***** Methods *****/ /***** Methods *****/
extern mp_obj_t CosmicUnicorn_clear(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_clear(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->clear(); self->cosmic->clear();
return mp_const_none; return mp_const_none;
} }
@ -418,54 +418,54 @@ extern mp_obj_t CosmicUnicorn_update(mp_obj_t self_in, mp_obj_t graphics_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
ModPicoGraphics_obj_t *picographics = MP_OBJ_TO_PTR2(graphics_in, ModPicoGraphics_obj_t); ModPicoGraphics_obj_t *picographics = MP_OBJ_TO_PTR2(graphics_in, ModPicoGraphics_obj_t);
self->Cosmic->update(picographics->graphics); self->cosmic->update(picographics->graphics);
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_set_brightness(mp_obj_t self_in, mp_obj_t value) { extern mp_obj_t CosmicUnicorn_set_brightness(mp_obj_t self_in, mp_obj_t value) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->set_brightness(mp_obj_get_float(value)); self->cosmic->set_brightness(mp_obj_get_float(value));
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_get_brightness(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_get_brightness(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
return mp_obj_new_float(self->Cosmic->get_brightness()); return mp_obj_new_float(self->cosmic->get_brightness());
} }
extern mp_obj_t CosmicUnicorn_adjust_brightness(mp_obj_t self_in, mp_obj_t delta) { extern mp_obj_t CosmicUnicorn_adjust_brightness(mp_obj_t self_in, mp_obj_t delta) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->adjust_brightness(mp_obj_get_float(delta)); self->cosmic->adjust_brightness(mp_obj_get_float(delta));
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_set_volume(mp_obj_t self_in, mp_obj_t value) { extern mp_obj_t CosmicUnicorn_set_volume(mp_obj_t self_in, mp_obj_t value) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->set_volume(mp_obj_get_float(value)); self->cosmic->set_volume(mp_obj_get_float(value));
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_get_volume(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_get_volume(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
return mp_obj_new_float(self->Cosmic->get_volume()); return mp_obj_new_float(self->cosmic->get_volume());
} }
extern mp_obj_t CosmicUnicorn_adjust_volume(mp_obj_t self_in, mp_obj_t delta) { extern mp_obj_t CosmicUnicorn_adjust_volume(mp_obj_t self_in, mp_obj_t delta) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->adjust_volume(mp_obj_get_float(delta)); self->cosmic->adjust_volume(mp_obj_get_float(delta));
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_light(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_light(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
return mp_obj_new_float(self->Cosmic->light()); return mp_obj_new_float(self->cosmic->light());
} }
extern mp_obj_t CosmicUnicorn_is_pressed(mp_obj_t self_in, mp_obj_t button) { extern mp_obj_t CosmicUnicorn_is_pressed(mp_obj_t self_in, mp_obj_t button) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
return mp_obj_new_bool(self->Cosmic->is_pressed((uint8_t)mp_obj_get_int(button))); return mp_obj_new_bool(self->cosmic->is_pressed((uint8_t)mp_obj_get_int(button)));
} }
extern mp_obj_t CosmicUnicorn_play_sample(mp_obj_t self_in, mp_obj_t data) { extern mp_obj_t CosmicUnicorn_play_sample(mp_obj_t self_in, mp_obj_t data) {
@ -477,21 +477,21 @@ extern mp_obj_t CosmicUnicorn_play_sample(mp_obj_t self_in, mp_obj_t data) {
mp_raise_ValueError("Supplied buffer is too small!"); mp_raise_ValueError("Supplied buffer is too small!");
} }
self->Cosmic->play_sample((uint8_t *)bufinfo.buf, bufinfo.len); self->cosmic->play_sample((uint8_t *)bufinfo.buf, bufinfo.len);
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_play_synth(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_play_synth(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->play_synth(); self->cosmic->play_synth();
return mp_const_none; return mp_const_none;
} }
extern mp_obj_t CosmicUnicorn_stop_playing(mp_obj_t self_in) { extern mp_obj_t CosmicUnicorn_stop_playing(mp_obj_t self_in) {
_CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t); _CosmicUnicorn_obj_t *self = MP_OBJ_TO_PTR2(self_in, _CosmicUnicorn_obj_t);
self->Cosmic->stop_playing(); self->cosmic->stop_playing();
return mp_const_none; return mp_const_none;
} }
@ -509,7 +509,7 @@ extern mp_obj_t CosmicUnicorn_synth_channel(mp_obj_t self_in, mp_obj_t channel_i
// Could very easily mess up in weird ways once object deletion is considered? // Could very easily mess up in weird ways once object deletion is considered?
_Channel_obj_t *channel_obj = m_new_obj_with_finaliser(_Channel_obj_t); _Channel_obj_t *channel_obj = m_new_obj_with_finaliser(_Channel_obj_t);
channel_obj->base.type = &Channel_type; channel_obj->base.type = &Channel_type;
channel_obj->channel = &self->Cosmic->synth_channel(channel); channel_obj->channel = &self->cosmic->synth_channel(channel);
return MP_OBJ_FROM_PTR(channel_obj); return MP_OBJ_FROM_PTR(channel_obj);
} }