From d5d0d903f0fbb3cbe5fc3e4bbc9669e0c5dc4c4c Mon Sep 17 00:00:00 2001
From: Terekhin Alexandr <alex@bearns.me>
Date: Fri, 1 Sep 2023 11:17:23 +0300
Subject: [PATCH] Fix target energy settings

---
 ui/parameters.go | 34 +++++++++++++++---------------
 ui/ui.go         | 55 +++++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/ui/parameters.go b/ui/parameters.go
index 119590f..924a050 100644
--- a/ui/parameters.go
+++ b/ui/parameters.go
@@ -8,23 +8,22 @@ var pu = []key{
 	{yabl.PCpuPresentEnergy, yabl.FPresentVoltage, 3},
 	{yabl.PPuPresentEnergy, yabl.FPresentCurrent, 4},
 	{yabl.PCpuPresentEnergy, yabl.FPresentCurrent, 5},
-	{yabl.PPuPeriphery, yabl.FConnectorInsert, 6},
-	{yabl.PPuPeriphery, yabl.FContactorOn, 7},
-	{yabl.PPuPeriphery, yabl.FConnectorLocked, 8},
-	{yabl.PPuPeriphery, yabl.FCpLineLevel, 9},
-	{yabl.PPuPeriphery, yabl.FIsolationState, 10},
-	{yabl.PPuPeriphery, yabl.FChargingAllowed, 11},
-	{yabl.PPuPeriphery, yabl.FPwmEnabled, 12},
-	{yabl.PPuPeriphery, yabl.FCpLineVoltage, 13},
-	{yabl.PCpuEnergySettings, yabl.FTargetBatteryVoltage, 14},
-	{yabl.PCpuEnergySettings, yabl.FTargetGoalVoltage, 15},
-	{yabl.PCpuEnergySettings, yabl.FPowerMax, 16},
-	{yabl.PCpuEnergySettings, yabl.FCurrentMax, 17},
-	{yabl.PCpuEnergySettings, yabl.FVoltageMax, 18},
-	{yabl.PPuDebug, yabl.FDebugModeOn, 19},
-	{yabl.PPuDebug, yabl.FDebugContactorOutputOn, 20},
-	{yabl.PPuPeriphery, yabl.FDebugContactorOn, 21},
-	{yabl.PPuErrors, yabl.FBoardReady, 22},
+	{yabl.PSeccTargetEnergy, yabl.FTargetCurrent, 6},
+	{yabl.PPuPeriphery, yabl.FConnectorInsert, 7},
+	{yabl.PPuPeriphery, yabl.FContactorOn, 8},
+	{yabl.PPuPeriphery, yabl.FConnectorLocked, 9},
+	{yabl.PPuPeriphery, yabl.FCpLineLevel, 10},
+	{yabl.PPuPeriphery, yabl.FIsolationState, 11},
+	{yabl.PPuPeriphery, yabl.FChargingAllowed, 12},
+	{yabl.PPuPeriphery, yabl.FPwmEnabled, 13},
+	{yabl.PPuPeriphery, yabl.FCpLineVoltage, 14},
+	{yabl.PSeccTargetEnergy, yabl.FTargetBatteryVoltage, 15},
+	{yabl.PSeccTargetEnergy, yabl.FTargetGoalVoltage, 16},
+	{yabl.PCpuEnergySettings, yabl.FPowerMax, 17},
+	{yabl.PCpuEnergySettings, yabl.FCurrentMax, 18},
+	{yabl.PCpuEnergySettings, yabl.FVoltageMax, 19},
+	{yabl.PPuDebug, yabl.FDebugModeOn, 20},
+	{yabl.PPuErrors, yabl.FBoardReady, 21},
 }
 
 var pu_errors = []key{
@@ -45,6 +44,7 @@ var pu_errors = []key{
 	{yabl.PPuErrors, yabl.FOutputCircuitBreakerEnabled, 15},
 	{yabl.PPuDebug, yabl.FDebugModeOn, 16},
 	{yabl.PPuDebug, yabl.FDebugContactorOutputOn, 17},
+	{yabl.PPuPeriphery, yabl.FDebugContactorOn, 18},
 }
 
 var contactors_errors = []key{
diff --git a/ui/ui.go b/ui/ui.go
index 8da2e93..c0909d7 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -57,52 +57,55 @@ type log struct {
 }
 
 func (g *gui) Consume(event *yabl.Event) {
+	g.pu.update(event)
+	g.puErrors.update(event)
+	g.contactorsErrors.update(event)
+	g.contactorsState.update(event)
+	g.peripheryState.update(event)
+	g.peripheryStationState.update(event)
+	g.converters.update(event)
+	g.convertersErrors.update(event)
+	g.cpu.update(event)
+
 	switch event.Object.(type) {
 	case *yabl.PuPresentEnergy:
-		g.pu.update(event)
+		break
 	case *yabl.PuPeriphery:
-		g.pu.update(event)
+		break
 	case *yabl.PuDebug:
-		g.pu.update(event)
-		g.puErrors.update(event)
+		break
 	case *yabl.PuErrors:
-		g.pu.update(event)
-		g.puErrors.update(event)
+		break
 	case *yabl.ContactorInternalErrors:
-		g.contactorsErrors.update(event)
+		break
 	case *yabl.ContactorInternalDebug:
-		g.contactorsErrors.update(event)
-		g.contactorsState.update(event)
+		break
 	case *yabl.ContactorInternalState:
-		g.contactorsState.update(event)
+		break
 	case *yabl.ContactorsInternalForce:
-		g.contactorsErrors.update(event)
+		break
 	case *yabl.PeripheryState:
-		g.peripheryState.update(event)
-		g.peripheryStationState.update(event)
+		break
 	case *yabl.PeripheryInfo:
-		g.peripheryState.update(event)
-		g.peripheryStationState.update(event)
+		break
 	case *yabl.PeripheryDebug:
-		g.peripheryState.update(event)
-		g.peripheryStationState.update(event)
+		break
 	case *yabl.ConverterPresentEnergy:
-		g.converters.update(event)
+		break
 	case *yabl.ConverterErrors:
-		g.converters.update(event)
-		g.convertersErrors.update(event)
+		break
 	case *yabl.ConverterDebug:
-		g.converters.update(event)
+		break
 	case *yabl.CpuPresentEnergy:
-		g.pu.update(event)
+		break
 	case *yabl.CpuEnergySettings:
-		g.pu.update(event)
+		break
 	case *yabl.CpuErrors:
-		g.cpu.update(event)
+		break
 	case *yabl.CpuPeriphery:
-		g.cpu.update(event)
+		break
 	case *yabl.CpuDebug:
-		g.cpu.update(event)
+		break
 	default:
 		return
 	}