Merge branch 'develop'

MyEMS · Dec 2, 2023 · 77ce42f · 77ce42f
2 parents 55377e6 + 44719b3
commit 77ce42f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - added charge time and discharge time settings to power conversion system of microgrid
 - added nominal voltage to microgrid battery in database, myems-api and myems-admin
+- added new supported protocol to datasource in myems-api
 ### Changed
 -
 ### Fixed

diff --git a/myems-api/core/datasource.py b/myems-api/core/datasource.py
@@ -101,7 +101,7 @@ def on_post(req, resp):
                 ('bacnet-ip',
                  'cassandra',
                  'clickhouse',
-                 'coap'
+                 'coap',
                  'controllogix',
                  'dlt645',
                  'elexon-bmrs',
@@ -111,7 +111,8 @@ def on_post(req, resp):
                  'modbus-rtu',
                  'modbus-tcp',
                  'mongodb',
-                 'mqtt-seg'
+                 'mqtt-md4220',
+                 'mqtt-seg',
                  'mqtt',
                  'mysql',
                  'opc-ua',
@@ -325,7 +326,7 @@ def on_put(req, resp, id_):
                 ('bacnet-ip',
                  'cassandra',
                  'clickhouse',
-                 'coap'
+                 'coap',
                  'controllogix',
                  'dlt645',
                  'elexon-bmrs',
@@ -335,7 +336,8 @@ def on_put(req, resp, id_):
                  'modbus-rtu',
                  'modbus-tcp',
                  'mongodb',
-                 'mqtt-seg'
+                 'mqtt-md4220',
+                 'mqtt-seg',
                  'mqtt',
                  'mysql',
                  'opc-ua',