diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 8bd3e5cf..f4f07c80 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -414,6 +414,57 @@ board_build.psram_type=qspi_opi board_upload.maximum_size = 16777216 board_upload.maximum_ram_size = 327680 board_upload.flash_size = 16MB +; ---------------------------------------------------------------------------------------- +; !!! this configuration expects an ESP32-S3 16MB Flash 8MB RAM +; ---------------------------------------------------------------------------------------- +[env:ESP32_S3_SIMPLE_AP] +board = esp32-s3-devkitc-1 +board_build.partitions = large_spiffs_16MB.csv +build_unflags = + -std=gnu++11 + -D CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y +lib_deps = + ${env.lib_deps} +build_flags = + -std=gnu++17 + ${env.build_flags} + -D HAS_BLE_WRITER + -D CORE_DEBUG_LEVEL=0 + -D ARDUINO_USB_CDC_ON_BOOT + -D CONFIG_ESP32S3_SPIRAM_SUPPORT=1 + -D CONFIG_SPIRAM_USE_MALLOC=1 + -D POWER_NO_SOFT_POWER + -D BOARD_HAS_PSRAM + -D CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y + -D FLASHER_AP_SS=-1 + -D FLASHER_AP_CLK=-1 + -D FLASHER_AP_MOSI=-1 + -D FLASHER_AP_MISO=-1 + -D FLASHER_AP_RESET=41 + -D FLASHER_AP_POWER={-1} + -D FLASHER_AP_TEST=-1 + -D FLASHER_AP_TXD=2 + -D FLASHER_AP_RXD=1 + -D FLASHER_DEBUG_TXD=12 + -D FLASHER_DEBUG_RXD=11 + -D FLASHER_DEBUG_PROG=40 + -D FLASHER_LED=38 + -D HAS_RGB_LED + -D FLASHER_RGB_LED=48 + -D MD5_ENABLED=1 + -D SERIAL_FLASHER_INTERFACE_UART=1 + -D SERIAL_FLASHER_BOOT_HOLD_TIME_MS=50 + -D SERIAL_FLASHER_RESET_HOLD_TIME_MS=100 + -D C6_OTA_FLASHING + -D HAS_SUBGHZ +build_src_filter = + +<*>--- +board_build.flash_mode=qio +board_build.arduino.memory_type = qio_opi +board_build.psram_type=qspi_opi +board_upload.maximum_size = 16777216 +board_upload.maximum_ram_size = 327680 +board_upload.flash_size = 16MB ; ---------------------------------------------------------------------------------------- ; !!! this configuration expects an ESP32-S3 16MB Flash 8MB RAM diff --git a/resources/tagtypes/54.json b/resources/tagtypes/54.json index f856ca66..33c2934a 100644 --- a/resources/tagtypes/54.json +++ b/resources/tagtypes/54.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BW 2.13\"", "width": 256, "height": 128, @@ -10,6 +10,7 @@ "black": [ 0, 0, 0 ] }, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], diff --git a/resources/tagtypes/55.json b/resources/tagtypes/55.json index 05d97e46..286ebc19 100644 --- a/resources/tagtypes/55.json +++ b/resources/tagtypes/55.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "HS BWR 2.13\"", "width": 256, "height": 128, @@ -11,6 +11,7 @@ "red": [ 255, 0, 0 ] }, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], diff --git a/resources/tagtypes/56.json b/resources/tagtypes/56.json index 6baf58cb..d8575295 100644 --- a/resources/tagtypes/56.json +++ b/resources/tagtypes/56.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "HS BWR 2.66\"", "width": 296, "height": 152, @@ -11,6 +11,7 @@ "red": [ 255, 0, 0 ] }, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ], diff --git a/resources/tagtypes/57.json b/resources/tagtypes/57.json index 01aa6fd8..47bf694e 100644 --- a/resources/tagtypes/57.json +++ b/resources/tagtypes/57.json @@ -1,4 +1,5 @@ { + "version": 2, "name": "TLSR BWR 1.54\"", "width": 200, "height": 200, @@ -10,6 +11,7 @@ "red": [255, 0, 0] }, "shortlut": 2, + "zlib_compression": "27", "options": ["button", "customlut"], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 15, 17, 18, 19, 20, 21], "template": { diff --git a/resources/tagtypes/58.json b/resources/tagtypes/58.json index 8779031b..07229c54 100644 --- a/resources/tagtypes/58.json +++ b/resources/tagtypes/58.json @@ -1,4 +1,5 @@ { + "version": 2, "name": "TLSR BW 2.13\"", "width": 256, "height": 128, @@ -11,6 +12,7 @@ "red": [255, 0, 0] }, "shortlut": 0, + "zlib_compression": "27", "options": ["led"], "contentids": [ 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20 ], diff --git a/resources/tagtypes/59.json b/resources/tagtypes/59.json index 18797439..d69fc765 100644 --- a/resources/tagtypes/59.json +++ b/resources/tagtypes/59.json @@ -1,4 +1,5 @@ { + "version": 2, "name": "TLSR BWR 2.13\"", "width": 264, "height": 136, @@ -12,6 +13,7 @@ "gray": [150, 150, 150] }, "shortlut": 0, + "zlib_compression": "27", "options": ["led"], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ], "template": { diff --git a/resources/tagtypes/60.json b/resources/tagtypes/60.json index 6c295ed4..943ee50c 100644 --- a/resources/tagtypes/60.json +++ b/resources/tagtypes/60.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "name": "HS BWY 3.5\"", "width": 384, "height": 184, @@ -12,6 +12,7 @@ }, "highlight_color": 3, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20, 27 ], "usetemplate": 51, diff --git a/resources/tagtypes/61.json b/resources/tagtypes/61.json index de4dca92..24bc9d74 100644 --- a/resources/tagtypes/61.json +++ b/resources/tagtypes/61.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWR 3.5\"", "width": 384, "height": 184, @@ -11,6 +11,7 @@ "red": [ 255, 0, 0 ] }, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ], "usetemplate": 51 diff --git a/resources/tagtypes/63.json b/resources/tagtypes/63.json index f9532689..81346221 100644 --- a/resources/tagtypes/63.json +++ b/resources/tagtypes/63.json @@ -1,4 +1,5 @@ { + "version": 2, "name": "TLSR BWR 4.2\"", "width": 400, "height": 304, @@ -10,6 +11,7 @@ "red": [255, 0, 0] }, "shortlut": 0, + "zlib_compression": "27", "options": ["led"], "contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ], diff --git a/resources/tagtypes/68.json b/resources/tagtypes/68.json index 31c34d1f..28421cdf 100644 --- a/resources/tagtypes/68.json +++ b/resources/tagtypes/68.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWY 3.46\"", "width": 480, "height": 176, @@ -12,6 +12,7 @@ }, "highlight_color": 3, "shortlut": 0, + "zlib_compression": "27", "options": [ "led" ], "contentids": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 19, 20, 21, 22, 23, 27 ],