From f127be4dd279f0ce7e1d7c206bc7dfb16a55d285 Mon Sep 17 00:00:00 2001 From: Dustin Mendoza Date: Mon, 25 Feb 2019 16:39:20 -0800 Subject: added height and width attributes for displayio --- shared-bindings/displayio/Display.c | 27 +++++++++++++++++++++++++++ shared-bindings/displayio/Display.h | 3 +++ shared-module/displayio/Display.c | 8 ++++++++ 3 files changed, 38 insertions(+) diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index ca72e407a..e1b34782b 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -246,6 +246,30 @@ STATIC mp_obj_t displayio_display_obj_set_auto_brightness(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_brightness_obj, displayio_display_obj_set_auto_brightness); +//| .. attribute:: width +//| +//| Gets the width of the board +//| +//| +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); +} +MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_width_obj, displayio_display_obj_get_width); + +//| .. attribute:: height +//| +//| Gets the height of the board +//| +//| +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); +} +MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_height_obj, displayio_display_obj_get_height); + const mp_obj_property_t displayio_display_auto_brightness_obj = { .base.type = &mp_type_property, .proxy = {(mp_obj_t)&displayio_display_get_auto_brightness_obj, @@ -260,6 +284,9 @@ STATIC const mp_rom_map_elem_t displayio_display_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&displayio_display_brightness_obj) }, { MP_ROM_QSTR(MP_QSTR_auto_brightness), MP_ROM_PTR(&displayio_display_auto_brightness_obj) }, + + { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_display_get_width_obj) }, + { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_display_get_height_obj) }, }; STATIC MP_DEFINE_CONST_DICT(displayio_display_locals_dict, displayio_display_locals_dict_table); diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h index 67b63c5c9..9e2528278 100644 --- a/shared-bindings/displayio/Display.h +++ b/shared-bindings/displayio/Display.h @@ -59,6 +59,9 @@ 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); + 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 da3424a36..b810286b1 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -157,6 +157,14 @@ 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){ + return self->width; +} + +mp_int_t common_hal_displayio_display_get_height(displayio_display_obj_t* self){ + return self->height; +} + void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t* self, bool auto_brightness) { self->auto_brightness = auto_brightness; } -- cgit v1.2.3 From 9737a45b33732886ef1e45e8cb2065c573334dba Mon Sep 17 00:00:00 2001 From: Dustin Mendoza Date: Sat, 2 Mar 2019 14:50:10 -0800 Subject: changed width and height to be properties --- shared-bindings/displayio/Display.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c index e1b34782b..ed5f135bf 100644 --- a/shared-bindings/displayio/Display.c +++ b/shared-bindings/displayio/Display.c @@ -246,6 +246,13 @@ STATIC mp_obj_t displayio_display_obj_set_auto_brightness(mp_obj_t self_in, mp_o } MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_auto_brightness_obj, displayio_display_obj_set_auto_brightness); +const mp_obj_property_t displayio_display_auto_brightness_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&displayio_display_get_auto_brightness_obj, + (mp_obj_t)&displayio_display_set_auto_brightness_obj, + (mp_obj_t)&mp_const_none_obj}, +}; + //| .. attribute:: width //| //| Gets the width of the board @@ -258,6 +265,13 @@ STATIC mp_obj_t displayio_display_obj_get_width(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_width_obj, displayio_display_obj_get_width); +const mp_obj_property_t displayio_display_width_obj = { + .base.type = &mp_type_property, + .proxy = {(mp_obj_t)&displayio_display_get_width_obj, + (mp_obj_t)&mp_const_none_obj, + (mp_obj_t)&mp_const_none_obj}, +}; + //| .. attribute:: height //| //| Gets the height of the board @@ -270,10 +284,10 @@ STATIC mp_obj_t displayio_display_obj_get_height(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_height_obj, displayio_display_obj_get_height); -const mp_obj_property_t displayio_display_auto_brightness_obj = { +const mp_obj_property_t displayio_display_height_obj = { .base.type = &mp_type_property, - .proxy = {(mp_obj_t)&displayio_display_get_auto_brightness_obj, - (mp_obj_t)&displayio_display_set_auto_brightness_obj, + .proxy = {(mp_obj_t)&displayio_display_get_height_obj, + (mp_obj_t)&mp_const_none_obj, (mp_obj_t)&mp_const_none_obj}, }; @@ -285,8 +299,8 @@ STATIC const mp_rom_map_elem_t displayio_display_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&displayio_display_brightness_obj) }, { MP_ROM_QSTR(MP_QSTR_auto_brightness), MP_ROM_PTR(&displayio_display_auto_brightness_obj) }, - { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_display_get_width_obj) }, - { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_display_get_height_obj) }, + { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_display_width_obj) }, + { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_display_height_obj) }, }; STATIC MP_DEFINE_CONST_DICT(displayio_display_locals_dict, displayio_display_locals_dict_table); -- cgit v1.2.3 From 4145f87fcd25f5adc2bcca52f96fea3b9f965e48 Mon Sep 17 00:00:00 2001 From: Dustin Mendoza Date: Tue, 5 Mar 2019 21:25:09 -0800 Subject: changed from mp_int_t to uint16_t --- shared-bindings/displayio/Display.c | 6 ++---- shared-bindings/displayio/Display.h | 4 ++-- 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; } -- cgit v1.2.3