Fixes build errors

Author: kdschlosser

builder/esp32.py

@@ -252,7 +252,7 @@ def repl_args(extra_args):
     esp_args, extra_args = esp_argParser.parse_known_args(extra_args)
 
     enable_uart_repl = esp_args.enable_uart_repl
-    uart_repl_bitrate = esp_args.enable_uart_repl
+    uart_repl_bitrate = esp_args.uart_repl_bitrate
 
     if mcu in ('esp32s3', 'esp32s2', 'esp32c3', 'esp32c6'):
         enable_cdc_repl = esp_args.enable_cdc_repl
@@ -1254,7 +1254,7 @@ def update_main():
 
 
 def build_sdkconfig(*args):
-    if custom_board_path is None:
+    if custom_board_path is not None:
         return
 
     base_config = [

ext_mod/spi3wire/include/spi3wire.h

@@ -10,6 +10,11 @@
     #include "esp_lcd_panel_io_additions.h"
     #include "esp_lcd_panel_io.h"
 
+#if CONFIG_LCD_ENABLE_DEBUG_LOG
+    #define SPI3WIRE_DEBUG_PRINT(...) mp_printf(&mp_plat_print, __VA_ARGS__);
+#else
+    #define SPI3WIRE_DEBUG_PRINT(...)
+#endif
 
     typedef struct {
         mp_obj_base_t base;

ext_mod/spi3wire/src/esp_lcd_panel_io_3wire_spi.c

@@ -15,6 +15,11 @@
 
 #include "esp_lcd_panel_io_additions.h"
 
+#define ESP_LCD_PANEL_IO_ADDITIONS_VER_MAJOR    1
+#define ESP_LCD_PANEL_IO_ADDITIONS_VER_MINOR    0
+#define ESP_LCD_PANEL_IO_ADDITIONS_VER_PATCH    0
+
+
 #define LCD_CMD_BYTES_MAX       (sizeof(uint32_t))  // Maximum number of bytes for LCD command
 #define LCD_PARAM_BYTES_MAX     (sizeof(uint32_t))  // Maximum number of bytes for LCD parameter
 
@@ -70,10 +75,8 @@ esp_err_t esp_lcd_new_panel_io_3wire_spi(const esp_lcd_panel_io_3wire_spi_config
 {
     ESP_RETURN_ON_FALSE(io_config && ret_io, ESP_ERR_INVALID_ARG, TAG, "Invalid argument");
     ESP_RETURN_ON_FALSE(io_config->expect_clk_speed <= PANEL_IO_3WIRE_SPI_CLK_MAX, ESP_ERR_INVALID_ARG, TAG, "Invalid Clock frequency");
-    ESP_RETURN_ON_FALSE(io_config->lcd_cmd_bytes > 0 && io_config->lcd_cmd_bytes <= LCD_CMD_BYTES_MAX, ESP_ERR_INVALID_ARG,
-                        TAG, "Invalid LCD command bytes");
-    ESP_RETURN_ON_FALSE(io_config->lcd_param_bytes > 0 && io_config->lcd_param_bytes <= LCD_PARAM_BYTES_MAX, ESP_ERR_INVALID_ARG,
-                        TAG, "Invalid LCD parameter bytes");
+    ESP_RETURN_ON_FALSE(io_config->lcd_cmd_bytes > 0 && io_config->lcd_cmd_bytes <= LCD_CMD_BYTES_MAX, ESP_ERR_INVALID_ARG, TAG, "Invalid LCD command bytes");
+    ESP_RETURN_ON_FALSE(io_config->lcd_param_bytes > 0 && io_config->lcd_param_bytes <= LCD_PARAM_BYTES_MAX, ESP_ERR_INVALID_ARG, TAG, "Invalid LCD parameter bytes");
 
     const spi_line_config_t *line_config = &io_config->line_config;
 
@@ -136,8 +139,7 @@ esp_err_t esp_lcd_new_panel_io_3wire_spi(const esp_lcd_panel_io_3wire_spi_config
     ESP_GOTO_ON_ERROR(gpio_set_level(panel_io->sda_io_num, sda_scl_idle_level), err, TAG, "Set SDA level failed");
 
     *ret_io = (esp_lcd_panel_io_handle_t)panel_io;
-    ESP_LOGI(TAG, "Panel IO create success, version: %d.%d.%d", ESP_LCD_PANEL_IO_ADDITIONS_VER_MAJOR,
-             ESP_LCD_PANEL_IO_ADDITIONS_VER_MINOR, ESP_LCD_PANEL_IO_ADDITIONS_VER_PATCH);
+    ESP_LOGI(TAG, "Panel IO create success, version: %d.%d.%d", ESP_LCD_PANEL_IO_ADDITIONS_VER_MAJOR, ESP_LCD_PANEL_IO_ADDITIONS_VER_MINOR, ESP_LCD_PANEL_IO_ADDITIONS_VER_PATCH);
     return ESP_OK;
 
 err:

ext_mod/spi3wire/src/spi3wire.c

@@ -127,7 +127,7 @@ static mp_obj_t spi3wire_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     esp_err_t ret = esp_lcd_new_panel_io_3wire_spi(self->io_config, &self->panel_io_handle);
 
-    if (ret !- 0) {
+    if (ret != 0) {
         mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("%d(esp_lcd_new_panel_io_3wire_spi)"), ret);
     }
 
@@ -161,13 +161,13 @@ static mp_obj_t spi3wire_tx_param(size_t n_args, const mp_obj_t *pos_args, mp_ma
         size_t buf_len = 0;
 
         if (args[ARG_params].u_obj != mp_const_none) {
-            mp_buffer_info_t *bufinfo;
+            mp_buffer_info_t bufinfo;
             mp_get_buffer_raise(args[ARG_params].u_obj, &bufinfo, MP_BUFFER_READ);
             buf_len = bufinfo.len;
             buf = bufinfo.buf;
         }
 
-        LCD_DEBUG_PRINT("spi3wire_tx_param(self, lcd_cmd=%d, param, param_size=%d)\n", cmd, buf_len)
+        SPI3WIRE_DEBUG_PRINT("spi3wire_tx_param(self, lcd_cmd=%d, param, param_size=%d)\n", cmd, buf_len)
 
         esp_err_t ret = esp_lcd_panel_io_tx_param(self->panel_io_handle, cmd, buf, buf_len);
 
@@ -185,7 +185,7 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(spi3wire_tx_param_obj, 2, spi3wire_tx_param);
 
 mp_obj_t spi3wire_deinit(mp_obj_t obj)
 {
-    LCD_DEBUG_PRINT("spi3wire_deinit(self)\n")
+    SPI3WIRE_DEBUG_PRINT("spi3wire_deinit(self)\n")
 
     mp_spi3wire_obj_t *self = (mp_spi3wire_obj_t *)obj;
 
@@ -213,13 +213,13 @@ mp_obj_t spi3wire_deinit(mp_obj_t obj)
         spi3wire_objs = m_realloc(spi3wire_objs, spi3wire_count * sizeof(mp_spi3wire_obj_t *));
     }
 
-    return mp_const_none
+    return mp_const_none;
 }
 
 static MP_DEFINE_CONST_FUN_OBJ_1(spi3wire_deinit_obj, spi3wire_deinit);
 
 
-static const mp_rom_map_elem_t mp_spi3wire_locals_dict_table[] = {
+static const mp_rom_map_elem_t spi3wire_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_tx_param), MP_ROM_PTR(&spi3wire_tx_param_obj) },
     { MP_ROM_QSTR(MP_QSTR_init),     MP_ROM_PTR(&spi3wire_init_obj)     },
     { MP_ROM_QSTR(MP_QSTR_deinit),   MP_ROM_PTR(&spi3wire_deinit_obj)   },
@@ -238,17 +238,17 @@ MP_DEFINE_CONST_OBJ_TYPE(
 );
 
 
-static const mp_rom_map_elem_t mp_module_spi3wire_globals_table[] = {
+static const mp_rom_map_elem_t spi3wire_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_spi3wire) },
     { MP_ROM_QSTR(MP_QSTR_Spi3Wire), MP_ROM_PTR(&mp_spi3wire_type)     },
 };
 
-static MP_DEFINE_CONST_DICT(mp_module_spi3wire_globals, mp_module_spi3wire_globals_table);
+static MP_DEFINE_CONST_DICT(spi3wire_globals, spi3wire_globals_table);
 
 
-const mp_obj_module_t mp_module_spi3wire = {
+const mp_obj_module_t module_spi3wire = {
     .base    = {&mp_type_module},
-    .globals = (mp_obj_dict_t *)&mp_module_spi3wire_globals,
+    .globals = (mp_obj_dict_t *)&spi3wire_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_spi3wire, mp_module_spi3wire);
+MP_REGISTER_MODULE(MP_QSTR_spi3wire, module_spi3wire);