Merge pull request #57 from bmorcelli/dev

Port to Marauder Mini and Marauder v4-OG
bmorcelli · Aug 1, 2024 · ca9d23c · ca9d23c
2 parents f00f849 + b7e133b
commit ca9d23c
Show file tree

Hide file tree

Showing 26 changed files with 354 additions and 109 deletions.
diff --git a/Launcher/Launcher_2.0_C.bin b/Launcher/Launcher_2.0_C.bin
diff --git a/Launcher/Launcher_2.0_CYD-2-USB.bin b/Launcher/Launcher_2.0_CYD-2-USB.bin
diff --git a/Launcher/Launcher_2.0_CYD-2432S028.bin b/Launcher/Launcher_2.0_CYD-2432S028.bin
diff --git a/Launcher/Launcher_2.0_Cardputer.bin b/Launcher/Launcher_2.0_Cardputer.bin
diff --git a/Launcher/Launcher_2.0_CoreS3.bin b/Launcher/Launcher_2.0_CoreS3.bin
diff --git a/Launcher/Launcher_2.0_Marauder-Mini.bin b/Launcher/Launcher_2.0_Marauder-Mini.bin
diff --git a/Launcher/Launcher_2.0_Marauder-v4-OG.bin b/Launcher/Launcher_2.0_Marauder-v4-OG.bin
diff --git a/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin b/Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin
diff --git a/Launcher/Launcher_2.0_core2.bin b/Launcher/Launcher_2.0_core2.bin
diff --git a/Launcher/Launcher_2.0_core_16Mb.bin b/Launcher/Launcher_2.0_core_16Mb.bin
diff --git a/Launcher/Launcher_2.0_cplus1_1.bin b/Launcher/Launcher_2.0_cplus1_1.bin
diff --git a/Launcher/Launcher_2.0_cplus2.bin b/Launcher/Launcher_2.0_cplus2.bin
diff --git a/Launcher/manifest_Marauder-Mini.json b/Launcher/manifest_Marauder-Mini.json
@@ -0,0 +1,12 @@
+{
+  "name": "Marauder-Mini",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "Launcher_2.0_Marauder-Mini.bin", "offset": 0 }
+      ]
+    }
+  ]
+}
diff --git a/Launcher/manifest_Marauder-v4-OG.json b/Launcher/manifest_Marauder-v4-OG.json
@@ -0,0 +1,12 @@
+{
+  "name": "Marauder-v4-OG",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "Launcher_2.0_Marauder-v4-OG.bin", "offset": 0 }
+      ]
+    }
+  ]
+}
diff --git a/flash0.html b/flash0.html
@@ -147,6 +147,12 @@ <h1 align="center">-= M5 Launcher =-</h1>
         <li>
           <label><input type="radio" name="type" value="CYD-2-USB" /> FLASH to <a href="https://www.amazon.com/dp/B0CLR7MQ91">CYD-2-USB</a></label>
         </li>
+        <li>
+          <label><input type="radio" name="type" value="Marauder-v4-OG" /> FLASH to Marauder-v4-OG</label>
+        </li>
+        <li>
+          <label><input type="radio" name="type" value="Marauder-Mini" /> FLASH to Marauder-Mini</label>
+        </li>
       </ul>
       <p class="button-row" align="center">
         <esp-web-install-button class="invisible"></esp-web-install-button>

diff --git a/merge_files.bat b/merge_files.bat
@@ -8,3 +8,5 @@ esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin
 esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin      0x0 .pio/build/lilygo-t-display-S3/bootloader.bin        0x8000 .pio/build/lilygo-t-display-S3/partitions.bin                                                   0x10000 .pio/build/lilygo-t-display-S3/firmware.bin
 esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_CYD-2432S028.bin  0x1000 .pio/build/CYD-2432S028/bootloader.bin        0x8000 .pio/build/CYD-2432S028/partitions.bin                                                                                0x10000 .pio/build/CYD-2432S028/firmware.bin
 esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_CYD-2-USB.bin     0x1000 .pio/build/CYD-2-USB/bootloader.bin           0x8000 .pio/build/CYD-2-USB/partitions.bin                                                                                   0x10000 .pio/build/CYD-2-USB/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_Marauder-v4-OG.bin 0x1000 .pio/build/Marauder-v4-OG/bootloader.bin     0x8000 .pio/build/Marauder-v4-OG/partitions.bin   0x10000 .pio/build/Marauder-v4-OG/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_Marauder-Mini.bin 0x1000 .pio/build/Marauder-Mini/bootloader.bin       0x8000 .pio/build/Marauder-Mini/partitions.bin    0x10000 .pio/build/Marauder-Mini/firmware.bin
diff --git a/merge_files.sh b/merge_files.sh
@@ -8,4 +8,6 @@ esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin
 esptool.py --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin      0x0 .pio/build/lilygo-t-display-S3/bootloader.bin        0x8000 .pio/build/lilygo-t-display-S3/partitions.bin     0x10000 .pio/build/lilygo-t-display-S3/firmware.bin
 esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_CYD-2432S028.bin       0x1000 .pio/build/CYD-2432S028/bootloader.bin        0x8000 .pio/build/CYD-2432S028/partitions.bin     0x10000 .pio/build/CYD-2432S028/firmware.bin
 esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_CYD-2-USB.bin          0x1000 .pio/build/CYD-2-USB/bootloader.bin           0x8000 .pio/build/CYD-2-USB/partitions.bin        0x10000 .pio/build/CYD-2-USB/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_Marauder-v4-OG.bin          0x1000 .pio/build/Marauder-v4-OG/bootloader.bin      0x8000 .pio/build/Marauder-v4-OG/partitions.bin   0x10000 .pio/build/Marauder-v4-OG/firmware.bin
+esptool.py --chip esp32 merge_bin --output Launcher/Launcher_2.0_Marauder-Mini.bin           0x1000 .pio/build/Marauder-Mini/bootloader.bin       0x8000 .pio/build/Marauder-Mini/partitions.bin    0x10000 .pio/build/Marauder-Mini/firmware.bin