summaryrefslogtreecommitdiff
path: root/shared-bindings/displayio
diff options
context:
space:
mode:
authorKevin Matocha <kmatocha@icloud.com>2021-03-17 09:30:51 -0500
committerKevin Matocha <kmatocha@icloud.com>2021-03-17 09:30:51 -0500
commitef91e1752c233e45bfa898eb67caab44f1b02313 (patch)
tree9b6f26eb1bd0d54143b4d174cec720dcaca8065e /shared-bindings/displayio
parent870dadc85adce4f10fa57dda1d11dda48b25dbc1 (diff)
parentbfc8c89536e12dba0cc9adc0065819d730bb0983 (diff)
merge upstream/main
Diffstat (limited to 'shared-bindings/displayio')
-rw-r--r--shared-bindings/displayio/Bitmap.c42
-rw-r--r--shared-bindings/displayio/Bitmap.h8
-rw-r--r--shared-bindings/displayio/ColorConverter.c2
-rw-r--r--shared-bindings/displayio/ColorConverter.h12
-rw-r--r--shared-bindings/displayio/Display.c60
-rw-r--r--shared-bindings/displayio/Display.h36
-rw-r--r--shared-bindings/displayio/EPaperDisplay.c11
-rw-r--r--shared-bindings/displayio/EPaperDisplay.h32
-rw-r--r--shared-bindings/displayio/FourWire.c6
-rw-r--r--shared-bindings/displayio/FourWire.h8
-rw-r--r--shared-bindings/displayio/Group.c21
-rw-r--r--shared-bindings/displayio/Group.h34
-rw-r--r--shared-bindings/displayio/I2CDisplay.c6
-rw-r--r--shared-bindings/displayio/I2CDisplay.h6
-rw-r--r--shared-bindings/displayio/OnDiskBitmap.c2
-rw-r--r--shared-bindings/displayio/OnDiskBitmap.h2
-rw-r--r--shared-bindings/displayio/Palette.c10
-rw-r--r--shared-bindings/displayio/Palette.h12
-rw-r--r--shared-bindings/displayio/ParallelBus.c11
-rw-r--r--shared-bindings/displayio/ParallelBus.h8
-rw-r--r--shared-bindings/displayio/Shape.c4
-rw-r--r--shared-bindings/displayio/Shape.h2
-rw-r--r--shared-bindings/displayio/TileGrid.c14
-rw-r--r--shared-bindings/displayio/TileGrid.h10
-rw-r--r--shared-bindings/displayio/__init__.c2
25 files changed, 184 insertions, 177 deletions
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index b9f06fe14..f906be2f9 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -150,7 +150,7 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
x = i % width;
y = i / width;
} else {
- mp_obj_t* items;
+ mp_obj_t *items;
mp_obj_get_array_fixed_n(index_obj, 2, &items);
x = mp_obj_get_int(items[0]);
y = mp_obj_get_int(items[1]);
@@ -189,7 +189,7 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val
//| set to None to copy all pixels"""
//| ...
//|
-STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args){
+STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum {ARG_x, ARG_y, ARG_source, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_index};
static const mp_arg_t allowed_args[] = {
{MP_QSTR_x, MP_ARG_REQUIRED | MP_ARG_INT},
@@ -199,7 +199,7 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
{MP_QSTR_y1, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
{MP_QSTR_x2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, // None convert to source->width
{MP_QSTR_y2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, // None convert to source->height
- {MP_QSTR_skip_index, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj=mp_const_none} },
+ {MP_QSTR_skip_index, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -220,46 +220,46 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg
int16_t y1 = args[ARG_y1].u_int;
int16_t x2, y2;
// if x2 or y2 is None, then set as the maximum size of the source bitmap
- if ( args[ARG_x2].u_obj == mp_const_none ) {
+ if (args[ARG_x2].u_obj == mp_const_none) {
x2 = source->width;
} else {
x2 = mp_obj_get_int(args[ARG_x2].u_obj);
}
- //int16_t y2;
- if ( args[ARG_y2].u_obj == mp_const_none ) {
+ // int16_t y2;
+ if (args[ARG_y2].u_obj == mp_const_none) {
y2 = source->height;
} else {
y2 = mp_obj_get_int(args[ARG_y2].u_obj);
}
// Check x,y are within self (target) bitmap boundary
- if ( (x < 0) || (y < 0) || (x > self->width) || (y > self->height) ) {
- mp_raise_ValueError(translate("out of range of target"));
+ if ((x < 0) || (y < 0) || (x > self->width) || (y > self->height)) {
+ mp_raise_ValueError(translate("out of range of target"));
}
// Check x1,y1,x2,y2 are within source bitmap boundary
- if ( (x1 < 0) || (x1 > source->width) ||
+ if ((x1 < 0) || (x1 > source->width) ||
(y1 < 0) || (y1 > source->height) ||
- (x2 < 0) || (x2 > source->width) ||
- (y2 < 0) || (y2 > source->height) ) {
- mp_raise_ValueError(translate("out of range of source"));
+ (x2 < 0) || (x2 > source->width) ||
+ (y2 < 0) || (y2 > source->height)) {
+ mp_raise_ValueError(translate("out of range of source"));
}
// Ensure x1 < x2 and y1 < y2
if (x1 > x2) {
- int16_t temp=x2;
- x2=x1;
- x1=temp;
+ int16_t temp = x2;
+ x2 = x1;
+ x1 = temp;
}
if (y1 > y2) {
- int16_t temp=y2;
- y2=y1;
- y1=temp;
+ int16_t temp = y2;
+ y2 = y1;
+ y1 = temp;
}
uint32_t skip_index;
bool skip_index_none; // flag whether skip_value was None
- if (args[ARG_skip_index].u_obj == mp_const_none ) {
+ if (args[ARG_skip_index].u_obj == mp_const_none) {
skip_index = 0;
skip_index_none = true;
} else {
@@ -283,7 +283,7 @@ STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj)
mp_uint_t value = (mp_uint_t)mp_obj_get_int(value_obj);
if ((value >> common_hal_displayio_bitmap_get_bits_per_value(self)) != 0) {
- mp_raise_ValueError(translate("pixel value requires too many bits"));
+ mp_raise_ValueError(translate("pixel value requires too many bits"));
}
common_hal_displayio_bitmap_fill(self, value);
@@ -305,5 +305,5 @@ const mp_obj_type_t displayio_bitmap_type = {
.name = MP_QSTR_Bitmap,
.make_new = displayio_bitmap_make_new,
.subscr = bitmap_subscr,
- .locals_dict = (mp_obj_dict_t*)&displayio_bitmap_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_bitmap_locals_dict,
};
diff --git a/shared-bindings/displayio/Bitmap.h b/shared-bindings/displayio/Bitmap.h
index 00cd98b0a..1f74c31fc 100644
--- a/shared-bindings/displayio/Bitmap.h
+++ b/shared-bindings/displayio/Bitmap.h
@@ -34,15 +34,15 @@ extern const mp_obj_type_t displayio_bitmap_type;
void common_hal_displayio_bitmap_construct(displayio_bitmap_t *self, uint32_t width,
uint32_t height, uint32_t bits_per_value);
-void common_hal_displayio_bitmap_load_row(displayio_bitmap_t *self, uint16_t y, uint8_t* data,
- uint16_t len);
+void common_hal_displayio_bitmap_load_row(displayio_bitmap_t *self, uint16_t y, uint8_t *data,
+ uint16_t len);
uint16_t common_hal_displayio_bitmap_get_height(displayio_bitmap_t *self);
uint16_t common_hal_displayio_bitmap_get_width(displayio_bitmap_t *self);
uint32_t common_hal_displayio_bitmap_get_bits_per_value(displayio_bitmap_t *self);
void common_hal_displayio_bitmap_set_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y, uint32_t value);
void common_hal_displayio_bitmap_blit(displayio_bitmap_t *self, int16_t x, int16_t y, displayio_bitmap_t *source,
- int16_t x1, int16_t y1, int16_t x2, int16_t y2,
- uint32_t skip_index, bool skip_index_none);
+ int16_t x1, int16_t y1, int16_t x2, int16_t y2,
+ uint32_t skip_index, bool skip_index_none);
uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *bitmap, int16_t x, int16_t y);
void common_hal_displayio_bitmap_fill(displayio_bitmap_t *bitmap, uint32_t value);
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 88d3a1ba8..d102d7f9d 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -146,5 +146,5 @@ const mp_obj_type_t displayio_colorconverter_type = {
{ &mp_type_type },
.name = MP_QSTR_ColorConverter,
.make_new = displayio_colorconverter_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_colorconverter_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_colorconverter_locals_dict,
};
diff --git a/shared-bindings/displayio/ColorConverter.h b/shared-bindings/displayio/ColorConverter.h
index 441f7c7ae..d5a5d0524 100644
--- a/shared-bindings/displayio/ColorConverter.h
+++ b/shared-bindings/displayio/ColorConverter.h
@@ -33,13 +33,13 @@
extern const mp_obj_type_t displayio_colorconverter_type;
-void common_hal_displayio_colorconverter_construct(displayio_colorconverter_t* self, bool dither);
-void common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *colorconverter, const _displayio_colorspace_t* colorspace, uint32_t input_color, uint32_t* output_color);
+void common_hal_displayio_colorconverter_construct(displayio_colorconverter_t *self, bool dither);
+void common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *colorconverter, const _displayio_colorspace_t *colorspace, uint32_t input_color, uint32_t *output_color);
-void common_hal_displayio_colorconverter_set_dither(displayio_colorconverter_t* self, bool dither);
-bool common_hal_displayio_colorconverter_get_dither(displayio_colorconverter_t* self);
+void common_hal_displayio_colorconverter_set_dither(displayio_colorconverter_t *self, bool dither);
+bool common_hal_displayio_colorconverter_get_dither(displayio_colorconverter_t *self);
-void common_hal_displayio_colorconverter_make_transparent(displayio_colorconverter_t* self, uint32_t transparent_color);
-void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self, uint32_t transparent_color);
+void common_hal_displayio_colorconverter_make_transparent(displayio_colorconverter_t *self, uint32_t transparent_color);
+void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t *self, uint32_t transparent_color);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_COLORCONVERTER_H
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 8d1a888fe..9d8f8298f 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -114,15 +114,15 @@
//| ...
//|
STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_args,
- const mp_obj_t *pos_args, mp_map_t *kw_args) {
+ const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart,
- ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row,
- ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word,
- ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command,
- ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command,
- ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands,
- ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high,
- ARG_SH1107_addressing };
+ ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row,
+ ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word,
+ ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command,
+ ARG_set_vertical_scroll, ARG_backlight_pin, ARG_brightness_command,
+ ARG_brightness, ARG_auto_brightness, ARG_single_byte_bounds, ARG_data_as_commands,
+ ARG_auto_refresh, ARG_native_frames_per_second, ARG_backlight_on_high,
+ ARG_SH1107_addressing };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
{ MP_QSTR_init_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -160,7 +160,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[ARG_init_sequence].u_obj, &bufinfo, MP_BUFFER_READ);
- const mcu_pin_obj_t* backlight_pin = validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj);
+ const mcu_pin_obj_t *backlight_pin = validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj);
mp_float_t brightness = mp_obj_get_float(args[ARG_brightness].u_obj);
@@ -170,7 +170,8 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
}
primary_display_t *disp = allocate_display_or_raise();
- displayio_display_obj_t *self = &disp->display;;
+ displayio_display_obj_t *self = &disp->display;
+ ;
self->base.type = &displayio_display_type;
common_hal_displayio_display_construct(
self,
@@ -200,7 +201,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
}
// Helper to ensure we have the native super class instead of a subclass.
-static displayio_display_obj_t* native_display(mp_obj_t display_obj) {
+static displayio_display_obj_t *native_display(mp_obj_t display_obj) {
mp_obj_t native_display = mp_instance_cast_to_native_base(display_obj, &displayio_display_type);
mp_obj_assert_native_inited(native_display);
return MP_OBJ_TO_PTR(native_display);
@@ -215,7 +216,7 @@ static displayio_display_obj_t* native_display(mp_obj_t display_obj) {
//|
STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
displayio_display_obj_t *self = native_display(self_in);
- displayio_group_t* group = NULL;
+ displayio_group_t *group = NULL;
if (group_in != mp_const_none) {
group = MP_OBJ_TO_PTR(native_group(group_in));
}
@@ -268,8 +269,7 @@ STATIC mp_obj_t displayio_display_obj_refresh(size_t n_args, const mp_obj_t *pos
uint32_t target_ms_per_frame;
if (args[ARG_target_frames_per_second].u_obj == mp_const_none) {
target_ms_per_frame = 0xffffffff;
- }
- else {
+ } else {
target_ms_per_frame = 1000 / mp_obj_get_int(args[ARG_target_frames_per_second].u_obj);
}
@@ -467,40 +467,40 @@ STATIC mp_obj_t displayio_display_obj_fill_row(size_t n_args, const mp_obj_t *po
mp_get_buffer_raise(result, &bufinfo, MP_BUFFER_WRITE);
if (bufinfo.typecode != BYTEARRAY_TYPECODE) {
- mp_raise_ValueError(translate("Buffer is not a bytearray."));
+ mp_raise_ValueError(translate("Buffer is not a bytearray."));
}
if (self->core.colorspace.depth != 16) {
- mp_raise_ValueError(translate("Display must have a 16 bit colorspace."));
+ mp_raise_ValueError(translate("Display must have a 16 bit colorspace."));
}
displayio_area_t area = {
- .x1 = 0,
- .y1 = y,
- .x2 = self->core.width,
- .y2 = y + 1
+ .x1 = 0,
+ .y1 = y,
+ .x2 = self->core.width,
+ .y2 = y + 1
};
uint8_t pixels_per_word = (sizeof(uint32_t) * 8) / self->core.colorspace.depth;
uint16_t buffer_size = self->core.width / pixels_per_word;
uint16_t pixels_per_buffer = displayio_area_size(&area);
if (pixels_per_buffer % pixels_per_word) {
- buffer_size += 1;
+ buffer_size += 1;
}
uint32_t *result_buffer = bufinfo.buf;
size_t result_buffer_size = bufinfo.len;
if (result_buffer_size >= (buffer_size * 4)) {
- volatile uint32_t mask_length = (pixels_per_buffer / 32) + 1;
- uint32_t mask[mask_length];
+ volatile uint32_t mask_length = (pixels_per_buffer / 32) + 1;
+ uint32_t mask[mask_length];
- for (uint16_t k = 0; k < mask_length; k++) {
- mask[k] = 0x00000000;
- }
+ for (uint16_t k = 0; k < mask_length; k++) {
+ mask[k] = 0x00000000;
+ }
- displayio_display_core_fill_area(&self->core, &area, mask, result_buffer);
- return result;
+ displayio_display_core_fill_area(&self->core, &area, mask, result_buffer);
+ return result;
} else {
- mp_raise_ValueError(translate("Buffer is too small"));
+ mp_raise_ValueError(translate("Buffer is too small"));
}
}
MP_DEFINE_CONST_FUN_OBJ_KW(displayio_display_fill_row_obj, 1, displayio_display_obj_fill_row);
@@ -526,5 +526,5 @@ const mp_obj_type_t displayio_display_type = {
{ &mp_type_type },
.name = MP_QSTR_Display,
.make_new = displayio_display_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_display_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_display_locals_dict,
};
diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h
index f9fbc157c..36015cd56 100644
--- a/shared-bindings/displayio/Display.h
+++ b/shared-bindings/displayio/Display.h
@@ -38,39 +38,39 @@ extern const mp_obj_type_t displayio_display_type;
#define NO_BRIGHTNESS_COMMAND 0x100
-void common_hal_displayio_display_construct(displayio_display_obj_t* self,
+void common_hal_displayio_display_construct(displayio_display_obj_t *self,
mp_obj_t bus, uint16_t width, uint16_t height,
int16_t colstart, int16_t rowstart, uint16_t rotation, uint16_t color_depth, bool grayscale,
bool pixels_in_byte_share_row, uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
uint8_t set_column_command, uint8_t set_row_command, uint8_t write_ram_command, uint8_t set_vertical_scroll,
- uint8_t* init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t* backlight_pin, uint16_t brightness_command,
+ uint8_t *init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t *backlight_pin, uint16_t brightness_command,
mp_float_t brightness, bool auto_brightness,
bool single_byte_bounds, bool data_as_commands, bool auto_refresh, uint16_t native_frames_per_second,
bool backlight_on_high, bool SH1107_addressing);
-bool common_hal_displayio_display_show(displayio_display_obj_t* self,
- displayio_group_t* root_group);
+bool common_hal_displayio_display_show(displayio_display_obj_t *self,
+ displayio_group_t *root_group);
-bool common_hal_displayio_display_refresh(displayio_display_obj_t* self, uint32_t target_ms_per_frame, uint32_t maximum_ms_per_real_frame);
+bool common_hal_displayio_display_refresh(displayio_display_obj_t *self, uint32_t target_ms_per_frame, uint32_t maximum_ms_per_real_frame);
-bool common_hal_displayio_display_get_auto_refresh(displayio_display_obj_t* self);
-void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t* self, bool auto_refresh);
+bool common_hal_displayio_display_get_auto_refresh(displayio_display_obj_t *self);
+void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self, bool auto_refresh);
-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);
-uint16_t common_hal_displayio_display_get_rotation(displayio_display_obj_t* self);
-void common_hal_displayio_display_set_rotation(displayio_display_obj_t* self, int rotation);
+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);
+uint16_t common_hal_displayio_display_get_rotation(displayio_display_obj_t *self);
+void common_hal_displayio_display_set_rotation(displayio_display_obj_t *self, int rotation);
-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);
+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);
-bool common_hal_displayio_display_get_dither(displayio_display_obj_t* self);
-void common_hal_displayio_display_set_dither(displayio_display_obj_t* self, bool dither);
+bool common_hal_displayio_display_get_dither(displayio_display_obj_t *self);
+void common_hal_displayio_display_set_dither(displayio_display_obj_t *self, bool dither);
-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);
+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);
-mp_obj_t common_hal_displayio_display_get_bus(displayio_display_obj_t* self);
+mp_obj_t common_hal_displayio_display_get_bus(displayio_display_obj_t *self);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_DISPLAY_H
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 4f5c47aca..6a7c089c9 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -148,7 +148,7 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
mp_get_buffer_raise(args[ARG_stop_sequence].u_obj, &stop_bufinfo, MP_BUFFER_READ);
- const mcu_pin_obj_t* busy_pin = validate_obj_is_free_pin_or_none(args[ARG_busy_pin].u_obj);
+ const mcu_pin_obj_t *busy_pin = validate_obj_is_free_pin_or_none(args[ARG_busy_pin].u_obj);
mp_int_t rotation = args[ARG_rotation].u_int;
if (rotation % 90 != 0) {
@@ -156,7 +156,8 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
}
primary_display_t *disp = allocate_display_or_raise();
- displayio_epaperdisplay_obj_t *self = &disp->epaper_display;;
+ displayio_epaperdisplay_obj_t *self = &disp->epaper_display;
+ ;
mp_float_t refresh_time = mp_obj_get_float(args[ARG_refresh_time].u_obj);
mp_float_t seconds_per_frame = mp_obj_get_float(args[ARG_seconds_per_frame].u_obj);
@@ -186,7 +187,7 @@ STATIC mp_obj_t displayio_epaperdisplay_make_new(const mp_obj_type_t *type, size
}
// Helper to ensure we have the native super class instead of a subclass.
-static displayio_epaperdisplay_obj_t* native_display(mp_obj_t display_obj) {
+static displayio_epaperdisplay_obj_t *native_display(mp_obj_t display_obj) {
mp_obj_t native_display = mp_instance_cast_to_native_base(display_obj, &displayio_epaperdisplay_type);
mp_obj_assert_native_inited(native_display);
return MP_OBJ_TO_PTR(native_display);
@@ -201,7 +202,7 @@ static displayio_epaperdisplay_obj_t* native_display(mp_obj_t display_obj) {
//|
STATIC mp_obj_t displayio_epaperdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
displayio_epaperdisplay_obj_t *self = native_display(self_in);
- displayio_group_t* group = NULL;
+ displayio_group_t *group = NULL;
if (group_in != mp_const_none) {
group = MP_OBJ_TO_PTR(native_group(group_in));
}
@@ -351,5 +352,5 @@ const mp_obj_type_t displayio_epaperdisplay_type = {
{ &mp_type_type },
.name = MP_QSTR_EPaperDisplay,
.make_new = displayio_epaperdisplay_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_epaperdisplay_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_epaperdisplay_locals_dict,
};
diff --git a/shared-bindings/displayio/EPaperDisplay.h b/shared-bindings/displayio/EPaperDisplay.h
index 14d4f6aa9..7c2b302ce 100644
--- a/shared-bindings/displayio/EPaperDisplay.h
+++ b/shared-bindings/displayio/EPaperDisplay.h
@@ -38,27 +38,27 @@ extern const mp_obj_type_t displayio_epaperdisplay_type;
#define NO_COMMAND 0x100
-void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t* self,
- mp_obj_t bus, const uint8_t* start_sequence, uint16_t start_sequence_len, const uint8_t* stop_sequence, uint16_t stop_sequence_len,
- uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
- uint16_t set_column_window_command, uint16_t set_row_window_command,
- uint16_t set_current_column_command, uint16_t set_current_row_command,
- uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint16_t refresh_display_command, mp_float_t refresh_time,
- const mcu_pin_obj_t* busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool always_toggle_chip_select, bool grayscale);
+void common_hal_displayio_epaperdisplay_construct(displayio_epaperdisplay_obj_t *self,
+ mp_obj_t bus, const uint8_t *start_sequence, uint16_t start_sequence_len, const uint8_t *stop_sequence, uint16_t stop_sequence_len,
+ uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
+ uint16_t set_column_window_command, uint16_t set_row_window_command,
+ uint16_t set_current_column_command, uint16_t set_current_row_command,
+ uint16_t write_black_ram_command, bool black_bits_inverted, uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color, uint16_t refresh_display_command, mp_float_t refresh_time,
+ const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame, bool always_toggle_chip_select, bool grayscale);
-bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t* self);
+bool common_hal_displayio_epaperdisplay_refresh(displayio_epaperdisplay_obj_t *self);
-bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t* self, displayio_group_t* root_group);
+bool common_hal_displayio_epaperdisplay_show(displayio_epaperdisplay_obj_t *self, displayio_group_t *root_group);
// Returns time in milliseconds.
-uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaperdisplay_obj_t* self);
-bool common_hal_displayio_epaperdisplay_get_busy(displayio_epaperdisplay_obj_t* self);
+uint32_t common_hal_displayio_epaperdisplay_get_time_to_refresh(displayio_epaperdisplay_obj_t *self);
+bool common_hal_displayio_epaperdisplay_get_busy(displayio_epaperdisplay_obj_t *self);
-uint16_t common_hal_displayio_epaperdisplay_get_width(displayio_epaperdisplay_obj_t* self);
-uint16_t common_hal_displayio_epaperdisplay_get_height(displayio_epaperdisplay_obj_t* self);
-uint16_t common_hal_displayio_epaperdisplay_get_rotation(displayio_epaperdisplay_obj_t* self);
-void common_hal_displayio_epaperdisplay_set_rotation(displayio_epaperdisplay_obj_t* self, int rotation);
+uint16_t common_hal_displayio_epaperdisplay_get_width(displayio_epaperdisplay_obj_t *self);
+uint16_t common_hal_displayio_epaperdisplay_get_height(displayio_epaperdisplay_obj_t *self);
+uint16_t common_hal_displayio_epaperdisplay_get_rotation(displayio_epaperdisplay_obj_t *self);
+void common_hal_displayio_epaperdisplay_set_rotation(displayio_epaperdisplay_obj_t *self, int rotation);
-mp_obj_t common_hal_displayio_epaperdisplay_get_bus(displayio_epaperdisplay_obj_t* self);
+mp_obj_t common_hal_displayio_epaperdisplay_get_bus(displayio_epaperdisplay_obj_t *self);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_EPAPERDISPLAY_H
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 455d22e72..d87f2421d 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -79,7 +79,7 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);
mp_obj_t spi = args[ARG_spi_bus].u_obj;
- displayio_fourwire_obj_t* self = &allocate_display_bus_or_raise()->fourwire_bus;
+ displayio_fourwire_obj_t *self = &allocate_display_bus_or_raise()->fourwire_bus;
self->base.type = &displayio_fourwire_type;
uint8_t polarity = args[ARG_polarity].u_int;
@@ -144,7 +144,7 @@ STATIC mp_obj_t displayio_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_a
chip_select = CHIP_SELECT_TOGGLE_EVERY_BYTE;
}
common_hal_displayio_fourwire_send(self, DISPLAY_COMMAND, chip_select, &command, 1);
- common_hal_displayio_fourwire_send(self, DISPLAY_DATA, chip_select, ((uint8_t*) bufinfo.buf), bufinfo.len);
+ common_hal_displayio_fourwire_send(self, DISPLAY_DATA, chip_select, ((uint8_t *)bufinfo.buf), bufinfo.len);
common_hal_displayio_fourwire_end_transaction(self);
return mp_const_none;
@@ -161,5 +161,5 @@ const mp_obj_type_t displayio_fourwire_type = {
{ &mp_type_type },
.name = MP_QSTR_FourWire,
.make_new = displayio_fourwire_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_fourwire_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_fourwire_locals_dict,
};
diff --git a/shared-bindings/displayio/FourWire.h b/shared-bindings/displayio/FourWire.h
index 6f6b528e7..300327f7a 100644
--- a/shared-bindings/displayio/FourWire.h
+++ b/shared-bindings/displayio/FourWire.h
@@ -36,12 +36,12 @@
extern const mp_obj_type_t displayio_fourwire_type;
-void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
- busio_spi_obj_t* spi, const mcu_pin_obj_t* command,
- const mcu_pin_obj_t* chip_select, const mcu_pin_obj_t* reset, uint32_t baudrate,
+void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t *self,
+ busio_spi_obj_t *spi, const mcu_pin_obj_t *command,
+ const mcu_pin_obj_t *chip_select, const mcu_pin_obj_t *reset, uint32_t baudrate,
uint8_t polarity, uint8_t phase);
-void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t* self);
+void common_hal_displayio_fourwire_deinit(displayio_fourwire_obj_t *self);
bool common_hal_displayio_fourwire_reset(mp_obj_t self);
bool common_hal_displayio_fourwire_bus_free(mp_obj_t self);
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index c1c05504d..75e210db8 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -72,7 +72,7 @@ STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_arg
}
// Helper to ensure we have the native super class instead of a subclass.
-displayio_group_t* native_group(mp_obj_t group_obj) {
+displayio_group_t *native_group(mp_obj_t group_obj) {
mp_obj_t native_group = mp_instance_cast_to_native_base(group_obj, &displayio_group_type);
if (native_group == MP_OBJ_NULL) {
mp_raise_ValueError_varg(translate("Must be a %q subclass."), MP_QSTR_Group);
@@ -202,7 +202,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_append_obj, displayio_group_obj_append
//|
STATIC mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t layer) {
displayio_group_t *self = native_group(self_in);
- if ((size_t) MP_OBJ_SMALL_INT_VALUE(index_obj) == common_hal_displayio_group_get_len(self)){
+ if ((size_t)MP_OBJ_SMALL_INT_VALUE(index_obj) == common_hal_displayio_group_get_len(self)) {
return displayio_group_obj_append(self_in, layer);
}
size_t index = mp_get_index(&displayio_group_type, common_hal_displayio_group_get_len(self), index_obj, false);
@@ -241,9 +241,9 @@ STATIC mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args,
displayio_group_t *self = native_group(pos_args[0]);
size_t index = mp_get_index(&displayio_group_type,
- common_hal_displayio_group_get_len(self),
- MP_OBJ_NEW_SMALL_INT(args[ARG_i].u_int),
- false);
+ common_hal_displayio_group_get_len(self),
+ MP_OBJ_NEW_SMALL_INT(args[ARG_i].u_int),
+ false);
return common_hal_displayio_group_pop(self, index);
}
MP_DEFINE_CONST_FUN_OBJ_KW(displayio_group_pop_obj, 1, displayio_group_obj_pop);
@@ -273,9 +273,12 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
displayio_group_t *self = native_group(self_in);
uint16_t len = common_hal_displayio_group_get_len(self);
switch (op) {
- case MP_UNARY_OP_BOOL: return mp_obj_new_bool(len != 0);
- case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(len);
- default: return MP_OBJ_NULL; // op not supported
+ case MP_UNARY_OP_BOOL:
+ return mp_obj_new_bool(len != 0);
+ case MP_UNARY_OP_LEN:
+ return MP_OBJ_NEW_SMALL_INT(len);
+ default:
+ return MP_OBJ_NULL; // op not supported
}
}
@@ -359,5 +362,5 @@ const mp_obj_type_t displayio_group_type = {
.subscr = group_subscr,
.unary_op = group_unary_op,
.getiter = mp_obj_new_generic_iterator,
- .locals_dict = (mp_obj_dict_t*)&displayio_group_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_group_locals_dict,
};
diff --git a/shared-bindings/displayio/Group.h b/shared-bindings/displayio/Group.h
index 69c73bf4d..266fce959 100644
--- a/shared-bindings/displayio/Group.h
+++ b/shared-bindings/displayio/Group.h
@@ -31,23 +31,23 @@
extern const mp_obj_type_t displayio_group_type;
-displayio_group_t* native_group(mp_obj_t group_obj);
+displayio_group_t *native_group(mp_obj_t group_obj);
-void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t scale, mp_int_t x, mp_int_t y);
-uint32_t common_hal_displayio_group_get_scale(displayio_group_t* self);
-void common_hal_displayio_group_set_scale(displayio_group_t* self, uint32_t scale);
-bool common_hal_displayio_group_get_hidden(displayio_group_t* self);
-void common_hal_displayio_group_set_hidden(displayio_group_t* self, bool hidden);
-mp_int_t common_hal_displayio_group_get_x(displayio_group_t* self);
-void common_hal_displayio_group_set_x(displayio_group_t* self, mp_int_t x);
-mp_int_t common_hal_displayio_group_get_y(displayio_group_t* self);
-void common_hal_displayio_group_set_y(displayio_group_t* self, mp_int_t y);
-void common_hal_displayio_group_append(displayio_group_t* self, mp_obj_t layer);
-void common_hal_displayio_group_insert(displayio_group_t* self, size_t index, mp_obj_t layer);
-size_t common_hal_displayio_group_get_len(displayio_group_t* self);
-mp_obj_t common_hal_displayio_group_pop(displayio_group_t* self, size_t index);
-mp_int_t common_hal_displayio_group_index(displayio_group_t* self, mp_obj_t layer);
-mp_obj_t common_hal_displayio_group_get(displayio_group_t* self, size_t index);
-void common_hal_displayio_group_set(displayio_group_t* self, size_t index, mp_obj_t layer);
+void common_hal_displayio_group_construct(displayio_group_t *self, uint32_t scale, mp_int_t x, mp_int_t y);
+uint32_t common_hal_displayio_group_get_scale(displayio_group_t *self);
+void common_hal_displayio_group_set_scale(displayio_group_t *self, uint32_t scale);
+bool common_hal_displayio_group_get_hidden(displayio_group_t *self);
+void common_hal_displayio_group_set_hidden(displayio_group_t *self, bool hidden);
+mp_int_t common_hal_displayio_group_get_x(displayio_group_t *self);
+void common_hal_displayio_group_set_x(displayio_group_t *self, mp_int_t x);
+mp_int_t common_hal_displayio_group_get_y(displayio_group_t *self);
+void common_hal_displayio_group_set_y(displayio_group_t *self, mp_int_t y);
+void common_hal_displayio_group_append(displayio_group_t *self, mp_obj_t layer);
+void common_hal_displayio_group_insert(displayio_group_t *self, size_t index, mp_obj_t layer);
+size_t common_hal_displayio_group_get_len(displayio_group_t *self);
+mp_obj_t common_hal_displayio_group_pop(displayio_group_t *self, size_t index);
+mp_int_t common_hal_displayio_group_index(displayio_group_t *self, mp_obj_t layer);
+mp_obj_t common_hal_displayio_group_get(displayio_group_t *self, size_t index);
+void common_hal_displayio_group_set(displayio_group_t *self, size_t index, mp_obj_t layer);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_GROUP_H
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index 5dc4711b3..2f27c7b5d 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -68,7 +68,7 @@ STATIC mp_obj_t displayio_i2cdisplay_make_new(const mp_obj_type_t *type, size_t
mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);
mp_obj_t i2c = args[ARG_i2c_bus].u_obj;
- displayio_i2cdisplay_obj_t* self = &allocate_display_bus_or_raise()->i2cdisplay_bus;
+ displayio_i2cdisplay_obj_t *self = &allocate_display_bus_or_raise()->i2cdisplay_bus;
self->base.type = &displayio_i2cdisplay_type;
common_hal_displayio_i2cdisplay_construct(self,
@@ -111,7 +111,7 @@ STATIC mp_obj_t displayio_i2cdisplay_obj_send(mp_obj_t self, mp_obj_t command_ob
}
uint8_t full_command[bufinfo.len + 1];
full_command[0] = command;
- memcpy(full_command + 1, ((uint8_t*) bufinfo.buf), bufinfo.len);
+ memcpy(full_command + 1, ((uint8_t *)bufinfo.buf), bufinfo.len);
common_hal_displayio_i2cdisplay_send(self, DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, full_command, bufinfo.len + 1);
common_hal_displayio_i2cdisplay_end_transaction(self);
@@ -129,5 +129,5 @@ const mp_obj_type_t displayio_i2cdisplay_type = {
{ &mp_type_type },
.name = MP_QSTR_I2CDisplay,
.make_new = displayio_i2cdisplay_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_i2cdisplay_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_i2cdisplay_locals_dict,
};
diff --git a/shared-bindings/displayio/I2CDisplay.h b/shared-bindings/displayio/I2CDisplay.h
index 37520202e..d40cd19d8 100644
--- a/shared-bindings/displayio/I2CDisplay.h
+++ b/shared-bindings/displayio/I2CDisplay.h
@@ -34,10 +34,10 @@
extern const mp_obj_type_t displayio_i2cdisplay_type;
-void common_hal_displayio_i2cdisplay_construct(displayio_i2cdisplay_obj_t* self,
- busio_i2c_obj_t* i2c, uint16_t device_address, const mcu_pin_obj_t* reset);
+void common_hal_displayio_i2cdisplay_construct(displayio_i2cdisplay_obj_t *self,
+ busio_i2c_obj_t *i2c, uint16_t device_address, const mcu_pin_obj_t *reset);
-void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t* self);
+void common_hal_displayio_i2cdisplay_deinit(displayio_i2cdisplay_obj_t *self);
bool common_hal_displayio_i2cdisplay_reset(mp_obj_t self);
bool common_hal_displayio_i2cdisplay_bus_free(mp_obj_t self);
diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index 938e408ab..e41f54edf 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -137,5 +137,5 @@ const mp_obj_type_t displayio_ondiskbitmap_type = {
{ &mp_type_type },
.name = MP_QSTR_OnDiskBitmap,
.make_new = displayio_ondiskbitmap_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_ondiskbitmap_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_ondiskbitmap_locals_dict,
};
diff --git a/shared-bindings/displayio/OnDiskBitmap.h b/shared-bindings/displayio/OnDiskBitmap.h
index 9a6c81f8f..aff3a19db 100644
--- a/shared-bindings/displayio/OnDiskBitmap.h
+++ b/shared-bindings/displayio/OnDiskBitmap.h
@@ -32,7 +32,7 @@
extern const mp_obj_type_t displayio_ondiskbitmap_type;
-void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self, pyb_file_obj_t* file);
+void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self, pyb_file_obj_t *file);
uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *bitmap,
int16_t x, int16_t y);
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index c868aea9c..d5acf1ed6 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -74,10 +74,12 @@ STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_a
STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
displayio_palette_t *self = MP_OBJ_TO_PTR(self_in);
switch (op) {
- case MP_UNARY_OP_BOOL: return mp_const_true;
+ case MP_UNARY_OP_BOOL:
+ return mp_const_true;
case MP_UNARY_OP_LEN:
return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_palette_get_len(self));
- default: return MP_OBJ_NULL; // op not supported
+ default:
+ return MP_OBJ_NULL; // op not supported
}
}
@@ -130,7 +132,7 @@ STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t val
if (bufinfo.typecode != 'b' && bufinfo.typecode != 'B' && bufinfo.typecode != BYTEARRAY_TYPECODE) {
mp_raise_ValueError(translate("color buffer must be a bytearray or array of type 'b' or 'B'"));
}
- uint8_t* buf = bufinfo.buf;
+ uint8_t *buf = bufinfo.buf;
if (bufinfo.len == 3 || bufinfo.len == 4) {
color = buf[0] << 16 | buf[1] << 8 | buf[2];
} else {
@@ -191,5 +193,5 @@ const mp_obj_type_t displayio_palette_type = {
.subscr = palette_subscr,
.unary_op = group_unary_op,
.getiter = mp_obj_new_generic_iterator,
- .locals_dict = (mp_obj_dict_t*)&displayio_palette_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_palette_locals_dict,
};
diff --git a/shared-bindings/displayio/Palette.h b/shared-bindings/displayio/Palette.h
index 8c9fe11e3..62b8f3600 100644
--- a/shared-bindings/displayio/Palette.h
+++ b/shared-bindings/displayio/Palette.h
@@ -31,12 +31,12 @@
extern const mp_obj_type_t displayio_palette_type;
-void common_hal_displayio_palette_construct(displayio_palette_t* self, uint16_t color_count);
-void common_hal_displayio_palette_set_color(displayio_palette_t* self, uint32_t palette_index, uint32_t color);
-uint32_t common_hal_displayio_palette_get_color(displayio_palette_t* self, uint32_t palette_index);
-uint32_t common_hal_displayio_palette_get_len(displayio_palette_t* self);
+void common_hal_displayio_palette_construct(displayio_palette_t *self, uint16_t color_count);
+void common_hal_displayio_palette_set_color(displayio_palette_t *self, uint32_t palette_index, uint32_t color);
+uint32_t common_hal_displayio_palette_get_color(displayio_palette_t *self, uint32_t palette_index);
+uint32_t common_hal_displayio_palette_get_len(displayio_palette_t *self);
-void common_hal_displayio_palette_make_opaque(displayio_palette_t* self, uint32_t palette_index);
-void common_hal_displayio_palette_make_transparent(displayio_palette_t* self, uint32_t palette_index);
+void common_hal_displayio_palette_make_opaque(displayio_palette_t *self, uint32_t palette_index);
+void common_hal_displayio_palette_make_transparent(displayio_palette_t *self, uint32_t palette_index);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_PALETTE_H
diff --git a/shared-bindings/displayio/ParallelBus.c b/shared-bindings/displayio/ParallelBus.c
index 30c9d373c..7391078a6 100644
--- a/shared-bindings/displayio/ParallelBus.c
+++ b/shared-bindings/displayio/ParallelBus.c
@@ -60,7 +60,7 @@
//| ...
//|
STATIC mp_obj_t displayio_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
- enum { ARG_data0, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset };
+ enum { ARG_data0, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset, ARG_frequency };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_data0, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
{ MP_QSTR_command, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
@@ -68,6 +68,7 @@ STATIC mp_obj_t displayio_parallelbus_make_new(const mp_obj_type_t *type, size_t
{ MP_QSTR_write, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
{ MP_QSTR_read, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
{ MP_QSTR_reset, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
+ { MP_QSTR_frequency, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 30000000 } },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -79,10 +80,10 @@ STATIC mp_obj_t displayio_parallelbus_make_new(const mp_obj_type_t *type, size_t
mcu_pin_obj_t *read = validate_obj_is_free_pin(args[ARG_read].u_obj);
mcu_pin_obj_t *reset = validate_obj_is_free_pin(args[ARG_reset].u_obj);
- displayio_parallelbus_obj_t* self = &allocate_display_bus_or_raise()->parallel_bus;
+ displayio_parallelbus_obj_t *self = &allocate_display_bus_or_raise()->parallel_bus;
self->base.type = &displayio_parallelbus_type;
- common_hal_displayio_parallelbus_construct(self, data0, command, chip_select, write, read, reset);
+ common_hal_displayio_parallelbus_construct(self, data0, command, chip_select, write, read, reset, args[ARG_frequency].u_int);
return self;
}
@@ -121,7 +122,7 @@ STATIC mp_obj_t displayio_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_o
RUN_BACKGROUND_TASKS;
}
common_hal_displayio_parallelbus_send(self, DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, &command, 1);
- common_hal_displayio_parallelbus_send(self, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, ((uint8_t*) bufinfo.buf), bufinfo.len);
+ common_hal_displayio_parallelbus_send(self, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, ((uint8_t *)bufinfo.buf), bufinfo.len);
common_hal_displayio_parallelbus_end_transaction(self);
return mp_const_none;
@@ -138,5 +139,5 @@ const mp_obj_type_t displayio_parallelbus_type = {
{ &mp_type_type },
.name = MP_QSTR_ParallelBus,
.make_new = displayio_parallelbus_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_parallelbus_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_parallelbus_locals_dict,
};
diff --git a/shared-bindings/displayio/ParallelBus.h b/shared-bindings/displayio/ParallelBus.h
index 1e74e3a0a..1a61aae0a 100644
--- a/shared-bindings/displayio/ParallelBus.h
+++ b/shared-bindings/displayio/ParallelBus.h
@@ -35,11 +35,11 @@
extern const mp_obj_type_t displayio_parallelbus_type;
-void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t* self,
- const mcu_pin_obj_t* data0, const mcu_pin_obj_t* command, const mcu_pin_obj_t* chip_select,
- const mcu_pin_obj_t* write, const mcu_pin_obj_t* read, const mcu_pin_obj_t* reset);
+void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *self,
+ const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
+ const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency);
-void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t* self);
+void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t *self);
bool common_hal_displayio_parallelbus_reset(mp_obj_t self);
bool common_hal_displayio_parallelbus_bus_free(mp_obj_t self);
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index 4d737ecae..0126df885 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -84,7 +84,7 @@ STATIC mp_obj_t displayio_shape_make_new(const mp_obj_type_t *type, size_t n_arg
//| ...
//|
STATIC mp_obj_t displayio_shape_obj_set_boundary(size_t n_args, const mp_obj_t *args) {
- (void) n_args;
+ (void)n_args;
displayio_shape_t *self = MP_OBJ_TO_PTR(args[0]);
mp_int_t y;
if (!mp_obj_get_int_maybe(args[1], &y)) {
@@ -113,5 +113,5 @@ const mp_obj_type_t displayio_shape_type = {
{ &mp_type_type },
.name = MP_QSTR_Shape,
.make_new = displayio_shape_make_new,
- .locals_dict = (mp_obj_dict_t*)&displayio_shape_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_shape_locals_dict,
};
diff --git a/shared-bindings/displayio/Shape.h b/shared-bindings/displayio/Shape.h
index d08a38782..961b57c67 100644
--- a/shared-bindings/displayio/Shape.h
+++ b/shared-bindings/displayio/Shape.h
@@ -35,7 +35,7 @@ void common_hal_displayio_shape_construct(displayio_shape_t *self, uint32_t widt
uint32_t height, bool mirror_x, bool mirror_y);
void common_hal_displayio_shape_set_boundary(displayio_shape_t *self, uint16_t y, uint16_t start_x,
- uint16_t end_x);
+ uint16_t end_x);
uint32_t common_hal_displayio_shape_get_pixel(void *shape, int16_t x, int16_t y);
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_SHAPE_H
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index 73a08f556..dee0d7a68 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -87,16 +87,16 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
uint16_t bitmap_height;
mp_obj_t native = mp_instance_cast_to_native_base(bitmap, &displayio_shape_type);
if (native != MP_OBJ_NULL) {
- displayio_shape_t* bmp = MP_OBJ_TO_PTR(native);
+ displayio_shape_t *bmp = MP_OBJ_TO_PTR(native);
bitmap_width = bmp->width;
bitmap_height = bmp->height;
} else if (MP_OBJ_IS_TYPE(bitmap, &displayio_bitmap_type)) {
- displayio_bitmap_t* bmp = MP_OBJ_TO_PTR(bitmap);
+ displayio_bitmap_t *bmp = MP_OBJ_TO_PTR(bitmap);
native = bitmap;
bitmap_width = bmp->width;
bitmap_height = bmp->height;
} else if (MP_OBJ_IS_TYPE(bitmap, &displayio_ondiskbitmap_type)) {
- displayio_ondiskbitmap_t* bmp = MP_OBJ_TO_PTR(bitmap);
+ displayio_ondiskbitmap_t *bmp = MP_OBJ_TO_PTR(bitmap);
native = bitmap;
bitmap_width = bmp->width;
bitmap_height = bmp->height;
@@ -136,7 +136,7 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
}
// Helper to ensure we have the native super class instead of a subclass.
-static displayio_tilegrid_t* native_tilegrid(mp_obj_t tilegrid_obj) {
+static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) {
mp_obj_t native_tilegrid = mp_instance_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type);
mp_obj_assert_native_inited(native_tilegrid);
return MP_OBJ_TO_PTR(native_tilegrid);
@@ -354,13 +354,13 @@ STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t v
x = i % width;
y = i / width;
} else {
- mp_obj_t* items;
+ mp_obj_t *items;
mp_obj_get_array_fixed_n(index_obj, 2, &items);
x = mp_obj_get_int(items[0]);
y = mp_obj_get_int(items[1]);
}
if (x >= common_hal_displayio_tilegrid_get_width(self) ||
- y >= common_hal_displayio_tilegrid_get_height(self)) {
+ y >= common_hal_displayio_tilegrid_get_height(self)) {
mp_raise_IndexError(translate("Tile index out of bounds"));
}
@@ -397,5 +397,5 @@ const mp_obj_type_t displayio_tilegrid_type = {
.name = MP_QSTR_TileGrid,
.make_new = displayio_tilegrid_make_new,
.subscr = tilegrid_subscr,
- .locals_dict = (mp_obj_dict_t*)&displayio_tilegrid_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&displayio_tilegrid_locals_dict,
};
diff --git a/shared-bindings/displayio/TileGrid.h b/shared-bindings/displayio/TileGrid.h
index 0ee1c7883..7c8d8a605 100644
--- a/shared-bindings/displayio/TileGrid.h
+++ b/shared-bindings/displayio/TileGrid.h
@@ -32,12 +32,12 @@
extern const mp_obj_type_t displayio_tilegrid_type;
void common_hal_displayio_tilegrid_construct(displayio_tilegrid_t *self, mp_obj_t bitmap,
- uint16_t bitmap_width_in_tiles, uint16_t bitmap_height_in_tiles,
- mp_obj_t pixel_shader, uint16_t width, uint16_t height,
- uint16_t tile_width, uint16_t tile_height, uint16_t x, uint16_t y, uint8_t default_tile);
+ uint16_t bitmap_width_in_tiles, uint16_t bitmap_height_in_tiles,
+ mp_obj_t pixel_shader, uint16_t width, uint16_t height,
+ uint16_t tile_width, uint16_t tile_height, uint16_t x, uint16_t y, uint8_t default_tile);
-bool common_hal_displayio_tilegrid_get_hidden(displayio_tilegrid_t* self);
-void common_hal_displayio_tilegrid_set_hidden(displayio_tilegrid_t* self, bool hidden);
+bool common_hal_displayio_tilegrid_get_hidden(displayio_tilegrid_t *self);
+void common_hal_displayio_tilegrid_set_hidden(displayio_tilegrid_t *self, bool hidden);
mp_int_t common_hal_displayio_tilegrid_get_x(displayio_tilegrid_t *self);
void common_hal_displayio_tilegrid_set_x(displayio_tilegrid_t *self, mp_int_t x);
mp_int_t common_hal_displayio_tilegrid_get_y(displayio_tilegrid_t *self);
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 16d068e2e..bca4289b0 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -88,5 +88,5 @@ STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_t
const mp_obj_module_t displayio_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&displayio_module_globals,
+ .globals = (mp_obj_dict_t *)&displayio_module_globals,
};