Merge branch 'develop' into FOGL-9094

docs/index.rst

@@ -1,4 +1,6 @@
-.. |dnp3| image:: images/dnp3.jpg
+.. |dnp3| image:: images/dnp3_1.jpg
+.. |dnp3_2| image:: images/dnp3_2.jpg
+.. |dnp3_3| image:: images/dnp3_3.jpg
 
 DNP3 Master Plugin
 ==================
@@ -18,13 +20,31 @@ The *fledge-south-dnp3* allows Fledge to act as a DNP3 master and gather data fr
   - **Outstation port**: The post on the Out Station to which the connection is established.
 
   - **Outstation link Id**: The Out Station link id.
+
+.. note::
+
+Note:
+
+The Outstation address, port and link Id will be ignored if the list of out stations has one or more entries in it. The global outstation definition is only retained for backward compatibility.
 
   - **Data scan**: Enable or disable the scanning of all objects and values in the Out Station.  This is the Integrity Poll for all Classes.
 
   - **Scan interval**: The interval between data scans of the Out Station.
 
   - **Network timeout**: Timeout for fetching data from the Out Station expressed in seconds.
 
+  - **DNP3 debug objects**: DNP3 communication and data objects logging. In order to have these messages logged the service log level must be set to 'info' or 'debug'.
+
++----------+
+| |dnp3_2| |
++----------+
+
+  - **Outstations tab**: A list of outstations. Each item in the list consists of three properties, the Outstation address, port and link id. If this list is populated with one or more outstations then the global 'Outstation address', 'Outstation port' and 'Outstation link Id' will be ignored.
+
++----------+
+| |dnp3_3| |
++----------+
+
 
 DNP3 Out Station Testing
 ------------------------