More work on replacement of ptt system

pierr3 · May 8, 2024 · b7b7c62 · b7b7c62
1 parent 797d0cb
commit b7b7c62
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 92 deletions.
diff --git a/backend/js/bindings.js b/backend/js/bindings.js
@@ -12,4 +12,5 @@ exports.AfvEventTypes = {
   VuMeter: "VuMeter",
   NetworkConnected: "network-connected",
   NetworkDisconnected: "network-disconnected",
+  PttKeySet: "UpdatePttKeyName",
 };
diff --git a/backend/src/InputHandler.cpp b/backend/src/InputHandler.cpp
@@ -34,14 +34,14 @@ void InputHandler::updatePttKey(int key, bool isJoystickButton, int joystickId)
     UserSettings::isJoystickButton = isJoystickButton;
     UserSettings::JoystickId = joystickId;
 
-    forwardPttKeyName();
+    InputHandler::forwardPttKeyName();
 }
 
 // NOLINTNEXTLINE
 void InputHandler::onTimer(Poco::Timer& /*timer*/)
 {
     sf::Joystick::update();
-    
+
     std::lock_guard<std::mutex> lock(m);
     if (isPttSetupRunning) {
 
@@ -52,7 +52,7 @@ void InputHandler::onTimer(Poco::Timer& /*timer*/)
                 updatePttKey(i, false);
 
                 isPttSetupRunning = false;
-                break;
+                return;
             }
         }
 
@@ -65,13 +65,9 @@ void InputHandler::onTimer(Poco::Timer& /*timer*/)
                         updatePttKey(j, true, i);
 
                         isPttSetupRunning = false;
-                        break;
+                        return;
                     }
                 }
-
-                if (!isPttSetupRunning) {
-                    break;
-                }
             }
         }
 
@@ -108,13 +104,19 @@ void InputHandler::onTimer(Poco::Timer& /*timer*/)
 
 void InputHandler::forwardPttKeyName()
 {
-    if (callbackAvailable) {
-        auto pttKeyName = getPttKeyName();
-        callbackRef.NonBlockingCall([pttKeyName](Napi::Env env, Napi::Function jsCallback) {
-            jsCallback.Call({ Napi::String::New(env, "UpdatePttKeyName"),
-                Napi::String::New(env, pttKeyName), Napi::String::New(env, "") });
-        });
+    TRACK_LOG_INFO("Forwarding Ptt Key Nam 1e");
+
+    if (!callbackAvailable) {
+        return;
     }
+
+    TRACK_LOG_INFO("Forwarding Ptt Key Name {}", getPttKeyName());
+
+    auto pttKeyName = getPttKeyName();
+    callbackRef.NonBlockingCall([pttKeyName](Napi::Env env, Napi::Function jsCallback) {
+        jsCallback.Call({ Napi::String::New(env, "UpdatePttKeyName"),
+            Napi::String::New(env, pttKeyName), Napi::String::New(env, "") });
+    });
 }
 
 std::string InputHandler::getPttKeyName()

diff --git a/backend/src/main.cpp b/backend/src/main.cpp
@@ -393,6 +393,16 @@ void StopAudio(const Napi::CallbackInfo& /*info*/)
     mClient->StopAudio();
 }
 
