Send inputs from main process to Runtime

pioneers · Oct 18, 2024 · b536c45 · b536c45
1 parent 74128b1
commit b536c45
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/main/MainApp.ts b/src/main/MainApp.ts
@@ -209,13 +209,8 @@ export default class MainApp implements MenuHandler, RuntimeCommsListener {
       this.#preventQuit = false;
       this.#mainWindow.close();
     });
-    addRendererListener('main-update-robot-mode', (mode) => {
-      this.#runtimeComms.sendRunMode({ mode });
-    });
-    // eslint-disable-next-line no-unused
-    addRendererListener('main-robot-input', (inputs) => {
-      // TODO: send inputs to robot
-    });
+    addRendererListener('main-update-robot-mode', this.#runtimeComms.sendRunMode.bind(this.#runtimeComms));
+    addRendererListener('main-robot-input', this.#runtimeComms.sendInputs.bind(this.#runtimeComms));
 
     try {
       this.#config = coerceToConfig(

diff --git a/src/main/network/RuntimeComms.ts b/src/main/network/RuntimeComms.ts
@@ -167,11 +167,11 @@ export default class RuntimeComms {
 
   /**
    * Sends a new run mode.
-   * @param runMode - the new run mode.
+   * @param mode - the new run mode.
    */
-  sendRunMode(runMode: protos.IRunMode) {
+  sendRunMode(mode: protos.Mode) {
     if (this.#tcpSock) {
-      this.#tcpSock.write(this.#createPacket(MsgType.RUN_MODE, runMode));
+      this.#tcpSock.write(this.#createPacket(MsgType.RUN_MODE, { mode }));
     }
   }
 
@@ -210,9 +210,8 @@ export default class RuntimeComms {
   /**
    * Sends control inputs to the robot.
    * @param inputs - the inputs to send.
-   * @param source - the device that is the source of the inputs.
    */
-  sendInputs(inputs: protos.Input[], source: protos.Source) {
+  sendInputs(inputs: protos.Input[]) {
     // if (this.#udpSock) {
     //  this.udpSock.send(protos.UserInputs.encode({
     //    inputs: inputs.length ? inputs : [
@@ -223,11 +222,7 @@ export default class RuntimeComms {
     // Old Dawn sends inputs through TCP, though comments say this is just for 2021?
     if (this.#tcpSock) {
       this.#tcpSock.write(
-        this.#createPacket(MsgType.INPUTS, {
-          inputs: inputs.length
-            ? inputs
-            : [protos.Input.create({ connected: false, source })],
-        }),
+        this.#createPacket(MsgType.INPUTS, { inputs }),
       );
     }
   }

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -298,6 +298,7 @@ export default function App() {
           source: RobotInputSource.KEYBOARD,
         }),
       };
+      // Possible bug requires testing: is Runtime ok with mixed input sources in same packet?
       window.electron.ipcRenderer.sendMessage('main-robot-input', [
         ...gamepadInputs,
         keyboardInput,