@@ -106,7 +106,6 @@ STATIC mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
106
106
107
107
int temp_host ;
108
108
109
- uint8_t miso_host = 5 ;
110
109
if (
111
110
mosi == SPI_IOMUX_PIN_NUM_MOSI &&
112
111
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
154
153
155
154
self -> callback = mp_const_none ;
156
155
157
- self -> host = host ;
158
- self -> bus_handle = (esp_lcd_spi_bus_handle_t )host ;
156
+ self -> bus_handle = (spi_host_device_t )host ;
159
157
160
158
self -> bus_config .sclk_io_num = clk ;
161
159
self -> bus_config .mosi_io_num = mosi ;
@@ -199,7 +197,7 @@ mp_lcd_err_t spi_del(mp_obj_t obj)
199
197
mp_raise_msg_varg (& mp_type_ValueError , MP_ERROR_TEXT ("%d(esp_lcd_panel_io_del)" ), ret );
200
198
}
201
199
202
- ret = spi_bus_free (self -> host );
200
+ ret = spi_bus_free (self -> bus_handle );
203
201
if (ret != 0 ) {
204
202
mp_raise_msg_varg (& mp_type_ValueError , MP_ERROR_TEXT ("%d(spi_bus_free)" ), ret );
205
203
}
@@ -254,12 +252,12 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
254
252
self -> panel_io_config .trans_queue_depth = 10 ;
255
253
}
256
254
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 );
258
256
if (ret != 0 ) {
259
257
mp_raise_msg_varg (& mp_type_ValueError , MP_ERROR_TEXT ("%d(spi_bus_initialize)" ), ret );
260
258
}
261
259
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 );
263
261
if (ret != 0 ) {
264
262
mp_raise_msg_varg (& mp_type_ValueError , MP_ERROR_TEXT ("%d(esp_lcd_new_panel_io_spi)" ), ret );
265
263
}
0 commit comments