Optimize the serial port reading process

anyshake · Apr 26, 2024 · a124a14 · a124a14
1 parent 1f0e2f3
commit a124a14
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Starting from v2.2.5, all notable changes to this project will be documented in this file.
 
+## v2.12.2
+
+- Always use fallback locale if the preferred locale is not available
+- Optimize the serial port reading process
+
 ## v2.12.1
 
 - Sort earthquake event source API by name in frontend

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.12.1
+v2.12.2
diff --git a/driver/serial/filter.go b/driver/serial/filter.go
@@ -4,16 +4,23 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"math"
+	"time"
 )
 
-func Filter(port io.ReadWriteCloser, signature []byte, retry int) ([]byte, error) {
+func Filter(port io.ReadWriteCloser, signature []byte) ([]byte, error) {
 	header := make([]byte, len(signature))
 
-	for i := 0; i < retry; i++ {
-		port.Read(header)
+	for i := 0; i < math.MaxUint8; i++ {
+		_, err := port.Read(header)
+		if err != nil {
+			return nil, err
+		}
 
 		if bytes.Equal(header, signature) {
-			return nil, nil
+			return header, nil
+		} else {
+			time.Sleep(time.Millisecond)
 		}
 	}
 

diff --git a/driver/serial/open.go b/driver/serial/open.go
@@ -8,11 +8,11 @@ import (
 
 func Open(device string, baud int) (io.ReadWriteCloser, error) {
 	port, err := serial.Open(device,
-		serial.WithHUPCL(false),
+		serial.WithHUPCL(true),
 		serial.WithDataBits(8),
 		serial.WithBaudrate(baud),
-		serial.WithReadTimeout(500),
-		serial.WithWriteTimeout(500),
+		serial.WithReadTimeout(5),
+		serial.WithWriteTimeout(5),
 		serial.WithParity(serial.NoParity),
 		serial.WithStopBits(serial.OneStopBit),
 	)

diff --git a/feature/geophone/read.go b/feature/geophone/read.go
@@ -11,7 +11,7 @@ import (
 
 func (g *Geophone) Read(port io.ReadWriteCloser, conf *config.Conf, packet *Packet, packetLen int) error {
 	// Filter frame header
-	_, err := serial.Filter(port, SYNC_WORD[:], 128)
+	_, err := serial.Filter(port, SYNC_WORD[:])
 	if err != nil {
 		return err
 	}

diff --git a/feature/geophone/reset.go b/feature/geophone/reset.go
@@ -12,6 +12,6 @@ func (g *Geophone) Reset(port io.ReadWriteCloser) error {
 		return err
 	}
 
-	serial.Filter(port, ACK_WORD[:], 128)
+	serial.Filter(port, ACK_WORD[:])
 	return nil
 }
diff --git a/frontend/dist/asset-manifest.json b/frontend/dist/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.7a040865.css",
-    "main.js": "./static/js/main.9e9bedf8.js",
+    "main.js": "./static/js/main.c4da8e75.js",
     "static/css/594.d6bfd15f.chunk.css": "./static/css/594.d6bfd15f.chunk.css",
     "static/js/594.7755917b.chunk.js": "./static/js/594.7755917b.chunk.js",
     "static/js/846.88ce4ddb.chunk.js": "./static/js/846.88ce4ddb.chunk.js",
@@ -49,6 +49,6 @@
   },
   "entrypoints": [
     "static/css/main.7a040865.css",
-    "static/js/main.9e9bedf8.js"
+    "static/js/main.c4da8e75.js"
   ]
 }
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><style>.public-loading{width:100%;height:100%;display:flex;position:fixed;align-items:center;flex-direction:column;justify-content:center}.public-loading span{color:#1f2937;margin-top:20px;font-weight:600;font-size:1.25rem}.public-loading svg{animation:rotate 1s linear infinite}@keyframes rotate{100%{transform:rotate(360deg)}}</style><script defer="defer" src="./static/js/main.9e9bedf8.js"></script><link href="./static/css/main.7a040865.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div class="public-loading"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="#6b21a8" width="70px"><path d="M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z"/></svg> <span>Loading...</span></div><div id="root"></div></body></html>
+<!doctype html><html><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><style>.public-loading{width:100%;height:100%;display:flex;position:fixed;align-items:center;flex-direction:column;justify-content:center}.public-loading span{color:#1f2937;margin-top:20px;font-weight:600;font-size:1.25rem}.public-loading svg{animation:rotate 1s linear infinite}@keyframes rotate{100%{transform:rotate(360deg)}}</style><script defer="defer" src="./static/js/main.c4da8e75.js"></script><link href="./static/css/main.7a040865.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div class="public-loading"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="#6b21a8" width="70px"><path d="M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z"/></svg> <span>Loading...</span></div><div id="root"></div></body></html>
diff --git a/frontend/dist/static/js/main.9e9bedf8.js b/frontend/dist/static/js/main.9e9bedf8.js
diff --git a/frontend/dist/static/js/main.c4da8e75.js b/frontend/dist/static/js/main.c4da8e75.js
diff --git a/...st/static/js/main.9e9bedf8.js.LICENSE.txt → ...st/static/js/main.c4da8e75.js.LICENSE.txt b/...st/static/js/main.9e9bedf8.js.LICENSE.txt → ...st/static/js/main.c4da8e75.js.LICENSE.txt
diff --git a/frontend/src/.env b/frontend/src/.env
@@ -1,2 +1,2 @@
-REACT_APP_VERSION=v2.12.1
-REACT_APP_RELEASE=7133eaa1-20240409233944
+REACT_APP_VERSION=v2.12.2
+REACT_APP_RELEASE=1f0e2f3d-20240426130534
diff --git a/frontend/src/src/helpers/app/getRelease.tsx b/frontend/src/src/helpers/app/getRelease.tsx
@@ -1,3 +1,3 @@
 export const getRelease = () => {
-    return process.env.REACT_APP_RELEASE || "unknown";
+    return process.env.REACT_APP_RELEASE ?? "unknown";
 };
diff --git a/frontend/src/src/helpers/app/getVersion.tsx b/frontend/src/src/helpers/app/getVersion.tsx
@@ -1,3 +1,3 @@
 export const getVersion = () => {
-    return process.env.REACT_APP_VERSION || "unknown";
+    return process.env.REACT_APP_VERSION ?? "custom build";
 };
diff --git a/frontend/src/src/helpers/i18n/getCurrentLocale.tsx b/frontend/src/src/helpers/i18n/getCurrentLocale.tsx
@@ -1,10 +1,10 @@
 import { i18n } from "i18next";
+import { i18nConfig } from "../../config/i18n";
 
 export const getCurrentLocale = async (i18n: Promise<i18n>) => {
-    const lang = (await i18n).language;
-    if (lang === "en") {
-        return "en-US";
-    }
-
-    return lang;
+    const currentLang = (await i18n).language;
+    const availableLocales = Object.keys(i18nConfig.resources);
+    return availableLocales.includes(currentLang)
+        ? currentLang
+        : i18nConfig.fallback;
 };
diff --git a/frontend/src/src/helpers/i18n/setUserLocale.tsx b/frontend/src/src/helpers/i18n/setUserLocale.tsx
@@ -1,4 +1,9 @@
 import { i18n } from "i18next";
+import { i18nConfig } from "../../config/i18n";
 
-export const setUserLocale = async (i18n: Promise<i18n>, lang: string) =>
-    (await i18n).changeLanguage(lang);
+export const setUserLocale = async (i18n: Promise<i18n>, lang: string) => {
+    const availableLocales = Object.keys(i18nConfig.resources);
+    (await i18n).changeLanguage(
+        availableLocales.includes(lang) ? lang : i18nConfig.fallback
+    );
+};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><style>.public-loading{width:100%;height:100%;display:flex;position:fixed;align-items:center;flex-direction:column;justify-content:center}.public-loading span{color:#1f2937;margin-top:20px;font-weight:600;font-size:1.25rem}.public-loading svg{animation:rotate 1s linear infinite}@keyframes rotate{100%{transform:rotate(360deg)}}</style><script defer="defer" src="./static/js/main.9e9bedf8.js"></script><link href="./static/css/main.7a040865.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div class="public-loading"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="#6b21a8" width="70px"><path d="M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z"/></svg> <span>Loading...</span></div><div id="root"></div></body></html>
		<!doctype html><html><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><style>.public-loading{width:100%;height:100%;display:flex;position:fixed;align-items:center;flex-direction:column;justify-content:center}.public-loading span{color:#1f2937;margin-top:20px;font-weight:600;font-size:1.25rem}.public-loading svg{animation:rotate 1s linear infinite}@keyframes rotate{100%{transform:rotate(360deg)}}</style><script defer="defer" src="./static/js/main.c4da8e75.js"></script><link href="./static/css/main.7a040865.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div class="public-loading"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="#6b21a8" width="70px"><path d="M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z"/></svg> <span>Loading...</span></div><div id="root"></div></body></html>