Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development

include/SunPosition.h

@@ -22,7 +22,6 @@ class SunPositionClass {
     bool getDoRecalc();
 
     SunSet _sun;
-    bool _isDayPeriod = true;
     bool _isSunsetAvailable = true;
     uint32_t _sunriseMinutes = 0;
     uint32_t _sunsetMinutes = 0;

src/SunPosition.cpp

@@ -26,7 +26,14 @@ void SunPositionClass::loop()
 
 bool SunPositionClass::isDayPeriod()
 {
-    return _isDayPeriod;
+    if (!_isValidInfo) {
+        return true;
+    }
+
+    struct tm timeinfo;
+    getLocalTime(&timeinfo, 5);
+    uint32_t minutesPastMidnight = timeinfo.tm_hour * 60 + timeinfo.tm_min;
+    return (minutesPastMidnight >= _sunriseMinutes) && (minutesPastMidnight < _sunsetMinutes);
 }
 
 bool SunPositionClass::isSunsetAvailable()
@@ -73,7 +80,6 @@ void SunPositionClass::updateSunData()
     setDoRecalc(false);
 
     if (!gotLocalTime) {
-        _isDayPeriod = true;
         _sunriseMinutes = 0;
         _sunsetMinutes = 0;
         _isValidInfo = false;
@@ -108,7 +114,6 @@ void SunPositionClass::updateSunData()
     // If no sunset/sunrise exists (e.g. astronomical calculation in summer)
     // assume it's day period
     if (std::isnan(sunriseRaw) || std::isnan(sunsetRaw)) {
-        _isDayPeriod = true;
         _isSunsetAvailable = false;
         _sunriseMinutes = 0;
         _sunsetMinutes = 0;
@@ -118,9 +123,7 @@ void SunPositionClass::updateSunData()
 
     _sunriseMinutes = static_cast<int>(sunriseRaw);
     _sunsetMinutes = static_cast<int>(sunsetRaw);
-    uint32_t minutesPastMidnight = timeinfo.tm_hour * 60 + timeinfo.tm_min;
 
-    _isDayPeriod = (minutesPastMidnight >= _sunriseMinutes) && (minutesPastMidnight < _sunsetMinutes);
     _isSunsetAvailable = true;
     _isValidInfo = true;
 }

webapp/package.json

@@ -2,6 +2,7 @@
   "name": "opendtu",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check build-only",
@@ -18,7 +19,7 @@
     "sortablejs": "^1.15.0",
     "spark-md5": "^3.0.2",
     "vue": "^3.3.8",
-    "vue-i18n": "^9.6.5",
+    "vue-i18n": "^9.7.0",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
@@ -29,7 +30,7 @@
     "@types/node": "^20.9.0",
     "@types/sortablejs": "^1.15.5",
     "@types/spark-md5": "^3.0.4",
-    "@vitejs/plugin-vue": "^4.4.1",
+    "@vitejs/plugin-vue": "^4.5.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/tsconfig": "^0.4.0",
     "eslint": "^8.53.0",
@@ -38,7 +39,7 @@
     "sass": "^1.69.5",
     "terser": "^5.24.0",
     "typescript": "^5.2.2",
-    "vite": "^4.5.0",
+    "vite": "^5.0.0",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vue-tsc": "^1.8.22"

webapp/vite.config.ts

@@ -7,7 +7,7 @@ import viteCompression from 'vite-plugin-compression';
 import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js'
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
 
-const path = require('path')
+import path from 'path'
 
 // example 'vite.user.ts': export const proxy_target = '192.168.16.107'
 let proxy_target;