Added error and waring messages and updated tower light inputs

- Added strings not ready in time error - Added battery already full warning - Added battery already empty warning - Added battery in stop input to tower light - Added warnings active to tower light - Added BMS State Machine errors to tower light input
2025-09-10 12:13:40 +02:00
parent d718c813c9
commit 0d3369d54d
9 changed files with 552 additions and 413 deletions
--- a/PLC/DUTs/Modbus/ErrorWarningRegisters/ST_WORD_BMS_ERROR_BITMAP.TcDUT
+++ b/PLC/DUTs/Modbus/ErrorWarningRegisters/ST_WORD_BMS_ERROR_BITMAP.TcDUT
@@ -11,6 +11,7 @@ STRUCT
 	bSafetyErrorVoltage : BIT;		// Bit 5
 	bSafetyErrorPressure : BIT;		// Bit 6
 	bSafetyErrorTemperature : BIT;	// Bit 7
+	bStringsNotReadyInTime : BIT;	// BIT 8
 END_STRUCT
 END_TYPE
 ]]></Declaration>
--- a/PLC/DUTs/Modbus/ErrorWarningRegisters/ST_WORD_BMS_WARNING_BITMAP.TcDUT
+++ b/PLC/DUTs/Modbus/ErrorWarningRegisters/ST_WORD_BMS_WARNING_BITMAP.TcDUT
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.8">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.12">
  <DUT Name="ST_WORD_BMS_WARNING_BITMAP" Id="{6dfd9c4b-4e74-434e-9f65-01d443c224d5}">
    <Declaration><![CDATA[TYPE ST_WORD_BMS_WARNING_BITMAP :
 STRUCT
@@ -15,6 +15,8 @@ STRUCT
 	bTCabinetString2Module1High : BIT;
 	bTCabinetString2Module2High : BIT;
 	bTCabinetString2Module3High : BIT;
+	bBatteryAlreadyFull : BIT;
+	bBatteryAlreadyEmpty : BIT;
 END_STRUCT
 END_TYPE
 ]]></Declaration>
--- a/PLC/PLC.plcproj
+++ b/PLC/PLC.plcproj
@@ -201,6 +201,9 @@
    <Compile Include="POUs\Sunspec\Refu\U_SUNSPEC_ERROR.TcDUT">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="POUs\Utility\FB_AlarmMessage.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="DUTs" />
@@ -208,6 +211,7 @@
    <Folder Include="DUTs\Modbus\HoldingRegisters" />
    <Folder Include="DUTs\Modbus\ErrorWarningRegisters" />
    <Folder Include="GVLs" />
+    <Folder Include="POUs\Utility" />
    <Folder Include="POUs\Sunspec" />
    <Folder Include="POUs\Sunspec\Kaco" />
    <Folder Include="POUs\Sunspec\Refu" />
--- a/PLC/PLC.tmc
+++ b/PLC/PLC.tmc
--- a/PLC/POUs/FB_String.TcPOU
+++ b/PLC/POUs/FB_String.TcPOU
@@ -474,6 +474,7 @@ CASE _iState OF
 		
 		IF (NOT xEnable) THEN
 			_xEnable := FALSE;
+			_xReleaseLimitErrorsInternal := FALSE;
 			_iState := 0;
 		END_IF
 		
@@ -516,6 +517,7 @@ CASE _iState OF
 			_tonSafetyOkTimeout.IN := FALSE;
 			xResetSafety := FALSE;
 			_xEnable := FALSE;
+			_xReleaseLimitErrorsInternal := FALSE;
 			_iState := 40;
 		END_IF
 		
@@ -580,6 +582,7 @@ CASE _iState OF
 		IF (NOT xEnable) THEN
 			_tonSafetyOkTimeout.IN := FALSE;
 			_xEnable := FALSE;
+			_xReleaseLimitErrorsInternal := FALSE;
 			//eStatus := E_COMPONENT_STATUS.SHUTDOWN;
 			_iState := 40;
 		END_IF
@@ -663,11 +666,11 @@ CASE _iState OF
 		// Shutdown
 		IF (NOT xEnable) THEN
 			_xEnable := FALSE;
