Skip to content

Commit d0493fa

Browse files
kdschlosserkdschlosser
committed
fixes build error
1 parent 6e66379 commit d0493fa

File tree

5 files changed

+39
-40
lines changed

5 files changed

+39
-40
lines changed

‎ext_mod/lcd_bus/esp32_src/i80_bus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
printf("data_gpio_nums[15]=%d\n", self->bus_config.data_gpio_nums[15]);
179179
printf("bus_width=%d\n", self->bus_config.bus_width);
180180
printf("cs_gpio_num=%d\n", self->panel_io_config.cs_gpio_num);
181-
printf("pclk_hz=%d\n", self->panel_io_config.pclk_hz);
181+
printf("pclk_hz=%lu\n", self->panel_io_config.pclk_hz);
182182
printf("trans_queue_depth=%d\n", self->panel_io_config.trans_queue_depth);
183183
printf("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits);
184184
printf("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits);
@@ -204,7 +204,7 @@
204204
mp_lcd_err_t i80_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap)
205205
{
206206
#if CONFIG_LCD_ENABLE_DEBUG_LOG
207-
printf("i80_init(self, width=%d, height=%d, bpp=%d, buffer_size=%d, rgb565_byte_swap=%d)\n", width, height, bpp, buffer_size, rgb565_byte_swap);
207+
printf("i80_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap);
208208
#endif
209209

210210
mp_lcd_i80_bus_obj_t *self = (mp_lcd_i80_bus_obj_t *)obj;

‎ext_mod/lcd_bus/esp32_src/rgb_bus.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -226,22 +226,22 @@
226226
self->panel_io_config.vsync_gpio_num = (int)args[ARG_vsync].u_int;
227227
self->panel_io_config.de_gpio_num = (int)args[ARG_de].u_int;
228228
self->panel_io_config.pclk_gpio_num = (int)args[ARG_pclk].u_int;
229-
self->panel_io_config.data_gpio_nums[0] = args[ARG_data0].u_int;
230-
self->panel_io_config.data_gpio_nums[1] = args[ARG_data1].u_int;
231-
self->panel_io_config.data_gpio_nums[2] = args[ARG_data2].u_int;
232-
self->panel_io_config.data_gpio_nums[3] = args[ARG_data3].u_int;
233-
self->panel_io_config.data_gpio_nums[4] = args[ARG_data4].u_int;
234-
self->panel_io_config.data_gpio_nums[5] = args[ARG_data5].u_int;
235-
self->panel_io_config.data_gpio_nums[6] = args[ARG_data6].u_int;
236-
self->panel_io_config.data_gpio_nums[7] = args[ARG_data7].u_int;
237-
self->panel_io_config.data_gpio_nums[8] = args[ARG_data8].u_int;
238-
self->panel_io_config.data_gpio_nums[9] = args[ARG_data9].u_int;
239-
self->panel_io_config.data_gpio_nums[10] = args[ARG_data10].u_int;
240-
self->panel_io_config.data_gpio_nums[11] = args[ARG_data11].u_int;
241-
self->panel_io_config.data_gpio_nums[12] = args[ARG_data12].u_int;
242-
self->panel_io_config.data_gpio_nums[13] = args[ARG_data13].u_int;
243-
self->panel_io_config.data_gpio_nums[14] = args[ARG_data14].u_int;
244-
self->panel_io_config.data_gpio_nums[15] = args[ARG_data15].u_int;
229+
self->panel_io_config.data_gpio_nums[0] = (int)args[ARG_data0].u_int;
230+
self->panel_io_config.data_gpio_nums[1] = (int)args[ARG_data1].u_int;
231+
self->panel_io_config.data_gpio_nums[2] = (int)args[ARG_data2].u_int;
232+
self->panel_io_config.data_gpio_nums[3] = (int)args[ARG_data3].u_int;
233+
self->panel_io_config.data_gpio_nums[4] = (int)args[ARG_data4].u_int;
234+
self->panel_io_config.data_gpio_nums[5] = (int)args[ARG_data5].u_int;
235+
self->panel_io_config.data_gpio_nums[6] = (int)args[ARG_data6].u_int;
236+
self->panel_io_config.data_gpio_nums[7] = (int)args[ARG_data7].u_int;
237+
self->panel_io_config.data_gpio_nums[8] = (int)args[ARG_data8].u_int;
238+
self->panel_io_config.data_gpio_nums[9] = (int)args[ARG_data9].u_int;
239+
self->panel_io_config.data_gpio_nums[10] = (int)args[ARG_data10].u_int;
240+
self->panel_io_config.data_gpio_nums[11] = (int)args[ARG_data11].u_int;
241+
self->panel_io_config.data_gpio_nums[12] = (int)args[ARG_data12].u_int;
242+
self->panel_io_config.data_gpio_nums[13] = (int)args[ARG_data13].u_int;
243+
self->panel_io_config.data_gpio_nums[14] = (int)args[ARG_data14].u_int;
244+
self->panel_io_config.data_gpio_nums[15] = (int)args[ARG_data15].u_int;
245245
self->panel_io_config.disp_gpio_num = (int)args[ARG_disp].u_int;
246246
self->panel_io_config.sram_trans_align = 8;
247247
self->panel_io_config.psram_trans_align = 64;

‎ext_mod/lcd_bus/esp32_src/spi_bus.c

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,8 @@ STATIC mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
7575
mp_lcd_spi_bus_obj_t *self = m_new_obj(mp_lcd_spi_bus_obj_t);
7676
self->base.type = &mp_lcd_spi_bus_type;
7777

78-
if ((args[ARG_spi_mode].u_int > 3) || (args[ARG_spi_mode].u_int < 0)) {
79-
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid spi mode (%d)"), args[ARG_spi_mode].u_int);
80-
}
81-
8278
self->callback = mp_const_none;
83-
self->spi_bus = (esp32_hw_spi_bus_obj_t *)MP_OBJ_TO_PTR(args[ARG_spi_bus].u_obj)
79+
self->spi_bus = (esp32_hw_spi_bus_obj_t *)MP_OBJ_TO_PTR(args[ARG_spi_bus].u_obj);
8480
self->panel_io_handle.panel_io = NULL;
8581
self->bus_handle = (esp_lcd_spi_bus_handle_t)self->spi_bus->host;
8682

@@ -112,13 +108,15 @@ STATIC mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
112108
printf("cs_gpio_num=%d\n", self->panel_io_config.cs_gpio_num);
113109
printf("dc_gpio_num=%d\n", self->panel_io_config.dc_gpio_num);
114110
printf("spi_mode=%d\n", self->panel_io_config.spi_mode);
115-
printf("pclk_hz=%d\n", self->panel_io_config.pclk_hz);
111+
printf("pclk_hz=%lu\n", self->panel_io_config.pclk_hz);
116112
printf("lcd_cmd_bits=%d\n", self->panel_io_config.lcd_cmd_bits);
117113
printf("lcd_param_bits=%d\n", self->panel_io_config.lcd_param_bits);
118-
printf("dc_low_on_data=%d\n", self->panel_io_config.flags.dc_low_on_data);
119-
printf("sio_mode=%d\n", self->panel_io_config.flags.sio_mode);
120-
printf("lsb_first=%d\n", self->panel_io_config.flags.lsb_first);
121-
printf("cs_high_active=%d\n", self->panel_io_config.flags.cs_high_active);
114+
printf("dc_low_on_data=%lu\n", self->panel_io_config.flags.dc_low_on_data);
115+
printf("sio_mode=%lu\n", self->panel_io_config.flags.sio_mode);
116+
printf("lsb_first=%lu\n", self->panel_io_config.flags.lsb_first);
117+
printf("cs_high_active=%lu\n", self->panel_io_config.flags.cs_high_active);
118+
printf("octal_mode=%lu\n", self->panel_io_config.flags.octal_mode);
119+
122120
#endif
123121

124122
return MP_OBJ_FROM_PTR(self);
@@ -134,7 +132,7 @@ mp_lcd_err_t spi_del(mp_obj_t obj)
134132
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_panel_io_del)"), ret);
135133
}
136134

137-
ret = spi_bus_free(self->host);
135+
ret = spi_bus_free(self->spi_bus->host);
138136
if (ret != ESP_OK) {
139137
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(spi_bus_free)"), ret);
140138
}
@@ -145,7 +143,7 @@ mp_lcd_err_t spi_del(mp_obj_t obj)
145143
mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap)
146144
{
147145
#if CONFIG_LCD_ENABLE_DEBUG_LOG
148-
printf("spi_init(self, width=%d, height=%d, bpp=%d, buffer_size=%d, rgb565_byte_swap=%d)\n", width, height, bpp, buffer_size, rgb565_byte_swap);
146+
printf("spi_init(self, width=%i, height=%i, bpp=%i, buffer_size=%lu, rgb565_byte_swap=%i)\n", width, height, bpp, buffer_size, (uint8_t)rgb565_byte_swap);
149147
#endif
150148
mp_lcd_spi_bus_obj_t *self = (mp_lcd_spi_bus_obj_t *)obj;
151149

@@ -158,11 +156,11 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
158156
self->panel_io_config.trans_queue_depth = 10;
159157

160158
#if CONFIG_LCD_ENABLE_DEBUG_LOG
161-
printf("rgb565_byte_swap=%d\n", self->rgb565_byte_swap);
162-
printf("trans_queue_depth=%d\n", self->panel_io_config.trans_queue_depth);
159+
printf("rgb565_byte_swap=%i\n", (uint8_t)self->rgb565_byte_swap);
160+
printf("trans_queue_depth=%i\n", (uint8_t)self->panel_io_config.trans_queue_depth);
163161
#endif
164162

165-
ret = esp_lcd_new_panel_io_spi(self->bus_handle, &self->panel_io_config, &self->panel_io_handle.panel_io);
163+
mp_lcd_err_t ret = esp_lcd_new_panel_io_spi(self->bus_handle, &self->panel_io_config, &self->panel_io_handle.panel_io);
166164
if (ret != ESP_OK) {
167165
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_new_panel_io_spi)"), ret);
168166
}
@@ -179,13 +177,14 @@ mp_lcd_err_t spi_get_lane_count(mp_obj_t obj, uint8_t *lane_count)
179177

