Skip to content

Commit ead0249

Browse files
kdschlosserkdschlosser
committed
Revert "API changes"
This reverts commit 1ebd4a7
1 parent 0f5b4ff commit ead0249

File tree

5 files changed

+112
-102
lines changed

5 files changed

+112
-102
lines changed

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
# ***IMPORTANT PLEASE READ***
22
_____________________________
33

4-
***API Breaking Change***
5-
`lcd_bus.RGBBus` and `lcd_bus.I80Bus` have had the data pins consilidated into a single parameter.
6-
The parameter name is `data_pins` and it is a tuple of the pin numbers that needs to be passed.
7-
8-
`lcd_bus.RGBBus` had 2 parameters removed. The `disp` and `disp_active_high` parameters. The "disp"
9-
pin is the power pin and it should be set as such with the display driver and not the bus
10-
11-
----------------------------------------------
124

135
The `mpy_cross` build command has been removed. It will be compiled automatically if it has not been compiled yet.
146

‎api_drivers/common_api_drivers/display/ili6122/ili6122.py‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎api_drivers/common_api_drivers/frozen/other/task_handler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def _task_handler(self, _):
155155

156156
except Exception as e:
157157
self._running = False
158-
158+
159159
if self.exception_hook:
160160
self.exception_hook(e)
161161

