From 4d866b7eae6f7dd60ace00c31a563c2efa8aec3a Mon Sep 17 00:00:00 2001 From: Muhammad Zaheer Date: Sun, 4 Sep 2022 20:49:24 +0530 Subject: [PATCH] Linebreak set to LF as per SerialPlotterProtocol --- src/App.tsx | 2 +- src/fakeMessagsGenerators.ts | 7 ++++--- src/msgAggregatorWorker.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 2b5e39a..5804970 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -188,7 +188,7 @@ export default function App() { monitorUISettings: { lineEnding: isEOL(urlParams.get("lineEnding")) ? (urlParams.get("lineEnding") as EOL) - : "\r\n", + : "\n", darkTheme: urlParams.get("darkTheme") === "true", wsPort: parseInt(urlParams.get("wsPort") || "3030"), interpolate: urlParams.get("interpolate") === "true", diff --git a/src/fakeMessagsGenerators.ts b/src/fakeMessagsGenerators.ts index 1899560..f88e89a 100644 --- a/src/fakeMessagsGenerators.ts +++ b/src/fakeMessagsGenerators.ts @@ -1,3 +1,4 @@ +const separator = "\n"; // format1: export const generateRandomMessages = () => { const messages: string[] = []; @@ -10,7 +11,7 @@ export const generateRandomMessages = () => { } let line = variables.join(" "); - messages.push(line + "\r\n"); + messages.push(line + separator); } return messages; @@ -30,7 +31,7 @@ export const namedVariables = () => { let pair = genNamedVarValPair(i); messages.push(pair); } - return [messages.join(",") + "\r\n"]; + return [messages.join(",") + separator]; }; export const namedVariablesMulti = () => { @@ -67,5 +68,5 @@ export const jumpyNamedVariables = () => { let pair = genNamedVarValPair(i); messages.push(pair); } - return [messages.join(",") + "\r\n"]; + return [messages.join(",") + separator]; }; diff --git a/src/msgAggregatorWorker.ts b/src/msgAggregatorWorker.ts index ec212d6..f220a5a 100644 --- a/src/msgAggregatorWorker.ts +++ b/src/msgAggregatorWorker.ts @@ -18,7 +18,7 @@ ctx.addEventListener("message", (event) => { let buffer = ""; let discardFirstLine = true; -const separator = "\r\n"; +const separator = "\n"; var re = new RegExp(`(${separator})`, "g"); export const parseSerialMessages = (