diff --git a/CMakeLists.txt b/CMakeLists.txt index 2270884..3cceb07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,6 @@ else() ) include($ENV{IDF_PATH}/tools/cmake/project.cmake) message("Using Main App") - project(WatchController) + project(LeoLightShow) endif() endif() diff --git a/main/lightsMain.cpp b/main/lightsMain.cpp index cb1abab..6fcff3d 100644 --- a/main/lightsMain.cpp +++ b/main/lightsMain.cpp @@ -15,7 +15,7 @@ // }, // // LED-Strips: 14 - 22 - 30 -// >> update http://172.16.16.10:8000/WatchController.bin +// >> update http://172.16.16.10:8000/LeoLightShow.bin #include "config.hpp" #include "lighsMain.hpp" @@ -48,7 +48,7 @@ static fos::Queue responseQ(2); DeviceState State; static const char* TAG = "Light"; -static const char* VERSION = "V 0.6.0"; +static const char* VERSION = "V 0.7.0"; unique_ptr pShell; void onCommand(string name, Cli::CArgs args) { diff --git a/partitions.csv b/partitions.csv new file mode 100644 index 0000000..46fc36b --- /dev/null +++ b/partitions.csv @@ -0,0 +1,8 @@ +# Name, Type, SubType, Offset, Size, Flags +# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap + nvs, data, nvs, , 0x4000, + otadata, data, ota, , 0x2000, +phy_init, data, phy, , 0x1000, + ota_0, app, ota_0, , 1536K, + ota_1, app, ota_1, , 1536K, + spiffs, data, spiffs, , 936K, diff --git a/sdkconfig b/sdkconfig index a0cc9ad..04ee08d 100644 --- a/sdkconfig +++ b/sdkconfig @@ -373,14 +373,14 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y -# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set +# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE="2MB" +CONFIG_ESPTOOLPY_FLASHSIZE="4MB" # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set @@ -394,13 +394,13 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table # -CONFIG_PARTITION_TABLE_SINGLE_APP=y +# CONFIG_PARTITION_TABLE_SINGLE_APP is not set # CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set # CONFIG_PARTITION_TABLE_TWO_OTA is not set # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set -# CONFIG_PARTITION_TABLE_CUSTOM is not set +CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 1e7e562..b9cc283 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -28,3 +28,10 @@ CONFIG_ETH_PHY_ADDR=1 # OTA over plain HTTP (no TLS server in use yet) # CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y + +# Enable filesystem +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" +