Merge branch 'develop'

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
--
+- added new protocols dtu-rtu, dtu-tcp and dtu-mqtt
 ### Changed
 - updated Distribution System in myems-web
 ### Fixed

myems-admin/app/controllers/settings/datasource/datasource.controller.js

@@ -47,6 +47,9 @@ app.controller('DataSourceController', function(
 			{"id":"coap", "name": "CoAP"},
 			{"id":"controllogix", "name": "ControlLogix"},
 			{"id":"dlt645", "name": "DL/T645"},
+			{"id":"dtu-rtu", "name": "DTU-RTU"},
+			{"id":"dtu-tcp", "name": "DTU-TCP"},
+			{"id":"dtu-mqtt", "name": "DTU-MQTT"},
 			{"id":"elexon-bmrs", "name": "Elexon BMRS"},
 			{"id":"iec104", "name": "IEC104"},
 			{"id":"influxdb", "name": "InfluxDB"},

myems-api/core/datasource.py

@@ -105,6 +105,9 @@ class DataSourceCollection:
                  'coap',
                  'controllogix',
                  'dlt645',
+                 'dtu-rtu',
+                 'dtu-tcp',
+                 'dtu-mqtt',
                  'elexon-bmrs',
                  'iec104',
                  'influxdb',
@@ -334,6 +337,9 @@ class DataSourceItem:
                  'coap',
                  'controllogix',
                  'dlt645',
+                 'dtu-rtu',
+                 'dtu-tcp',
+                 'dtu-mqtt',
                  'elexon-bmrs',
                  'iec104',
                  'influxdb',
@@ -620,6 +626,9 @@ class DataSourceImport:
                  'coap',
                  'controllogix',
                  'dlt645',
+                 'dtu-rtu',
+                 'dtu-tcp',
+                 'dtu-mqtt',
                  'elexon-bmrs',
                  'iec104',
                  'influxdb',