From f94c79f8435622f9d8b1a97ae378d4749183fa50 Mon Sep 17 00:00:00 2001 From: Yinyin Liu Date: Mon, 5 Aug 2024 15:23:58 +0200 Subject: [PATCH] aggregator: take care of no aggregating data in folder --- .../CerboReleaseFiles/dbus-fzsonick-48tl/aggregator.py | 5 ++++- .../VenusReleaseFiles/dbus-fzsonick-48tl/aggregator.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/firmware/Cerbo_Release/CerboReleaseFiles/dbus-fzsonick-48tl/aggregator.py b/firmware/Cerbo_Release/CerboReleaseFiles/dbus-fzsonick-48tl/aggregator.py index 1d2da45f8..ed1a9f3bc 100755 --- a/firmware/Cerbo_Release/CerboReleaseFiles/dbus-fzsonick-48tl/aggregator.py +++ b/firmware/Cerbo_Release/CerboReleaseFiles/dbus-fzsonick-48tl/aggregator.py @@ -221,7 +221,10 @@ class Aggregator: except ValueError: pass - if len(node_data) == 1: + if len(node_data) == 0: + # No data collected, return default AggregatedData with zeros + return AggregatedData(0.0, 0.0, 0.0, 0.0, 0.0) + elif len(node_data) == 1: # Directly use the values for a single node for node_number, data in node_data.items(): min_soc = data['soc'][0] if data['soc'] else 0.0 diff --git a/firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/aggregator.py b/firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/aggregator.py index 8b529d1b9..0f787b8ce 100755 --- a/firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/aggregator.py +++ b/firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/aggregator.py @@ -226,7 +226,10 @@ class Aggregator: except ValueError: pass - if len(node_data) == 1: + if len(node_data) == 0: + # No data collected, return default AggregatedData with zeros + return AggregatedData(0.0, 0.0, 0.0, 0.0, 0.0) + elif len(node_data) == 1: # Directly use the values for a single node for node_number, data in node_data.items(): min_soc = data['soc'][0] if data['soc'] else 0.0