Merge pull request #319 from ExpressLRS/add-namimnorc-2400-diversity-rx

Add NamimnoRC Diversity RX target support
ExpressLRS · Apr 8, 2022 · a12928b · a12928b
2 parents a53dc1e + 030820f
commit a12928b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/devices/namimnorc-2400.json b/devices/namimnorc-2400.json
@@ -111,6 +111,41 @@
         "name": "NamimnoRC_FLASH_2400_ESP_RX_via_WIFI"
       }
     ],
+    "userDefines": [
+      "REGULATORY_DOMAIN_ISM_2400",
+      "REGULATORY_DOMAIN_EU_CE_2400",
+      "BINDING_PHRASE",
+      "HYBRID_SWITCHES_8",
+      "ENABLE_TELEMETRY",
+      "LOCK_ON_FIRST_CONNECTION",
+      "USE_500HZ",
+      "AUTO_WIFI_ON_BOOT",
+      "AUTO_WIFI_ON_INTERVAL",
+      "HOME_WIFI_SSID",
+      "HOME_WIFI_PASSWORD",
+      "RCVR_UART_BAUD",
+      "RCVR_INVERT_TX"
+    ],
+    "wikiUrl": "https://www.expresslrs.org/{version}/quick-start/receivers/rx-flash2400/",
+    "deviceType": "ExpressLRS",
+    "aliases": []
+  },{
+    "category": "NamimnoRC FLASH 2.4 GHz",
+    "name": "NamimnoRC FLASH 2400 ESP Diversity RX",
+    "targets": [
+      {
+        "flashingMethod": "UART",
+        "name": "NamimnoRC_FLASH_2400_ESP_RX_PA_via_UART"
+      },
+      {
+        "flashingMethod": "BetaflightPassthrough",
+        "name": "NamimnoRC_FLASH_2400_ESP_RX_PA_via_BetaflightPassthrough"
+      },
+      {
+        "flashingMethod": "WIFI",
+        "name": "NamimnoRC_FLASH_2400_ESP_RX_PA_via_WIFI"
+      }
+    ],
     "userDefines": [
       "REGULATORY_DOMAIN_ISM_2400",
       "REGULATORY_DOMAIN_EU_CE_2400",

diff --git a/src/api/src/factories/TargetUserDefinesFactory.ts b/src/api/src/factories/TargetUserDefinesFactory.ts
@@ -84,6 +84,9 @@ export default class TargetUserDefinesFactory {
           case UserDefineKey.UNLOCK_HIGHER_POWER:
             return UserDefine.Boolean(UserDefineKey.UNLOCK_HIGHER_POWER, true);
           case UserDefineKey.USE_DIVERSITY:
+            if (target.startsWith('NamimnoRC_FLASH_2400_ESP_RX_PA')) {
+              return UserDefine.Boolean(UserDefineKey.USE_DIVERSITY, true);
+            }
             return UserDefine.Boolean(UserDefineKey.USE_DIVERSITY);
           case UserDefineKey.NO_SYNC_ON_ARM:
             return UserDefine.Boolean(UserDefineKey.NO_SYNC_ON_ARM);