180178
if (self->panel_io_config.flags.sio_mode) {
181179
*lane_count = 2;
182-
}
183-
if (self->bus_config.quadwp_io_num != -1) {
184-
*lane_count = 4;
180+
} else if (self->spi_bus->octal_mode) {
181+
*lane_count = 8;
182+
} else {
183+
*lane_count = 0;
185184
}
186185

187186
#if CONFIG_LCD_ENABLE_DEBUG_LOG
188-
printf("spi_get_lane_count(self) -> %d\n", *lane_count);
187+
printf("spi_get_lane_count(self) -> %i\n", (uint8_t)(*lane_count));
189188
#endif
190189

191190
return LCD_OK;
@@ -197,7 +196,7 @@ mp_obj_t mp_spi_bus_get_host(mp_obj_t obj)
197196
mp_lcd_spi_bus_obj_t *self = (mp_lcd_spi_bus_obj_t *)obj;
198197

199198
#if CONFIG_LCD_ENABLE_DEBUG_LOG
200-
printf("mp_spi_bus_get_host(self) -> %d\n", (uint8_t)self->spi_bus->host);
199+
printf("mp_spi_bus_get_host(self) -> %i\n", (uint8_t)self->spi_bus->host);
201200
#endif
202201

203202
return mp_obj_new_int((uint8_t)self->spi_bus->host);

‎ext_mod/lcd_bus/lcd_types.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ mp_obj_t lcd_panel_io_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t
256256
void *buf = heap_caps_calloc(1, size, caps);
257257

258258
#if CONFIG_LCD_ENABLE_DEBUG_LOG
259-
printf("lcd_panel_io_allocate_framebuffer(self, size=%d, caps=%d)\n", size, caps);
259+
printf("lcd_panel_io_allocate_framebuffer(self, size=%lu, caps=%lu)\n", size, caps);
260260
#endif
261261
#else
262262
LCD_UNUSED(caps);

‎spi.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class Bus(object):
1616

1717
def get_host(
1818
self,
19+
*,
1920
host: int,
20-
/,
2121
mosi: Optional[int] = None,
2222
miso: Optional[int] = None,
2323
sck: Optional[int] = None,

0 commit comments

Comments
 (0)