Skip to content

Commit 9d55480

Browse files
committed
fixes SPIBus invalid argument
1 parent 7a8f44b commit 9d55480

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

ext_mod/lcd_bus/esp32_include/spi_bus.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
lcd_panel_io_t panel_io_handle;
3131
esp_lcd_panel_io_spi_config_t panel_io_config;
3232
spi_bus_config_t bus_config;
33-
esp_lcd_spi_bus_handle_t bus_handle;
34-
35-
int host;
33+
spi_host_device_t bus_handle;
3634

3735
} mp_lcd_spi_bus_obj_t;
3836

ext_mod/lcd_bus/esp32_src/spi_bus.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ STATIC mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
106106

107107
int temp_host;
108108

109-
uint8_t miso_host = 5;
110109
if (
111110
mosi == SPI_IOMUX_PIN_NUM_MOSI &&
112111
clk == SPI_IOMUX_PIN_NUM_CLK &&
@@ -154,8 +153,7 @@ STATIC mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
154153

155154
self->callback = mp_const_none;
156155

157-
self->host = host;
158-
self->bus_handle = (esp_lcd_spi_bus_handle_t)host;
156+
self->bus_handle = (spi_host_device_t)host;
159157

160158
self->bus_config.sclk_io_num = clk;
161159
self->bus_config.mosi_io_num = mosi;
@@ -199,7 +197,7 @@ mp_lcd_err_t spi_del(mp_obj_t obj)
199197
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_panel_io_del)"), ret);
200198
}
201199

202-
ret = spi_bus_free(self->host);
200+
ret = spi_bus_free(self->bus_handle);
203201
if (ret != 0) {
204202
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(spi_bus_free)"), ret);
205203
}
@@ -254,12 +252,12 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
254252
self->panel_io_config.trans_queue_depth = 10;
255253
}
256254

257-
mp_lcd_err_t ret = spi_bus_initialize(self->host, &self->bus_config, SPI_DMA_CH_AUTO);
255+
mp_lcd_err_t ret = spi_bus_initialize(self->bus_handle, &self->bus_config, SPI_DMA_CH_AUTO);
258256
if (ret != 0) {
259257
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(spi_bus_initialize)"), ret);
260258
}
261259

262-
ret = esp_lcd_new_panel_io_spi(self->bus_handle, &self->panel_io_config, &self->panel_io_handle.panel_io);
260+
ret = esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)self->bus_handle, &self->panel_io_config, &self->panel_io_handle.panel_io);
263261
if (ret != 0) {
264262
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_new_panel_io_spi)"), ret);
265263
}

0 commit comments

Comments
 (0)