Add functionality to all knobs
This commit is contained in:
parent
dc4f8e88a9
commit
04931c70a7
3 changed files with 58 additions and 79 deletions
|
@ -1,10 +1,8 @@
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { createGlobalStyle } from "styled-components";
|
import { createGlobalStyle } from "styled-components";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { RootState } from "typesafe-actions";
|
|
||||||
import Select from "react-select";
|
import Select from "react-select";
|
||||||
import SerialPort from "serialport";
|
import SerialPort from "serialport";
|
||||||
import Knob from "./Components/Knob";
|
|
||||||
import { connect, disconnect } from "./redux/actions/asyncSerialConnectionActions";
|
import { connect, disconnect } from "./redux/actions/asyncSerialConnectionActions";
|
||||||
import { setSerialPort } from "./redux/actions/serialConnectionActions";
|
import { setSerialPort } from "./redux/actions/serialConnectionActions";
|
||||||
import KnobSection from "./Components/KnobSection";
|
import KnobSection from "./Components/KnobSection";
|
||||||
|
@ -30,14 +28,7 @@ const fetchPorts = async () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
const [status, setStatus] = useState(0);
|
|
||||||
const dispatch = useDispatch();
|
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();
|
fetchPorts();
|
||||||
|
|
||||||
|
@ -47,46 +38,9 @@ const App = () => {
|
||||||
dispatch(setSerialPort(selectedOption.value));
|
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 (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<GlobalStyle />
|
<GlobalStyle />
|
||||||
<Knob
|
|
||||||
increase={sendIncreaseHandler}
|
|
||||||
decrease={sendDecreaseHandler}
|
|
||||||
toggle={sendToggleHandler}
|
|
||||||
status={Math.floor((status / 255) * 100)}
|
|
||||||
/>
|
|
||||||
<KnobSection />
|
<KnobSection />
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|
|
@ -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 styled from "styled-components";
|
||||||
|
import { RootState } from "typesafe-actions";
|
||||||
import Knob from "./Knob";
|
import Knob from "./Knob";
|
||||||
|
|
||||||
const KnobSection = () => {
|
|
||||||
const KnobContainer = styled.div`
|
const KnobContainer = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin: 1rem;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const KnobSection = () => {
|
||||||
|
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 (
|
return (
|
||||||
<KnobContainer>
|
<KnobContainer>
|
||||||
|
{status.map((element) => (
|
||||||
<Knob
|
<Knob
|
||||||
increase={() => {}}
|
key={element.id}
|
||||||
decrease={() => {}}
|
increase={() => { sendIncreaseHandler(element.id); }}
|
||||||
toggle={() => {}}
|
decrease={() => { sendDecreaseHandler(element.id); }}
|
||||||
status={255}
|
toggle={() => { sendToggleHandler(element.id); }}
|
||||||
|
status={Math.floor((element.value / 255) * 100)}
|
||||||
/>
|
/>
|
||||||
<Knob
|
))}
|
||||||
increase={() => {}}
|
|
||||||
decrease={() => {}}
|
|
||||||
toggle={() => {}}
|
|
||||||
status={255}
|
|
||||||
/>
|
|
||||||
<Knob
|
|
||||||
increase={() => {}}
|
|
||||||
decrease={() => {}}
|
|
||||||
toggle={() => {}}
|
|
||||||
status={255}
|
|
||||||
/>
|
|
||||||
<Knob
|
|
||||||
increase={() => {}}
|
|
||||||
decrease={() => {}}
|
|
||||||
toggle={() => {}}
|
|
||||||
status={255}
|
|
||||||
/>
|
|
||||||
|
|
||||||
</KnobContainer>
|
</KnobContainer>
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
|
@ -9,8 +9,8 @@ const els = require("electron-localshortcut");
|
||||||
const devTools = require("electron-devtools-installer");
|
const devTools = require("electron-devtools-installer");
|
||||||
const chalk = require("chalk");
|
const chalk = require("chalk");
|
||||||
|
|
||||||
const windowWidth = 1000;
|
const windowWidth = 900;
|
||||||
const windowHeight = 350;
|
const windowHeight = 300;
|
||||||
|
|
||||||
let tray = null;
|
let tray = null;
|
||||||
let mainWindow = null;
|
let mainWindow = null;
|
||||||
|
|
Reference in a new issue