8000 Removed parameter so CS is always toggled · domdfcoding/circuitpython@b2ad16f · GitHub
[go: up one dir, main page]
Skip to content

Commit b2ad16f

Browse files
author
Melissa LeBlanc-Williams
committed
Removed parameter so CS is always toggled
1 parent 0df4053 commit b2ad16f

File tree

7 files changed

+8
-15
lines changed

7 files changed

+8
-15
lines changed

‎ports/atmel-samd/boards/hallowing_m0_express/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ void board_init(void) {
9393
0x37, // set vertical scroll command
9494
display_init_sequence,
9595
sizeof(display_init_sequence),
96-
&pin_PA00,
97-
true);
96+
&pin_PA00);
9897
common_hal_displayio_display_set_auto_brightness(display, true);
9998
}
10099

‎ports/atmel-samd/boards/pybadge/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ void board_init(void) {
9999
0x37, // set vertical scroll command
100100
display_init_sequence,
101101
sizeof(display_init_sequence),
102-
&pin_PA00,
103-
true);
102+
&pin_PA00);
104103
common_hal_displayio_display_set_auto_brightness(display, true);
105104
}
106105

‎ports/atmel-samd/boards/pyportal/board.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ void board_init(void) {
9090
0x37, // Set vertical scroll command
9191
display_init_sequence,
9292
sizeof(display_init_sequence),
93-
&pin_PB31,
94-
true);
93+
&pin_PB31);
9594
common_hal_displayio_display_set_auto_brightness(display, true);
9695
}
9796

‎shared-bindings/displayio/Display.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
//| :param bool init_cs_toggle: Toggle the Chip Select between each initialization command
9595
//|
9696
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) {
97-
enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command, ARG_set_vertical_scroll, ARG_backlight_pin, ARG_init_cs_toggle };
97+
enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_set_column_command, ARG_set_row_command, ARG_write_ram_command, ARG_set_vertical_scroll, ARG_backlight_pin };
9898
static const mp_arg_t allowed_args[] = {
9999
{ MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
100100
{ MP_QSTR_init_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -109,7 +109,6 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
109109
{ MP_QSTR_write_ram_command, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0x2c} },
110110
{ MP_QSTR_set_vertical_scroll, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0x0} },
111111
{ MP_QSTR_backlight_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
112-
{ MP_QSTR_init_cs_toggle, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
113112
};
114113
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
115114
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -148,8 +147,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
148147
args[ARG_color_depth].u_int, args[ARG_set_column_command].u_int, args[ARG_set_row_command].u_int,
149148
args[ARG_write_ram_command].u_int,
150149
args[ARG_set_vertical_scroll].u_int,
151-
bufinfo.buf, bufinfo.len, MP_OBJ_TO_PTR(backlight_pin),
152-
args[ARG_init_cs_toggle].u_bool);
150+
bufinfo.buf, bufinfo.len, MP_OBJ_TO_PTR(backlight_pin));
153151

154152
return self;
155153
}

‎shared-bindings/displayio/Display.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
4040
mp_obj_t bus, uint16_t width, uint16_t height,
4141
int16_t colstart, int16_t rowstart, uint16_t rotation, uint16_t color_depth,
4242
uint8_t set_column_command, uint8_t set_row_command, uint8_t write_ram_command, uint8_t set_vertical_scroll,
43-
uint8_t* init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t* backlight_pin, bool init_cs_toggle);
43+
uint8_t* init_sequence, uint16_t init_sequence_len, const mcu_pin_obj_t* backlight_pin);
4444

4545
int32_t common_hal_displayio_display_wait_for_frame(displayio_display_obj_t* self);
4646

‎shared-module/displayio/Display.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
4444
mp_obj_t bus, uint16_t width, uint16_t height, int16_t colstart, int16_t rowstart, uint16_t rotation,
4545
uint16_t color_depth, uint8_t set_column_command, uint8_t set_row_command,
4646
uint8_t write_ram_command, uint8_t set_vertical_scroll, uint8_t* init_sequence, uint16_t init_sequence_len,
47-
const mcu_pin_obj_t* backlight_pin, bool init_cs_toggle) {
47+
const mcu_pin_obj_t* backlight_pin) {
4848
self->color_depth = color_depth;
4949
self->set_column_command = set_column_command;
5050
self->set_row_command = set_row_command;
@@ -54,7 +54,6 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
5454
self->colstart = colstart;
5555
self->rowstart = rowstart;
5656
self->auto_brightness = false;
57-
self->init_cs_toggle = init_cs_toggle;
5857

5958
if (MP_OBJ_IS_TYPE(bus, &displayio_parallelbus_type)) {
6059
self->begin_transaction = common_hal_displayio_parallelbus_begin_transaction;
@@ -83,7 +82,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
8382
bool delay = (data_size & DELAY) != 0;
8483
data_size &= ~DELAY;
8584
uint8_t *data = cmd + 2;
86-
if (self->init_cs_toggle && self->set_cs != NULL) {
85+
if (self->set_cs != NULL) {
8786
self->set_cs(self->bus, true);
8887
common_hal_time_delay_ms(1);
8988
self->set_cs(self->bus, false);

‎shared-module/displayio/Display.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ typedef struct {
5050
uint64_t last_refresh;
5151
int16_t colstart;
5252
int16_t rowstart;
53-
bool init_cs_toggle;
5453
display_bus_begin_transaction begin_transaction;
5554
display_bus_send send;
5655
display_bus_end_transaction end_transaction;

0 commit comments

Comments
 (0)
0