diff --git a/include/Const.h b/include/Const.h index 2865cd60..dad4c8a8 100644 --- a/include/Const.h +++ b/include/Const.h @@ -44,6 +44,14 @@ #define FIRMWARE_NAME "esp32s2_4mb" #endif +#ifdef esp32c3m_4mb +#define FIRMWARE_NAME "esp32c3m_4mb" +#endif + +#ifdef esp32s3_16mb +#define FIRMWARE_NAME "esp32s3_16mb" +#endif + // Размер буфера json #define JSON_BUFFER_SIZE 4096 // держим 2 кб не меняем diff --git a/myProfile.json b/myProfile.json index 0e4c8536..bb6592b5 100644 --- a/myProfile.json +++ b/myProfile.json @@ -25,7 +25,7 @@ "projectProp": { "platformio": { "default_envs": "esp8266_4mb", - "comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp32cam_4mb or esp32s2_4mb or esp32_4mb3f or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota", + "comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp32cam_4mb or esp32s2_4mb or esp32_4mb3f or esp32s3_16mb or esp32c3m_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota", "envs": [ { "name": "esp8266_4mb", @@ -106,6 +106,22 @@ "firmware": "0x10000", "partitions": "0x8000", "littlefs": "0x290000" + }, + { + "name": "esp32c3m_4mb", + "boot_app0": "0xe000", + "bootloader_qio_80m": "0x1000", + "firmware": "0x10000", + "partitions": "0x8000", + "littlefs": "0x310000" + }, + { + "name": "esp32s3_16mb", + "boot_app0": "0xe000", + "bootloader_qio_80m": "0x1000", + "firmware": "0x10000", + "partitions": "0x8000", + "littlefs": "0x910000" } ] } diff --git a/platformio.ini b/platformio.ini index 10eae1e1..b0f643a3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -266,6 +266,52 @@ build_src_filter = + ${env:esp32s2_4mb_fromitems.build_src_filter} +[env:esp32c3m_4mb] +lib_deps = + ${common_env_data.lib_deps_external} + ${env:esp32c3m_4mb_fromitems.lib_deps} +build_flags = + -Desp32c3m_4mb="esp32c3m_4mb" +framework = arduino +board = lolin_c3_mini +platform = espressif32 @6.3.1 +monitor_filters = esp32_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 +debug_tool = esp-prog +board_build.filesystem = littlefs +board_build.partitions = tools/partitions_custom.csv +build_src_filter = + +<*.cpp> + + + + + + + ${env:esp32s2_4mb_fromitems.build_src_filter} + +[env:esp32s3_16mb] +lib_deps = + ${common_env_data.lib_deps_external} + ${env:esp32s3_16mb_fromitems.lib_deps} +build_flags = + -Desp32s3_16mb="esp32s3_16mb" +framework = arduino +board = esp32-s3-devkitc-1 +board_build.mcu = esp32s3 +platform = espressif32 @6.3.1 +monitor_filters = esp32_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 +debug_tool = esp-prog +board_build.partitions = tools/large_spiffs_16MB.csv +board_upload.flash_size = 16MB +board_build.filesystem = littlefs +build_src_filter = + +<*.cpp> + + + + + + + ${env:esp32s3_16mb_fromitems.build_src_filter} + [env:esp32_16mb] lib_deps = ${common_env_data.lib_deps_external} @@ -724,3 +770,11 @@ build_src_filter = + + +[env:esp32c3m_4mb_fromitems] +lib_deps = +build_src_filter = + +[env:esp32s3_16mb_fromitems] +lib_deps = +build_src_filter = + diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp index ef885187..7c8777eb 100644 --- a/src/EspFileSystem.cpp +++ b/src/EspFileSystem.cpp @@ -78,7 +78,8 @@ uint32_t ESP_getChipId(void) } // устарела используем новую функцию ниже -#ifndef esp32s2_4mb +#if !defined(esp32s2_4mb) && !defined(esp32c3m_4mb) && !defined(esp32s3_16mb) +//#ifndef esp32s2_4mb uint32_t ESP_getFlashChipId(void) { #ifdef ESP32 diff --git a/src/Main.cpp b/src/Main.cpp index 0d1e7951..75341d64 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -3,7 +3,7 @@ #include "classes/IoTDB.h" #include "utils/Statistic.h" #include -#ifdef esp32s2_4mb +#if defined(esp32s2_4mb) || defined(esp32s3_16mb) #include #endif @@ -80,7 +80,7 @@ void stopErrorMarker(int id) { } void setup() { -#ifdef esp32s2_4mb +#if defined(esp32s2_4mb) || defined(esp32s3_16mb) USB.begin(); #endif #if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) diff --git a/src/PeriodicTasks.cpp b/src/PeriodicTasks.cpp index aca4f182..f9fa9c9d 100644 --- a/src/PeriodicTasks.cpp +++ b/src/PeriodicTasks.cpp @@ -59,7 +59,7 @@ String ESP_getResetReason(void) { return ESP.getResetReason(); } #endif -#ifdef esp32s2_4mb +#if defined(esp32s2_4mb) || defined(esp32s3_16mb) || defined(esp32c3m_4mb) String ESP_getResetReason(void) { return ESP32GetResetReason(0); // CPU 0 }