Merge pull request #341 from justinlampley/AddTxBackpackPassthroughTa…

…rgets Add Passthrough flashing method and 2 new targets
ExpressLRS · Jun 6, 2022 · b6cc786 · b6cc786
2 parents 7c59b0a + 2ea467c
commit b6cc786
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 1 deletion.
diff --git a/devices/diy-backpack.json b/devices/diy-backpack.json
@@ -22,6 +22,9 @@
     "name": "DUPLEX TX Backpack",
     "targets": [
       {
+        "flashingMethod": "Passthrough",
+        "name": "DUPLETX_TX_Backpack_via_PASSTHRU"
+      },{
         "flashingMethod": "UART",
         "name": "DUPLETX_TX_Backpack_via_UART"
       },

diff --git a/devices/happymodel-backpack.json b/devices/happymodel-backpack.json
@@ -4,6 +4,9 @@
     "name": "HappyModel TX Backpack",
     "targets": [
       {
+        "flashingMethod": "Passthrough",
+        "name": "HappyModel_TX_Backpack_via_PASSTHRU"
+      },{
         "flashingMethod": "UART",
         "name": "HappyModel_TX_Backpack_via_UART"
       },

diff --git a/graphql.schema.json b/graphql.schema.json
@@ -982,6 +982,12 @@
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "Passthrough",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "possibleTypes": null

diff --git a/src/api/src/models/enum/FlashingMethod.ts b/src/api/src/models/enum/FlashingMethod.ts
@@ -9,6 +9,7 @@ enum FlashingMethod {
   WIFI = 'WIFI',
   EdgeTxPassthrough = 'EdgeTxPassthrough',
   Radio = 'Radio',
+  Passthrough = 'Passthrough',
 }
 
 registerEnumType(FlashingMethod, {

diff --git a/src/ui/components/FlashingMethodDescription/index.tsx b/src/ui/components/FlashingMethodDescription/index.tsx
@@ -213,6 +213,27 @@ const FlashingMethodDescription: FunctionComponent<FlashingMethodDescriptionProp
             </p>
           </div>
         );
+      case FlashingMethod.Passthrough:
+        return (
+          <div>
+            <p>
+              This method allows you to flash your module while it is connected
+              to your transmitter by using the passthrough feature.
+            </p>
+            <p>
+              <DocumentationLink
+                firmwareVersion={firmwareVersionData}
+                url={
+                  wikiUrl ??
+                  'https://www.expresslrs.org/{version}/quick-start/getting-started/'
+                }
+              >
+                Check the Wiki page for your particular device for more
+                information.
+              </DocumentationLink>
+            </p>
+          </div>
+        );
       default:
         return '';
     }

diff --git a/src/ui/gql/generated/types.ts b/src/ui/gql/generated/types.ts
@@ -118,6 +118,7 @@ export enum FlashingMethod {
   WIFI = 'WIFI',
   EdgeTxPassthrough = 'EdgeTxPassthrough',
   Radio = 'Radio',
+  Passthrough = 'Passthrough',
 }
 
 export type UserDefine = {

diff --git a/src/ui/views/ConfiguratorView/index.tsx b/src/ui/views/ConfiguratorView/index.tsx
@@ -514,7 +514,9 @@ const ConfiguratorView: FunctionComponent<ConfiguratorViewProps> = (props) => {
     if (
       deviceTarget &&
       (deviceTarget.flashingMethod === FlashingMethod.BetaflightPassthrough ||
-        deviceTarget.flashingMethod === FlashingMethod.UART)
+        deviceTarget.flashingMethod === FlashingMethod.UART ||
+        deviceTarget.flashingMethod === FlashingMethod.EdgeTxPassthrough ||
+        deviceTarget.flashingMethod === FlashingMethod.Passthrough)
     ) {
       setSerialPortRequired(true);
     } else {