From 04931c70a79198a2fe4b33693f2c0ad0889676a1 Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Thu, 28 Oct 2021 13:42:06 +0200
Subject: [PATCH] Add functionality to all knobs

---
 Dashboard/src/App.tsx                    | 50 +-------------
 Dashboard/src/Components/KnobSection.tsx | 83 +++++++++++++++---------
 Dashboard/src/electron.js                |  4 +-
 3 files changed, 58 insertions(+), 79 deletions(-)

diff --git a/Dashboard/src/App.tsx b/Dashboard/src/App.tsx
index 6e512b2..0bb926d 100644
--- a/Dashboard/src/App.tsx
+++ b/Dashboard/src/App.tsx
@@ -1,10 +1,8 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { createGlobalStyle } from "styled-components";
-import { useDispatch, useSelector } from "react-redux";
-import { RootState } from "typesafe-actions";
+import { useDispatch } from "react-redux";
 import Select from "react-select";
 import SerialPort from "serialport";
-import Knob from "./Components/Knob";
 import { connect, disconnect } from "./redux/actions/asyncSerialConnectionActions";
 import { setSerialPort } from "./redux/actions/serialConnectionActions";
 import KnobSection from "./Components/KnobSection";
@@ -30,14 +28,7 @@ const fetchPorts = async () => {
 };
 
 const App = () => {
-  const [status, setStatus] = useState(0);
   const dispatch = useDispatch();
-  const serialConnection = useSelector<RootState, RootState["serialConnection"]>((state) => state.serialConnection);
-  const SerialDataListener = (data: string) => {
-    const parsedData = data.split(",");
-    console.log(parsedData);
-    setStatus(parseInt(parsedData[2], 10));
-  };
 
   fetchPorts();
 
@@ -47,46 +38,9 @@ const App = () => {
     dispatch(setSerialPort(selectedOption.value));
   };
 
-  useEffect(() => {
-    if (serialConnection.portController !== null) {
-      serialConnection.portController.parser.on("data", SerialDataListener);
-    }
-
-    return () => {
-      if (serialConnection.portController !== null) {
-        serialConnection.portController.parser.removeListener("data", SerialDataListener);
-      }
-    };
-  }, [serialConnection]);
-
-  const sendIncreaseHandler = () => {
-    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
-      setStatus(status + 1);
-      serialConnection.portController.port.write("2i");
-    }
-  };
-  const sendDecreaseHandler = () => {
-    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
-      setStatus(status - 1);
-      serialConnection.portController.port.write("2d");
-    }
-  };
-  const sendToggleHandler = () => {
-    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
-      setStatus(status - 1);
-      serialConnection.portController.port.write("2t");
-    }
-  };
-
   return (
     <div>
       <GlobalStyle />
-      <Knob
-        increase={sendIncreaseHandler}
-        decrease={sendDecreaseHandler}
-        toggle={sendToggleHandler}
-        status={Math.floor((status / 255) * 100)}
-      />
       <KnobSection />
       <button
         type="button"
diff --git a/Dashboard/src/Components/KnobSection.tsx b/Dashboard/src/Components/KnobSection.tsx
index 5d8763b..e88e8d6 100644
--- a/Dashboard/src/Components/KnobSection.tsx
+++ b/Dashboard/src/Components/KnobSection.tsx
@@ -1,39 +1,64 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
+import { useSelector } from "react-redux";
 import styled from "styled-components";
+import { RootState } from "typesafe-actions";
 import Knob from "./Knob";
 
+const KnobContainer = styled.div`
+display: flex;
+justify-content: space-between;
+margin: 1rem;
+`;
+
 const KnobSection = () => {
-  const KnobContainer = styled.div`
-  display: flex;
-  `;
+  const [status, setStatus] = useState([{ id: 0, value: 0 }, { id: 1, value: 0 }, { id: 2, value: 0 }, { id: 3, value: 0 }]);
+  const serialConnection = useSelector<RootState, RootState["serialConnection"]>((state) => state.serialConnection);
+
+  const SerialDataListener = (data: string) => {
+    const parsedData = data.split(",");
+    console.log(parsedData);
+    setStatus(status.map((element) => ({ ...element, value: parseInt(parsedData[element.id], 10) })));
+  };
+
+  useEffect(() => {
+    if (serialConnection.portController !== null) {
+      serialConnection.portController.parser.on("data", SerialDataListener);
+    }
+
+    return () => {
+      if (serialConnection.portController !== null) {
+        serialConnection.portController.parser.removeListener("data", SerialDataListener);
+      }
+    };
+  }, [serialConnection]);
+
+  const sendIncreaseHandler = (index: number) => {
+    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
+      serialConnection.portController.port.write(`${index}i`);
+    }
+  };
+  const sendDecreaseHandler = (index: number) => {
+    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
+      serialConnection.portController.port.write(`${index}d`);
+    }
+  };
+  const sendToggleHandler = (index: number) => {
+    if (serialConnection.portController !== null && serialConnection.portController.port !== null) {
+      serialConnection.portController.port.write(`${index}t`);
+    }
+  };
 
   return (
     <KnobContainer>
-      <Knob
-        increase={() => {}}
-        decrease={() => {}}
-        toggle={() => {}}
-        status={255}
-      />
-      <Knob
-        increase={() => {}}
-        decrease={() => {}}
-        toggle={() => {}}
-        status={255}
-      />
-      <Knob
-        increase={() => {}}
-        decrease={() => {}}
-        toggle={() => {}}
-        status={255}
-      />
-      <Knob
-        increase={() => {}}
-        decrease={() => {}}
-        toggle={() => {}}
-        status={255}
-      />
-
+      {status.map((element) => (
+        <Knob
+          key={element.id}
+          increase={() => { sendIncreaseHandler(element.id); }}
+          decrease={() => { sendDecreaseHandler(element.id); }}
+          toggle={() => { sendToggleHandler(element.id); }}
+          status={Math.floor((element.value / 255) * 100)}
+        />
+      ))}
     </KnobContainer>
 
   );
diff --git a/Dashboard/src/electron.js b/Dashboard/src/electron.js
index b9dc8dc..43bc5d3 100644
--- a/Dashboard/src/electron.js
+++ b/Dashboard/src/electron.js
@@ -9,8 +9,8 @@ const els = require("electron-localshortcut");
 const devTools = require("electron-devtools-installer");
 const chalk = require("chalk");
 
-const windowWidth = 1000;
-const windowHeight = 350;
+const windowWidth = 900;
+const windowHeight = 300;
 
 let tray = null;
 let mainWindow = null;