diff --git a/.github/workflows/build-willow.yml b/.github/workflows/build-willow.yml index ca5041ce..d25d2365 100644 --- a/.github/workflows/build-willow.yml +++ b/.github/workflows/build-willow.yml @@ -18,6 +18,7 @@ jobs: matrix: device: - ESP32_S3_BOX + - ESP32_S3_BOX_3 - ESP32_S3_BOX_LITE runs-on: ubuntu-22.04 container: diff --git a/Dockerfile b/Dockerfile index 6abaf9fd..2078b806 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY container.gitconfig /root/.gitconfig ENV PATH="$PATH:/willow/.local/bin" WORKDIR /willow -ENV ADF_VER="2939a3e541f46f6dd916d2e3b7462609ec4fae5c" +ENV ADF_VER="willow-main-2023091400" RUN \ cd /opt/esp/idf && \ curl https://raw.githubusercontent.com/toverainc/esp-adf/$ADF_VER/idf_patches/idf_v4.4_freertos.patch | patch -p1 diff --git a/main/display.c b/main/display.c index 557af69c..25473fec 100644 --- a/main/display.c +++ b/main/display.c @@ -28,6 +28,8 @@ esp_err_t init_display(void) case WILLOW_HW_UNSUPPORTED: __attribute__((fallthrough)); case WILLOW_HW_ESP32_S3_BOX: + __attribute__((fallthrough)); + case WILLOW_HW_ESP32_S3_BOX_3: bl_duty_off = 0; bl_duty_on = config_get_int("lcd_brightness", DEFAULT_LCD_BRIGHTNESS); break; diff --git a/main/slvgl.c b/main/slvgl.c index b8cb6b7b..a1a7e153 100644 --- a/main/slvgl.c +++ b/main/slvgl.c @@ -126,6 +126,8 @@ esp_err_t init_lvgl_touch(void) switch (hw_type) { case WILLOW_HW_ESP32_S3_BOX: + __attribute__((fallthrough)); + case WILLOW_HW_ESP32_S3_BOX_3: break; default: ESP_LOGI(TAG, "%s does not have a touch screen, skipping init", str_hw_type(hw_type)); diff --git a/main/system.c b/main/system.c index 6c4d0583..9477c403 100644 --- a/main/system.c +++ b/main/system.c @@ -15,6 +15,7 @@ static const char *willow_hw_t[WILLOW_HW_MAX] = { [WILLOW_HW_UNSUPPORTED] = "Hardware not supported.", [WILLOW_HW_ESP32_S3_BOX] = "ESP32-S3-BOX", [WILLOW_HW_ESP32_S3_BOX_LITE] = "ESP32-S3-BOX-Lite", + [WILLOW_HW_ESP32_S3_BOX_3] = "ESP32-S3-BOX-3", }; const char *str_hw_type(int id) @@ -31,6 +32,8 @@ static void set_hw_type(void) hw_type = WILLOW_HW_ESP32_S3_BOX; #elif defined(CONFIG_ESP32_S3_BOX_LITE_BOARD) hw_type = WILLOW_HW_ESP32_S3_BOX_LITE; +#elif defined(CONFIG_ESP32_S3_BOX_3_BOARD) + hw_type = WILLOW_HW_ESP32_S3_BOX_3; #else hw_type = WILLOW_HW_UNSUPPORTED; #endif diff --git a/main/system.h b/main/system.h index 4ac79727..fbc00a40 100644 --- a/main/system.h +++ b/main/system.h @@ -4,6 +4,7 @@ enum willow_hw_t { WILLOW_HW_UNSUPPORTED = 0, WILLOW_HW_ESP32_S3_BOX, WILLOW_HW_ESP32_S3_BOX_LITE, + WILLOW_HW_ESP32_S3_BOX_3, WILLOW_HW_MAX, // keep this last }; @@ -20,4 +21,4 @@ esp_periph_set_handle_t hdl_pset; const char *str_hw_type(int id); void init_system(void); -void restart_delayed(void); \ No newline at end of file +void restart_delayed(void);