dandri/ratdeck
1
0
Fork 0
mirror of https://github.com/ratspeak/ratdeck.git synced 2026-08-14 23:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsdeck: ship DIO flash images (off-brand flash fails QIO at boot)

Browse Source
This commit is contained in:
DeFiDude
2026-06-10 20:17:23 -06:00
parent a2dee44b07
commit 73e1e7aa84
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+4 -4
View File
@@ -30,7 +30,7 @@ jobs:
- name: Merge single .bin for M5Burner
run: |
esptool.py --chip esp32s3 merge-bin \
--flash-mode qio --flash-size 16MB \
--flash-mode dio --flash-size 16MB \
-o ratdeck-merged.bin \
0x0000 .pio/build/ratdeck_915/bootloader.bin \
0x8000 .pio/build/ratdeck_915/partitions.bin \
@@ -48,7 +48,7 @@ jobs:
{
"chipFamily": "ESP32-S3",
"flashSize": "16MB",
"flashMode": "qio",
"flashMode": "dio",
"flashFreq": "80m",
"parts": [
{ "path": "bootloader.bin", "offset": "0x0000" },
@@ -115,7 +115,7 @@ jobs:
- name: Merge single .bin for M5Burner
run: |
esptool.py --chip esp32s3 merge-bin \
--flash-mode qio --flash-size 16MB \
--flash-mode dio --flash-size 16MB \
-o ratdeck-merged.bin \
0x0000 .pio/build/ratdeck_915/bootloader.bin \
0x8000 .pio/build/ratdeck_915/partitions.bin \
@@ -133,7 +133,7 @@ jobs:
{
"chipFamily": "ESP32-S3",
"flashSize": "16MB",
"flashMode": "qio",
"flashMode": "dio",
"flashFreq": "80m",
"parts": [
{ "path": "bootloader.bin", "offset": "0x0000" },
Makefile
+1 -1
View File
@@ -79,7 +79,7 @@ standalone-image: build-standalone
rnode-only-image: build-rnode
mkdir -p $(BUILD_DIR)
python3 -m esptool --chip esp32s3 merge-bin \
--flash-mode qio --flash-size 16MB \
--flash-mode dio --flash-size 16MB \
--output $(RNODE_ONLY_BIN) \
0x0000 $(RNODE_BOOTLOADER_BIN) \
0x8000 $(RNODE_PARTITIONS_BIN) \
launcher/platformio.ini
+2 -1
View File
@@ -4,7 +4,7 @@ board = esp32-s3-devkitc-1
framework = arduino
board_build.flash_size = 16MB
board_build.flash_mode = qio
board_build.flash_mode = dio
board_build.partitions = ../partitions/rsdeck_16mb_dual.csv
board_upload.flash_size = 16MB
@@ -13,6 +13,7 @@ build_flags =
-DARDUINO_USB_CDC_ON_BOOT=1
-DARDUINO_USB_MODE=1
-I../src/platform
-I../src
build_unflags =
-std=gnu++11
merge_firmware.py
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ def merge_bin(source, target, env):
python = env.subst("$PYTHONEXE")
env.Execute(
f"{shlex.quote(python)} -m esptool --chip esp32s3 merge-bin "
"--flash-mode qio --flash-size 16MB "
"--flash-mode dio --flash-size 16MB "
f"-o {shlex.quote(output)} "
f"0x0000 {shlex.quote(os.path.join(build_dir, 'bootloader.bin'))} "
f"0x8000 {shlex.quote(os.path.join(build_dir, 'partitions.bin'))} "
tools/make_dual_image.py
+1 -1
View File
@@ -68,7 +68,7 @@ def main() -> int:
"esp32s3",
"merge-bin",
"--flash-mode",
"qio",
"dio",
"--flash-size",
"16MB",
"--output",
tools/package_merged_zip.py
+1 -1
View File
@@ -23,7 +23,7 @@ def main() -> int:
manifest = {
"chipFamily": "ESP32-S3",
"flashSize": "16MB",
"flashMode": "qio",
"flashMode": "dio",
"flashFreq": "80m",
"parts": [
{"path": image_name, "offset": "0x0000"},
vendor/rnode_firmware/Makefile
Vendored
+1 -1
View File
@@ -35,7 +35,7 @@ CARDPUTER_ADV_EXTRA_FLAGS = \"-DBOARD_MODEL=0x43\" \"-DCARDPUTER_ADV_DEFAULT_FRE
# T-Deck (Plus) dual-boot build — same staging pattern as the Cardputer Adv.
# Defaults reuse the CARDPUTER_ADV_DEFAULT_* fallbacks in Utilities.h.
TDECK_FQBN = esp32:esp32:esp32s3:CDCOnBoot=cdc,USBMode=hwcdc,FlashSize=16M,FlashMode=qio,PartitionScheme=no_ota
TDECK_FQBN = esp32:esp32:esp32s3:CDCOnBoot=cdc,USBMode=hwcdc,FlashSize=16M,FlashMode=dio,PartitionScheme=no_ota
TDECK_SKETCH = build/tdeck_sketch/RNode_Firmware
TDECK_BUILD = build/tdeck_build
TDECK_OUTPUT = build/tdeck.esp32.esp32s3