‎ext_mod/lcd_bus/esp32_src/i80_bus.c‎

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,22 @@
3131
enum {
3232
ARG_dc,
3333
ARG_wr,
34-
ARG_data_pins,
34+
ARG_data0,
35+
ARG_data1,
36+
ARG_data2,
37+
ARG_data3,
38+
ARG_data4,
39+
ARG_data5,
40+
ARG_data6,
41+
ARG_data7,
42+
ARG_data8,
43+
ARG_data9,
44+
ARG_data10,
45+
ARG_data11,
46+
ARG_data12,
47+
ARG_data13,
48+
ARG_data14,
49+
ARG_data15,
3550
ARG_cs,
3651
ARG_freq,
3752
ARG_dc_idle_high,
@@ -47,7 +62,22 @@
4762
const mp_arg_t make_new_args[] = {
4863
{ MP_QSTR_dc, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
4964
{ MP_QSTR_wr, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
50-
{ MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
65+
{ MP_QSTR_data0, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
66+
{ MP_QSTR_data1, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
67+
{ MP_QSTR_data2, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
68+
{ MP_QSTR_data3, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
69+
{ MP_QSTR_data4, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
70+
{ MP_QSTR_data5, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
71+
{ MP_QSTR_data6, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
72+
{ MP_QSTR_data7, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
73+
{ MP_QSTR_data8, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
74+
{ MP_QSTR_data9, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
75+
{ MP_QSTR_data10, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
76+
{ MP_QSTR_data11, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
77+
{ MP_QSTR_data12, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
78+
{ MP_QSTR_data13, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
79+
{ MP_QSTR_data14, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
80+
{ MP_QSTR_data15, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
5181
{ MP_QSTR_cs, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
5282
{ MP_QSTR_freq, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 10000000 } },
5383
{ MP_QSTR_dc_idle_high, MP_ARG_BOOL | MP_ARG_KW_ONLY, { .u_bool = false } },
@@ -79,18 +109,31 @@
79109
self->bus_config.dc_gpio_num = (int)args[ARG_dc].u_int;
80110
self->bus_config.wr_gpio_num = (int)args[ARG_wr].u_int;
81111
self->bus_config.clk_src = LCD_CLK_SRC_PLL160M;
82-
83-
mp_obj_tuple_t *data_pins = MP_OBJ_TO_PTR(args[ARG_data_pins].u_obj);
84-
85-
for (size_t i = 0; i < data_pins->len; i++) {
86-
self->bus_config.data_gpio_nums[i] = (int)mp_obj_get_int(data_pins->items[i]);
87-
}
88-
89-
for (size_t i = data_pins->len; i < SOC_LCD_I80_BUS_WIDTH; i++) {
90-
self->bus_config.data_gpio_nums[i] = -1;
112+
self->bus_config.data_gpio_nums[0] = args[ARG_data0].u_int;
113+
self->bus_config.data_gpio_nums[1] = args[ARG_data1].u_int;
114+
self->bus_config.data_gpio_nums[2] = args[ARG_data2].u_int;
115+
self->bus_config.data_gpio_nums[3] = args[ARG_data3].u_int;
116+
self->bus_config.data_gpio_nums[4] = args[ARG_data4].u_int;
117+
self->bus_config.data_gpio_nums[5] = args[ARG_data5].u_int;
118+
self->bus_config.data_gpio_nums[6] = args[ARG_data6].u_int;
119+
self->bus_config.data_gpio_nums[7] = args[ARG_data7].u_int;
120+
self->bus_config.data_gpio_nums[8] = args[ARG_data8].u_int;
121+
self->bus_config.data_gpio_nums[9] = args[ARG_data9].u_int;
122+
self->bus_config.data_gpio_nums[10] = args[ARG_data10].u_int;
123+
self->bus_config.data_gpio_nums[11] = args[ARG_data11].u_int;
124+
self->bus_config.data_gpio_nums[12] = args[ARG_data12].u_int;
125+
self->bus_config.data_gpio_nums[13] = args[ARG_data13].u_int;
126+
self->bus_config.data_gpio_nums[14] = args[ARG_data14].u_int;
127+
self->bus_config.data_gpio_nums[15] = args[ARG_data15].u_int;
128+
129+
uint8_t i = 0;
130+
for (; i < SOC_LCD_I80_BUS_WIDTH; i++) {
131+
if (self->bus_config.data_gpio_nums[i] == -1) {
132+
break;
133+
}
91134
}
92135

93-
self->bus_config.bus_width = (size_t)data_pins->len;
136+
self->bus_config.bus_width = (size_t) i;
94137

95138
self->panel_io_config.cs_gpio_num = (int)args[ARG_cs].u_int;
96139
self->panel_io_config.pclk_hz = (uint32_t)args[ARG_freq].u_int;

‎ext_mod/lcd_bus/esp32_src/rgb_bus.c‎

Lines changed: 56 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,22 @@
8484
ARG_vsync,
8585
ARG_de,
8686
ARG_pclk,
87-
ARG_data_pins,
87+
ARG_data0,
88+
ARG_data1,
89+
ARG_data2,
90+
ARG_data3,
91+
ARG_data4,
92+
ARG_data5,
93+
ARG_data6,
94+
ARG_data7,
95+
ARG_data8,
96+
ARG_data9,
97+
ARG_data10,
98+
ARG_data11,
99+
ARG_data12,
100+
ARG_data13,
101+
ARG_data14,
102+
ARG_data15,
88103
ARG_freq,
89104
ARG_hsync_front_porch,
90105
ARG_hsync_back_porch,
@@ -105,7 +120,22 @@
105120
{ MP_QSTR_vsync, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
106121
{ MP_QSTR_de, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
107122
{ MP_QSTR_pclk, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
108-
{ MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
123+
{ MP_QSTR_data0, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
124+
{ MP_QSTR_data1, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
125+
{ MP_QSTR_data2, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
126+
{ MP_QSTR_data3, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
127+
{ MP_QSTR_data4, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
128+
{ MP_QSTR_data5, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
129+
{ MP_QSTR_data6, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
130+
{ MP_QSTR_data7, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
131+
{ MP_QSTR_data8, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
132+
{ MP_QSTR_data9, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
133+
{ MP_QSTR_data10, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
134+
{ MP_QSTR_data11, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
135+
{ MP_QSTR_data12, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
136+
{ MP_QSTR_data13, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
137+
{ MP_QSTR_data14, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
138+
{ MP_QSTR_data15, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = -1 } },
109139
{ MP_QSTR_freq, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 8000000 } },
110140
{ MP_QSTR_hsync_front_porch, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
111141
{ MP_QSTR_hsync_back_porch, MP_ARG_INT | MP_ARG_KW_ONLY, { .u_int = 0 } },
@@ -149,26 +179,37 @@
149179
self->panel_io_config.vsync_gpio_num = (int)args[ARG_vsync].u_int;
150180
self->panel_io_config.de_gpio_num = (int)args[ARG_de].u_int;
151181
self->panel_io_config.pclk_gpio_num = (int)args[ARG_pclk].u_int;
152-
153-
mp_obj_tuple_t *data_pins = MP_OBJ_TO_PTR(args[ARG_data_pins].u_obj);
154-
155-
for (size_t i = 0; i < data_pins->len; i++) {
156-
self->panel_io_config.data_gpio_nums[i] = (int)mp_obj_get_int(data_pins->items[i]);
157-
}
158-
159-
for (size_t i = data_pins->len; i < 16; i++) {
160-
self->panel_io_config.data_gpio_nums[i] = -1;
161-
}
162-
163-
self->panel_io_config.data_width = (size_t)data_pins->len;
164-
182+
self->panel_io_config.data_gpio_nums[0] = (int)args[ARG_data0].u_int;
183+
self->panel_io_config.data_gpio_nums[1] = (int)args[ARG_data1].u_int;
184+
self->panel_io_config.data_gpio_nums[2] = (int)args[ARG_data2].u_int;
185+
self->panel_io_config.data_gpio_nums[3] = (int)args[ARG_data3].u_int;
186+
self->panel_io_config.data_gpio_nums[4] = (int)args[ARG_data4].u_int;
187+
self->panel_io_config.data_gpio_nums[5] = (int)args[ARG_data5].u_int;
188+
self->panel_io_config.data_gpio_nums[6] = (int)args[ARG_data6].u_int;
189+
self->panel_io_config.data_gpio_nums[7] = (int)args[ARG_data7].u_int;
190+
self->panel_io_config.data_gpio_nums[8] = (int)args[ARG_data8].u_int;
191+
self->panel_io_config.data_gpio_nums[9] = (int)args[ARG_data9].u_int;
192+
self->panel_io_config.data_gpio_nums[10] = (int)args[ARG_data10].u_int;
193+
self->panel_io_config.data_gpio_nums[11] = (int)args[ARG_data11].u_int;
194+
self->panel_io_config.data_gpio_nums[12] = (int)args[ARG_data12].u_int;
195+
self->panel_io_config.data_gpio_nums[13] = (int)args[ARG_data13].u_int;
196+
self->panel_io_config.data_gpio_nums[14] = (int)args[ARG_data14].u_int;
197+
self->panel_io_config.data_gpio_nums[15] = (int)args[ARG_data15].u_int;
198+
self->panel_io_config.disp_gpio_num = (int)args[ARG_disp].u_int;
165199
self->panel_io_config.sram_trans_align = 8;
166200
self->panel_io_config.psram_trans_align = 64;
167201
self->panel_io_config.flags.refresh_on_demand = (uint32_t)args[ARG_refresh_on_demand].u_bool;
168202
self->panel_io_config.flags.fb_in_psram = 0;
169203
self->panel_io_config.flags.double_fb = 0;
170204

205+
int i = 0;
206+
for (; i < 16; i++) {
207+
if (self->panel_io_config.data_gpio_nums[i] == -1) {
208+
break;
209+
}
210+
}
171211

212+
self->panel_io_config.data_width = (size_t) i;
172213

173214
#if CONFIG_LCD_ENABLE_DEBUG_LOG
174215
printf("pclk_hz=%lu\n", self->bus_config.pclk_hz);

0 commit comments

Comments
 (0)