More esp fixing

Author: tannewt

ports/espressif/CMakeLists.txt

@@ -6,7 +6,7 @@ set(ENV{IDF_PATH} ${CMAKE_SOURCE_DIR}/esp-idf)
 
 # The component list here determines what options we get in menuconfig and what the ninja file can build.
 set(COMPONENTS bt driver esp-tls esp_adc_cal esp_event esp_netif esp_psram esp_wifi esptool_py freertos log lwip main mbedtls mdns soc ulp usb wpa_supplicant esp_lcd)
-set(EXTRA_COMPONENT_DIRS esp-protocols/components/mdns)
+set(EXTRA_COMPONENT_DIRS "esp-protocols/components/mdns")
 
 list(APPEND EXTRA_COMPONENT_DIRS "esp32-camera")
 

ports/espressif/boards/adafruit_esp32s3_camera/board.c

@@ -87,7 +87,7 @@ static void io_expander_backlight_init(void) {
     i2c_master_write_byte(cmd, AW9523_REG_SOFTRESET, true);
     i2c_master_write_byte(cmd, 0, true);
     i2c_master_stop(cmd);
-    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_RATE_MS);
+    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
 
     cmd = i2c_cmd_link_create();
@@ -97,7 +97,7 @@ static void io_expander_backlight_init(void) {
     i2c_master_write_byte(cmd, AW9523_DEFAULT_CONFIG >> 8, true);
     i2c_master_write_byte(cmd, AW9523_DEFAULT_CONFIG & 0xff, true);
     i2c_master_stop(cmd);
-    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_RATE_MS);
+    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
 
     cmd = i2c_cmd_link_create();
@@ -107,7 +107,7 @@ static void io_expander_backlight_init(void) {
     i2c_master_write_byte(cmd, AW9523_DEFAULT_OUTPUT >> 8, true);
     i2c_master_write_byte(cmd, AW9523_DEFAULT_OUTPUT & 0xff, true);
     i2c_master_stop(cmd);
-    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_RATE_MS);
+    i2c_master_cmd_begin(i2c_num, cmd, 1000 / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
 
     i2c_driver_delete(i2c_num);

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

@@ -8,6 +8,7 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
+CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 FLASH_SDKCONFIG = esp-idf-config/sdkconfig-4MB-1ota.defaults
 
 CIRCUITPY_AUDIOBUSIO = 0

ports/espressif/common-hal/espulp/ULP.c

@@ -35,11 +35,11 @@
 #define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32_ULP_COPROC_RESERVE_MEM)
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
 #include "esp32s2/ulp.h"
-#include "esp32s2/ulp_riscv.h"
+#include "ulp_riscv.h"
 #define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM)
 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
 #include "esp32s3/ulp.h"
-#include "esp32s3/ulp_riscv.h"
+#include "ulp_riscv.h"
 #define ULP_COPROC_RESERVE_MEM (CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM)
 #endif