Merge pull request #47 from bmorcelli/dev

Download feedback and CYD port
bmorcelli · Jul 21, 2024 · 8b9ff83 · 8b9ff83
2 parents e73c5f8 + afa9fb5
commit 8b9ff83
Show file tree

Hide file tree

Showing 35 changed files with 709 additions and 222 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_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/mainfest_M5Core.json b/Launcher/mainfest_M5Core.json
@@ -7,12 +7,6 @@
         "parts": [
           { "path": "Launcher_2.0_core_16Mb.bin", "offset": 0 }
         ]
-      },
-      {
-        "chipFamily": "ESP8266",
-        "parts": [
-          { "path": "esp8266.bin", "offset": 0 }
-        ]
       }
     ]
   }

diff --git a/Launcher/mainfest_M5Core2.json b/Launcher/mainfest_M5Core2.json
@@ -7,12 +7,6 @@
         "parts": [
           { "path": "Launcher_2.0_core2.bin", "offset": 0 }
         ]
-      },
-      {
-        "chipFamily": "ESP8266",
-        "parts": [
-          { "path": "esp8266.bin", "offset": 0 }
-        ]
       }
     ]
   }

diff --git a/Launcher/mainfest_M5CoreS3.json b/Launcher/mainfest_M5CoreS3.json
@@ -7,12 +7,6 @@
         "parts": [
           { "path": "Launcher_2.0_CoreS3.bin", "offset": 0 }
         ]
-      },
-      {
-        "chipFamily": "ESP8266",
-        "parts": [
-          { "path": "esp8266.bin", "offset": 0 }
-        ]
       }
     ]
   }

diff --git a/Launcher/manifest_CYD-2-USB.json b/Launcher/manifest_CYD-2-USB.json
@@ -0,0 +1,12 @@
+{
+  "name": "M5stickC",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "Launcher_2.0_CYD-2-USB.bin", "offset": 0 }
+      ]
+    }
+  ]
+}
diff --git a/Launcher/manifest_CYD-2432S028.json b/Launcher/manifest_CYD-2432S028.json
@@ -0,0 +1,12 @@
+{
+  "name": "M5stickC",
+  "builds": [
+    {
+      "chipFamily": "ESP32",
+      "improv": false,
+      "parts": [
+        { "path": "Launcher_2.0_CYD-2432S028.bin", "offset": 0 }
+      ]
+    }
+  ]
+}
diff --git a/Launcher/manifest_Lyligo_TDispS3Touch.json b/Launcher/manifest_Lyligo_TDispS3Touch.json
@@ -1,18 +1,12 @@
 {
-  "name": "Lilygo T-Display S3 touchscreen",
-  "builds": [
-    {
-      "chipFamily": "ESP32-S3",
-      "improv": false,
-      "parts": [
-        { "path": "Launcher_2.0_T-Display-S3-Touchscreen.bin", "offset": 0 }
-      ]
-    },
-    {
-      "chipFamily": "ESP8266",
-      "parts": [
-        { "path": "esp8266.bin", "offset": 0 }
-      ]
-    }
-  ]
+    "name": "Lilygo T-Display S3 touchscreen",
+    "builds": [
+      {
+        "chipFamily": "ESP32-S3",
+        "improv": false,
+        "parts": [
+          { "path": "Launcher_2.0_T-Display-S3-Touchscreen.bin", "offset": 0 }
+        ]
+      }
+    ]
 }
diff --git a/Launcher/manifest_M5Cardputer.json b/Launcher/manifest_M5Cardputer.json
@@ -7,12 +7,6 @@
       "parts": [
         { "path": "Launcher_2.0_Cardputer.bin", "offset": 0 }
       ]
-    },
-    {
-      "chipFamily": "ESP8266",
-      "parts": [
-        { "path": "esp8266.bin", "offset": 0 }
-      ]
     }
   ]
 }
diff --git a/Launcher/manifest_M5stickC.json b/Launcher/manifest_M5stickC.json
@@ -7,12 +7,6 @@
       "parts": [
         { "path": "Launcher_2.0_C.bin", "offset": 0 }
       ]
-    },
-    {
-      "chipFamily": "ESP8266",
-      "parts": [
-        { "path": "esp8266.bin", "offset": 0 }
-      ]
     }
   ]
 }
diff --git a/Launcher/manifest_M5stickCP.json b/Launcher/manifest_M5stickCP.json
@@ -7,12 +7,6 @@
       "parts": [
         { "path": "Launcher_2.0_cplus1_1.bin", "offset": 0 }
       ]
-    },
-    {
-      "chipFamily": "ESP8266",
-      "parts": [
-        { "path": "esp8266.bin", "offset": 0 }
-      ]
     }
   ]
 }
diff --git a/Launcher/manifest_M5stickCP2.json b/Launcher/manifest_M5stickCP2.json
@@ -7,12 +7,6 @@
       "parts": [
         { "path": "Launcher_2.0_cplus2.bin", "offset": 0 }
       ]
-    },
-    {
-      "chipFamily": "ESP8266",
-      "parts": [
-        { "path": "esp8266.bin", "offset": 0 }
-      ]
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -62,8 +62,11 @@ Sourcecode will be released in the future..
 * UiFlow 1 doesn´t work with M5Launcher.. it uses an old MicroPython distro, that uses an old ESP-IDF distro with lots os secrets that I couldn´t figure out.
 
 ## Changelog
+* 2.2.2:
+     * [x] Port for [CYD-2432S028R](https://www.amazon.com/dp/B0BVFXR313) and [CYD-2-Usb](https://www.amazon.com/dp/B0CLR7MQ91)
+     * [x] Added check after finish the download that will delete failed downloaded files
 * 2.2.1:
-     * [x] Port fot [Lilygo T-Display S3 Touch](https://www.lilygo.cc/products/t-display-s3?variant=42351558590645)
+     * [x] Port for [Lilygo T-Display S3 Touch](https://www.lilygo.cc/products/t-display-s3?variant=42351558590645)
      * [x] Fixed JSON read/write
 * 2.2.0: 
      * [x] M5Launcher 2.2+ now can be updated OverTheAir or Using SD Card

diff --git a/flash0.html b/flash0.html
@@ -139,8 +139,14 @@ <h1 align="center">-= M5 Launcher =-</h1>
           <label><input type="radio" name="type" value="M5CoreS3" /> FLASH to M5CoreS3 Devices 16Mb</label>
         </li>
         <li>
-          <label><input type="radio" name="type" value="manifest_Lyligo_TDispS3Touch" /> FLASH to Lyligo <a href="https://www.lilygo.cc/products/t-display-s3?variant=42351558590645">T-Display S3 Touchscreen</a></label>
-        </li>        
+          <label><input type="radio" name="type" value="Lyligo_TDispS3Touch" /> FLASH to Lyligo<a href="https://www.lilygo.cc/products/t-display-s3?variant=42351558590645">T-Display S3 Touch</a></label>
+        </li>
+        <li>
+          <label><input type="radio" name="type" value="CYD-2432S028" /> FLASH to <a href="https://www.amazon.com/dp/B0BVFXR313">CYD-2432S028</a></label>
+        </li>
+        <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>
       </ul>
       <p class="button-row" align="center">
         <esp-web-install-button class="invisible"></esp-web-install-button>