Skip to content

Commit 4b51d56

Browse files
committed
fix: micropython 1.19.1 compilation error
1 parent d04cc63 commit 4b51d56

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

lcd/bus/spi/spi_panel.c

+16
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ STATIC mp_obj_t mp_lcd_spi_panel_make_new(const mp_obj_type_t *type,
8282
self->cmd_bits = args[ARG_cmd_bits].u_int;
8383
self->param_bits = args[ARG_param_bits].u_int;
8484

85+
#if (MICROPY_VERSION_MAJOR == 1) && (MICROPY_VERSION_MINOR >= 20)
8586
if (mp_obj_is_type(self->spi_obj, &machine_spi_type)) {
87+
#else
88+
if (mp_obj_is_type(self->spi_obj, &machine_hw_spi_type)) {
89+
#endif
8690
hal_lcd_spi_panel_construct(&self->base);
8791
} else if (mp_obj_is_type(self->spi_obj, &mp_machine_soft_spi_type)) {
8892
hal_lcd_softspi_panel_construct(&self->base);
@@ -154,7 +158,11 @@ STATIC inline void mp_lcd_spi_panel_p_tx_param(mp_obj_base_t *self,
154158
size_t param_size)
155159
{
156160
mp_lcd_spi_panel_obj_t *spi_panel_obj = (mp_lcd_spi_panel_obj_t *)self;
161+
#if (MICROPY_VERSION_MAJOR == 1) && (MICROPY_VERSION_MINOR >= 20)
157162
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_spi_type)) {
163+
#else
164+
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_hw_spi_type)) {
165+
#endif
158166
hal_lcd_spi_panel_tx_param(self, lcd_cmd, param, param_size);
159167
} else if (mp_obj_is_type(spi_panel_obj->spi_obj, &mp_machine_soft_spi_type)) {
160168
hal_lcd_softspi_panel_tx_param(self, lcd_cmd, param, param_size);
@@ -168,7 +176,11 @@ STATIC inline void mp_lcd_spi_panel_p_tx_color(mp_obj_base_t *self,
168176
size_t color_size)
169177
{
170178
mp_lcd_spi_panel_obj_t *spi_panel_obj = (mp_lcd_spi_panel_obj_t *)self;
179+
#if (MICROPY_VERSION_MAJOR == 1) && (MICROPY_VERSION_MINOR >= 20)
171180
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_spi_type)) {
181+
#else
182+
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_hw_spi_type)) {
183+
#endif
172184
hal_lcd_spi_panel_tx_color(self, lcd_cmd, color, color_size);
173185
} else if (mp_obj_is_type(spi_panel_obj->spi_obj, &mp_machine_soft_spi_type)) {
174186
hal_lcd_softspi_panel_tx_color(self, lcd_cmd, color, color_size);
@@ -179,7 +191,11 @@ STATIC inline void mp_lcd_spi_panel_p_tx_color(mp_obj_base_t *self,
179191
STATIC inline void mp_lcd_spi_panel_p_deinit(mp_obj_base_t *self)
180192
{
181193
mp_lcd_spi_panel_obj_t *spi_panel_obj = (mp_lcd_spi_panel_obj_t *)self;
194+
#if (MICROPY_VERSION_MAJOR == 1) && (MICROPY_VERSION_MINOR >= 20)
182195
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_spi_type)) {
196+
#else
197+
if (mp_obj_is_type(spi_panel_obj->spi_obj, &machine_hw_spi_type)) {
198+
#endif
183199
hal_lcd_spi_panel_deinit(self);
184200
} else if (mp_obj_is_type(spi_panel_obj->spi_obj, &mp_machine_soft_spi_type)) {
185201
hal_lcd_softspi_panel_deinit(self);

0 commit comments

Comments
 (0)