From 74bbc96c78e6d770c13c283e82b3f72b6cb92e16 Mon Sep 17 00:00:00 2001 From: Gary Bisaga Date: Sun, 8 Feb 2026 11:50:15 -0500 Subject: [PATCH 1/3] Remove deviceType from API and UI (fixes #648) --- codegen.yml | 2 +- devices/axis-2400.json | 2 - devices/axis-backpack.json | 1 - devices/betafpv-2400.json | 6 --- devices/betafpv-900.json | 3 -- devices/betafpv-backpack.json | 1 - devices/diy-2400.json | 10 ----- devices/diy-900.json | 8 ---- devices/diy-backpack.json | 3 -- devices/diy-bluetooth-joystick.json | 3 +- devices/emax-2400.json | 2 - devices/emax-900.json | 2 - devices/foxeer-2400.json | 1 - devices/frsky-900.json | 8 ---- devices/frsky-backpack.json | 1 - devices/fusion-backpack.json | 1 - devices/ghost-2400.json | 3 -- devices/happymodel-2400.json | 5 --- devices/happymodel-900.json | 4 -- devices/happymodel-backpack.json | 2 - devices/hdzero-backpack.json | 2 - devices/hglrc-2400.json | 2 - devices/hglrc-900.json | 1 - devices/iflight-2400.json | 2 - devices/iflight-900.json | 2 - devices/jumper-2400.json | 4 -- devices/jumper-900.json | 1 - devices/matek-2400.json | 3 -- devices/namimnorc-2400.json | 5 --- devices/namimnorc-900.json | 4 -- devices/namimnorc-backpack.json | 1 - devices/neutronrc-900.json | 1 - devices/orqa-backpack.json | 1 - devices/quadcopters-2400.json | 2 - devices/radiomaster-2400.json | 8 +--- devices/radiomaster-backpack.json | 1 - devices/rapidfire-backpack.json | 3 -- devices/rx5808-backpack.json | 4 -- devices/siyi-2400.json | 3 -- devices/steadyview-backpack.json | 2 - devices/vantac-2400.json | 2 - graphql.schema.json | 39 ------------------- release/app/package.json | 3 ++ src/api/src/models/Device.ts | 6 --- src/api/src/models/enum/DeviceType.ts | 12 ------ .../DeviceDescriptionsLoader/index.ts | 2 - src/api/src/services/Device/index.ts | 10 ----- src/ui/App.tsx | 4 +- .../queries/availableFirmwareTargets.graphql | 1 - src/ui/views/ConfiguratorView/index.tsx | 11 +++--- 50 files changed, 13 insertions(+), 197 deletions(-) delete mode 100644 src/api/src/models/enum/DeviceType.ts diff --git a/codegen.yml b/codegen.yml index 20a61644c..80ca9825b 100644 --- a/codegen.yml +++ b/codegen.yml @@ -1,5 +1,5 @@ overwrite: true -schema: 'http://localhost:3500/graphql' +schema: './graphql.schema.json' generates: src/ui/gql/generated/types.ts: documents: diff --git a/devices/axis-2400.json b/devices/axis-2400.json index 4d14ca9ac..689cced3c 100644 --- a/devices/axis-2400.json +++ b/devices/axis-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/axisflying-thor/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -55,7 +54,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/axisflying-thor/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/axis-backpack.json b/devices/axis-backpack.json index e47a8dd5a..b86e43142 100644 --- a/devices/axis-backpack.json +++ b/devices/axis-backpack.json @@ -14,7 +14,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/axisflying-thor/", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/betafpv-2400.json b/devices/betafpv-2400.json index 16d0ef090..3bc532c2d 100644 --- a/devices/betafpv-2400.json +++ b/devices/betafpv-2400.json @@ -24,7 +24,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "HiYOUNGER", @@ -60,7 +59,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -87,7 +85,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -117,7 +114,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -161,7 +157,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/betafpv2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "HiYOUNGER", @@ -214,7 +209,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/betafpv-900.json b/devices/betafpv-900.json index 1ea13190c..9aff2bd5b 100644 --- a/devices/betafpv-900.json +++ b/devices/betafpv-900.json @@ -26,7 +26,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv900/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "HiYOUNGER", @@ -64,7 +63,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/betafpv900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -98,7 +96,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/betafpv900/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "HiYOUNGER", diff --git a/devices/betafpv-backpack.json b/devices/betafpv-backpack.json index 424854947..b2f1bae7f 100644 --- a/devices/betafpv-backpack.json +++ b/devices/betafpv-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/diy-2400.json b/devices/diy-2400.json index e92aa19d8..9a062b5c4 100644 --- a/devices/diy-2400.json +++ b/devices/diy-2400.json @@ -22,7 +22,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -48,7 +47,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -75,7 +73,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -102,7 +99,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -132,7 +128,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -159,7 +154,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -191,7 +185,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "Flywoo", @@ -302,7 +295,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "BETAFPV", @@ -347,7 +339,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "Happymodel 2.4 GHz", @@ -378,7 +369,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/diy-900.json b/devices/diy-900.json index 91e3c0cee..6584930eb 100644 --- a/devices/diy-900.json +++ b/devices/diy-900.json @@ -25,7 +25,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -54,7 +53,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -84,7 +82,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -113,7 +110,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -147,7 +143,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy900/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "GEPRC", @@ -188,7 +183,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -210,7 +204,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -232,7 +225,6 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/diy900/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/diy-backpack.json b/devices/diy-backpack.json index b7baf21dc..60708711a 100644 --- a/devices/diy-backpack.json +++ b/devices/diy-backpack.json @@ -14,7 +14,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -44,7 +43,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [ { "category": "TX", @@ -73,7 +71,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/diy-bluetooth-joystick.json b/devices/diy-bluetooth-joystick.json index dfe589723..0b581fe71 100644 --- a/devices/diy-bluetooth-joystick.json +++ b/devices/diy-bluetooth-joystick.json @@ -12,6 +12,5 @@ "UART_INVERTED" ], "wikiUrl": "", - "deviceType": "ExpressLRS" - } +} ] diff --git a/devices/emax-2400.json b/devices/emax-2400.json index a2a4ed4de..3db7b28bc 100644 --- a/devices/emax-2400.json +++ b/devices/emax-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -50,7 +49,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/emax-900.json b/devices/emax-900.json index 89c092ef9..e859e6305 100644 --- a/devices/emax-900.json +++ b/devices/emax-900.json @@ -25,7 +25,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -54,7 +53,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/foxeer-2400.json b/devices/foxeer-2400.json index cc63a51ba..8ddd74323 100644 --- a/devices/foxeer-2400.json +++ b/devices/foxeer-2400.json @@ -28,7 +28,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/foxeer2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/frsky-900.json b/devices/frsky-900.json index 830f22586..24e263f44 100644 --- a/devices/frsky-900.json +++ b/devices/frsky-900.json @@ -30,7 +30,6 @@ "UNLOCK_HIGHER_POWER" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/frsky-r9modules/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -58,7 +57,6 @@ "DISABLE_ALL_BEEPS" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/frsky-r9modules/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -83,7 +81,6 @@ "DISABLE_ALL_BEEPS" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/frsky-r9modules/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -110,7 +107,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/r9/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -136,7 +132,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/r9/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -162,7 +157,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/r9/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -188,7 +182,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/r9/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -214,7 +207,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/r9/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/frsky-backpack.json b/devices/frsky-backpack.json index 34698841b..3c97ca5a3 100644 --- a/devices/frsky-backpack.json +++ b/devices/frsky-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/fusion-backpack.json b/devices/fusion-backpack.json index 64eb974f4..7ae20e2bb 100644 --- a/devices/fusion-backpack.json +++ b/devices/fusion-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/ghost-2400.json b/devices/ghost-2400.json index 2433f79de..c892c05e3 100644 --- a/devices/ghost-2400.json +++ b/devices/ghost-2400.json @@ -19,7 +19,6 @@ "MY_STARTUP_MELODY" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/ghost2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -42,7 +41,6 @@ "MY_STARTUP_MELODY" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/ghost2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -66,7 +64,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/ghost2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/happymodel-2400.json b/devices/happymodel-2400.json index f50e28fa2..3fda6bc2e 100644 --- a/devices/happymodel-2400.json +++ b/devices/happymodel-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/es24tx/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -50,7 +49,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/es24tx/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -82,7 +80,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/hmep2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "RadioMaster", @@ -121,7 +118,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/hmep2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -145,7 +141,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/hmpp2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/happymodel-900.json b/devices/happymodel-900.json index 4d911febf..438976909 100644 --- a/devices/happymodel-900.json +++ b/devices/happymodel-900.json @@ -26,7 +26,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/es900tx/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -60,7 +59,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/hmes900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -97,7 +95,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/es900tx/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -123,7 +120,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/hmes900/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/happymodel-backpack.json b/devices/happymodel-backpack.json index e1d876204..ec409833e 100644 --- a/devices/happymodel-backpack.json +++ b/devices/happymodel-backpack.json @@ -22,7 +22,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [ { "category": "TX", @@ -63,7 +62,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/hdzero-backpack.json b/devices/hdzero-backpack.json index 5f65e9fa7..99783cab6 100644 --- a/devices/hdzero-backpack.json +++ b/devices/hdzero-backpack.json @@ -14,7 +14,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -32,7 +31,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/hglrc-2400.json b/devices/hglrc-2400.json index 3810afad6..fdf8404d2 100644 --- a/devices/hglrc-2400.json +++ b/devices/hglrc-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -55,7 +54,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/hglrc-900.json b/devices/hglrc-900.json index 5489dc031..823a20479 100644 --- a/devices/hglrc-900.json +++ b/devices/hglrc-900.json @@ -30,7 +30,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/iflight-2400.json b/devices/iflight-2400.json index 1fba030c2..3e2018e00 100644 --- a/devices/iflight-2400.json +++ b/devices/iflight-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -55,7 +54,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/iflight-900.json b/devices/iflight-900.json index cd3cf94fb..65f56259f 100644 --- a/devices/iflight-900.json +++ b/devices/iflight-900.json @@ -25,7 +25,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -59,7 +58,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/jumper-2400.json b/devices/jumper-2400.json index 36742a990..5dc1e44f9 100644 --- a/devices/jumper-2400.json +++ b/devices/jumper-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/jumper-aion/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -53,7 +52,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/aion-internal/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -83,7 +81,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/jumper-internal/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -115,7 +112,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/jumper-900.json b/devices/jumper-900.json index 3a87afc6b..db6691c3b 100644 --- a/devices/jumper-900.json +++ b/devices/jumper-900.json @@ -22,7 +22,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/jumper900/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/matek-2400.json b/devices/matek-2400.json index 394eed5b4..6e1132d40 100644 --- a/devices/matek-2400.json +++ b/devices/matek-2400.json @@ -28,7 +28,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/matek2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -54,7 +53,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -86,7 +84,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/matek2400/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "RadioMaster", diff --git a/devices/namimnorc-2400.json b/devices/namimnorc-2400.json index 6adc3dbf5..644b0aff6 100644 --- a/devices/namimnorc-2400.json +++ b/devices/namimnorc-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/flash2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -50,7 +49,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/flash2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -74,7 +72,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/flash2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -106,7 +103,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/flash2400/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -138,7 +134,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/flash2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/namimnorc-900.json b/devices/namimnorc-900.json index de5fd34cb..9df42c0be 100644 --- a/devices/namimnorc-900.json +++ b/devices/namimnorc-900.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/voyager900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -50,7 +49,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/voyager900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -76,7 +74,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/voyager900/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -110,7 +107,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/voyager900/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/namimnorc-backpack.json b/devices/namimnorc-backpack.json index 7db040df9..7e7abd631 100644 --- a/devices/namimnorc-backpack.json +++ b/devices/namimnorc-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/neutronrc-900.json b/devices/neutronrc-900.json index 9ff6113f9..1b71093cc 100644 --- a/devices/neutronrc-900.json +++ b/devices/neutronrc-900.json @@ -30,7 +30,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/orqa-backpack.json b/devices/orqa-backpack.json index 125f1c6a0..be8e31ebe 100644 --- a/devices/orqa-backpack.json +++ b/devices/orqa-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://github.com/ExpressLRS/Backpack/wiki/Orqa-FPV.Connect-Wiring", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/quadcopters-2400.json b/devices/quadcopters-2400.json index 1bccc6734..7aa292f55 100644 --- a/devices/quadcopters-2400.json +++ b/devices/quadcopters-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [ { "category": "QuadKopters", @@ -62,7 +61,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/radiomaster-2400.json b/devices/radiomaster-2400.json index 10c3a58ee..b08a6ba3e 100644 --- a/devices/radiomaster-2400.json +++ b/devices/radiomaster-2400.json @@ -26,7 +26,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-internal/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -56,7 +55,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-internal/", - "deviceType": "ExpressLRS", "aliases": [ { "category": "RadioMaster", @@ -90,8 +88,7 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-ranger/", - "deviceType": "ExpressLRS" - }, +}, { "category": "RadioMaster", "name": "RadioMaster Ranger Micro 2400 TX", @@ -116,7 +113,6 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-ranger/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -143,7 +139,6 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-ranger/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -173,7 +168,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/rm-internal/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/radiomaster-backpack.json b/devices/radiomaster-backpack.json index 5cb20ebee..d8171edff 100644 --- a/devices/radiomaster-backpack.json +++ b/devices/radiomaster-backpack.json @@ -22,7 +22,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [ { "category": "TX", diff --git a/devices/rapidfire-backpack.json b/devices/rapidfire-backpack.json index e5fd474c8..f606392ce 100644 --- a/devices/rapidfire-backpack.json +++ b/devices/rapidfire-backpack.json @@ -14,7 +14,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "https://www.expresslrs.org/hardware/backpack/backpack-vrx-setup/#rapidfire-backpack-connection", - "deviceType": "Backpack", "aliases": [] }, { @@ -32,7 +31,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "https://www.expresslrs.org/hardware/backpack/backpack-vrx-setup/#rapidfire-backpack-connection", - "deviceType": "Backpack", "aliases": [] }, { @@ -50,7 +48,6 @@ ], "userDefines": ["BINDING_PHRASE", "HOME_WIFI_SSID", "HOME_WIFI_PASSWORD"], "wikiUrl": "https://www.expresslrs.org/hardware/backpack/backpack-vrx-setup/#rapidfire-backpack-connection", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/rx5808-backpack.json b/devices/rx5808-backpack.json index 098c4cc82..0c6186802 100644 --- a/devices/rx5808-backpack.json +++ b/devices/rx5808-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -40,7 +39,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -62,7 +60,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -84,7 +81,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/siyi-2400.json b/devices/siyi-2400.json index 0b87a0a3a..c9b71c0bc 100644 --- a/devices/siyi-2400.json +++ b/devices/siyi-2400.json @@ -20,7 +20,6 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/siyifm30/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -44,7 +43,6 @@ "RCVR_UART_BAUD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/siyiFRmini/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -68,7 +66,6 @@ "UART_INVERTED" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/siyiFRmini/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/devices/steadyview-backpack.json b/devices/steadyview-backpack.json index fd826b123..0ca620799 100644 --- a/devices/steadyview-backpack.json +++ b/devices/steadyview-backpack.json @@ -18,7 +18,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] }, { @@ -40,7 +39,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "", - "deviceType": "Backpack", "aliases": [] } ] diff --git a/devices/vantac-2400.json b/devices/vantac-2400.json index 09b5a2b84..118d37a2a 100644 --- a/devices/vantac-2400.json +++ b/devices/vantac-2400.json @@ -23,7 +23,6 @@ "HOME_WIFI_PASSWORD" ], "wikiUrl": "https://www.expresslrs.org/quick-start/transmitters/vantac-lite/", - "deviceType": "ExpressLRS", "aliases": [] }, { @@ -55,7 +54,6 @@ "RCVR_INVERT_TX" ], "wikiUrl": "https://www.expresslrs.org/quick-start/receivers/vantac2400/", - "deviceType": "ExpressLRS", "aliases": [] } ] diff --git a/graphql.schema.json b/graphql.schema.json index 66599a992..c477af755 100644 --- a/graphql.schema.json +++ b/graphql.schema.json @@ -597,22 +597,6 @@ "isDeprecated": false, "deprecationReason": null }, - { - "name": "deviceType", - "description": null, - "args": [], - "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "ENUM", - "name": "DeviceType", - "ofType": null - } - }, - "isDeprecated": false, - "deprecationReason": null - }, { "name": "id", "description": null, @@ -775,29 +759,6 @@ "enumValues": null, "possibleTypes": null }, - { - "kind": "ENUM", - "name": "DeviceType", - "description": null, - "fields": null, - "inputFields": null, - "interfaces": null, - "enumValues": [ - { - "name": "Backpack", - "description": null, - "isDeprecated": false, - "deprecationReason": null - }, - { - "name": "ExpressLRS", - "description": null, - "isDeprecated": false, - "deprecationReason": null - } - ], - "possibleTypes": null - }, { "kind": "ENUM", "name": "FirmwareSource", diff --git a/release/app/package.json b/release/app/package.json index 306cdbd56..b1289b704 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -17,5 +17,8 @@ "license": "GPL-3.0-or-later", "dependencies": { "serialport": "^12.0.0" + }, + "resolutions": { + "node-gyp-build": "4.8.1" } } diff --git a/src/api/src/models/Device.ts b/src/api/src/models/Device.ts index 66a3adc59..0b8525ea7 100644 --- a/src/api/src/models/Device.ts +++ b/src/api/src/models/Device.ts @@ -1,5 +1,4 @@ import { Field, ObjectType } from 'type-graphql'; -import DeviceType from './enum/DeviceType'; import Target from './Target'; import UserDefine from './UserDefine'; @@ -23,9 +22,6 @@ export default class Device { @Field(() => String, { nullable: true }) wikiUrl?: string; - @Field(() => DeviceType) - deviceType: DeviceType; - @Field(() => Boolean) verifiedHardware: boolean; @@ -50,7 +46,6 @@ export default class Device { category: string, targets: Target[], userDefines: UserDefine[], - deviceType: DeviceType, verifiedHardware: boolean, wikiUrl?: string, parent?: string | null, @@ -65,7 +60,6 @@ export default class Device { this.targets = targets; this.userDefines = userDefines; this.wikiUrl = wikiUrl; - this.deviceType = deviceType; this.verifiedHardware = verifiedHardware; this.parent = parent; this.abbreviatedName = abbreviatedName; diff --git a/src/api/src/models/enum/DeviceType.ts b/src/api/src/models/enum/DeviceType.ts deleted file mode 100644 index f71fe91e4..000000000 --- a/src/api/src/models/enum/DeviceType.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { registerEnumType } from 'type-graphql'; - -enum DeviceType { - ExpressLRS = 'ExpressLRS', - Backpack = 'Backpack', -} - -registerEnumType(DeviceType, { - name: 'DeviceType', -}); - -export default DeviceType; diff --git a/src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts b/src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts index 6dcb08624..0f30f3e33 100644 --- a/src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts +++ b/src/api/src/services/BinaryFlashingStrategy/DeviceDescriptionsLoader/index.ts @@ -16,7 +16,6 @@ import Mutex from '../../../library/Mutex'; import { DeviceDescription, TargetsJSONLoader } from '../TargetsJSONLoader'; import FlashingMethod from '../../../models/enum/FlashingMethod'; import Target from '../../../models/Target'; -import DeviceType from '../../../models/enum/DeviceType'; import { UserDefineFilters } from '../../UserDefinesLoader'; import UserDefine from '../../../models/UserDefine'; import TargetUserDefinesFactory from '../../../factories/TargetUserDefinesFactory'; @@ -106,7 +105,6 @@ export default class DeviceDescriptionsLoader { category, uploadMethods, [], - DeviceType.ExpressLRS, true, undefined, undefined, diff --git a/src/api/src/services/Device/index.ts b/src/api/src/services/Device/index.ts index 6b7fae353..db1a99846 100644 --- a/src/api/src/services/Device/index.ts +++ b/src/api/src/services/Device/index.ts @@ -5,7 +5,6 @@ import Device from '../../models/Device'; import Target from '../../models/Target'; import FlashingMethod from '../../models/enum/FlashingMethod'; import UserDefineKey from '../../library/FirmwareBuilder/Enum/UserDefineKey'; -import DeviceType from '../../models/enum/DeviceType'; import { LoggerService } from '../../logger'; import UserDefineOverride from '../../models/UserDefineOverride'; import TargetUserDefinesFactory from '../../factories/TargetUserDefinesFactory'; @@ -119,13 +118,6 @@ export default class DeviceService implements IDevices { } ); - const deviceType = - DeviceType[value.deviceType as keyof typeof DeviceType]; - - if (!deviceType) { - throw new Error(`"${value.deviceType}" is not a valid device type`); - } - const device: Device = { id: value.name, name: value.name, @@ -133,7 +125,6 @@ export default class DeviceService implements IDevices { targets, userDefines, wikiUrl: value.wikiUrl, - deviceType, parent: null, abbreviatedName: value.abbreviatedName, verifiedHardware: value.verifiedHardware ?? true, @@ -163,7 +154,6 @@ export default class DeviceService implements IDevices { }), userDefines: device.userDefines, wikiUrl: alias.wikiUrl, - deviceType: device.deviceType, parent: device.id, abbreviatedName: alias.abbreviatedName, verifiedHardware: alias.verifiedHardware ?? true, diff --git a/src/ui/App.tsx b/src/ui/App.tsx index 164650bad..dc9a64b3e 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -12,7 +12,7 @@ import SerialMonitorView from './views/SerialMonitorView'; import SettingsView from './views/SettingsView'; import SupportView from './views/SupportView'; import { Config } from './config'; -import { DeviceType, MulticastDnsInformation } from './gql/generated/types'; +import { MulticastDnsInformation } from './gql/generated/types'; import useNetworkDevices from './hooks/useNetworkDevices'; import WifiDeviceNotification from './components/WifiDeviceNotification'; import AppStateProvider from './context/AppStateProvider'; @@ -70,7 +70,6 @@ const App = () => { selectedDevice={device} networkDevices={networkDevices} onDeviceChange={onDeviceChange} - deviceType={DeviceType.ExpressLRS} buildProgressNotifications={buildProgressNotifications} lastBuildProgressNotification={ lastBuildProgressNotification @@ -92,7 +91,6 @@ const App = () => { selectedDevice={device} networkDevices={networkDevices} onDeviceChange={onDeviceChange} - deviceType={DeviceType.Backpack} buildProgressNotifications={buildProgressNotifications} lastBuildProgressNotification={ lastBuildProgressNotification diff --git a/src/ui/gql/queries/availableFirmwareTargets.graphql b/src/ui/gql/queries/availableFirmwareTargets.graphql index d94eec7e4..799da76ac 100644 --- a/src/ui/gql/queries/availableFirmwareTargets.graphql +++ b/src/ui/gql/queries/availableFirmwareTargets.graphql @@ -25,7 +25,6 @@ query availableFirmwareTargets( flashingMethod } wikiUrl - deviceType parent abbreviatedName verifiedHardware diff --git a/src/ui/views/ConfiguratorView/index.tsx b/src/ui/views/ConfiguratorView/index.tsx index 1b1090969..27d531749 100644 --- a/src/ui/views/ConfiguratorView/index.tsx +++ b/src/ui/views/ConfiguratorView/index.tsx @@ -31,6 +31,7 @@ import { import SettingsIcon from '@mui/icons-material/Settings'; import { ContentCopy, NetworkWifi, Save } from '@mui/icons-material'; import { SxProps, Theme } from '@mui/system'; +import { useLocation } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import FirmwareVersionForm from '../../components/FirmwareVersionForm'; import DeviceTargetForm from '../../components/DeviceTargetForm'; @@ -49,7 +50,6 @@ import { BuildJobType, BuildProgressNotification, Device, - DeviceType, FirmwareSource, FirmwareVersionDataInput, FlashingMethod, @@ -147,7 +147,6 @@ interface ConfiguratorViewProps { selectedDevice: string | null; networkDevices: Map; onDeviceChange: (dnsDevice: MulticastDnsInformation | null) => void; - deviceType: DeviceType; buildProgressNotifications: BuildProgressNotification[]; lastBuildProgressNotification: BuildProgressNotification | null; resetBuildProgressNotifications: () => void; @@ -163,7 +162,6 @@ const ConfiguratorView: FunctionComponent = (props) => { selectedDevice, networkDevices, onDeviceChange, - deviceType, buildProgressNotifications, lastBuildProgressNotification, resetBuildProgressNotifications, @@ -171,6 +169,9 @@ const ConfiguratorView: FunctionComponent = (props) => { resetBuildLogs, } = props; + const location = useLocation(); + const isExpressLRSRoute = location.pathname === '/configurator'; + const [viewState, setViewState] = useState( ViewState.Configuration ); @@ -443,8 +444,8 @@ const ConfiguratorView: FunctionComponent = (props) => { }, [deviceTarget]); const hasLuaScript = useMemo(() => { - return deviceType === DeviceType.ExpressLRS && isTX; - }, [deviceType, isTX]); + return isExpressLRSRoute && isTX; + }, [isExpressLRSRoute, isTX]); const [ fetchLuaScript, From 12f6139ffcac0c3ab09593b3591001d048d59d05 Mon Sep 17 00:00:00 2001 From: Gary Bisaga Date: Sun, 8 Feb 2026 12:07:45 -0500 Subject: [PATCH 2/3] Fix JSON format --- devices/diy-bluetooth-joystick.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/diy-bluetooth-joystick.json b/devices/diy-bluetooth-joystick.json index 0b581fe71..546e23273 100644 --- a/devices/diy-bluetooth-joystick.json +++ b/devices/diy-bluetooth-joystick.json @@ -11,6 +11,6 @@ "userDefines": [ "UART_INVERTED" ], - "wikiUrl": "", -} + "wikiUrl": "" + } ] From 66117ec8f1dcfdaf2f53aef6a7e598b0f264b8d4 Mon Sep 17 00:00:00 2001 From: Gary Bisaga Date: Sun, 8 Feb 2026 16:22:23 -0500 Subject: [PATCH 3/3] back out configs --- codegen.yml | 2 +- release/app/package.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/codegen.yml b/codegen.yml index 80ca9825b..20a61644c 100644 --- a/codegen.yml +++ b/codegen.yml @@ -1,5 +1,5 @@ overwrite: true -schema: './graphql.schema.json' +schema: 'http://localhost:3500/graphql' generates: src/ui/gql/generated/types.ts: documents: diff --git a/release/app/package.json b/release/app/package.json index b1289b704..306cdbd56 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -17,8 +17,5 @@ "license": "GPL-3.0-or-later", "dependencies": { "serialport": "^12.0.0" - }, - "resolutions": { - "node-gyp-build": "4.8.1" } }