From 882d78e02d91ba17ae19b41960d4da87b4a45433 Mon Sep 17 00:00:00 2001
From: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Date: Wed, 1 Jan 2025 14:10:54 -0800
Subject: [PATCH] Updated device roles and modem presets

---
 .../config/device/DeviceConfigPage.tsx        | 26 ++++++++++++++-----
 .../config/device/LoRaConfigPage.tsx          | 25 ++++++++++--------
 .../config/device/PowerConfigPage.tsx         |  2 +-
 src/locales/en/translation.json               | 12 ++++++---
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/components/config/device/DeviceConfigPage.tsx b/src/components/config/device/DeviceConfigPage.tsx
index d881490d..44e023ae 100644
--- a/src/components/config/device/DeviceConfigPage.tsx
+++ b/src/components/config/device/DeviceConfigPage.tsx
@@ -99,8 +99,8 @@ export const DeviceConfigPage = ({
       >
         <div className="flex flex-col gap-6">
           <ConfigSelect
-            text={t("config.radio.device.deviceRole.title")}
-            {...register("role")}
+              text={t("config.radio.device.deviceRole.title")}
+              {...register("role")}
           >
             <option value="0">
               {t("config.radio.device.deviceRole.client")}
@@ -111,9 +111,6 @@ export const DeviceConfigPage = ({
             <option value="2">
               {t("config.radio.device.deviceRole.router")}
             </option>
-            <option value="3">
-              {t("config.radio.device.deviceRole.routerClient")}
-            </option>
             <option value="4">
               {t("config.radio.device.deviceRole.repeater")}
             </option>
@@ -123,11 +120,26 @@ export const DeviceConfigPage = ({
             <option value="6">
               {t("config.radio.device.deviceRole.sensor")}
             </option>
+            <option value="7">
+              {t("config.radio.device.deviceRole.tak")}
+            </option>
+            <option value="8">
+              {t("config.radio.device.deviceRole.clientHidden")}
+            </option>
+            <option value="9">
+              {t("config.radio.device.deviceRole.lostFound")}
+            </option>
+            <option value="10">
+              {t("config.radio.device.deviceRole.takTracker")}
+            </option>
+            <option value="11">
+              {t("config.radio.device.deviceRole.routerLate")}
+            </option>
           </ConfigSelect>
 
           <ConfigInput
-            type="checkbox"
-            text={t("config.radio.device.serialEnabled")}
+              type="checkbox"
+              text={t("config.radio.device.serialEnabled")}
             error={errors.serialEnabled?.message as string}
             {...register("serialEnabled")}
           />
diff --git a/src/components/config/device/LoRaConfigPage.tsx b/src/components/config/device/LoRaConfigPage.tsx
index 93d61707..0cbddd34 100644
--- a/src/components/config/device/LoRaConfigPage.tsx
+++ b/src/components/config/device/LoRaConfigPage.tsx
@@ -150,9 +150,9 @@ export const LoRaConfigPage = ({ className = "" }: ILoRaConfigPageProps) => {
           />
 
           <ConfigSelect
-            text={t("config.radio.lora.modemPreset.title")}
-            disabled={!useModemPreset}
-            {...register("modemPreset")}
+              text={t("config.radio.lora.modemPreset.title")}
+              disabled={!useModemPreset}
+              {...register("modemPreset")}
           >
             <option value="0">
               {t("config.radio.lora.modemPreset.longFast")}
@@ -160,27 +160,30 @@ export const LoRaConfigPage = ({ className = "" }: ILoRaConfigPageProps) => {
             <option value="1">
               {t("config.radio.lora.modemPreset.longSlow")}
             </option>
-            <option value="2">
-              {t("config.radio.lora.modemPreset.veryLongSlow")}
-            </option>
             <option value="3">
               {t("config.radio.lora.modemPreset.medSlow")}
             </option>
             <option value="4">
-              {t("config.radio.lora.modemPreset.shortSlow")}
+              {t("config.radio.lora.modemPreset.medFast")}
             </option>
             <option value="5">
-              {t("config.radio.lora.modemPreset.shortFast")}
+              {t("config.radio.lora.modemPreset.shortSlow")}
             </option>
             <option value="6">
+              {t("config.radio.lora.modemPreset.shortFast")}
+            </option>
+            <option value="7">
               {t("config.radio.lora.modemPreset.longModerate")}
             </option>
+            <option value="8">
+              {t("config.radio.lora.modemPreset.shortTurbo")}
+            </option>
           </ConfigSelect>
 
           <ConfigInput
-            disabled={useModemPreset}
-            type="number"
-            text={t("config.radio.lora.bandwidth")}
+              disabled={useModemPreset}
+              type="number"
+              text={t("config.radio.lora.bandwidth")}
             error={errors.bandwidth?.message as string}
             {...register("bandwidth")}
           />
diff --git a/src/components/config/device/PowerConfigPage.tsx b/src/components/config/device/PowerConfigPage.tsx
index b417df51..e506f8f3 100644
--- a/src/components/config/device/PowerConfigPage.tsx
+++ b/src/components/config/device/PowerConfigPage.tsx
@@ -104,7 +104,7 @@ export const PowerConfigPage = ({ className = "" }: IPowerConfigPageProps) => {
       >
         <div className="flex flex-col gap-6">
           <ConfigInput
-            type="checkbox"
+            type="switch"
             text={t("config.radio.power.enablePowerSaving")}
             error={errors.isPowerSaving?.message as string}
             {...register("isPowerSaving")}
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 1b0bff27..261f6f9a 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -202,7 +202,12 @@
           "routerClient": "Router + Client",
           "repeater": "Repeater",
           "tracker": "Tracker",
-          "sensor": "Sensor"
+          "sensor": "Sensor",
+          "tak": "Tak",
+          "clientHidden": "Client (hidden)",
+          "lostFound": "Lost and Found",
+          "takTracker": "Tak Tracker",
+          "routerLate": "Router Late"
         },
         "serialEnabled": "Serial Enabled",
         "serialDebugEnabled": "Serial Debug Enabled",
@@ -279,11 +284,12 @@
           "title": "Modem Preset",
           "longFast": "Long Fast",
           "longSlow": "Long Slow",
-          "veryLongSlow": "Very Long Slow",
+          "medFast": "Medium Fast",
           "medSlow": "Medium Slow",
           "shortSlow": "Short Slow",
           "shortFast": "Short Fast",
-          "longModerate": "Long Moderate"
+          "longModerate": "Long Moderate",
+          "shortTurbo": "Short Turbo"
         },
         "bandwidth": "Bandwidth (kHz)",
         "spreadFactor": "Spread Factor (1 << spread_factor)",