From e8533d4186a82465656e2af8a231df576479ed09 Mon Sep 17 00:00:00 2001 From: Terekhin Alexander Date: Fri, 18 Apr 2025 14:16:40 +0300 Subject: [PATCH] Add makefile Signed-off-by: Terekhin Alexander --- cli-mon.go | 1 + go.mod | 2 +- ui/parameters.go | 18 ++++++++++-------- yabl/const.go | 7 ++++++- yabl/init.go | 13 +++++++++++++ yabl/protocol.go | 1 + yabl/types.go | 14 ++++++++++---- 7 files changed, 42 insertions(+), 14 deletions(-) diff --git a/cli-mon.go b/cli-mon.go index 7eba9d9..80fd133 100644 --- a/cli-mon.go +++ b/cli-mon.go @@ -58,6 +58,7 @@ func main() { {Id: yabl.CanIdLogicEnergyMode, Mask: 0xFFF}, {Id: yabl.CanIdLogicErrors, Mask: 0xFFF}, {Id: yabl.CanIdLogicWorkingMode, Mask: 0xFFF}, + {Id: yabl.CanIdLogicCommunicationMode, Mask: 0xFFF}, {Id: yabl.CanIdPeripheryState, Mask: 0xFFF}, {Id: yabl.CanIdPeripheryInfo, Mask: 0xFFF}, {Id: yabl.CanIdPeripheryDebug, Mask: 0xFFF}, diff --git a/go.mod b/go.mod index e26b183..b1abe9f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module cli-mon -go 1.19 +go 1.24 require ( github.com/gdamore/tcell/v2 v2.6.0 diff --git a/ui/parameters.go b/ui/parameters.go index 924a050..45357e8 100644 --- a/ui/parameters.go +++ b/ui/parameters.go @@ -16,14 +16,16 @@ var pu = []key{ {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}, + {yabl.PLogicCommunicationMode, yabl.FReadyToHlc, 14}, + {yabl.PSeccTargetEnergy, yabl.FAllowDynamicDistribution, 15}, + {yabl.PPuPeriphery, yabl.FCpLineVoltage, 16}, + {yabl.PSeccTargetEnergy, yabl.FTargetBatteryVoltage, 17}, + {yabl.PSeccTargetEnergy, yabl.FTargetGoalVoltage, 18}, + {yabl.PCpuEnergySettings, yabl.FPowerMax, 19}, + {yabl.PCpuEnergySettings, yabl.FCurrentMax, 20}, + {yabl.PCpuEnergySettings, yabl.FVoltageMax, 21}, + {yabl.PPuDebug, yabl.FDebugModeOn, 22}, + {yabl.PPuErrors, yabl.FBoardReady, 23}, } var pu_errors = []key{ diff --git a/yabl/const.go b/yabl/const.go index 66dfda4..45173e1 100644 --- a/yabl/const.go +++ b/yabl/const.go @@ -29,6 +29,7 @@ const ( CanIdLogicEnergyMode = 0x047 CanIdLogicErrors = 0x048 CanIdLogicWorkingMode = 0x049 + CanIdLogicCommunicationMode = 0x4A CanIdPeripheryState = 0x067 CanIdPeripheryInfo = 0x068 CanIdPeripheryDebug = 0x06C @@ -97,6 +98,7 @@ const ( PLogicEnergyMode AName = "LogicEnergyMode" PLogicErrors AName = "LogicErrors" PLogicWorkingMode AName = "LogicWorkingMode" + PLogicCommunicationMode AName = "LogicCommunicationMode" PContactorInternalState AName = "ContactorInternalState" PContactorInternalErrors AName = "ContactorInternalErrors" PContactorsInternalForce AName = "ContactorsInternalForce" @@ -153,6 +155,8 @@ const ( FVoltageMax FName = "VoltageMax" FPowerMax FName = "PowerMax" + FReadyToHlc FName = "ReadyToHlc" + // FBoardReady FName = "BoardReady" FNotReadySettings FName = "NotReadySettings" @@ -232,7 +236,8 @@ const ( // FTargetBatteryVoltage FName = "TargetBatteryVoltage" // FTargetGoalVoltage FName = "TargetGoalVoltage" - FTargetCurrent FName = "TargetCurrent" + FTargetCurrent FName = "TargetCurrent" + FAllowDynamicDistribution FName = "AllowDynamicDistribution" // FBoardReady FName = "BoardReady" diff --git a/yabl/init.go b/yabl/init.go index 8c1e05c..cbc671b 100644 --- a/yabl/init.go +++ b/yabl/init.go @@ -187,6 +187,19 @@ func (c *converter) initialize() { } } + for i := uint(0); i <= CONNECTOR_COUNT; i++ { + key := key{CanIdLogicCommunicationMode, i} + lcm := &LogicCommunicationMode{unit: unit(i)} + c.LogicCommunicationMode[i] = lcm + fields = entityToFields(lcm) + c.protocolMap[key] = &action{ + fields: fields, + interval: 1000, + name: PLogicCommunicationMode, + object: lcm, + } + } + for i := uint(0); i < CONTACTOR_MAX; i++ { key := key{CanIdContIntState, i} cis := &ContactorInternalState{unit: unit(i)} diff --git a/yabl/protocol.go b/yabl/protocol.go index c2b6c4d..bb73d42 100644 --- a/yabl/protocol.go +++ b/yabl/protocol.go @@ -49,6 +49,7 @@ type converter struct { logicEnergyMode [CONNECTOR_MAX]*LogicEnergyMode logicErrorsInstance *LogicErrors logicWorkingMode [CONNECTOR_MAX]*LogicWorkingMode + LogicCommunicationMode [CONNECTOR_MAX]*LogicCommunicationMode contactorInternalStateArray [CONTACTOR_MAX]*ContactorInternalState contactorInternalErrorsInstance *ContactorInternalErrors contactorsInternalForce *ContactorsInternalForce diff --git a/yabl/types.go b/yabl/types.go index 59d1c83..caa3a10 100644 --- a/yabl/types.go +++ b/yabl/types.go @@ -132,6 +132,11 @@ type LogicWorkingMode struct { Availability *BooleanType } +type LogicCommunicationMode struct { + unit + ReadyToHlc *BooleanType +} + type CpuPresentEnergy struct { unit PowerDirectionMode *V2GModeType @@ -213,10 +218,11 @@ type PuDebug struct { type SeccTargetEnergy struct { unit - TargetChargingAllow *BooleanType - TargetBatteryVoltage *Voltage11BitType - TargetGoalVoltage *Voltage11BitType - TargetCurrent *Current10BitType + TargetChargingAllow *BooleanType + TargetBatteryVoltage *Voltage11BitType + TargetGoalVoltage *Voltage11BitType + TargetCurrent *Current10BitType + AllowDynamicDistribution *BooleanType } type SeccErrors struct {