+void SetupPttBegin(const Napi::CallbackInfo& /*info*/)
+{
+    mainStaticData::inputHandler->startPttSetup();
+}
+
+void SetupPttEnd(const Napi::CallbackInfo& /*info*/)
+{
+    mainStaticData::inputHandler->stopPttSetup();
+}
+
 static void HandleAfvEvents(afv_native::ClientEventType eventType, void* data, void* data2)
 {
     if (!callbackAvailable) {
@@ -853,6 +863,10 @@ Napi::Object Init(Napi::Env env, Napi::Object exports)
 
     exports.Set(Napi::String::New(env, "StopAudio"), Napi::Function::New(env, StopAudio));
 
+    exports.Set(Napi::String::New(env, "SetupPttBegin"), Napi::Function::New(env, SetupPttBegin));
+
+    exports.Set(Napi::String::New(env, "SetupPttEnd"), Napi::Function::New(env, SetupPttEnd));
+
     exports.Set(Napi::String::New(env, "Exit"), Napi::Function::New(env, Exit));
 
     return exports;

diff --git a/backend/types/index.d.ts b/backend/types/index.d.ts
@@ -22,6 +22,7 @@ export declare const AfvEventTypes: {
   NetworkConnected: string;
   NetworkDisconnected: string;
   VuMeter: string;
+  PttKeySet: string;
 };
 
 declare namespace TrackAudioAfv {
@@ -84,7 +85,14 @@ declare namespace TrackAudioAfv {
     func: (arg: string, arg2: string, arg3: string) => void
   ): void;
 
+  export function SetupPttBegin(): void;
+  export function SetupPttEnd(): void;
+
   export function IsConnected(): boolean;
-  export function Bootstrap(resourcePath: string): {canRun: boolean, needUpdate: boolean, version: string};
+  export function Bootstrap(resourcePath: string): {
+    canRun: boolean;
+    needUpdate: boolean;
+    version: string;
+  };
   export function Exit(): void;
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
     "@sentry/react": "7.113.0",
     "bootstrap": "^5.3.3",
     "bootstrap-scss": "^5.3.3",
+    "build-backend": "^1.0.2",
     "clsx": "^2.1.0",
     "electron-store": "^8.2.0",
     "i": "^0.3.7",
@@ -73,7 +74,6 @@
     "sass": "^1.74.1",
     "styled-components": "^5.3.11",
     "trackaudio-afv": "file:backend/trackaudio-afv-1.0.0.tgz",
-    "uiohook-napi": "1.5.2",
     "use-debounce": "^10.0.0",
     "zustand": "^4.5.2"
   },

diff --git a/src/app/components/bootstrap.tsx b/src/app/components/bootstrap.tsx
@@ -20,7 +20,7 @@ const Bootsrap: React.FC = () => {
         useRadioState
           .getState()
           .setTransceiverCountForStationCallsign(station, parseInt(count));
-      },
+      }
     );
 
     window.api.on(
@@ -39,16 +39,16 @@ const Bootsrap: React.FC = () => {
               .addRadio(
                 freq,
                 station,
-                useSessionStore.getState().getStationCallsign(),
+                useSessionStore.getState().getStationCallsign()
               );
             void window.api.SetRadioGain(
-              useSessionStore.getState().radioGain / 100,
+              useSessionStore.getState().radioGain / 100
             );
           })
           .catch((err: unknown) => {
             console.error(err);
           });
