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

protomatter: move get_width/height to common_hal

Browse Source
This commit is contained in:
Jeff Epler 2020-04-15 10:19:33 -05:00
parent 545b6e560a
commit 64c3968a2e
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shared-bindings/protomatter/Protomatter.c
View File

@ -321,7 +321,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_refresh_obj, protomatter_proto
STATIC mp_obj_t protomatter_protomatter_get_width(mp_obj_t self_in) {
protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
check_for_deinit(self);
return MP_OBJ_NEW_SMALL_INT(self->width);
return MP_OBJ_NEW_SMALL_INT(common_hal_protomatter_protomatter_get_width(self));
}
MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_width_obj, protomatter_protomatter_get_width);
const mp_obj_property_t protomatter_protomatter_width_obj = {
@ -338,8 +338,7 @@ const mp_obj_property_t protomatter_protomatter_width_obj = {
STATIC mp_obj_t protomatter_protomatter_get_height(mp_obj_t self_in) {
protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
check_for_deinit(self);
int computed_get_height = (self->rgb_count / 3) << (self->addr_count);
return MP_OBJ_NEW_SMALL_INT(computed_get_height);
return MP_OBJ_NEW_SMALL_INT(common_hal_protomatter_protomatter_get_height(self));
}
MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_height_obj, protomatter_protomatter_get_height);

2
shared-bindings/protomatter/Protomatter.h
View File

@ -55,5 +55,7 @@ void common_hal_protomatter_protomatter_reconstruct(protomatter_protomatter_obj_
void common_hal_protomatter_protomatter_set_paused(protomatter_protomatter_obj_t* self, bool paused);
bool common_hal_protomatter_protomatter_get_paused(protomatter_protomatter_obj_t* self);
void common_hal_protomatter_protomatter_refresh(protomatter_protomatter_obj_t* self);
int common_hal_protomatter_protomatter_get_width(protomatter_protomatter_obj_t* self);
int common_hal_protomatter_protomatter_get_height(protomatter_protomatter_obj_t* self);
#endif

9
shared-module/protomatter/Protomatter.c
View File

@ -198,3 +198,12 @@ void common_hal_protomatter_protomatter_refresh(protomatter_protomatter_obj_t* s
_PM_swapbuffer_maybe(&self->core);
}
int common_hal_protomatter_protomatter_get_width(protomatter_protomatter_obj_t* self) {
return self->width;
}
int common_hal_protomatter_protomatter_get_height(protomatter_protomatter_obj_t* self) {
int computed_height = (self->rgb_count / 3) << (self->addr_count);
return computed_height;
}