-			_xReleaseLimitErrorsInternal := FALSE;
 			IF GVL_CONFIG.xShutdownDischargeWithInverter THEN
 				_rPowerInverterInternal := GVL_CONFIG.rAbsShutdownDischargePower;
 				_iState := 31;
 			ELSE
+				_xReleaseLimitErrorsInternal := FALSE;
 				_rPowerInverterInternal := 0.0;
 				_xEnableInverter := FALSE;
 				_iState := 40;
@@ -675,7 +678,6 @@ CASE _iState OF
 			
 		ELSIF (NOT _xAllModulesReady) OR (NOT _xBalanceOk) OR (NOT xSafetyIntlksOk) OR (NOT xRepairSwitchOk) OR (_xErrorInternal) THEN
 			xError := TRUE;
-			_xReleaseLimitErrorsInternal := FALSE;
 			_xEnable := FALSE;
 			_rPowerInverterInternal := 0.0;
 			_xEnableInverter := FALSE;
--- a/PLC/POUs/MAIN.TcPOU
+++ b/PLC/POUs/MAIN.TcPOU
@@ -70,6 +70,15 @@ VAR
 	// NA Protection Alarm
 	_fbNAProtectionAlarm : FB_TcAlarm;
 	
+	// String ready timeout alarm
+	_fbStringReadyTimeoutAlarm : FB_AlarmMessage;
+	
+	// Battery already full warning
+	_fbBatteryAlreadyFullWarning : FB_AlarmMessage;
+	
+	// Battery already empty warning
+	_fbBatteryAlreadyEmptyWarning : FB_AlarmMessage;
+	
 	// First cycle tag
 	_xFirstCycle : BOOL := TRUE;
 	
@@ -120,6 +129,7 @@ VAR
 	
 	_xErrorActive : BOOL;
 	_xWarningActive : BOOL;
+	_xBatteryActive : BOOL;
 	
 	// Battery in safety check mode
 	_xInSafetyCheckMode : BOOL;
@@ -149,6 +159,7 @@ VAR
 	// Hardware reset button rising edge trigger
 	_fbRTrigHardwareAck : R_TRIG;
 	
+	// String not ready in time timeout
 	_fbStringReadyTimeout : TON;
 	
 	// Sum of voltage of all active strings
@@ -176,6 +187,9 @@ VAR
 	_xStringsInAutoMode : BOOL;
 	_xStringSafetyComError : BOOL;
 	
+	_xStringNotReadyInTime : BOOL;
+	_xErrorBMSSMActive : BOOL;
+	
 	_eStringOpMode : E_STRING_OPERATING_MODE;
 	
 	_rMaxCurrentInverterDCVoltage : REAL;
@@ -227,6 +241,10 @@ END_VAR
 	_fbEMSHeartbeatAlarm.CreateEx(stEventEntry := TC_EVENTS.BMSEvents.EMSHeartbeatTimeout, TRUE, 0);
 	
 	_fbNAProtectionAlarm.CreateEx(stEventEntry := TC_EVENTS.BMSEvents.NAProtectionTripped, TRUE, 0);
+	
+	_fbStringReadyTimeoutAlarm.Init(stEventType := TC_EVENTS.BMSEvents.StringReadyTimeout, TRUE);
+	_fbBatteryAlreadyFullWarning.Init(stEventType := TC_EVENTS.BMSEvents.BatteryAlreadyFull, FALSE);
+	_fbBatteryAlreadyEmptyWarning.Init(stEventType := TC_EVENTS.BMSEvents.BatteryAlreadyEmpty, FALSE);
 END_IF

 // Reset error flag
@@ -518,7 +536,7 @@ IF _fbTempCabinetSCSString2.xError THEN
 	_xErrorActive := TRUE;
 END_IF

-// Handle string 1 modbus error and warning
+// Handle string 2 modbus error and warning
 GVL_MODBUS.stBMSErrorReg.wStringErrorActive.1 := _afbStrings[1].xError;
 GVL_MODBUS.stBMSErrorReg.wStringWarningActive.1 := _afbStrings[1].xWarning;
 GVL_MODBUS.stBMSErrorReg.wString2ErrorActive.stBitmap.bDCSwitch := (NOT _afbStrings[1].xRepairSwitchOk);
