Added device information properties

Author: docbender

org.openhab.binding.simatic/src/main/java/org/openhab/binding/simatic/internal/handler/simaticBridgeHandler.java

@@ -83,7 +83,7 @@ public SimaticBridgeHandler(Bridge bridge) {
     @SuppressWarnings("null")
     @Override
     public void initialize() {
-        updateProperty(SimaticBindingConstants.PROPERTY_VERSION, SimaticBindingConstants.VERSION);
+        updateProperty(SimaticBindingConstants.PROPERTY_BINDING_VERSION, SimaticBindingConstants.VERSION);
 
         config = getConfigAs(SimaticBridgeConfiguration.class);
 
@@ -167,6 +167,34 @@ public void initialize() {
                         String.valueOf(connection.getReadAreas().size()));
                 updateProperty(SimaticBindingConstants.PROPERTY_AREAS,
                         (connection.getReadAreas().size() == 0) ? "none" : connection.getReadAreas().toString());
+                if (connection.info.getPlcName() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_PLC_NAME, connection.info.getPlcName());
+                }
+                if (connection.info.getModuleName() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_MODULE_NAME, connection.info.getModuleName());
+                }
+                if (connection.info.getModuleTypeName() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_MODULE_NAME_TYPE,
+                            connection.info.getModuleTypeName());
+                }
+                if (connection.info.getCopyright() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_COPYRIGHT, connection.info.getCopyright());
+                }
+                if (connection.info.getSerialNumber() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_SERIAL, connection.info.getSerialNumber());
+                }
+                if (connection.info.getOrderNr() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_ORDER_NUMBER, connection.info.getOrderNr());
+                }
+                if (connection.info.getHwVersion() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_HW_VERSION, connection.info.getHwVersion());
+                }
+                if (connection.info.getFwVersion() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_FW_VERSION, connection.info.getFwVersion());
+                }
+                if (connection.info.getMemorySize() != null) {
+                    updateProperty(SimaticBindingConstants.PROPERTY_MEMORY_SIZE, connection.info.getMemorySize());
+                }
 
                 updateStatus(ThingStatus.ONLINE);
             } else {

org.openhab.binding.simatic/src/main/java/org/openhab/binding/simatic/internal/simatic/SimaticGenericDevice.java

@@ -67,6 +67,7 @@ public class SimaticGenericDevice implements SimaticIDevice {
     protected final AtomicBoolean tryReconnect = new AtomicBoolean(false);
     /** PDU size **/
     protected int pduSize = 0;
+    public final SimaticDeviceInfo info = new SimaticDeviceInfo();
     protected final Charset charset;
     protected final SimaticUpdateMode updateMode;
 

org.openhab.binding.simatic/src/main/java/org/openhab/binding/simatic/internal/simatic/SimaticTCP.java

@@ -138,6 +138,8 @@ public Boolean open() {
                 portState.setState(PortStates.LISTENING);
                 // prepare data after PDU is negotiated
                 prepareData();
+                // request device info
+                info.getInfo(dc);
                 setConnected(true);
             } else {
                 logger.error("{} - cannot connect to PLC", this.toString());

org.openhab.binding.simatic/src/main/java/org/openhab/binding/simatic/internal/simaticBindingConstants.java

@@ -39,10 +39,19 @@ public class SimaticBindingConstants {
     public static final String CHANNEL_BYTES = "chBytesTypeID";
 
     // List of all Property IDs
-    public static final String PROPERTY_VERSION = "version";
+    public static final String PROPERTY_BINDING_VERSION = "bindingVersion";
     public static final String PROPERTY_PDU = "pdu";
     public static final String PROPERTY_AREAS_COUNT = "areasCount";
     public static final String PROPERTY_AREAS = "areas";
+    public static final String PROPERTY_PLC_NAME = "plcName";
+    public static final String PROPERTY_MODULE_NAME = "moduleName";
+    public static final String PROPERTY_MODULE_NAME_TYPE = "moduleNameType";
+    public static final String PROPERTY_COPYRIGHT = "copyright";
+    public static final String PROPERTY_SERIAL = "serialNumber";
+    public static final String PROPERTY_ORDER_NUMBER = "orderNumber";
+    public static final String PROPERTY_HW_VERSION = "hardwareVersion";
+    public static final String PROPERTY_FW_VERSION = "firmwareVersion";
+    public static final String PROPERTY_MEMORY_SIZE = "workingMemorySize";
 
     // List of all Channel Type UIDs
     public static final ChannelTypeUID CHANNEL_TYPE_TAG_COUNT = new ChannelTypeUID(BINDING_ID, CHANNEL_TAG_COUNT);

org.openhab.binding.simatic/src/main/resources/OH-INF/thing/thing-types.xml

@@ -13,11 +13,11 @@
 			<channel id="Bytes" typeId="chBytesTypeID"/>
 		</channels>
 		<properties>
-			<property name="version">4.0</property>
+			<property name="bindingVersion">-</property>
 			<property name="vendor">Siemens</property>
-			<property name="pdu">Unknown</property>
-			<property name="areasCount">Unknown</property>
-			<property name="areas">Unknown</property>
+			<property name="pdu">-</property>
+			<property name="areasCount">-</property>
+			<property name="areas">-</property>
 		</properties>
 		<config-description>
 			<parameter name="address" type="text" required="true">