From eb25b8e91e07e9c502b40e6c83f8930196ef933b Mon Sep 17 00:00:00 2001 From: atef Date: Wed, 19 Mar 2025 11:24:36 +0100 Subject: [PATCH] Update the Alarm Record constructor --- .../BatteryDeligreenAlarmRecord.cs | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/csharp/Lib/Devices/BatteryDeligreen/BatteryDeligreenAlarmRecord.cs b/csharp/Lib/Devices/BatteryDeligreen/BatteryDeligreenAlarmRecord.cs index e69d691af..297befac4 100644 --- a/csharp/Lib/Devices/BatteryDeligreen/BatteryDeligreenAlarmRecord.cs +++ b/csharp/Lib/Devices/BatteryDeligreen/BatteryDeligreenAlarmRecord.cs @@ -1,17 +1,36 @@ +using static InnovEnergy.Lib.Devices.BatteryDeligreen.AlarmBitMessage; + namespace InnovEnergy.Lib.Devices.BatteryDeligreen; public class BatteryDeligreenAlarmRecord { - public List CellAlarmList { get; set; } - public List CellTemperatureAlarm { get; set; } - public String EnviTempAlarm { get; set; } - public String PowerTempAlarm { get; set; } - public String CurrentAlarm { get; set; } - public String TotalVoltageAlarm { get; set; } - - - public BatteryDeligreenAlarmRecord( List cellAlarmList, List cellTemperatureAlarm, String enviTempAlarm1, String powerTempAlarm1, String currentAlarm1, String totalVoltageAlarm1) + public List CellAlarmList { get; set; } + public List CellTemperatureAlarm { get; set; } + public String EnviTempAlarm { get; set; } + public String PowerTempAlarm { get; set; } + public String CurrentAlarm { get; set; } + public String TotalVoltageAlarm { get; set; } + public AlarmEvent1_ AlarmEvent1 { get; set; } + /* public AlarmBitMessage.AlarmEvent2 AlarmEvent2 { get; set; } + public AlarmBitMessage.AlarmEvent3 AlarmEvent3 { get; set; } + public AlarmBitMessage.AlarmEvent4 AlarmEvent4 { get; set; } + public AlarmBitMessage.AlarmEvent5 AlarmEvent5 { get; set; } + public AlarmBitMessage.AlarmEvent6 AlarmEvent6 { get; set; } + public AlarmBitMessage.AlarmEvent7 AlarmEvent7 { get; set; } + public AlarmBitMessage.AlarmEvent8 AlarmEvent8 { get; set; } + + public AlarmBitMessage.DisconnectionState1 DisconnectionState1 { get; set; } + public AlarmBitMessage.DisconnectionState2 DisconnectionState2 { get; set; } + public AlarmBitMessage.EquilibriumState1 EquilibriumState1 { get; set; } + public AlarmBitMessage.EquilibriumState2 EquilibriumState2 { get; set; } + public AlarmBitMessage.OnOffState OnOffState { get; set; } + public AlarmBitMessage.SystemState SystemState { get; set; }*/ + + public BatteryDeligreenAlarmRecord( List cellAlarmList, List cellTemperatureAlarm, String enviTempAlarm1, String powerTempAlarm1, + String currentAlarm1, String totalVoltageAlarm1, Byte alarmEvent1/*, Enum alarmEvent2, Enum alarmEvent3, + Enum alarmEvent4, Enum alarmEvent5, Enum alarmEvent6, Enum alarmEvent7, Enum alarmEvent8, Enum disconnectionState1, + Enum disconnectionState2, Enum equilibriumState1, Enum equilibriumState2, Enum onOffState, Enum systemState*/) { CellAlarmList = cellAlarmList; CellTemperatureAlarm = cellTemperatureAlarm; @@ -19,5 +38,6 @@ public class BatteryDeligreenAlarmRecord PowerTempAlarm = powerTempAlarm1; CurrentAlarm = currentAlarm1; TotalVoltageAlarm = totalVoltageAlarm1; + AlarmEvent1 = new AlarmEvent1_(alarmEvent1); } } \ No newline at end of file