@@ -528,9 +546,6 @@ GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bTCabinetString2Module2High
 GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bTCabinetString2Module3High := _afbStrings[1].xTempCabinetModule3Warning;
 GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bTCabinetSCSString2High := _fbTempCabinetSCSString2.xWarningHigh;

-// Copy general error to modbus error register
-GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.stBitmap.bError := _xErrorActive;
-

 // ===============================
 // Get global string status information
@@ -950,6 +965,10 @@ IF _xGetPowerMeterData THEN
 END_IF


+// Handle modbus global warning and error flag
+GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.stBitmap.bError := _xErrorActive OR _xErrorBMSSMActive;
+
+
 // Call safety fb
 _fbSafety(refuStringErrorsModbus := GVL_MODBUS.stBMSErrorReg.wBMSErrorActive);

@@ -971,6 +990,7 @@ END_IF
 	
 // Reset alarm confirmation
 IF _xConfirmAlarms OR _rtHardwareResetButton.Q THEN
+	_xErrorBMSSMActive := FALSE;
 	GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.wRegister := 0;
 	GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.wRegister := 0;
 	GVL_MODBUS.stBMSErrorReg.wString1ErrorActive.wRegister := 0;
@@ -981,10 +1001,10 @@ END_IF
 _fbPowerMeter24V();

 _fbTowerLight(
-	xAutoInStop := FALSE,
-	xWarningActive := FALSE,
+	xAutoInStop := NOT _xBatteryActive,
+	xWarningActive := _xWarningActive,
 	xWarningConfirmPending := FALSE,
-	xErrorActive := _xErrorActive,
+	xErrorActive := _xErrorActive OR _xErrorBMSSMActive,
 	xErrorConfirmPending := FALSE);]]></ST>
    </Implementation>
    <Action Name="SM_AUTO" Id="{b5166e16-4fea-442b-9560-02c156f9a9ad}">
