From eef228c6f7deed38862a7b062bfb5c5f84de72dd Mon Sep 17 00:00:00 2001
From: Tobi177 <tobo@comodoweb.com>
Date: Sun, 26 Jul 2020 23:23:33 +0200
Subject: [PATCH] more work on current1 and currentmode1 implementation. Added
 to the victron gui as well

---
 driver/chargerybms.py                        | 13 +++++++++----
 gui/qml/PageBatteryChargeryBMSImpedances.qml |  9 +++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/driver/chargerybms.py b/driver/chargerybms.py
index 9b617b0..2ad4fc3 100644
--- a/driver/chargerybms.py
+++ b/driver/chargerybms.py
@@ -128,8 +128,8 @@ if args.victron:
 	dbusservice.add_path('/Voltages/BatteryCapacityWH',    -1)
 	dbusservice.add_path('/Voltages/BatteryCapacityAH',    -1)
 	dbusservice.add_path('/Voltages/UpdateTimestamp',      -1)
-	dbusservice.add_path('/Impedances/InstantCurrentMode', -1)
-	dbusservice.add_path('/Impedances/InstantCurrent',     -1)
+	dbusservice.add_path('/Impedances/CurrentMode1',       -1)
+	dbusservice.add_path('/Impedances/Current1',           -1)
 	dbusservice.add_path('/Impedances/Cell1',              -1)
 	dbusservice.add_path('/Impedances/Cell2',              -1)
 	dbusservice.add_path('/Impedances/Cell3',              -1)
@@ -200,8 +200,8 @@ if args.victron:
 	dbusservice.add_path('/Raw/Voltages/BatteryCapacityWH',    -1)
 	dbusservice.add_path('/Raw/Voltages/BatteryCapacityAH',    -1)
 	dbusservice.add_path('/Raw/Voltages/UpdateTimestamp',      -1)
-	dbusservice.add_path('/Raw/Impedances/InstantCurrentMode', -1)
-	dbusservice.add_path('/Raw/Impedances/InstantCurrent',     -1)
+	dbusservice.add_path('/Raw/Impedances/CurrentMode1',       -1)
+	dbusservice.add_path('/Raw/Impedances/Current1',           -1)
 	dbusservice.add_path('/Raw/Impedances/Cell1',              -1)
 	dbusservice.add_path('/Raw/Impedances/Cell2',              -1)
 	dbusservice.add_path('/Raw/Impedances/Cell3',              -1)
@@ -1283,6 +1283,11 @@ def parse_packet(packet):
 									BMS_STATUS['impedances']['current_mode1']['value'] = -1
 									BMS_STATUS['impedances']['current_mode1']['text']  = ""
 									BMS_STATUS['impedances']['current1']['text'] = ""
+								if args.victron:
+									dbusservice["/Impedances/CurrentMode1"] = BMS_STATUS['impedances']['current_mode1']['text']
+									dbusservice["/Raw/Impedances/CurrentMode1"] = BMS_STATUS['impedances']['current_mode1']['value']
+									dbusservice["/Impedances/Current1"] = BMS_STATUS['impedances']['current1']['text']
+									dbusservice["/Raw/Impedances/Current1"] = BMS_STATUS['impedances']['current1']['value']
 
 
 								# cell impedances BMS8
diff --git a/gui/qml/PageBatteryChargeryBMSImpedances.qml b/gui/qml/PageBatteryChargeryBMSImpedances.qml
index 6267ed1..2efba21 100644
--- a/gui/qml/PageBatteryChargeryBMSImpedances.qml
+++ b/gui/qml/PageBatteryChargeryBMSImpedances.qml
@@ -10,6 +10,15 @@ MbPage {
 
 	model: VisualItemModel {
 
+		MbItemRow {
+			id: currentState1
+			description: qsTr("Measured State")
+			values: [
+				MbTextBlock { item { bind: service.path("/Impedances/CurrentMode1"); } height: 25 },
+				MbTextBlock { item { bind: service.path("/Impedances/Current1"); } width: 70; height: 25 }
+			]
+		}
+
 		MbItemRow {
 			description: qsTr("Impedances Min|Max|Sum")
 			values: [