Merge pull request #405 from shorepine/sequencer

Force `MP_SCHEDULER_DEPTH` to be set by copying our own `mpconfigport.h` over `ports/esp32`
shorepine · Oct 16, 2024 · 7aa0adf · 7aa0adf
2 parents 7146245 + ee8cff5
commit 7aa0adf
Show file tree

Hide file tree

Showing 9 changed files with 409 additions and 47 deletions.
diff --git a/tulip/esp32s3/CMakeLists.txt b/tulip/esp32s3/CMakeLists.txt
@@ -18,6 +18,9 @@ execute_process(COMMAND bash -c "python3 ../../../lv_binding_micropython_tulip/g
                     WORKING_DIRECTORY "."
                 )
 
+# We also have to copy over mpconfigport.h
+execute_process(COMMAND bash -c "cp ../mpconfigport.h ../../../micropython/ports/esp32/mpconfigport.h" WORKING_DIRECTORY ".")
+
 # Turn this on for debugging submodules
 #file(WRITE "submod" "${GIT_SUBMOD_RESULT}")
 

diff --git a/tulip/esp32s3/boards/N16R8/mpconfigboard.h b/tulip/esp32s3/boards/N16R8/mpconfigboard.h
@@ -19,3 +19,4 @@
 #define MICROPY_HW_ENABLE_USBDEV (1)
 #define MICROPY_HW_ESP_USB_SERIAL_JTAG (0)
 #define MICROPY_ENABLE_SCHEDULER (1)
+#define MICROPY_SCHEDULER_DEPTH             (128)
diff --git a/tulip/esp32s3/boards/N32R8/mpconfigboard.h b/tulip/esp32s3/boards/N32R8/mpconfigboard.h
@@ -8,14 +8,3 @@
 #define MICROPY_HW_ENABLE_UART_REPL         (1)
 
 
-#define MICROPY_HW_I2C0_SCL                 (I2C_SCL)
-#define MICROPY_HW_I2C0_SDA                 (I2C_SDA)
-
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (0)
-#define MICROPY_PY_BLUETOOTH (0)
-#define MICROPY_BLUETOOTH_NIMBLE (0)
-#define MICROPY_HW_USB_CDC (1)
-#define MICROPY_HW_ENABLE_USBDEV (1)
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG (0)
-#define MICROPY_ENABLE_SCHEDULER (1)
diff --git a/tulip/esp32s3/boards/TDECK/mpconfigboard.h b/tulip/esp32s3/boards/TDECK/mpconfigboard.h
@@ -8,16 +8,6 @@
 #define MICROPY_HW_ENABLE_UART_REPL         (1)
 
 #define USB_SERIAL_JTAG_PACKET_SZ_BYTES 64
-#define MICROPY_HW_I2C0_SCL                 (I2C_SCL)
-#define MICROPY_HW_I2C0_SDA                 (I2C_SDA)
 
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (0)
-#define MICROPY_PY_BLUETOOTH (0)
-#define MICROPY_BLUETOOTH_NIMBLE (0)
-#define MICROPY_HW_USB_CDC (0)
-#define MICROPY_HW_ENABLE_USBDEV (0)
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG (1)
-#define MICROPY_ENABLE_SCHEDULER (1)
 #define MICROPY_ESP32_USE_BOOTLOADER_RTC (0)
-#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs,args) void
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs,args) void
diff --git a/tulip/esp32s3/boards/TULIP4_R11/mpconfigboard.h b/tulip/esp32s3/boards/TULIP4_R11/mpconfigboard.h
@@ -7,16 +7,3 @@
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.
 #define MICROPY_HW_ENABLE_UART_REPL         (1)
 
-
-#define MICROPY_HW_I2C0_SCL                 (I2C_SCL)
-#define MICROPY_HW_I2C0_SDA                 (I2C_SDA)
-
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (0)
-#define MICROPY_PY_BLUETOOTH (0)
-#define MICROPY_BLUETOOTH_NIMBLE (0)
-#define MICROPY_HW_USB_CDC (1)
-#define MICROPY_HW_ENABLE_USBDEV (1)
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG (0)
-#define MICROPY_ENABLE_SCHEDULER (1)
-
diff --git a/tulip/esp32s3/boards/TULIP4_R11_DEBUG/mpconfigboard.h b/tulip/esp32s3/boards/TULIP4_R11_DEBUG/mpconfigboard.h
@@ -8,14 +8,3 @@
 #define MICROPY_HW_ENABLE_UART_REPL         (1)
 
 
-#define MICROPY_HW_I2C0_SCL                 (I2C_SCL)
-#define MICROPY_HW_I2C0_SDA                 (I2C_SDA)
-
-#define MICROPY_HW_ENABLE_SDCARD            (0)
-#define MICROPY_PY_MACHINE_I2S              (0)
-#define MICROPY_PY_BLUETOOTH (0)
-#define MICROPY_BLUETOOTH_NIMBLE (0)
-#define MICROPY_HW_USB_CDC (1)
-#define MICROPY_HW_ENABLE_USBDEV (1)
-#define MICROPY_HW_ESP_USB_SERIAL_JTAG (0)
-#define MICROPY_ENABLE_SCHEDULER (1)