Merge pull request #647 from ExpressLRS/add-zip-flashing-type

Add zip flashing method, handle unknown flashing methods gracefully.

graphql.schema.json

@@ -1035,6 +1035,12 @@
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "Zip",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "possibleTypes": null

src/api/src/models/enum/FlashingMethod.ts

@@ -7,6 +7,7 @@ enum FlashingMethod {
   Stock_BL = 'Bootloader',
   UART = 'UART',
   WIFI = 'WIFI',
+  Zip = 'Zip',
   EdgeTxPassthrough = 'EdgeTxPassthrough',
   Passthrough = 'Passthrough',
 }

src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts

@@ -56,7 +56,9 @@ export default class DeviceDescriptionsLoader {
     this.deviceOptionsMutex = new Mutex();
   }
 
-  private uploadMethodToFlashingMethod(uploadMethod: string): FlashingMethod {
+  private uploadMethodToFlashingMethod(
+    uploadMethod: string
+  ): FlashingMethod | null {
     switch (uploadMethod.toLowerCase()) {
       case 'betaflight':
         return FlashingMethod.BetaflightPassthrough;
@@ -74,8 +76,11 @@ export default class DeviceDescriptionsLoader {
         return FlashingMethod.WIFI;
       case 'stock':
         return FlashingMethod.Stock_BL;
+      case 'zip':
+        return FlashingMethod.Zip;
       default:
-        throw new Error(`Upload Method ${uploadMethod} Not Recognized!`);
+        this.logger.warn(`Upload Method ${uploadMethod} Not Recognized!`);
+        return null;
     }
   }
 
@@ -84,18 +89,22 @@ export default class DeviceDescriptionsLoader {
     category: string,
     config: DeviceDescription
   ): Device {
+    const uploadMethods: Target[] = config.upload_methods
+      .filter(
+        (uploadMethod) =>
+          this.uploadMethodToFlashingMethod(uploadMethod) !== null
+      )
+      .map((uploadMethod) => {
+        const targetName = `${id}.${uploadMethod}`;
+        const mappedUploadMethod =
+          this.uploadMethodToFlashingMethod(uploadMethod);
+        return new Target(targetName, targetName, mappedUploadMethod!);
+      });
     return new Device(
       id,
       config.product_name,
       category,
-      config.upload_methods.map((uploadMethod) => {
-        const targetName = `${id}.${uploadMethod}`;
-        return new Target(
-          targetName,
-          targetName,
-          this.uploadMethodToFlashingMethod(uploadMethod)
-        );
-      }),
+      uploadMethods,
       [],
       DeviceType.ExpressLRS,
       true,

src/i18n/locales/en/messages.json

@@ -70,7 +70,8 @@
     "UART": "This method allows you to flash your receiver or transmitter via its USB port or wiring up an FTDI device.",
     "WIFI": "This method creates a firmware file you can upload to your receiver or transmitter by connecting to its built in wifi.",
     "EdgeTxPassthrough": "This method allows you to flash your transmitter module while it is connected to your transmitter by using the passthrough feature of the EdgeTX firmware.",
-    "Passthrough": "This method allows you to flash your module while it is connected to your transmitter by using the passthrough feature."
+    "Passthrough": "This method allows you to flash your module while it is connected to your transmitter by using the passthrough feature.",
+    "Zip": "This method creates an archive of all files required for your device."
   },
   "FlashingMethodOptions": {
     "FlashingMethod": "Flashing Method"

src/ui/components/FlashingMethodDescription/index.tsx

@@ -165,6 +165,22 @@ const FlashingMethodDescription: FunctionComponent<
             </p>
           </div>
         );
+      case FlashingMethod.Zip:
+        return (
+          <div>
+            <p>{t('FlashingMethodDescription.Zip')}</p>
+            <p>
+              <DocumentationLink
+                url={
+                  wikiUrl ??
+                  'https://www.expresslrs.org/quick-start/getting-started/'
+                }
+              >
+                {t('FlashingMethodDescription.GeneralWiki')}
+              </DocumentationLink>
+            </p>
+          </div>
+        );
       default:
         return '';
     }