node-red-contrib-power-saver 4.1.2 → 4.1.4

package/CHANGELOG.md

@@ -1 +1 @@
-[The changelog has moved here](http://power-saver.smoky.no/changelog/)
+[The changelog has moved here](https://powersaver.no/changelog/#change-log)

package/docs/.vuepress/client.js

@@ -0,0 +1,7 @@
+import { defineClientConfig } from "@vuepress/client";
+import FloatingVue from "floating-vue";
+import "floating-vue/dist/style.css";
+
+export default defineClientConfig({
+  rootComponents: [FloatingVue],
+});

package/docs/.vuepress/clientAppEnhance.js

@@ -1,5 +1,5 @@
 import FloatingVue from "floating-vue";
 import "floating-vue/dist/style.css";
-export default ({ app, router, siteData }) => {
+export default ({ app }) => {
   app.use(FloatingVue);
 };

package/docs/.vuepress/components/AdsenseAdd.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <ins
-      v-if="øverst"
+      v-if="type === 'øverst'"
       class="adsbygoogle"
       style="display: inline-block; width: 740px; height: 90px"
       data-ad-client="ca-pub-9857859182772006"
@@ -38,3 +38,9 @@ onMounted(() => {
   (adsbygoogle = window.adsbygoogle || []).push({});
 });
 </script>
+
+<style scoped>
+ins {
+  margin-bottom: 30px;
+}
+</style>

package/docs/.vuepress/config.js

@@ -1,12 +1,34 @@
-const { path } = require("@vuepress/utils");
-const navbar = require("./navbar");
+import navbar from "./navbar";
+import { path } from "@vuepress/utils";
+import { registerComponentsPlugin } from "@vuepress/plugin-register-components";
+import { searchPlugin } from "@vuepress/plugin-search";
+import { googleAnalyticsPlugin } from "@vuepress/plugin-google-analytics";
 
-module.exports = {
-  lang: "en-US",
-  title: "Power Saver",
-  description: "A Node-RED node collection to save money on hourly changing power prices",
+import { defaultTheme, defineUserConfig } from "vuepress";
+
+export default defineUserConfig({
   base: "/",
-  themeConfig: {
+  description: "A Node-RED node collection to save money on hourly changing power prices",
+  head: [
+    ["link", { rel: "shortcut icon", type: "image/x-icon", href: "euro.png" }],
+    [
+      "script",
+      {
+        async: true,
+        crossorigin: "anonymous",
+        src: "https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-9857859182772006",
+      },
+    ],
+  ],
+  lang: "en-US",
+  plugins: [
+    registerComponentsPlugin({ componentsDir: path.resolve(__dirname, "./components") }),
+    searchPlugin({}),
+    googleAnalyticsPlugin({
+      id: "G-Z2QNNCDQZG",
+    }),
+  ],
+  theme: defaultTheme({
     contributors: false,
     logo: "/Ukraine-heart-shape-flag.png",
     navbar,
@@ -55,26 +77,5 @@ module.exports = {
       "/contribute/": [{ text: "Contribute", children: ["/contribute/README.md"] }],
       "/changelog/": [{ text: "Changelog", children: ["/changelog/README.md"] }],
     },
-  },
-  head: [
-    ["link", { rel: "shortcut icon", type: "image/x-icon", href: "euro.png" }],
-    [
-      "script",
-      {
-        async: true,
-        crossorigin: "anonymous",
-        src: "https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-9857859182772006",
-      },
-    ],
-  ],
-  plugins: [
-    [
-      "@vuepress/register-components",
-      {
-        componentsDir: path.resolve(__dirname, "./components"),
-      },
-    ],
-    ["@vuepress/plugin-search"],
-    ["@vuepress/google-analytics", { id: "G-Z2QNNCDQZG" }],
-  ],
-};
+  }),
+});

package/docs/README.md

@@ -1,6 +1,7 @@
 ---
 home: true
 heroImage: /logo.png
+heroHeight: 112
 heroAlt: Power Saver
 heroText: node-red-contrib-power-saver
 tagline: A collection of nodes to Node-RED that automates saving money on variable electricity prices
@@ -36,4 +37,9 @@ footerHtml: true
 
 This is a collection of nodes for the popular [Node-RED](https://nodered.org/) that you can use to save money on variable electricity prices. Node-RED is a widely used low-code programming tool that can be used together with many smart home solutions to create automations.
 
+Please remember to take a look at our [privacy rules](./privacy.md).
+<br/>
+<br/>
+<br/>
+
 <DonateButtons/>

package/docs/changelog/README.md

@@ -7,6 +7,14 @@ sidebarDepth: 1
 
 List the most significant changes.
 
+## 4.1.4
+
+- Update dependencies.
+
+## 4.1.3
+
+- Fix bug that saved some data in wrong context storage.
+
 ## 4.1.2
 
 - Fix so configured values for output are sent, not only true/false.

package/docs/contribute/README.md

@@ -49,7 +49,7 @@ Main developer: [Otto Paulsen](https://github.com/ottopaulsen)
 
 Heat Capacitor developer: [Arne Klaveness](https://github.com/TomTorger)
 
-Example contributors: [Stefan](https://github.com/oakhill87/node-red-contrib-power-saver)
+Example contributors: [Stefan](https://github.com/oakhill87/node-red-contrib-power-saver), [Kim Storøy](https://www.facebook.com/kim.storoy)
 
 ###
 

package/docs/examples/example-grid-tariff-capacity-part.md

@@ -426,6 +426,8 @@ context.set("buffer", []);
 ```js
 // Number of minutes used to calculate assumed consumption:
 const ESTIMATION_TIME_MINUTES = 1;
+// Allows records to deviate from maxAgeMs
+const DELAY_TIME_MS_ALLOWED = 3 * 1000;
 
 const buffer = context.get("buffer") || [];
 
@@ -441,7 +443,7 @@ currentHour.setMinutes(0);
 currentHour.setSeconds(0);
 
 // Remove too old records from buffer
-const maxAgeMs = ESTIMATION_TIME_MINUTES * 60 * 1000;
+const maxAgeMs = (ESTIMATION_TIME_MINUTES * 60 * 1000) + DELAY_TIME_MS_ALLOWED;
 let oldest = buffer[0];
 while (timeMs - oldest.timeMs > maxAgeMs) {
   buffer.splice(0, 1);
@@ -451,10 +453,16 @@ context.set("buffer", buffer);
 
 // Calculate buffer
 const periodMs = buffer[buffer.length - 1].timeMs - buffer[0].timeMs;
-const consumptionInPeriod = buffer[buffer.length - 1].accumulatedConsumption - buffer[0].accumulatedConsumption;
+let consumptionInPeriod = buffer[buffer.length - 1].accumulatedConsumption - buffer[0].accumulatedConsumption;
+if (consumptionInPeriod < 0) {
+  consumptionInPeriod = 0;
+}
 if (periodMs === 0) {
-  return; // First item in buffer
+  //Should only occur during startup
+  node.status({ fill: "red", shape: "dot", text: "First item in buffer" });
+  return; // Stopping rest of the flow for this message
 }
+node.status({ fill: "green", shape: "dot", text: "Working" });
 
 // Estimate remaining of current hour
 const timeLeftMs = 60 * 60 * 1000 - (time.getMinutes() * 60000 + time.getSeconds() * 1000 + time.getMilliseconds());
@@ -546,6 +554,7 @@ const MAX_COUNTING = 3; // Number of days to calculate month average of
 const BUFFER = 0.5; // kWh - Closer to limit increases alarm level
 const SAFE_SONE = 2; // kWh - Further from limit reduces level
 const ALARM = 8; // Min level that causes status to be alarm
+const MIN_TIMELEFT = 30; //Min level for time left (30 seconds)
 ```
 
 The `HA_NAME` must be set to the name you have given your Home Assistant. One place to find this is in Node-RED,
@@ -572,9 +581,11 @@ const MAX_COUNTING = 3; // Number of days to calculate month
 const BUFFER = 0.5; // Closer to limit increases level
 const SAFE_ZONE = 2; // Further from limit reduces level
 const ALARM = 8; // Min level that causes status to be alarm
+const MIN_TIMELEFT = 3 * 60; //Min level for time left
 
 const ha = global.get("homeassistant")[HA_NAME];
 if (!ha.isConnected) {
+  node.status({ fill: "red", shape: "dot", text: "Ha not connected" });
   return;
 }
 
@@ -640,6 +651,7 @@ const averageConsumptionNow = msg.payload.averageConsumptionNow;
 const currentHour = msg.payload.currentHour;
 
 if (timeLeftSec === 0) {
+  node.status({ fill: "red", shape: "dot", text: "Time Left 0" });
   return null;
 }
 
@@ -687,17 +699,19 @@ const alarmLevel = calculateLevel(hourEstimate, currentHourRanking, currentMonth
 // Evaluate status
 const status = alarmLevel >= ALARM ? "Alarm" : alarmLevel > 0 ? "Warning" : "Ok";
 
+// Avoid calculations to increase too much when timeLeftSec is approaching zero
+const minTimeLeftSec = Math.max(timeLeftSec, MIN_TIMELEFT);
 // Calculate reduction
 const reductionRequired =
   alarmLevel < ALARM
     ? 0
-    : (Math.max((currentMonthlyEstimate - currentStep) * highestCounting.length, 0) * 3600) / timeLeftSec;
+    : (Math.max((currentMonthlyEstimate - currentStep) * highestCounting.length, 0) * 3600) / minTimeLeftSec;
 const reductionRecommended =
-  alarmLevel < 3 ? 0 : (Math.max(hourEstimate + SAFE_ZONE - currentStep, 0) * 3600) / timeLeftSec;
+  alarmLevel < 3 ? 0 : (Math.max(hourEstimate + SAFE_ZONE - currentStep, 0) * 3600) / minTimeLeftSec;
 
 // Calculate increase possible
 const increasePossible =
-  alarmLevel >= 3 ? 0 : (Math.max(currentStep - hourEstimate - SAFE_ZONE, 0) * 3600) / timeLeftSec;
+  alarmLevel >= 3 ? 0 : (Math.max(currentStep - hourEstimate - SAFE_ZONE, 0) * 3600) / minTimeLeftSec;
 
 // Create output
 const fill = status === "Ok" ? "green" : status === "Alarm" ? "red" : "yellow";
@@ -895,6 +909,8 @@ If you don't want the actions, or you want to control actions another way,
 you can omit the action-related nodes and only use the nodes creating the sensors.
 :::
 
+The `MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION` constant in the `On Message` code sets a period (of default 5 minutes) in the beginning of the hour when no reduction action is taken. This is to avoid that a high consumption at the end of the previous hour causes reduction actions to be taken as soon as the hour changes.
+
 ::: details Code
 
 <CodeGroup>
@@ -1008,6 +1024,7 @@ flow.set("actions", actions);
 
 ```js
 const MIN_CONSUMPTION_TO_CARE = 0.05; // Do not reduce unless at least 50W
+const MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION = 5;
 
 const actions = flow.get("actions");
 const ha = global.get("homeassistant").homeAssistant;
@@ -1015,10 +1032,21 @@ const ha = global.get("homeassistant").homeAssistant;
 let reductionRequired = msg.payload.reductionRequired;
 let reductionRecommended = msg.payload.reductionRecommended;
 
+node.status({});
+
 if (reductionRecommended <= 0) {
   return null;
 }
 
+if (3600 - msg.payload.timeLeftSec < MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION * 60) {
+  node.status({
+    fill: "yellow",
+    shape: "ring",
+    text: "No action during first " + MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION + " minutes",
+  });
+  return;
+}
+
 function takeAction(action, consumption) {
   const info = {
     time: new Date().toISOString(),
@@ -1105,7 +1133,7 @@ function resetAction(action) {
   const info = {
     time: new Date().toISOString(),
     name: "Reset action",
-    data: msg.paylaod,
+    data: msg.payload,
     action,
   };
   const output1 = action.payloadToResetAction ? { payload: action.payloadToResetAction } : null;

package/docs/guide/README.md

@@ -239,4 +239,8 @@ You may directly replace the `Power Saver` node by two of the new nodes (`ps-rec
 
 See more details in the [documentation for the `ps-strategy-best-save`](../nodes/ps-strategy-best-save.md) node.
 
-<VippsPlakat/>
+## Disclaimer
+
+This software is offered for free as open source. You use it totally on your own risk. The developers take no responsibility of any consequences caused by use or misuse of this software.
+
+It is not recommended to reduce the temperature of the water heater or similar over longer periods, due to the risk of legionella. Please read the recommendations of [FHI](https://www.fhi.no/sv/smittsomme-sykdommer/legionella/) about this. You do this at your own risk.

package/docs/privacy.md

@@ -0,0 +1,17 @@
+# Privacy Policy
+
+We use Google Adsense to display advertisements on our website.
+
+Google Adsense collects information about your website visits, including your IP address, to display relevant advertisements.
+
+We have no control over and are not responsible for the information collection performed by Google Adsense.
+
+Please refer to Google's privacy policy for more information on how they handle your personal information: [policies.google.com/privacy](https://policies.google.com/privacy).
+
+If you choose to donate, we are very happy for your contribution. Due to documentation rules we will record
+name, email, phone, donation service and amount for all donations. Each donation service may record
+additional information. Please refer to the privacy rules for the service you use for more information
+
+By visiting our website, you consent to these privacy rules, the use of cookies and advertising by Google Adsense.
+
+We will update this privacy policy if necessary. Please check regularly for updates.

package/examples/example-grid-tariff-capacity-flow.json

@@ -82,7 +82,7 @@
     "type": "function",
     "z": "d938c47f.3398f8",
     "name": "Collect estimate for hour",
-    "func": "\n// Number of minutes used to calculate assumed consumption:\nconst ESTIMATION_TIME_MINUTES = 1\n\nconst buffer = context.get(\"buffer\") || []\n\n// Add new record to buffer\nconst time = new Date(msg.payload.timestamp)\nconst timeMs = time.getTime()\nconst accumulatedConsumption = msg.payload.accumulatedConsumption\nconst accumulatedConsumptionLastHour = msg.payload.accumulatedConsumptionLastHour\nbuffer.push({timeMs, accumulatedConsumption})\n\nconst currentHour = new Date(msg.payload.timestamp)\ncurrentHour.setMinutes(0)\ncurrentHour.setSeconds(0)\n\n// Remove too old records from buffer\nconst maxAgeMs = ESTIMATION_TIME_MINUTES * 60 * 1000\nlet oldest = buffer[0]\nwhile ((timeMs - oldest.timeMs) > maxAgeMs) {\n    buffer.splice(0, 1)\n    oldest = buffer[0]\n}\ncontext.set(\"buffer\", buffer)\n\n// Calculate buffer\nconst periodMs = buffer[buffer.length - 1].timeMs - buffer[0].timeMs\nconst consumptionInPeriod = buffer[buffer.length - 1].accumulatedConsumption - buffer[0].accumulatedConsumption\nif (periodMs === 0) {\n    return // First item in buffer\n}\n\n// Estimate remaining of current hour\nconst timeLeftMs = (60 * 60 * 1000) - (time.getMinutes() * 60000 + time.getSeconds() * 1000 + time.getMilliseconds())\nconst consumptionLeft = consumptionInPeriod / periodMs * timeLeftMs\nconst averageConsumptionNow = consumptionInPeriod / periodMs * 60 * 60 * 1000\n\n// Estimate total hour\nconst hourEstimate = accumulatedConsumptionLastHour + consumptionLeft + 0 // Change for testing\n\nmsg.payload = {\n  accumulatedConsumption,\n  accumulatedConsumptionLastHour,\n  periodMs,\n  consumptionInPeriod,\n  averageConsumptionNow,\n  timeLeftMs,\n  consumptionLeft,\n  hourEstimate,\n  currentHour\n}\n\nreturn msg;",
+    "func": "\n// Number of minutes used to calculate assumed consumption:\nconst ESTIMATION_TIME_MINUTES = 1\n// Allows records to deviate from maxAgeMs\nconst DELAY_TIME_MS_ALLOWED = 3 * 1000\n\nconst buffer = context.get(\"buffer\") || []\n\n// Add new record to buffer\nconst time = new Date(msg.payload.timestamp)\nconst timeMs = time.getTime()\nconst accumulatedConsumption = msg.payload.accumulatedConsumption\nconst accumulatedConsumptionLastHour = msg.payload.accumulatedConsumptionLastHour\nbuffer.push({timeMs, accumulatedConsumption})\n\nconst currentHour = new Date(msg.payload.timestamp)\ncurrentHour.setMinutes(0)\ncurrentHour.setSeconds(0)\n\n// Remove too old records from buffer\nconst maxAgeMs = (ESTIMATION_TIME_MINUTES * 60 * 1000) + DELAY_TIME_MS_ALLOWED\nlet oldest = buffer[0]\nwhile ((timeMs - oldest.timeMs) > maxAgeMs) {\n    buffer.splice(0, 1)\n    oldest = buffer[0]\n}\ncontext.set(\"buffer\", buffer)\n\n// Calculate buffer\nconst periodMs = buffer[buffer.length - 1].timeMs - buffer[0].timeMs\nlet consumptionInPeriod = buffer[buffer.length - 1].accumulatedConsumption - buffer[0].accumulatedConsumption\nif (consumptionInPeriod < 0) {\nconsumptionInPeriod = 0\n}\nif (periodMs === 0) {\n  //Should only occur during startup\n  node.status({ fill: \"red\", shape: \"dot\", text: \"First item in buffer\" })\n  return // Stopping rest of the flow for this message\n}\nnode.status({ fill: \"green\", shape: \"dot\", text: \"Working\" })\n\n// Estimate remaining of current hour\nconst timeLeftMs = (60 * 60 * 1000) - (time.getMinutes() * 60000 + time.getSeconds() * 1000 + time.getMilliseconds())\nconst consumptionLeft = consumptionInPeriod / periodMs * timeLeftMs\nconst averageConsumptionNow = consumptionInPeriod / periodMs * 60 * 60 * 1000\n\n// Estimate total hour\nconst hourEstimate = accumulatedConsumptionLastHour + consumptionLeft + 0 // Change for testing\n\nmsg.payload = {\n  accumulatedConsumption,\n  accumulatedConsumptionLastHour,\n  periodMs,\n  consumptionInPeriod,\n  averageConsumptionNow,\n  timeLeftMs,\n  consumptionLeft,\n  hourEstimate,\n  currentHour\n}\n\nreturn msg;",
     "outputs": 1,
     "noerr": 0,
     "initialize": "// Code added here will be run once\n// whenever the node is started.\ncontext.set(\"buffer\", [])",
@@ -97,7 +97,7 @@
     "type": "function",
     "z": "d938c47f.3398f8",
     "name": "Calculate values",
-    "func": "const HA_NAME = \"homeAssistant\"; // Your HA name\nconst STEPS = [10, 15, 20]\nconst MAX_COUNTING = 3 // Number of days to calculate month\nconst BUFFER = 0.5 // Closer to limit increases level\nconst SAFE_ZONE = 2 // Further from limit reduces level\nconst ALARM = 8 // Min level that causes status to be alarm\n\nconst ha = global.get(\"homeassistant\")[HA_NAME];\nif(!ha.isConnected) {\n    return\n}\n\nfunction isNull(value) {\n    return value === null || value === undefined\n}\n\nfunction calculateLevel(hourEstimate, \n                        currentHourRanking,\n                        highestCountingAverageWithCurrent,\n                        nextStep) {\n    if(currentHourRanking === 0) {\n        return 0\n    }\n    if(highestCountingAverageWithCurrent > nextStep) {\n        return 9\n    }\n    if(highestCountingAverageWithCurrent > (nextStep - BUFFER)) {\n        return 8\n    }\n    if(hourEstimate > nextStep) {\n        return 7\n    }\n    if(hourEstimate > (nextStep - BUFFER)) {\n        return 6\n    }\n    if(currentHourRanking === 1 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 5\n    }\n    if(currentHourRanking === 2 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 4\n    }\n    if(currentHourRanking === 3 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 3\n    }\n    if(currentHourRanking === 1) {\n        return 2\n    }\n    if(currentHourRanking === 2) {\n        return 1\n    }\n    return 0\n}\n\n\nif (msg.payload.highestPerDay) {\n    context.set(\"highestPerDay\", msg.payload.highestPerDay)\n    context.set(\"highestCounting\", msg.payload.highestCounting)\n    context.set(\"highestToday\", msg.payload.highestToday)\n    context.set(\"currentMonthlyMaxAverage\", msg.payload.currentMonthlyMaxAverage)\n    node.status({fill:\"green\",shape:\"ring\",text:\"Got ranking\"});\n    return\n}\n\nconst highestPerDay = context.get(\"highestPerDay\")\nconst highestCounting = context.get(\"highestCounting\")\nconst highestToday = context.get(\"highestToday\")\nconst currentMonthlyMaxAverage = context.get(\"currentMonthlyMaxAverage\")\nconst hourEstimate = msg.payload.hourEstimate\nconst timeLeftMs = msg.payload.timeLeftMs\nconst timeLeftSec = timeLeftMs / 1000\nconst periodMs = msg.payload.periodMs\nconst accumulatedConsumption = msg.payload.accumulatedConsumption\nconst accumulatedConsumptionLastHour = msg.payload.accumulatedConsumptionLastHour\nconst consumptionLeft = msg.payload.consumptionLeft\nconst averageConsumptionNow = msg.payload.averageConsumptionNow\nconst currentHour = msg.payload.currentHour\n\nif (timeLeftSec === 0) {\n    return null\n}\n\nif (isNull(highestPerDay)) {\n    node.status({fill:\"red\",shape:\"dot\",text:\"No highest per day\"});\n    return\n}\nif (isNull(highestToday)) {\n    node.status({fill:\"red\",shape:\"dot\",text:\"No highest today\"});\n    return\n}\nif (isNull(hourEstimate)) {\n    node.status({fill:\"red\",shape:\"dot\",text:\"No estimate\"});\n    return\n}\n\nconst currentStep = STEPS.reduceRight((prev, val) => val > currentMonthlyMaxAverage ? val : prev, STEPS[STEPS.length - 1])\n\n// Set currentHourRanking\nlet currentHourRanking = MAX_COUNTING + 1\nfor(let i = highestCounting.length - 1; i >= 0; i--) {\n    if(hourEstimate > highestCounting[i].consumption) {\n        currentHourRanking = i + 1\n    }\n}\nif(hourEstimate < highestToday.consumption) {\n    currentHourRanking = 0\n}\n\nconst current = {from: currentHour, consumption: hourEstimate}\nconst highestCountingWithCurrent = [...highestCounting, current].sort((a, b) => b.consumption - a.consumption).slice(0, highestCounting.length)\nconst currentMonthlyEstimate = highestCountingWithCurrent.length === 0 ? 0 : highestCountingWithCurrent.reduce((prev, val) => prev + val.consumption, 0) / highestCountingWithCurrent.length\n\n// Set alarm level\nconst alarmLevel = calculateLevel(\n    hourEstimate,\n    currentHourRanking,\n    currentMonthlyEstimate,\n    currentStep)\n\n// Evaluate status\nconst status = alarmLevel >= ALARM ? \"Alarm\" : alarmLevel > 0 ? \"Warning\" : \"Ok\"\n\n// Calculate reduction\nconst reductionRequired = alarmLevel < ALARM ? 0 :\n    Math.max((currentMonthlyEstimate - currentStep) * highestCounting.length, 0)\n    * 3600 / timeLeftSec;\nconst reductionRecommended = alarmLevel < 3 ? 0 :\n    Math.max(hourEstimate + SAFE_ZONE - currentStep, 0)\n    * 3600 / timeLeftSec;\n\n// Calculate increase possible\nconst increasePossible = alarmLevel >= 3 ? 0 :\n    Math.max(currentStep - hourEstimate - SAFE_ZONE, 0)\n    * 3600 / timeLeftSec;\n\n// Create output\nconst fill = status === \"Ok\" ? \"green\" : status === \"Alarm\" ? \"red\" : \"yellow\";\nnode.status({fill,shape:\"dot\",text:\"Working\"});\n\nconst RESOLUTION = 1000\n\nconst payload = {\n    status, // Ok, Warning, Alarm\n    statusOk: status === \"Ok\",\n    statusWarning: status === \"Warning\",\n    statusAlarm: status === \"Alarm\",\n    alarmLevel,\n    highestPerDay,\n    highestCounting,\n    highestCountingWithCurrent,\n    highestToday,\n    highestTodayConsumption: highestToday.consumption,\n    highestTodayFrom: highestToday.from,\n    currentMonthlyEstimate: Math.round(currentMonthlyEstimate * RESOLUTION) / RESOLUTION,\n    accumulatedConsumptionLastHour: Math.round(accumulatedConsumptionLastHour * RESOLUTION) / RESOLUTION,\n    consumptionLeft: Math.round(consumptionLeft * RESOLUTION) / RESOLUTION,\n    hourEstimate: Math.round(hourEstimate * RESOLUTION) / RESOLUTION,\n    averageConsumptionNow: Math.round(averageConsumptionNow * RESOLUTION) / RESOLUTION,\n    reductionRequired: Math.round(reductionRequired * RESOLUTION) / RESOLUTION,\n    reductionRecommended: Math.round(reductionRecommended * RESOLUTION) / RESOLUTION,\n    increasePossible: Math.round(increasePossible * RESOLUTION) / RESOLUTION,\n    currentStep,\n    currentHourRanking,\n    timeLeftSec,\n    periodMs,\n    accumulatedConsumption\n}\n\nmsg.payload = payload\n\nreturn msg;",
+    "func": "const HA_NAME = \"homeAssistant\"; // Your HA name\nconst STEPS = [10, 15, 20]\nconst MAX_COUNTING = 3 // Number of days to calculate month\nconst BUFFER = 0.5 // Closer to limit increases level\nconst SAFE_ZONE = 2 // Further from limit reduces level\nconst ALARM = 8 // Min level that causes status to be alarm\nconst MIN_TIMELEFT = 30 //Min level for time left (30 seconds)\n\nconst ha = global.get(\"homeassistant\")[HA_NAME];\nif (!ha.isConnected) {\n    node.status({ fill: \"red\", shape: \"dot\", text: \"Ha not connected\" })\n    return;\n}\n\nfunction isNull(value) {\n    return value === null || value === undefined\n}\n\nfunction calculateLevel(hourEstimate,\n    currentHourRanking,\n    highestCountingAverageWithCurrent,\n    nextStep) {\n    if (currentHourRanking === 0) {\n        return 0\n    }\n    if (highestCountingAverageWithCurrent > nextStep) {\n        return 9\n    }\n    if (highestCountingAverageWithCurrent > (nextStep - BUFFER)) {\n        return 8\n    }\n    if (hourEstimate > nextStep) {\n        return 7\n    }\n    if (hourEstimate > (nextStep - BUFFER)) {\n        return 6\n    }\n    if (currentHourRanking === 1 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 5\n    }\n    if (currentHourRanking === 2 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 4\n    }\n    if (currentHourRanking === 3 && (nextStep - hourEstimate) < SAFE_ZONE) {\n        return 3\n    }\n    if (currentHourRanking === 1) {\n        return 2\n    }\n    if (currentHourRanking === 2) {\n        return 1\n    }\n    return 0\n}\n\n\nif (msg.payload.highestPerDay) {\n    context.set(\"highestPerDay\", msg.payload.highestPerDay)\n    context.set(\"highestCounting\", msg.payload.highestCounting)\n    context.set(\"highestToday\", msg.payload.highestToday)\n    context.set(\"currentMonthlyMaxAverage\", msg.payload.currentMonthlyMaxAverage)\n    node.status({ fill: \"green\", shape: \"ring\", text: \"Got ranking\" });\n    return\n}\n\nconst highestPerDay = context.get(\"highestPerDay\")\nconst highestCounting = context.get(\"highestCounting\")\nconst highestToday = context.get(\"highestToday\")\nconst currentMonthlyMaxAverage = context.get(\"currentMonthlyMaxAverage\")\nconst hourEstimate = msg.payload.hourEstimate\nconst timeLeftMs = msg.payload.timeLeftMs\nconst timeLeftSec = timeLeftMs / 1000\nconst periodMs = msg.payload.periodMs\nconst accumulatedConsumption = msg.payload.accumulatedConsumption\nconst accumulatedConsumptionLastHour = msg.payload.accumulatedConsumptionLastHour\nconst consumptionLeft = msg.payload.consumptionLeft\nconst averageConsumptionNow = msg.payload.averageConsumptionNow\nconst currentHour = msg.payload.currentHour\n\nif (timeLeftSec === 0) {\n    node.status({ fill: \"red\", shape: \"dot\", text: \"Time Left 0\" });\n    return null;\n}\n\nif (isNull(highestPerDay)) {\n    node.status({ fill: \"red\", shape: \"dot\", text: \"No highest per day\" });\n    return\n}\nif (isNull(highestToday)) {\n    node.status({ fill: \"red\", shape: \"dot\", text: \"No highest today\" });\n    return\n}\nif (isNull(hourEstimate)) {\n    node.status({ fill: \"red\", shape: \"dot\", text: \"No estimate\" });\n    return\n}\n\nconst currentStep = STEPS.reduceRight((prev, val) => val > currentMonthlyMaxAverage ? val : prev, STEPS[STEPS.length - 1])\n\n// Set currentHourRanking\nlet currentHourRanking = MAX_COUNTING + 1\nfor (let i = highestCounting.length - 1; i >= 0; i--) {\n    if (hourEstimate > highestCounting[i].consumption) {\n        currentHourRanking = i + 1\n    }\n}\nif (hourEstimate < highestToday.consumption) {\n    currentHourRanking = 0\n}\n\nconst current = { from: currentHour, consumption: hourEstimate }\nconst highestCountingWithCurrent = [...highestCounting, current].sort((a, b) => b.consumption - a.consumption).slice(0, highestCounting.length)\nconst currentMonthlyEstimate = highestCountingWithCurrent.length === 0 ? 0 : highestCountingWithCurrent.reduce((prev, val) => prev + val.consumption, 0) / highestCountingWithCurrent.length\n\n// Set alarm level\nconst alarmLevel = calculateLevel(\n    hourEstimate,\n    currentHourRanking,\n    currentMonthlyEstimate,\n    currentStep)\n\n// Evaluate status\nconst status = alarmLevel >= ALARM ? \"Alarm\" : alarmLevel > 0 ? \"Warning\" : \"Ok\"\n\n// Avoid calculations to increase too much when timeLeftSec is approaching zero\nconst minTimeLeftSec = Math.max(timeLeftSec, MIN_TIMELEFT);\n// Calculate reduction\nconst reductionRequired = alarmLevel < ALARM ? 0 :\n    Math.max((currentMonthlyEstimate - currentStep) * highestCounting.length, 0)\n    * 3600 / minTimeLeftSec;\nconst reductionRecommended = alarmLevel < 3 ? 0 :\n    Math.max(hourEstimate + SAFE_ZONE - currentStep, 0)\n    * 3600 / minTimeLeftSec;\n\n// Calculate increase possible\nconst increasePossible = alarmLevel >= 3 ? 0 :\n    Math.max(currentStep - hourEstimate - SAFE_ZONE, 0)\n    * 3600 / minTimeLeftSec;\n\n// Create output\nconst fill = status === \"Ok\" ? \"green\" : status === \"Alarm\" ? \"red\" : \"yellow\";\nnode.status({ fill, shape: \"dot\", text: \"Working\" });\n\nconst RESOLUTION = 1000\n\nconst payload = {\n    status, // Ok, Warning, Alarm\n    statusOk: status === \"Ok\",\n    statusWarning: status === \"Warning\",\n    statusAlarm: status === \"Alarm\",\n    alarmLevel,\n    highestPerDay,\n    highestCounting,\n    highestCountingWithCurrent,\n    highestToday,\n    highestTodayConsumption: highestToday.consumption,\n    highestTodayFrom: highestToday.from,\n    currentMonthlyEstimate: Math.round(currentMonthlyEstimate * RESOLUTION) / RESOLUTION,\n    accumulatedConsumptionLastHour: Math.round(accumulatedConsumptionLastHour * RESOLUTION) / RESOLUTION,\n    consumptionLeft: Math.round(consumptionLeft * RESOLUTION) / RESOLUTION,\n    hourEstimate: Math.round(hourEstimate * RESOLUTION) / RESOLUTION,\n    averageConsumptionNow: Math.round(averageConsumptionNow * RESOLUTION) / RESOLUTION,\n    reductionRequired: Math.round(reductionRequired * RESOLUTION) / RESOLUTION,\n    reductionRecommended: Math.round(reductionRecommended * RESOLUTION) / RESOLUTION,\n    increasePossible: Math.round(increasePossible * RESOLUTION) / RESOLUTION,\n    currentStep,\n    currentHourRanking,\n    timeLeftSec,\n    periodMs,\n    accumulatedConsumption\n}\n\nmsg.payload = payload\n\nreturn msg;",
     "outputs": 1,
     "noerr": 0,
     "initialize": "",
@@ -112,7 +112,7 @@
     "type": "function",
     "z": "d938c47f.3398f8",
     "name": "Reduction Actions",
-    "func": "const MIN_CONSUMPTION_TO_CARE = 0.05 // Do not reduce unless at least 50W\n\nconst actions = flow.get(\"actions\")\nconst ha = global.get(\"homeassistant\").homeAssistant\n\nlet reductionRequired = msg.payload.reductionRequired\nlet reductionRecommended = msg.payload.reductionRecommended\n\nif(reductionRecommended <= 0) {\n  return null\n}\n\nfunction takeAction(action, consumption ) {\n  const info = {\n    time: new Date().toISOString(),\n    name: \"Reduction action\",\n    data: msg.payload,\n    action\n  }\n\n  // output1 is for actions\n  const output1 = action.payloadToTakeAction ? { payload: action.payloadToTakeAction } : null\n  // output 2 is for overriding PS strategies\n  const output2 = action.nameOfStrategyToOverride ? { payload: { config: { override: \"off\" }, name: action.nameOfStrategyToOverride} } : null\n  // output 3 is for logging\n  const output3 = { payload: info }\n\n  node.send([output1, output2, output3])\n  reductionRequired = Math.max(0, reductionRequired - consumption)\n  reductionRecommended = Math.max(0, reductionRecommended - consumption)\n  action.actionTaken = true\n  action.actionTime = Date.now()\n  action.savedConsumption = consumption\n  flow.set(\"actions\", actions)\n}\n\nfunction getConsumption(consumption) {\n  if(typeof consumption === \"string\") {\n    const sensor = ha.states[consumption]\n    return sensor.state / 1000\n  } else if (typeof consumption === \"number\") {\n    return consumption\n  } else if(typeof consumption === \"function\") {\n    return consumption()\n  } else {\n    node.warn(\"Config error: consumption has illegal type: \" + typeof consumption)\n    return 0\n  }\n}\n\nactions\n.filter(a => msg.payload.alarmLevel >= a.minAlarmLevel && !a.actionTaken)\n.forEach(a => {\n  const consumption = getConsumption(a.consumption)\n  if (consumption < MIN_CONSUMPTION_TO_CARE) {\n    return\n  }\n  if (reductionRequired > 0 || (reductionRecommended > 0 && a.reduceWhenRecommended)) {\n    takeAction(a, consumption)\n  }\n})\n    \n",
+    "func": "const MIN_CONSUMPTION_TO_CARE = 0.05 // Do not reduce unless at least 50W\nconst MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION = 5\n\nconst actions = flow.get(\"actions\")\nconst ha = global.get(\"homeassistant\").homeAssistant\n\nlet reductionRequired = msg.payload.reductionRequired\nlet reductionRecommended = msg.payload.reductionRecommended\n\nnode.status({})\n\nif(reductionRecommended <= 0 ) {\n  return null\n}\n\nif (3600 - msg.payload.timeLeftSec < MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION * 60) {\n  node.status({ fill: \"yellow\", shape: \"ring\", text: \"No action during first \" + MIN_MINUTES_INTO_HOUR_TO_TAKE_ACTION + \" minutes\"});\n  return\n}\n\nfunction takeAction(action, consumption ) {\n  const info = {\n    time: new Date().toISOString(),\n    name: \"Reduction action\",\n    data: msg.payload,\n    action\n  }\n\n  // output1 is for actions\n  const output1 = action.payloadToTakeAction ? { payload: action.payloadToTakeAction } : null\n  // output 2 is for overriding PS strategies\n  const output2 = action.nameOfStrategyToOverride ? { payload: { config: { override: \"off\" }, name: action.nameOfStrategyToOverride} } : null\n  // output 3 is for logging\n  const output3 = { payload: info }\n\n  node.send([output1, output2, output3])\n  reductionRequired = Math.max(0, reductionRequired - consumption)\n  reductionRecommended = Math.max(0, reductionRecommended - consumption)\n  action.actionTaken = true\n  action.actionTime = Date.now()\n  action.savedConsumption = consumption\n  flow.set(\"actions\", actions)\n}\n\nfunction getConsumption(consumption) {\n  if(typeof consumption === \"string\") {\n    const sensor = ha.states[consumption]\n    return sensor.state / 1000\n  } else if (typeof consumption === \"number\") {\n    return consumption\n  } else if(typeof consumption === \"function\") {\n    return consumption()\n  } else {\n    node.warn(\"Config error: consumption has illegal type: \" + typeof consumption)\n    return 0\n  }\n}\n\nactions\n.filter(a => msg.payload.alarmLevel >= a.minAlarmLevel && !a.actionTaken)\n.forEach(a => {\n  const consumption = getConsumption(a.consumption)\n  if (consumption < MIN_CONSUMPTION_TO_CARE) {\n    return\n  }\n  if (reductionRequired > 0 || (reductionRecommended > 0 && a.reduceWhenRecommended)) {\n    takeAction(a, consumption)\n  }\n})\n    \n",
     "outputs": 3,
     "noerr": 0,
     "initialize": "// You MUST edit the actions array with your own actions.\n\nconst actions = [\n    { \n        consumption: \"sensor.varmtvannsbereder_electric_consumption_w\",\n        name: \"Varmtvannsbereder\",\n        id: \"vvb\",\n        minAlarmLevel: 3,\n        reduceWhenRecommended: true,\n        minTimeOffSec: 300,\n        nameOfStrategyToOverride: \"Best Save\",\n    },\n    { \n        consumption: \"sensor.varme_gulv_bad_electric_consumption_w_2\",\n        name: \"Varme gulv bad 1. etg.\",\n        id: \"gulvbad\",\n        minAlarmLevel: 3,\n        reduceWhenRecommended: true,\n        minTimeOffSec: 300,\n        payloadToTakeAction: {\n            domain: \"climate\",\n            service: \"turn_off\",\n            target: {\n                entity_id: [\"climate.varme_gulv_bad_2\"]\n            }\n        },\n        payloadToResetAction: {\n            domain: \"climate\",\n            service: \"turn_on\",\n            target: {\n                entity_id: [\"climate.varme_gulv_bad_2\"]\n            }\n        }\n    },\n    { \n        consumption: \"sensor.varme_gulv_gang_electric_consumption_w\",\n        name: \"Varme gulv gang 1. etg.\",\n        id: \"gulvgang\",\n        minAlarmLevel: 3,\n        reduceWhenRecommended: true,\n        minTimeOffSec: 300,\n        payloadToTakeAction: {\n            domain: \"climate\",\n            service: \"turn_off\",\n            target: {\n                entity_id: [\"climate.varme_gulv_gang\"]\n            }\n        },\n        payloadToResetAction: {\n            domain: \"climate\",\n            service: \"turn_on\",\n            target: {\n                entity_id: [\"climate.varme_gulv_gang\"]\n            }\n        }\n    },\n    {\n        consumption: \"sensor.varme_gulv_kjellerstue_electric_consumption_w\",\n        name: \"Varme gulv kjellerstue\",\n        id: \"gulvkjeller\",\n        minAlarmLevel: 3,\n        reduceWhenRecommended: true,\n        minTimeOffSec: 300,\n        payloadToTakeAction: {\n            domain: \"climate\",\n            service: \"turn_off\",\n            target: {\n                entity_id: [\"climate.varme_gulv_kjellerstue\"]\n            }\n        },\n        payloadToResetAction: {\n            domain: \"climate\",\n            service: \"turn_on\",\n            target: {\n                entity_id: [\"climate.varme_gulv_kjellerstue\"]\n            }\n        }\n    }\n]\n// End of actions array\n\n// DO NOT DELETE THE CODE BELOW\n\n// Set default values for all actions\nactions.forEach(a => {\n    a.actionTaken = false\n    a.savedConsumption = 0\n})\n\nflow.set(\"actions\", actions)\n",
@@ -127,7 +127,7 @@
     "type": "function",
     "z": "d938c47f.3398f8",
     "name": "Reset Actions",
-    "func": "\nconst actions = flow.get(\"actions\")\nconst ha = global.get(\"homeassistant\").homeAssistant\n\nconst BUFFER_TO_RESET = 1 // Must have 1kW extra to perform reset\n\nlet increasePossible = msg.payload.increasePossible\n\nif (increasePossible <= 0) {\n  return null\n}\n\nfunction resetAction(action) {\n  const info = {\n    time: new Date().toISOString(),\n    name: \"Reset action\",\n    data: msg.paylaod,\n    action\n  }\n  const output1 = action.payloadToResetAction ? { payload: action.payloadToResetAction } : null\n  const output2 = action.nameOfStrategyToOverride ? { payload: { config: { override: \"auto\" }, name: action.nameOfStrategyToOverride } } : null\n  const output3 = { payload: info }\n\n  node.send([output1, output2, output3])\n  increasePossible -= action.savedConsumption\n  action.actionTaken = false\n  action.savedConsumption = 0\n  flow.set(\"actions\", actions)\n}\n\nactions\n  .filter(a => a.actionTaken\n    && (a.savedConsumption + BUFFER_TO_RESET) <= increasePossible\n    && (Date.now() - a.actionTime > a.minTimeOffSec * 1000)\n  ).forEach(a => resetAction(a))\n",
+    "func": "\nconst actions = flow.get(\"actions\")\nconst ha = global.get(\"homeassistant\").homeAssistant\n\nconst BUFFER_TO_RESET = 1 // Must have 1kW extra to perform reset\n\nlet increasePossible = msg.payload.increasePossible\n\nif (increasePossible <= 0) {\n  return null\n}\n\nfunction resetAction(action) {\n  const info = {\n    time: new Date().toISOString(),\n    name: \"Reset action\",\n    data: msg.payload,\n    action\n  }\n  const output1 = action.payloadToResetAction ? { payload: action.payloadToResetAction } : null\n  const output2 = action.nameOfStrategyToOverride ? { payload: { config: { override: \"auto\" }, name: action.nameOfStrategyToOverride } } : null\n  const output3 = { payload: info }\n\n  node.send([output1, output2, output3])\n  increasePossible -= action.savedConsumption\n  action.actionTaken = false\n  action.savedConsumption = 0\n  flow.set(\"actions\", actions)\n}\n\nactions\n  .filter(a => a.actionTaken\n    && (a.savedConsumption + BUFFER_TO_RESET) <= increasePossible\n    && (Date.now() - a.actionTime > a.minTimeOffSec * 1000)\n  ).forEach(a => resetAction(a))\n",
     "outputs": 3,
     "noerr": 0,
     "initialize": "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-power-saver",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "A module for Node-RED that you can use to turn on and off a switch based on power prices",
   "main": "index.js",
   "scripts": {
@@ -46,24 +46,25 @@
     "url": "https://github.com/ottopaulsen/node-red-contrib-power-saver.git"
   },
   "devDependencies": {
-    "@vuepress/bundler-vite": "^2.0.0-beta.36",
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.36",
-    "@vuepress/plugin-register-components": "^2.0.0-beta.36",
-    "@vuepress/plugin-search": "^2.0.0-beta.38",
-    "@vuepress/utils": "^2.0.0-beta.35",
-    "eslint": "^8.25.0",
-    "expect": "^27.5.1",
-    "mocha": "^9.2.0",
-    "node-red": "^3.0.2",
-    "node-red-node-test-helper": "^0.2.7",
-    "sass-loader": "^12.6.0",
-    "vuepress": "^2.0.0-beta.36"
+    "@vuepress/bundler-vite": "2.0.0-beta.67",
+    "@vuepress/plugin-google-analytics": "2.0.0-beta.67",
+    "@vuepress/plugin-register-components": "2.0.0-beta.67",
+    "@vuepress/plugin-search": "2.0.0-beta.67",
+    "@vuepress/utils": "2.0.0-beta.67",
+    "chai": "^4.3.10",
+    "eslint": "8.52.0",
+    "expect": "29.7.0",
+    "mocha": "^10.2.0",
+    "node-red": "^3.1.0",
+    "node-red-node-test-helper": "0.3.2",
+    "sass-loader": "^13.3.2",
+    "vuepress": "2.0.0-beta.67"
   },
   "dependencies": {
-    "floating-vue": "^2.0.0-beta.20",
-    "lodash.clonedeep": "^4.5.0",
-    "luxon": "^3.1.0",
-    "nano-time": "^1.0.0",
-    "node-fetch": "^2.6.7"
+    "floating-vue": "2.0.0-beta.24",
+    "lodash.clonedeep": "4.5.0",
+    "luxon": "3.4.3",
+    "nano-time": "1.0.0",
+    "node-fetch": "2.6.7"
   }
 }

package/src/handle-output.js

@@ -62,7 +62,7 @@ function sendSwitch(node, onOff) {
   const output1 = onOff ? { payload: node.outputValueForOn } : null;
   const output2 = onOff ? null : { payload: node.outputValueForOff };
   node.send([output1, output2, null]);
-  node.context().set("currentOutput", onOff);
+  node.context().set("currentOutput", onOff, node.contextStorage);
 }
 
 function runSchedule(node, schedule, time, currentSent = false) {

package/src/schedule-merger-functions.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const cloneDeep = require("lodash.clonedeep");
 const { msgHasConfig } = require("./utils.js");
 
 function msgHasSchedule(msg) {
@@ -11,7 +12,7 @@ function validateSchedule(msg) {
 }
 
 function saveSchedule(node, msg) {
-  let savedSchedules = node.context().get("savedSchedules") || {};
+  let savedSchedules = node.context().get("savedSchedules", node.contextStorage) || {};
 
   // If the saved schedule has a different start period, delete them
   const ids = Object.keys(savedSchedules);
@@ -28,14 +29,14 @@ function saveSchedule(node, msg) {
   }
 
   const id = msg.payload.strategyNodeId;
-  savedSchedules[id] = msg.payload;
+  savedSchedules[id] = cloneDeep(msg.payload);
   node.context().set("savedSchedules", savedSchedules);
 }
 
 function mergeSchedules(node, logicFunction) {
   // Transpose all schedules
   const transposed = {};
-  const savedSchedules = node.context().get("savedSchedules");
+  const savedSchedules = node.context().get("savedSchedules", node.contextStorage);
   if (!savedSchedules) {
     const msg = "No schedules";
     node.warn(msg);

package/src/schedule-merger.js

@@ -87,7 +87,7 @@ module.exports = function (RED) {
           };
 
           const planFromTime = msg.payload.time ? DateTime.fromISO(msg.payload.time) : DateTime.now();
-          const currentOutput = node.context().get("currentOutput");
+          const currentOutput = node.context().get("currentOutput", node.contextStorage);
           const plannedOutputNow = getOutputForTime(plan.schedule, planFromTime, node.outputIfNoSchedule);
 
           const outputCommands = {

package/src/strategy-functions.js

@@ -12,7 +12,7 @@ function strategyOnInput(node, msg, doPlanning, calcSavings) {
   const { plan, commands } = handleStrategyInput(node, msg, config, doPlanning, calcSavings);
   if (plan) {
     const planFromTime = msg.payload.time ? DateTime.fromISO(msg.payload.time) : DateTime.now();
-    const currentOutput = node.context().get("currentOutput");
+    const currentOutput = node.context().get("currentOutput", node.contextStorage);
     const plannedOutputNow =
       node.override === "auto"
         ? getOutputForTime(plan.schedule, planFromTime, node.outputIfNoSchedule)

package/src/strategy-heat-capacitor-functions.js

@@ -1,6 +1,6 @@
 "use strict";
 const { DateTime } = require("luxon");
-const { roundPrice } = require("./utils");
+const { roundPrice, getDiffToNextOn } = require("./utils");
 
 function calculateOpportunities(prices, pattern, amount) {
   //creating a price vector with minute granularity
@@ -121,6 +121,7 @@ function calculateSchedule(
   buySellStackedArray,
   buyPrices,
   sellPrices,
+  setpoint,
   maxTempAdjustment,
   boostTempHeat,
   boostTempCool,
@@ -137,10 +138,25 @@ function calculateSchedule(
     boostTempCool: boostTempCool,
     heatingDuration: buyDuration,
     coolingDuration: sellDuration,
+    minimalSchedule: [], //array of dicts with date as key and temperature as value
   };
 
+  function pushTempChange(startDate, minutes, tempAdj, sp) {
+    if (
+      schedule.minimalSchedule.length > 0 &&
+      schedule.minimalSchedule[schedule.minimalSchedule.length - 1].adjustment == tempAdj
+    )
+      return;
+    schedule.minimalSchedule.push({
+      startAt: startDate.plus({ minutes: minutes }).toISO(),
+      setpoint: sp + tempAdj,
+      adjustment: tempAdj,
+    });
+  }
+
   if (buySellStackedArray[0].length === 0) {
     //No procurements or sales scheduled
+    schedule.minimalSchedule.push({ startDate: -maxTempAdjustment });
     schedule.temperatures.fill(-maxTempAdjustment, 0, arrayLength);
   } else {
     let lastBuyIndex = 0;
@@ -155,27 +171,32 @@ function calculateSchedule(
       lastBuyIndex == 0 ? (boostCool = 0) : (boostCool = boostTempCool);
 
       //Cooling period. Adding boosted cooling temperature for the period of divestment
+      pushTempChange(startDate, lastBuyIndex, -maxTempAdjustment - boostCool, setpoint);
       if (sellIndex - lastBuyIndex <= sellDuration) {
         schedule.temperatures.fill(-maxTempAdjustment - boostCool, lastBuyIndex, sellIndex);
       } else {
+        pushTempChange(startDate, lastBuyIndex + sellDuration, -maxTempAdjustment, setpoint);
         schedule.temperatures.fill(-maxTempAdjustment - boostCool, lastBuyIndex, lastBuyIndex + sellDuration);
         schedule.temperatures.fill(-maxTempAdjustment, lastBuyIndex + sellDuration, sellIndex);
       }
       //Heating period. Adding boosted heating temperature for the period of procurement
+      pushTempChange(startDate, sellIndex, maxTempAdjustment + boostHeat, setpoint);
       if (buyIndex - sellIndex <= buyDuration) {
         schedule.temperatures.fill(maxTempAdjustment + boostHeat, sellIndex, buyIndex);
       } else {
+        pushTempChange(startDate, sellIndex + buyDuration, maxTempAdjustment, setpoint);
         schedule.temperatures.fill(maxTempAdjustment + boostHeat, sellIndex, sellIndex + buyDuration);
         schedule.temperatures.fill(maxTempAdjustment, sellIndex + buyDuration, buyIndex);
       }
-
       lastBuyIndex = buyIndex;
     }
 
     //final fill
+    pushTempChange(startDate, lastBuyIndex, -maxTempAdjustment - boostCool, setpoint);
     if (arrayLength - lastBuyIndex <= sellDuration) {
       schedule.temperatures.fill(-maxTempAdjustment - boostCool, lastBuyIndex, arrayLength);
     } else {
+      pushTempChange(startDate, lastBuyIndex + sellDuration, -maxTempAdjustment, setpoint);
       schedule.temperatures.fill(-maxTempAdjustment - boostCool, lastBuyIndex, lastBuyIndex + sellDuration);
       schedule.temperatures.fill(-maxTempAdjustment, lastBuyIndex + sellDuration, arrayLength);
     }
@@ -186,14 +207,26 @@ function calculateSchedule(
 }
 
 function findTemp(date, schedule) {
-  let diff = Math.round(date.diff(schedule.startAt).as("minutes"));
-  return schedule.temperatures[diff];
+  let closestDate = null;
+  let temp = null;
+  schedule.minimalSchedule.forEach((e) => {
+    const testDate = DateTime.fromISO(e.startAt);
+    if (date < testDate) return;
+    if (closestDate !== null) {
+      if (closestDate > testDate) return; //
+    }
+    closestDate = testDate;
+    temp = e.adjustment;
+  });
+  if (temp == null) temp = 0;
+  return temp;
 }
 
 function runBuySellAlgorithm(
   priceData,
   timeHeat1C,
   timeCool1C,
+  setpoint,
   boostTempHeat,
   boostTempCool,
   maxTempAdjustment,
@@ -225,6 +258,7 @@ function runBuySellAlgorithm(
     buySellCleaned,
     buyPrices,
     sellPrices,
+    setpoint,
     maxTempAdjustment,
     boostTempHeat,
     boostTempCool,