From 706e04a7a84f543294a3ea46f4e791a0af543052 Mon Sep 17 00:00:00 2001
From: Martin Jobst <martin.jobst@posteo.de>
Date: Fri, 13 Sep 2024 12:17:49 +0200
Subject: [PATCH 1/2] Add types for modbus-ng interface

---
 .../typelib/modbus_ng/ModbusBusAdapter.adp    | 31 ++++++++++++++
 .../typelib/modbus_ng/ModbusMaster.fbt        | 40 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
 create mode 100644 data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusMaster.fbt

diff --git a/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
new file mode 100644
index 0000000000..a9a2e6cc61
--- /dev/null
+++ b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AdapterType Name="ModbusBusAdapter" Comment="Modbus Bus Adapter">
+	<Identification Standard="61499-1" Description="Copyright (c) 2024 Martin Erich Jobst&#10; &#10;This program and the accompanying materials are made&#10;available under the terms of the Eclipse Public License 2.0&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#10;&#10;SPDX-License-Identifier: EPL-2.0" >
+	</Identification>
+	<VersionInfo Version="1.0" Author="Martin Erich Jobst" Date="2024-09-12">
+	</VersionInfo>
+	<CompilerInfo>
+	</CompilerInfo>
+	<InterfaceList>
+		<EventInputs>
+			<Event Name="INIT0" Type="Event" Comment="">
+				<With Var="QO"/>
+			</Event>
+		</EventInputs>
+		<EventOutputs>
+			<Event Name="INIT" Type="Event" Comment="">
+				<With Var="QI"/>
+				<With Var="MasterId"/>
+				<With Var="Index"/>
+			</Event>
+		</EventOutputs>
+		<InputVars>
+			<VarDeclaration Name="QO" Type="BOOL" Comment=""/>
+		</InputVars>
+		<OutputVars>
+			<VarDeclaration Name="QI" Type="BOOL" Comment=""/>
+			<VarDeclaration Name="MasterId" Type="UINT" Comment=""/>
+			<VarDeclaration Name="Index" Type="UINT" Comment=""/>
+		</OutputVars>
+	</InterfaceList>
+</AdapterType>
diff --git a/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusMaster.fbt b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusMaster.fbt
new file mode 100644
index 0000000000..bbd6012a50
--- /dev/null
+++ b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusMaster.fbt
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FBType Name="ModbusMaster" Comment="Modbus Master">
+	<Identification Standard="61499-2" Description="Copyright (c) 2024 Martin Erich Jobst&#10; &#10;This program and the accompanying materials are made&#10;available under the terms of the Eclipse Public License 2.0&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#10;&#10;SPDX-License-Identifier: EPL-2.0" >
+	</Identification>
+	<VersionInfo Version="1.0" Author="Martin Erich Jobst" Date="2024-09-12">
+	</VersionInfo>
+	<CompilerInfo>
+	</CompilerInfo>
+	<InterfaceList>
+		<EventInputs>
+			<Event Name="INIT" Type="Event" Comment="Service Initialization">
+				<With Var="QI"/>
+				<With Var="Address"/>
+				<With Var="Port"/>
+			</Event>
+		</EventInputs>
+		<EventOutputs>
+			<Event Name="INITO" Type="Event" Comment="Initialization Confirm">
+				<With Var="QO"/>
+				<With Var="STATUS"/>
+			</Event>
+			<Event Name="IND" Type="Event" Comment="Indication from Resource">
+				<With Var="QO"/>
+				<With Var="STATUS"/>
+			</Event>
+		</EventOutputs>
+		<InputVars>
+			<VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier"/>
+			<VarDeclaration Name="Address" Type="WSTRING" Comment="Modbus Address"/>
+			<VarDeclaration Name="Port" Type="WSTRING" Comment="Modbus Port"/>
+		</InputVars>
+		<OutputVars>
+			<VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier"/>
+			<VarDeclaration Name="STATUS" Type="WSTRING" Comment="Service Status"/>
+		</OutputVars>
+		<Plugs>
+			<AdapterDeclaration Name="BusAdapterOut" Type="ModbusBusAdapter" Comment=""/>
+		</Plugs>
+	</InterfaceList>
+</FBType>

From 946497854ff98e1cf8e4a613dc2e72eb57e38eb3 Mon Sep 17 00:00:00 2001
From: Martin Jobst <martin.jobst@posteo.de>
Date: Tue, 28 Jan 2025 14:13:55 +0100
Subject: [PATCH 2/2] Fix typo in ModbusBusAdapter.adp

---
 .../typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
index a9a2e6cc61..d9e9472204 100644
--- a/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
+++ b/data/typelibrary/io-1.0.0/typelib/modbus_ng/ModbusBusAdapter.adp
@@ -8,7 +8,7 @@
 	</CompilerInfo>
 	<InterfaceList>
 		<EventInputs>
-			<Event Name="INIT0" Type="Event" Comment="">
+			<Event Name="INITO" Type="Event" Comment="">
 				<With Var="QO"/>
 			</Event>
 		</EventInputs>