fixed timer period off low battery charge

chpro · Apr 1, 2024 · 18c15b5 · 18c15b5
1 parent cc8dcc0
commit 18c15b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/config.js b/app/config.js
@@ -36,6 +36,7 @@ const CONFIG = {
     timerPeriodManually: Number(process.env.TIMER_PERIOD_MANUALLY) || 60 * MINUTE,
     timerPeriodOffFallback: Number(process.env.TIMER_PERIOD_OFF_FALLBACK) || 10 * MINUTE,
     timerPeriodOffPrimarySourceActive: Number(process.env.TIMER_PERIOD_OFF_PRIMARY_SOURCE_ACTIVE) || 12 * 60 * MINUTE,
+    timerPeriodOffLowBatteryCharge: Number(process.env.TIMER_PERIOD_OFF_LOW_BATTERY_CHARGE) || 10 * MINUTE,
 };
 
 module.exports = {CONFIG}
diff --git a/app/switchstatus.js b/app/switchstatus.js
@@ -13,7 +13,7 @@ const SWITCH_STATUS = {
     OFF_FALLBACK: {on: false, status: -4, message: "Off due to no value for energy production was available and time outside fallback operating hours", timerPeriod: CONFIG.timerPeriodOffFallback},
     OFF_FORECAST: {on: false, status: -5, message: "Off due to too low energy production within the forecast fallback operating mode", timerPeriod: CONFIG.timerPeriodOffFallback},
     OFF_PRIMARY_SOURCE_ACTIVE: {on: false, status: -6, message: "Off due to too another appliance is enabled and producing hot water", timerPeriod: CONFIG.timerPeriodOffPrimarySourceActive},
-    OFF_LOW_BATTERY_CHARGE: {on: false, status: -7, message: "Off due to too low battery charge", timerPeriod: CONFIG.timerPeriodOffPrimarySourceActive},
+    OFF_LOW_BATTERY_CHARGE: {on: false, status: -7, message: "Off due to too low battery charge", timerPeriod: CONFIG.timerPeriodOffLowBatteryCharge},
 };
 
 module.exports = {SWITCH_STATUS}
diff --git a/app/webservice.js b/app/webservice.js
@@ -1,4 +1,5 @@
 const hrc = require('./control')
+const dataProvider = require('./influxdataprovider')
 const CONFIG = require('./config').CONFIG
 const SWITCH_STATUS = require('./switchstatus').SWITCH_STATUS
 const express = require('express')
@@ -14,7 +15,11 @@ var corsOptions = {
 ws.use(cors(corsOptions))
 
 ws.get('/config', (req, res) => {
-    res.json({"config": CONFIG, "status": SWITCH_STATUS})
+    hrc.switch0.get(function(switchOn) {
+        dataProvider.getCurrentStatusValues(switchOn, function(currentStatusValues) {
+            res.json({"values": currentStatusValues, "config": CONFIG, "status": SWITCH_STATUS})
+        });
+    });
 })
 
 ws.get('/switchStatus', (req, res) => {