Merge pull request #221 from builder555/dev

Dev
builder555 · Jan 4, 2025 · 6f51819 · 6f51819
2 parents 497e2ce + 11e8504
commit 6f51819
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/run-dev.sh b/run-dev.sh
@@ -6,6 +6,7 @@ fi
 cd backend
 LOG_LEVEL=info pipenv run server &
 pid1=$!
+sleep 1 #sometimes may be required, otherwise UI can start before backend
 
 cd ../ui
 npm run dev &

diff --git a/ui/src/stores/appstore.js b/ui/src/stores/appstore.js
@@ -17,10 +17,12 @@ export const useAppStore = defineStore('appStore', () => {
     if (Object.keys(rawLiveData.value).length < 1) return {};
     const tempInF = tempConverter[1](rawLiveData.value.LiveTemp);
     const isTempInF = settings.value.TemperatureUnit?.value === 1;
+    const handleTempInC = rawLiveData.value.HandleTemp * 0.1;
+    const handleTempInF = tempConverter[1](handleTempInC);
     return {
       LiveTemp: isTempInF ? tempInF : rawLiveData.value.LiveTemp,
       Voltage: (rawLiveData.value.Voltage * 0.1).toFixed(1),
-      HandleTemp: (rawLiveData.value.HandleTemp * 0.1).toFixed(1),
+      HandleTemp: (isTempInF ? handleTempInF : handleTempInC).toFixed(1),
       OperatingMode: rawLiveData.value.OperatingMode,
       Watts: (rawLiveData.value.Watts * 0.1).toFixed(1),
       PeakWatts: peakWatts.value.toFixed(1),

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.2.9
+2.2.11