some more changes to hopefully stop a boot loop

Author: kdschlosser

builder/esp32.py

@@ -16,7 +16,7 @@
     scrub_build_folder
 )
 
-IDF_VER = '5.4.0'
+IDF_VER = '5.4.2'
 
 
 def get_partition_file_name(otp):
@@ -158,7 +158,7 @@ def get_espidf():
         ]
     ]
     print()
-    print(f'collecting ESP-IDF v5.4.0')
+    print(f'collecting ESP-IDF v5.4.2')
     print('this might take a while...')
     result, _ = spawn(cmd, spinner=True)
     if result != 0:
@@ -943,7 +943,7 @@ def submodules():
         ['./install.sh', 'all']
     ]
 
-    print(f'setting up ESP-IDF v5.4.0')
+    print(f'setting up ESP-IDF v5.4.2')
     print('this might take a while...')
     env = {k: v for k, v in os.environ.items()}
     env['IDF_PATH'] = os.path.abspath(idf_path)
@@ -1349,8 +1349,8 @@ def build_sdkconfig(*args):
         'CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y'
     ]
 
-    if board == 'ESP32_GENERIC_S3':
-        base_config.insert(1, 'CONFIG_SPIRAM_XIP_FROM_PSRAM=y')
+    # if board == 'ESP32_GENERIC_S3':
+    #     base_config.insert(1, 'CONFIG_SPIRAM_XIP_FROM_PSRAM=y')
 
     if DEBUG:
         base_config.extend([
@@ -1570,7 +1570,7 @@ def compile(*args):  # NOQA
 
             espressif_path = os.path.expanduser('~/.espressif')
 
-            for ver in ('3.8', '3.9', '3.10', '3.11', '3.12', '3.13'):
+            for ver in ('3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'):
                 python_path = (
                     f'{espressif_path}/python_env/'
                     f'idf{IDF_VER[:-2]}_py{ver}_env/bin'

ext_mod/lcd_bus/esp32_include/i2c_bus.h

@@ -7,8 +7,8 @@
     #include "lcd_types.h"
 
     // esp-idf includes
-    #include "esp_lcd_panel_io.h"
-    #include "driver/i2c.h"
+    // #include "esp_lcd_panel_io.h"
+    // #include "driver/i2c.h"
 
     // micropython includes
     #include "mphalport.h"
@@ -27,11 +27,12 @@
 
         bool trans_done;
         bool rgb565_byte_swap;
-
+        /*
         lcd_panel_io_t panel_io_handle;
         esp_lcd_panel_io_i2c_config_t panel_io_config;
         i2c_port_t port;
         esp_lcd_i2c_bus_handle_t bus_handle;
+        */
 
     } mp_lcd_i2c_bus_obj_t;
 

ext_mod/micropython.cmake

@@ -4,9 +4,9 @@ if(ESP_PLATFORM)
     include(${CMAKE_CURRENT_LIST_DIR}/esp32_components.cmake)
     include(${CMAKE_CURRENT_LIST_DIR}/spi3wire/micropython.cmake)
 
-    if(DEFINED ENV{LEDSTRIP})
-        include(${CMAKE_CURRENT_LIST_DIR}/led_strip/micropython.cmake)
-    endif()
+    # if(DEFINED ENV{LEDSTRIP})
+    #     include(${CMAKE_CURRENT_LIST_DIR}/led_strip/micropython.cmake)
+    # endif()
 
 
     if(DEFINED ENV{PY_FREERTOS})