From 65e4f15b9b489349f3d6abb1e954aa88501c606a Mon Sep 17 00:00:00 2001 From: Trefor Southwell <48591903+springfall2008@users.noreply.github.com> Date: Wed, 10 Jan 2024 08:48:54 +0000 Subject: [PATCH] Additional fix for missing load scenario Prevent negative data during wrap of days previous --- apps/predbat/predbat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/predbat/predbat.py b/apps/predbat/predbat.py index 07ff3d387..d49d0cacb 100644 --- a/apps/predbat/predbat.py +++ b/apps/predbat/predbat.py @@ -18,7 +18,7 @@ import os import yaml -THIS_VERSION = "v7.14.37" +THIS_VERSION = "v7.14.38" TIME_FORMAT = "%Y-%m-%dT%H:%M:%S%z" TIME_FORMAT_SECONDS = "%Y-%m-%dT%H:%M:%S.%f%z" TIME_FORMAT_OCTOPUS = "%Y-%m-%d %H:%M:%S%z" @@ -3309,9 +3309,9 @@ def get_from_incrementing(self, data, index, backwards=True): while index < 0: index += 24 * 60 if backwards: - return data.get(index, 0) - data.get(index + 1, 0) + return max(data.get(index, 0) - data.get(index + 1, 0), 0) else: - return data.get(index + 1, 0) - data.get(index, 0) + return max(data.get(index + 1, 0) - data.get(index, 0), 0) def record_length(self, charge_window, charge_limit, best_price): """