diff options
| author | Dustin Mendoza <penguindustin@gmail.com> | 2019-03-05 21:25:09 -0800 |
|---|---|---|
| committer | Dustin Mendoza <penguindustin@gmail.com> | 2019-03-05 21:25:09 -0800 |
| commit | 4145f87fcd25f5adc2bcca52f96fea3b9f965e48 (patch) | |
| tree | af0116e9153e9e86e38fa9d46e4a74fc2c731880 | |
| parent | 9737a45b33732886ef1e45e8cb2065c573334dba (diff) | |
changed from mp_int_t to uint16_t
| -rw-r--r-- | shared-bindings/displayio/Display.c | 6 | ||||
| -rw-r--r-- | shared-bindings/displayio/Display.h | 4 | ||||
| -rw-r--r-- | shared-module/displayio/Display.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index ed5f135bf..1f46330e8 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -260,8 +260,7 @@ const mp_obj_property_t displayio_display_auto_brightness_obj = { //| STATIC mp_obj_t displayio_display_obj_get_width(mp_obj_t self_in) { displayio_display_obj_t *self = MP_OBJ_TO_PTR(self_in); - mp_int_t width = common_hal_displayio_display_get_width(self); - return mp_obj_new_int(width); + return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_width_obj, displayio_display_obj_get_width); @@ -279,8 +278,7 @@ const mp_obj_property_t displayio_display_width_obj = { //| STATIC mp_obj_t displayio_display_obj_get_height(mp_obj_t self_in) { displayio_display_obj_t *self = MP_OBJ_TO_PTR(self_in); - mp_float_t height = common_hal_displayio_display_get_height(self); - return mp_obj_new_int(height); + return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_height(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_height_obj, displayio_display_obj_get_height); diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h index 9e2528278..ee9106f77 100644 --- a/shared-bindings/displayio/Display.h +++ b/shared-bindings/displayio/Display.h @@ -59,8 +59,8 @@ bool displayio_display_send_pixels(displayio_display_obj_t* self, uint32_t* pixe bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t* self); void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t* self, bool auto_brightness); -mp_int_t common_hal_displayio_display_get_width(displayio_display_obj_t* self); -mp_int_t common_hal_displayio_display_get_height(displayio_display_obj_t* self); +uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t* self); +uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t* self); mp_float_t common_hal_displayio_display_get_brightness(displayio_display_obj_t* self); bool common_hal_displayio_display_set_brightness(displayio_display_obj_t* self, mp_float_t brightness); diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index b810286b1..6dd039604 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -157,11 +157,11 @@ bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t* s return self->auto_brightness; } -mp_int_t common_hal_displayio_display_get_width(displayio_display_obj_t* self){ +uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t* self){ return self->width; } -mp_int_t common_hal_displayio_display_get_height(displayio_display_obj_t* self){ +uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t* self){ return self->height; } |
