Merge pull request #12 from nmzaheer/main

Linebreak set to LF as per SerialPlotterProtocol
arduino · Sep 5, 2022 · eac6d39 · eac6d39
2 parents 2264606 + 4d866b7
commit eac6d39
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -1,3 +1,4 @@
+const separator = "\n";
 // format1: <value1> <value2> <value3>
 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
@@ -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 = (