Merge pull request #54 from chrisdutz/develop

Another  PR

plc4cpp/protocols/driver-bases/base/pom.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.plc4x</groupId>
+    <artifactId>plc4cpp-protocols-driver-bases</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plc4cpp-protocol-driver-base</artifactId>
+  <name>PLC4Cpp: Protocol: Driver-Base: Base</name>
+  <description>Base classes needed to implement all of the other driver bases.</description>
+
+  <build>
+    <!-- This is probably not required, however it helps IntelliJ detect the files as sources -->
+    <sourceDirectory>src/main/cpp</sourceDirectory>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4cpp-api</artifactId>
+      <version>0.4.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>

plc4cpp/protocols/driver-bases/base/src/main/cmake/CMakeLists.txt

@@ -0,0 +1,58 @@
+#[[
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+]]
+
+cmake_minimum_required(VERSION 3.7)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_library(api ../../src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/connection/DefaultPlcFieldHandler.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/connection/PlcFieldHandler.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectedEvent.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/BaseDefaultFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigDecimalFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBigIntegerFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultBooleanFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteArrayFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultByteFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/items/DefaultDoubleFieldItem.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcReadRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/DefaultPlcWriteRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcFieldResponse.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcProprietaryResponse.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcReadRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcResponse.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/InternalPlcWriteRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryRequest.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcProprietaryResponse.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcReader.cpp
+        ../../src/main/cpp/org/apache/plc4x/cpp/base/messages/PlcWriter.cpp
+        )
+
+#[[
+    Import the boost headers
+]]
+target_include_directories (api PUBLIC ../../../../../${boost.include-directory})
+

plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.cpp

@@ -0,0 +1,55 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "AbstractPlcConnection.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+						PlcConnectionMetadata& AbstractPlcConnection::getMetadata()
+						{
+							return *this;
+						}
+						bool AbstractPlcConnection::canRead()
+						{
+							return false;
+						}
+						bool AbstractPlcConnection::canWrite()
+						{
+							return false;
+						}
+						bool AbstractPlcConnection::canSubscribe()
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+	}
+}

plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/AbstractPlcConnection.h

@@ -0,0 +1,79 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _ABSTRCT_PLC_HANDLER
+#define _ABSTRCT_PLC_HANDLER
+
+#include <boost/system/error_code.hpp>
+#include "../../../../../../../../../../../../api/src/main/cpp/org/apache/plc4x/cpp/api/PlcConnection.h"
+#include <string>
+
+using namespace org::apache::plc4x::cpp::api;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{
+						/**
+						 * Base class for implementing connections.
+						 * Per default, all operations (read, write, subscribe) are unsupported.
+						 * Concrete implementations should override the methods indicating connection capabilities
+						 * and for obtaining respective request builders.
+						 */
+						class AbstractPlcConnection : public PlcConnection, PlcConnectionMetadata
+						{
+
+						public:
+							PlcConnectionMetadata& getMetadata();
+							bool canRead();
+							bool canWrite();
+							bool canSubscribe();
+
+							virtual void open() = 0;
+							virtual void close() = 0;
+							virtual bool send(unsigned char* pBytesToSend, int iNumBytesToSend) = 0;
+
+							// Todo: Check if required
+							//PlcReadRequest.Builder readRequestBuilder();
+							// PlcWriteRequest.Builder writeRequestBuilder();
+							// PlcSubscriptionRequest.Builder subscriptionRequestBuilder();
+							// PlcUnsubscriptionRequest.Builder nsubscriptionRequestBuilder();
+
+						protected:
+							virtual void onReceive(const boost::system::error_code& errorCode, std::size_t bytes_transferred) = 0;
+						private:
+
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif
+

plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.cpp

@@ -0,0 +1,39 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#include "ChannelFactory.h"
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{						
+					}
+				}
+			}
+		}
+	}
+}

plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/ChannelFactory.h

@@ -0,0 +1,59 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#ifndef _CHANNEL_FACTORY
+#define _CHANNEL_FACTORY
+
+#include <boost/system/error_code.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/tcp.hpp>
+
+#include <string>
+
+using namespace boost::asio;
+using namespace boost::asio::ip;
+using boost::asio::ip::address;
+
+namespace org
+{
+	namespace apache
+	{
+		namespace plc4x
+		{
+			namespace cpp
+			{
+				namespace base
+				{
+					namespace connection
+					{						
+						class ChannelFactory 
+						{
+
+						public:							
+							virtual tcp::socket* createChannel() =  0;
+						};
+					}
+				}
+			}
+		}
+	}
+}
+
+#endif