From 4a00a4c41442eb892cd1792b645e03402a26145c Mon Sep 17 00:00:00 2001
From: Matthias Heisig <matthias.heisig@cmblu.de>
Date: Tue, 8 Apr 2025 07:24:55 +0200
Subject: [PATCH] Added Modbus registers

---
 .../HoldingRegisters/ST_MODBUS_REG_13.TcDUT   | 27 +++++++++++++++++++
 PLC/GVLs/GVL_CONFIG.TcGVL                     |  3 ++-
 PLC/GVLs/GVL_MODBUS.TcGVL                     | 11 +++++++-
 PLC/PLC.plcproj                               |  5 +++-
 Uniper.sln                                    |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 PLC/DUTs/Modbus/HoldingRegisters/ST_MODBUS_REG_13.TcDUT

diff --git a/PLC/DUTs/Modbus/HoldingRegisters/ST_MODBUS_REG_13.TcDUT b/PLC/DUTs/Modbus/HoldingRegisters/ST_MODBUS_REG_13.TcDUT
new file mode 100644
index 0000000..40046e0
--- /dev/null
+++ b/PLC/DUTs/Modbus/HoldingRegisters/ST_MODBUS_REG_13.TcDUT
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
+  <DUT Name="ST_MODBUS_REG_13" Id="{ff1eee07-3bd7-4808-a42a-073911e581d6}">
+    <Declaration><![CDATA[TYPE ST_MODBUS_REG_13 :
+STRUCT
+	// String warning active flags
+	// Addr: 13.000
+	wBMSWarningActive : WORD;
+	
+	// String error active
+	// Addr: 13.001
+	wBMSErrorActive : WORD;
+
+	// String warning active flags
+	// (Bit 0 -> String 1, Bit 1 -> String 2, etc.) 
+	// Addr: 13.002
+	wStringWarningActive : WORD;
+	
+	// String error active
+	// (Bit 0 -> String 1, Bit 1 -> String 2, etc.)
+	// Addr: 13.003 
+	wStringErrorActive : WORD;
+END_STRUCT
+END_TYPE
+]]></Declaration>
+  </DUT>
+</TcPlcObject>
\ No newline at end of file
diff --git a/PLC/GVLs/GVL_CONFIG.TcGVL b/PLC/GVLs/GVL_CONFIG.TcGVL
index eb8d6b0..9235595 100644
--- a/PLC/GVLs/GVL_CONFIG.TcGVL
+++ b/PLC/GVLs/GVL_CONFIG.TcGVL
@@ -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.11">
   <GVL Name="GVL_CONFIG" Id="{0773bf51-0237-454d-a970-cfd896054edb}">
     <Declaration><![CDATA[{attribute 'qualified_only'}
 VAR_GLOBAL CONSTANT
@@ -7,6 +7,7 @@ VAR_GLOBAL CONSTANT
 	// Number of active strings
 	// ===========================
 	uiNumberOfStrings : UINT := 2;
+	uiNumberOfUnits : UINT := uiNumberOfStrings * 12;
 END_VAR
 VAR_GLOBAL PERSISTENT
 	// ===========================
diff --git a/PLC/GVLs/GVL_MODBUS.TcGVL b/PLC/GVLs/GVL_MODBUS.TcGVL
index 4f04cc1..bb764f5 100644
--- a/PLC/GVLs/GVL_MODBUS.TcGVL
+++ b/PLC/GVLs/GVL_MODBUS.TcGVL
@@ -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.11">
   <GVL Name="GVL_MODBUS" Id="{913a9222-1338-4c08-b758-91c1bd26dcd9}">
     <Declaration><![CDATA[{attribute 'qualified_only'}
 VAR_GLOBAL
@@ -16,6 +16,15 @@ VAR_GLOBAL
 			eChargeStatus := E_CHARGE_STATUS.UNDEFINED,
 			eBatteryStatus := E_BATTERY_STATUS.OFF)
 	);
+	
+	// Addr: 13.000
+	stBMSErrorReg : ST_MODBUS_REG_13;
+	
+	// Addr: 14.000 -> 14.023
+	awWarningsUnitsActive : ARRAY [0..(GVL_CONFIG.uiNumberOfUnits-1)] OF WORD;
+	
+	// Addr: 15.000 -> 15.023
+	awErrorsUnitsActive : ARRAY [0..(GVL_CONFIG.uiNumberOfUnits-1)] OF WORD;
 END_VAR]]></Declaration>
   </GVL>
 </TcPlcObject>
\ No newline at end of file
diff --git a/PLC/PLC.plcproj b/PLC/PLC.plcproj
index 6fb6a4e..6fed435 100644
--- a/PLC/PLC.plcproj
+++ b/PLC/PLC.plcproj
@@ -9,7 +9,7 @@
     <WriteProductVersion>true</WriteProductVersion>
     <GenerateTpy>false</GenerateTpy>
     <Name>PLC</Name>
-    <ProgramVersion>3.1.4026.12</ProgramVersion>
+    <ProgramVersion>3.1.4026.14</ProgramVersion>
     <Application>{afd0b275-de2f-4006-ab0f-6826ccfce7be}</Application>
     <TypeSystem>{18a2eab9-0077-4cea-9d3b-9a168bdf0814}</TypeSystem>
     <Implicit_Task_Info>{6e35f35d-280b-4da2-9c5b-fc35ab6da425}</Implicit_Task_Info>
@@ -66,6 +66,9 @@
     <Compile Include="DUTs\Modbus\HoldingRegisters\ST_MODBUS_REG_12.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DUTs\Modbus\HoldingRegisters\ST_MODBUS_REG_13.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="DUTs\Modbus\ST_EMS_MODBUS_INTERFACE.TcDUT">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Uniper.sln b/Uniper.sln
index 56345bb..4114438 100644
--- a/Uniper.sln
+++ b/Uniper.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # TcXaeShell Solution File, Format Version 11.00
-VisualStudioVersion = 15.0.33403.129
+VisualStudioVersion = 17.7.34302.85
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "Uniper", "Uniper.tsproj", "{24BCEDE3-526F-4D87-A687-3DBA9D107213}"
 EndProject