-      },
+      }
     );
 
     window.api.on("FrequencyRxBegin", (frequency: string) => {
@@ -98,7 +98,7 @@ const Bootsrap: React.FC = () => {
         const frequency = parseInt(dataArr[1]);
         useSessionStore.getState().setIsAtc(isAtc);
         useSessionStore.getState().setFrequency(frequency);
-      },
+      }
     );
 
     window.api.on("network-disconnected", () => {
@@ -109,7 +109,8 @@ const Bootsrap: React.FC = () => {
     });
 
     window.api.on("ptt-key-set", (key: string) => {
-      useSessionStore.getState().setPttKeyName(key);
+      console.log("Ptt key set to", key);
+      useUtilStore.getState().setPttKeyName(key);
     });
 
     window.api

diff --git a/src/app/components/settings-modal/settings-modal.tsx b/src/app/components/settings-modal/settings-modal.tsx
@@ -4,7 +4,6 @@ import AudioInput from "./audio-input";
 import AudioOutputs from "./audio-outputs";
 import useUtilStore from "../../store/utilStore";
 import clsx from "clsx";
-import useSessionStore from "../../store/sessionStore";
 import { useDebouncedCallback } from "use-debounce";
 import { Configuration } from "../../../config.d";
 import { AudioApi, AudioDevice } from "trackaudio-afv";
@@ -23,28 +22,25 @@ const SettingsModal: React.FC<SettingsModalProps> = ({ closeModal }) => {
   const [changesSaved, setChangesSaved] = useState(SaveStatus.NoChanges);
   const [audioApis, setAudioApis] = useState(Array<AudioApi>);
   const [audioOutputDevices, setAudioOutputDevices] = useState(
-    Array<AudioDevice>,
+    Array<AudioDevice>
   );
   const [audioInputDevices, setAudioInputDevices] = useState(
-    Array<AudioDevice>,
+    Array<AudioDevice>
   );
   const [hardwareType, setHardwareType] = useState(0);
   const [config, setConfig] = useState({} as Configuration);
   const [alwaysOnTop, setAlwaysOnTop] = useState(0);
 
   const [isSettingPtt, setIsSettingPtt] = useState(false);
-  const [pttKeyName, setPttKeyName] = useSessionStore((state) => [
-    state.pttKeyName,
-    state.setPttKeyName,
-  ]);
 
   const [cid, setCid] = useState("");
   const [password, setPassword] = useState("");
 
-  const [vu, vuPeak, updateVu] = useUtilStore((state) => [
+  const [vu, vuPeak, updateVu, pttKeyName] = useUtilStore((state) => [
     state.vu,
     state.peakVu,
     state.updateVu,
+    state.pttKeyName,
   ]);
   const [isMicTesting, setIsMicTesting] = useState(false);
 
@@ -56,7 +52,6 @@ const SettingsModal: React.FC<SettingsModalProps> = ({ closeModal }) => {
         setCid(config.cid || "");
         setPassword(config.password || "");
         setHardwareType(config.hardwareType || 0);
-        setPttKeyName(config.pttKeyName || "None");
         setAlwaysOnTop(config.alwaysOnTop ? 1 : 0);
       })
       .catch((err: unknown) => {
@@ -89,7 +84,7 @@ const SettingsModal: React.FC<SettingsModalProps> = ({ closeModal }) => {
       .catch((err: unknown) => {
         console.error(err);
       });
-  }, [config.audioApi, setPttKeyName]);
+  }, [config.audioApi]);
 
   const debouncedCid = useDebouncedCallback((cid: string) => {
     setChangesSaved(SaveStatus.Saving);
@@ -183,7 +178,7 @@ const SettingsModal: React.FC<SettingsModalProps> = ({ closeModal }) => {
   };
 
   const handleHardwareTypeChange = (
-    e: React.ChangeEvent<HTMLSelectElement>,
+    e: React.ChangeEvent<HTMLSelectElement>
   ) => {
     setChangesSaved(SaveStatus.Saving);
     const hardwareType = parseInt(e.target.value);
@@ -324,7 +319,7 @@ const SettingsModal: React.FC<SettingsModalProps> = ({ closeModal }) => {
                     className={clsx(
                       "btn mt-3 w-100",
                       !isMicTesting && "btn-info",
-                      isMicTesting && "btn-warning",
+                      isMicTesting && "btn-warning"
                     )}
                     onClick={handleMicTest}
                     disabled={

diff --git a/src/app/store/sessionStore.ts b/src/app/store/sessionStore.ts
@@ -8,7 +8,6 @@ interface sessionStore {
   isConnecting: boolean;
   version: string;
   frequency: number;
-  pttKeyName: string;
   radioGain: number;
   stationCallsign: string;
   setCallsign: (callsign: string) => void;
@@ -18,7 +17,6 @@ interface sessionStore {
   setVersion: (version: string) => void;
   setNetworkConnected: (isConnected: boolean) => void;
   setFrequency: (frequency: number) => void;
-  setPttKeyName: (pttKeyName: string) => void;
   setRadioGain: (radioGain: number) => void;
   setStationCallsign: (stationCallsign: string) => void;
   getStationCallsign: () => string;
@@ -57,9 +55,6 @@ const useSessionStore = create<sessionStore>((set) => ({
   setFrequency: (frequency) => {
     set({ frequency });
   },
-  setPttKeyName: (pttKeyName) => {
-    set({ pttKeyName });
-  },
   setRadioGain: (radioGain) => {
     set({ radioGain });
   },

diff --git a/src/app/store/utilStore.ts b/src/app/store/utilStore.ts
@@ -4,6 +4,8 @@ interface UtilStore {
   vu: number;
   peakVu: number;
   platform: string;
+  pttKeyName: string;
+  setPttKeyName: (pttKeyName: string) => void;
   updateVu: (vu: number, peakVu: number) => void;
   updatePlatform: (platform: string) => void;
 }
@@ -12,6 +14,10 @@ const useUtilStore = create<UtilStore>((set) => ({
   vu: 0,
   peakVu: 0,
   platform: "",
+  pttKeyName: "",
+  setPttKeyName: (pttKeyName: string) => {
+    set({ pttKeyName });
+  },
   updateVu: (vu: number, peakVu: number) => {
     set({ vu, peakVu });
   },

diff --git a/src/config.d.ts b/src/config.d.ts
@@ -8,12 +8,9 @@ export interface Configuration {
   password: string;
   callsign: string;
 
-  pttKey: number;
-  pttKeyName: string;
   hardwareType: number;
   radioGain: number;
 
   alwaysOnTop: boolean;
-
   consentedToTelemetry: boolean | undefined;
 }