@@ -1025,6 +1045,7 @@ _fbTowerLight(
 		IF _xStringsReady AND (NOT _xStringsErrorActive) THEN
 			_xGetPowerMeterData := TRUE;
 			_fbStringReadyTimeout(IN := FALSE);
+			GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.stBitmap.bStringsNotReadyInTime := 1;
 			_rPowerInverter := 0.0;
 			// Set active parallel members (modbus)
 			GVL_MODBUS.stModbusEMSComm.stModbusReg10.uiActiveParallelMembers := GVL_CONFIG.uiNumberOfStrings;
@@ -1034,10 +1055,11 @@ _fbTowerLight(
 		
 		IF _xStringsErrorActive OR _fbStringReadyTimeout.Q THEN
 			_fbStringReadyTimeout(IN := FALSE);
+			_xStringNotReadyInTime := TRUE;
 			_xEnableString := FALSE;
 			GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic := 0;
 			_xCanChangeMode := TRUE;
-			_iState := 45;
+			_iState := 1000;
 		END_IF
 		
 		
@@ -1053,6 +1075,7 @@ _fbTowerLight(
 		// Set inverter power to modbus requested power
 		_rPowerInverter := _rAutoPowerRequest;
 		_xReleaseInverterPower := TRUE;
+		_xBatteryActive := TRUE;
 		
 		// Check if the battery should still be active
 		IF (_rAutoPowerRequest = 0.0) AND NOT GVL_MODBUS.stModbusEMSComm.stModbusReg12.wBMSControlsRegister.stBitmap.bScheduleActive THEN
@@ -1172,6 +1195,7 @@ _fbTowerLight(
 			IF GVL_CONFIG.xShutdownDischargeWithInverter THEN
 				_iState := 40;
 			ELSE
+				_xBatteryActive := FALSE;
 				_xReleaseInverterPower := FALSE;
 				_rPowerInverter := 0.0;
 				_xEnableString := FALSE;
@@ -1193,6 +1217,7 @@ _fbTowerLight(
 		IF _xStringsShutdownDischargeAllowed OR _xEMSHeartbeatNotOK THEN
 			_rPowerInverter := GVL_CONFIG.rAbsShutdownDischargePower;
 		ELSE
+			_xBatteryActive := FALSE;
 			_xReleaseInverterPower := FALSE;
 			_xGetPowerMeterData := TRUE;
 			GVL_MODBUS.stModbusEMSComm.stModbusReg10.uiActiveParallelMembers := 0;
@@ -1213,12 +1238,10 @@ _fbTowerLight(
 		IF (ABS(_rAutoPowerRequest) > DINT_TO_REAL(GVL_CONFIG.diMinimumAbsPowerForEnable)) AND (NOT _xStringsErrorActive) AND _xStringsAllInAutomaticMode THEN
 			IF _rAutoPowerRequest < 0 AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus <> E_CHARGE_STATUS.FULL THEN
 				_iState := 0;
-				// TODO: Meldung ausgeben, dass Batterie schon voll ist
 			END_IF
 			
 			IF _rAutoPowerRequest > 0 AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus <> E_CHARGE_STATUS.EMPTY THEN
 				_iState := 0;
-				// TODO: Meldung ausgeben, dass Batterie schon leer ist.
 			END_IF
 		END_IF
 		
@@ -1236,12 +1259,10 @@ _fbTowerLight(
 			_xCanChangeMode := FALSE;
 			IF (_rAutoPowerRequest < 0 OR GVL_MODBUS.stModbusEMSComm.stModbusReg12.wBMSControlsRegister.stBitmap.bScheduleActive) AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus <> E_CHARGE_STATUS.FULL THEN
 				_iState := 0;
-				// TODO: Meldung ausgeben, dass Batterie schon voll ist
 			END_IF
 			
 			IF (_rAutoPowerRequest > 0 OR GVL_MODBUS.stModbusEMSComm.stModbusReg12.wBMSControlsRegister.stBitmap.bScheduleActive) AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus <> E_CHARGE_STATUS.EMPTY THEN
 				_iState := 0;
-				// TODO: Meldung ausgeben, dass Batterie schon leer ist.
 			END_IF
 			
 			IF (_rAutoPowerRequest <> 0 OR GVL_MODBUS.stModbusEMSComm.stModbusReg12.wBMSControlsRegister.stBitmap.bScheduleActive) THEN
@@ -1263,8 +1284,11 @@ _fbTowerLight(
 		GVL_MODBUS.stModbusEMSComm.stModbusReg10.uiActiveParallelMembers := 0;
 		_xReleaseInverterPower := FALSE;
 		_xEnableString := FALSE;
+		_xBatteryActive := FALSE;
 		_rPowerInverter := 0.0;
 		GVL_MODBUS.stModbusEMSComm.stModbusReg11.eBatteryStatus := E_BATTERY_STATUS.ERROR;
+		_xErrorBMSSMActive := TRUE;
+		_xStringNotReadyInTime := FALSE;
 		_iState := 1010;
 		
 	1010: // Wait for reset from error state
@@ -1285,6 +1309,32 @@ _fbTowerLight(
 		END_IF
 END_CASE

+// String not ready in time alarm
+_fbStringReadyTimeoutAlarm(xActive := _xStringNotReadyInTime , xAcknowledge := _xConfirmAlarms);
+IF GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.stBitmap.bStringsNotReadyInTime AND _fbStringReadyTimeoutAlarm.ClearedAndConfirmed THEN
+	GVL_MODBUS.stBMSErrorReg.wBMSErrorActive.stBitmap.bStringsNotReadyInTime := 0;
+END_IF
+
+// Battery already full warning
+IF (_rAutoPowerRequest < 0) AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus = E_CHARGE_STATUS.FULL THEN
+	GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bBatteryAlreadyFull := 1;
+	_fbBatteryAlreadyFullWarning(xActive := TRUE);
+	_xWarningActive := TRUE;
+ELSE
+	GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bBatteryAlreadyFull := 0;
+	_fbBatteryAlreadyFullWarning(xActive := FALSE);
+END_IF
+
+// Battery already empty
+IF (_rAutoPowerRequest > 0) AND GVL_MODBUS.stModbusEMSComm.stModbusReg11.eChargeStatus = E_CHARGE_STATUS.EMPTY THEN
+	GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bBatteryAlreadyEmpty := 1;
+	_fbBatteryAlreadyEmptyWarning(xActive := TRUE);
+	_xWarningActive := TRUE;
+ELSE
+	GVL_MODBUS.stBMSErrorReg.wBMSWarningActive.stBitmap.bBatteryAlreadyEmpty := 0;
+	_fbBatteryAlreadyEmptyWarning(xActive := FALSE);
+END_IF
+
 // Calculate string power balancing
 IF _rStringsSumVoltage <> 0 AND (_uiNumberOfActiveStrings <> 0) THEN
 	FOR _ui := 0 TO (GVL_CONFIG.uiNumberOfStrings-1) DO
--- a/PLC/POUs/Utility/FB_AlarmMessage.TcPOU
+++ b/PLC/POUs/Utility/FB_AlarmMessage.TcPOU
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.12">
+  <POU Name="FB_AlarmMessage" Id="{4e628f13-10b9-47d9-8d26-ceb4bcb9bf43}" SpecialFunc="None">
+    <Declaration><![CDATA[FUNCTION_BLOCK FB_AlarmMessage
+VAR_INPUT
+	xActive : BOOL;
+	xAcknowledge : BOOL;
+END_VAR
+VAR_OUTPUT
+END_VAR
+VAR
+	_fbAlarmMessage : Fb_TcAlarm;
+END_VAR
+]]></Declaration>
+    <Implementation>
+      <ST><![CDATA[IF xActive AND (NOT _fbAlarmMessage.bRaised) THEN
+	_fbAlarmMessage.Raise();
+END_IF
+
+IF (NOT xActive) AND (_fbAlarmMessage.bRaised) THEN
+	_fbAlarmMessage.Clear(0);
+END_IF
+
+IF _fbAlarmMessage.eConfirmationState = TcEventConfirmationState.WaitForConfirmation AND xAcknowledge THEN
+	_fbAlarmMessage.Confirm(0);
+END_IF]]></ST>
+    </Implementation>
+    <Property Name="Arguments" Id="{f40c819a-ad71-4e81-830e-67d02b4e9e2f}">
+      <Declaration><![CDATA[PROPERTY PUBLIC Arguments : I_TcArguments]]></Declaration>
+      <Get Name="Get" Id="{c1b8ca1b-cb6c-4841-8282-61423914cb4e}">
+        <Declaration><![CDATA[VAR
+END_VAR
+]]></Declaration>
+        <Implementation>
+          <ST><![CDATA[Arguments := _fbAlarmMessage.ipArguments;]]></ST>
+        </Implementation>
+      </Get>
+    </Property>
+    <Property Name="ClearedAndConfirmed" Id="{4e7fa79e-e44f-42ff-ab45-0e14a9921a12}">
+      <Declaration><![CDATA[PROPERTY ClearedAndConfirmed : BOOL]]></Declaration>
+      <Get Name="Get" Id="{70df159d-fc9d-44c5-ae42-7d731a5dae12}">
+        <Declaration><![CDATA[VAR
+END_VAR
+]]></Declaration>
+        <Implementation>
+          <ST><![CDATA[ClearedAndConfirmed := (NOT _fbAlarmMessage.bRaised) AND (_fbAlarmMessage.eConfirmationState <> TcEventConfirmationState.WaitForConfirmation);]]></ST>
+        </Implementation>
+      </Get>
+    </Property>
+    <Method Name="Init" Id="{c066689c-dd69-4f09-b5b0-76b34267abac}">
+      <Declaration><![CDATA[METHOD Init : BOOL
+VAR_INPUT
+	stEventType : TcEventEntry;
+	xWithConfirmation : BOOL;
+END_VAR
+]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[_fbAlarmMessage.CreateEx(stEventEntry := stEventType, bWithConfirmation := xWithConfirmation);]]></ST>
+      </Implementation>
+    </Method>
+  </POU>
+</TcPlcObject>
--- a/Uniper.tsproj
+++ b/Uniper.tsproj
@@ -263,7 +263,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{9AE64910-5EB2-4866-93FD-EFE059C38C36}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{9284B485-4CF2-58BB-E7AD-715AFD445915}" TmcPath="PLC\PLC.tmc">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{A0BDDF9C-C9F7-55C1-187A-F0E26785FA79}" TmcPath="PLC\PLC.tmc">
 					<Name>PLC Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="2" AreaNo="1">
@@ -272,31 +272,6 @@
 							<Name>MAIN._xShowAckEmergencyStop</Name>
 							<Type>BOOL</Type>
 						</Var>
-						<Var>
-							<Name>MAIN.xSafetyRun</Name>
-							<Comment><![CDATA[ Safety]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN.xSafetyErrAck</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._xShowErrorOnButton</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTowerLight.xRedLight</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTowerLight.xYellowLight</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTowerLight.xGreenLight</Name>
-							<Type>BOOL</Type>
-						</Var>
 						<Var>
 							<Name>MAIN._afbStrings[0].xCloseDCCB</Name>
 							<Comment><![CDATA[ Signal to close dc circuit breaker]]></Comment>
@@ -1301,6 +1276,31 @@
 							<Comment><![CDATA[ Motor speed setpoint]]></Comment>
 							<Type>INT</Type>
 						</Var>
+						<Var>
+							<Name>MAIN.xSafetyRun</Name>
+							<Comment><![CDATA[ Safety]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN.xSafetyErrAck</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._xShowErrorOnButton</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTowerLight.xRedLight</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTowerLight.xYellowLight</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTowerLight.xGreenLight</Name>
+							<Type>BOOL</Type>
+						</Var>
 					</Vars>
 					<Vars VarGrpType="1">
 						<Name>PlcTask Inputs</Name>
@@ -1312,95 +1312,6 @@
 							<Name>MAIN.xNAProtectionOK</Name>
 							<Type>BOOL</Type>
 						</Var>
-						<Var>
-							<Name>MAIN.xSafetyResterTaster</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._xHarwareResetButton</Name>
-							<Comment><![CDATA[ Hardware reset button]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbSafety.xVoltagesInRange</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbSafety.xPressureInRange</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbSafety.xTemperaturesInRange</Name>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._uiEtherCATState</Name>
-							<Comment><![CDATA[ String EtherCAT state]]></Comment>
-							<Type>UINT</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString1.iAnalogValue</Name>
-							<Comment><![CDATA[ Analog input value]]></Comment>
-							<Type>INT</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString1.xUnderrange</Name>
-							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString1.xOverrange</Name>
-							<Comment><![CDATA[ Input is overloaded]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString1.xErrorCard</Name>
-							<Comment><![CDATA[ Input card has error
- EL30xx also sets this if an underrange or overrange error is present]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString2.iAnalogValue</Name>
-							<Comment><![CDATA[ Analog input value]]></Comment>
-							<Type>INT</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString2.xUnderrange</Name>
-							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString2.xOverrange</Name>
-							<Comment><![CDATA[ Input is overloaded]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetSCSString2.xErrorCard</Name>
-							<Comment><![CDATA[ Input card has error
- EL30xx also sets this if an underrange or overrange error is present]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetBMS.iAnalogValue</Name>
-							<Comment><![CDATA[ Analog input value]]></Comment>
-							<Type>INT</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetBMS.xUnderrange</Name>
-							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetBMS.xOverrange</Name>
-							<Comment><![CDATA[ Input is overloaded]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>MAIN._fbTempCabinetBMS.xErrorCard</Name>
-							<Comment><![CDATA[ Input card has error
- EL30xx also sets this if an underrange or overrange error is present]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
 						<Var>
 							<Name>MAIN._afbStrings[0].xECWcState</Name>
 							<Type>BOOL</Type>
@@ -7102,6 +7013,95 @@
 						<Var>
 							<Name>MAIN._afbStrings[1]._fbStringCurrent.xErrorCard</Name>
 							<Comment><![CDATA[ Input card has error
+ EL30xx also sets this if an underrange or overrange error is present]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN.xSafetyResterTaster</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._xHarwareResetButton</Name>
+							<Comment><![CDATA[ Hardware reset button]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbSafety.xVoltagesInRange</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbSafety.xPressureInRange</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbSafety.xTemperaturesInRange</Name>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._uiEtherCATState</Name>
+							<Comment><![CDATA[ String EtherCAT state]]></Comment>
+							<Type>UINT</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString1.iAnalogValue</Name>
+							<Comment><![CDATA[ Analog input value]]></Comment>
+							<Type>INT</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString1.xUnderrange</Name>
+							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString1.xOverrange</Name>
+							<Comment><![CDATA[ Input is overloaded]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString1.xErrorCard</Name>
+							<Comment><![CDATA[ Input card has error
+ EL30xx also sets this if an underrange or overrange error is present]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString2.iAnalogValue</Name>
+							<Comment><![CDATA[ Analog input value]]></Comment>
+							<Type>INT</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString2.xUnderrange</Name>
+							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString2.xOverrange</Name>
+							<Comment><![CDATA[ Input is overloaded]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetSCSString2.xErrorCard</Name>
+							<Comment><![CDATA[ Input card has error
+ EL30xx also sets this if an underrange or overrange error is present]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetBMS.iAnalogValue</Name>
+							<Comment><![CDATA[ Analog input value]]></Comment>
+							<Type>INT</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetBMS.xUnderrange</Name>
+							<Comment><![CDATA[ Card has detected an open circuit]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetBMS.xOverrange</Name>
+							<Comment><![CDATA[ Input is overloaded]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+						<Var>
+							<Name>MAIN._fbTempCabinetBMS.xErrorCard</Name>
+							<Comment><![CDATA[ Input card has error
 EL30xx also sets this if an underrange or overrange error is present]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
--- a/UniperEvents.tmc
+++ b/UniperEvents.tmc
@@ -66,7 +66,7 @@
 			</Hides>
 		</DataType>
 		<DataType>
-			<Name GUID="{38B06309-F943-4A07-B886-7794168DA12C}">BMSEvents</Name>
+			<Name GUID="{15B292FB-2865-4A12-B6F6-7CC6F040F457}">BMSEvents</Name>
 			<DisplayName TxtId=""><![CDATA[String event class]]></DisplayName>
 			<EventId>
 				<Name Id="1">NotAllCompInAuto</Name>
@@ -143,6 +143,21 @@
 				<DisplayName TxtId=""><![CDATA[NAProtection tripped]]></DisplayName>
 				<Severity>Error</Severity>
 			</EventId>
+			<EventId>
+				<Name Id="16">StringReadyTimeout</Name>
+				<DisplayName TxtId=""><![CDATA[String did not respond with ready signal in time]]></DisplayName>
+				<Severity>Error</Severity>
+			</EventId>
+			<EventId>
+				<Name Id="17">BatteryAlreadyFull</Name>
+				<DisplayName TxtId=""><![CDATA[Battery is already full]]></DisplayName>
+				<Severity>Warning</Severity>
+			</EventId>
+			<EventId>
+				<Name Id="18">BatteryAlreadyEmpty</Name>
+				<DisplayName TxtId=""><![CDATA[Battery is already empty]]></DisplayName>
+				<Severity>Warning</Severity>
+			</EventId>
 			<Hides>
 				<Hide GUID="{1D326C00-DF37-4B94-8E0D-C22524EB2E89}"/>
 				<Hide GUID="{E7132508-795D-4A6C-AFB1-FED6C1DE44FD}"/>
@@ -167,6 +182,9 @@
 				<Hide GUID="{58BB5280-6EA8-4841-8B84-F66A8442CCAE}"/>
 				<Hide GUID="{533FD64E-DB47-4CEE-B1FE-56FF11855B32}"/>
 				<Hide GUID="{A9772971-CD78-465C-8E48-55EB7EA9B235}"/>
+				<Hide GUID="{38B06309-F943-4A07-B886-7794168DA12C}"/>
+				<Hide GUID="{C5989D51-C416-407D-91C1-68DFCCF19D2C}"/>
+				<Hide GUID="{E2E9B78A-AB33-453C-9D00-EFACF1A47180}"/>
 			</Hides>
 		</DataType>
 		<DataType>