Merge pull request adafruit#1601 from penguindustin/master

dhalbert · web-flow · commit 2eaa98ad7103 · 2019-03-06T12:43:55.000-05:00
added height and width attributes for displayio
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
@@ -253,13 +253,52 @@ const mp_obj_property_t displayio_display_auto_brightness_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
+//|   .. 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);
+    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);
+
+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
+//|
+//|
+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);
+    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);
+
+const mp_obj_property_t displayio_display_height_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&displayio_display_get_height_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
 STATIC const mp_rom_map_elem_t displayio_display_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&displayio_display_show_obj) },
     { MP_ROM_QSTR(MP_QSTR_refresh_soon), MP_ROM_PTR(&displayio_display_refresh_soon_obj) },
     { MP_ROM_QSTR(MP_QSTR_wait_for_frame), MP_ROM_PTR(&displayio_display_wait_for_frame_obj) },
 
     { 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_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);
 
diff --git 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);
 
+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
@@ -158,6 +158,14 @@ bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t* s
     return self->auto_brightness;
 }
 
+uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t* self){
+    return self->width;
+}
+
+uint16_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;
 }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,14 @@ bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t* s`
`158`	`158`	`return self->auto_brightness;`
`159`	`159`	`}`
`160`	`160`
	`161`	`+uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t* self){`
	`162`	`+ return self->width;`
	`163`	`+}`
	`164`	`+`
	`165`	`+uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t* self){`
	`166`	`+ return self->height;`
	`167`	`+}`
	`168`	`+`
`161`	`169`	`void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t* self, bool auto_brightness) {`
`162`	`170`	`self->auto_brightness = auto_brightness;`
`163`	`171`	`}`