Merge pull request #44 from cnpem-sei/PR-update-variables-BSMP-FACs-FAPs

Changed ID of BSMP variables in FAC-DCDC and FAC-DCDC-EMA and FAPs

CHANGES.md

@@ -1,11 +1,18 @@
 # Changelog
 
-## [2.1.0] - 2022-01-18
+## [2.2.0] - 2023-02-27
+### Changed:
+- ID of BSMP variables in FAC-DCDC and FAC-DCDC-EMA 
+- ID of BSMP variables in FAP-4P and FAP-2P2S 
+
+### Removed:
+- "Ground Leakage Overcurrent" from FAC-DCDC and FAC-DCDC-EMA module alarm and interlock lists
+
+## [2.1.0] - 2023-01-18
 ### Added:
 - SWLS resonant converter PS module specification
 - Leakage overcurrent interlock for FAC-DCDC and FAC-DCDC-EMA
 
-
 ### Changed:
 - Fixed variable type for IIB interlock and alarm registers from FAC-DCDC-EMA PS module
 

src/pydrs/__init__.py

@@ -1,4 +1,4 @@
 from .pydrs import EthDRS, GenericDRS, SerialDRS  # noqa: F401
 
-__version__ = "2.1.0"
-__date__ = "18/01/2023"
+__version__ = "2.2.0"
+__date__ = "27/02/2023"

src/pydrs/consts/__init__.py

@@ -22,7 +22,7 @@
 COM_REQUEST_CURVE = "\x40"
 COM_SEND_WFM_REF = "\x41"
 
-UDC_FIRMWARE_VERSION = "0.44.01    08/22"
+UDC_FIRMWARE_VERSION = "0.45.00    01/23"
 
 ufm_offset = {
     "serial": 0,

src/pydrs/consts/fac.py

@@ -105,7 +105,6 @@
     "Bottom Driver 2 Error",
     "Inductors Overtemperature",
     "Heat-Sink Overtemperature",
-    "Ground Leakage Overcurrent",
     "Board IIB Overtemperature",
     "Module Overhumidity",
 ]
@@ -121,7 +120,6 @@
     "Driver 2 Overcurrent",
     "Inductors Overtemperature",
     "Heat-Sink Overtemperature",
-    "Ground Leakage Overcurrent",
     "Board IIB Overtemperature",
     "Module Overhumidity",
 ]
@@ -260,7 +258,6 @@
     "Bottom Driver 2 Error",
     "Inductors Overtemperature",
     "Heat-Sink Overtemperature",
-    "Ground Leakage Overcurrent",
     "Board IIB Overtemperature",
     "Module Overhumidity",
 ]
@@ -276,7 +273,6 @@
     "Driver 2 Overcurrent",
     "Inductors Overtemperature",
     "Heat-Sink Overtemperature",
-    "Ground Leakage Overcurrent",
     "Board IIB Overtemperature",
     "Module Overhumidity",
 ]
@@ -343,17 +339,17 @@
     "i_load2": {"addr": 35, "format": "f", "size": 4, "egu": "A"},
     "v_capacitor_bank": {"addr": 36, "format": "f", "size": 4, "egu": "V"},
     "duty_cycle": {"addr": 37, "format": "f", "size": 4, "egu": "p.u."},
-    "v_input_iib": {"addr": 38, "format": "f", "size": 4, "egu": "V"},
-    "i_input_iib": {"addr": 39, "format": "f", "size": 4, "egu": "A"},
-    "i_output_iib": {"addr": 40, "format": "f", "size": 4, "egu": "A"},
-    "temp_igbts_1_iib": {"addr": 41, "format": "f", "size": 4, "egu": "°C"},
-    "temp_igbts_2_iib": {"addr": 42, "format": "f", "size": 4, "egu": "°C"},
-    "temp_inductor_iib": {"addr": 43, "format": "f", "size": 4, "egu": "°C"},
-    "temp_heatsink_iib": {"addr": 44, "format": "f", "size": 4, "egu": "°C"},
-    "v_driver_iib": {"addr": 45, "format": "f", "size": 4, "egu": "V"},
-    "i_driver_1_iib": {"addr": 46, "format": "f", "size": 4, "egu": "A"},
-    "i_driver_2_iib": {"addr": 47, "format": "f", "size": 4, "egu": "A"},
-    "i_leakage_iib": {"addr": 48, "format": "f", "size": 4, "egu": "A"},
+    "i_leakage": {"addr": 38, "format": "f", "size": 4, "egu": "A"},
+    "v_input_iib": {"addr": 39, "format": "f", "size": 4, "egu": "V"},
+    "i_input_iib": {"addr": 40, "format": "f", "size": 4, "egu": "A"},
+    "i_output_iib": {"addr": 41, "format": "f", "size": 4, "egu": "A"},
+    "temp_igbts_1_iib": {"addr": 42, "format": "f", "size": 4, "egu": "°C"},
+    "temp_igbts_2_iib": {"addr": 43, "format": "f", "size": 4, "egu": "°C"},
+    "temp_inductor_iib": {"addr": 44, "format": "f", "size": 4, "egu": "°C"},
+    "temp_heatsink_iib": {"addr": 45, "format": "f", "size": 4, "egu": "°C"},
+    "v_driver_iib": {"addr": 46, "format": "f", "size": 4, "egu": "V"},
+    "i_driver_1_iib": {"addr": 47, "format": "f", "size": 4, "egu": "A"},
+    "i_driver_2_iib": {"addr": 48, "format": "f", "size": 4, "egu": "A"},
     "temp_board_iib": {"addr": 49, "format": "f", "size": 4, "egu": "°C"},
     "rh_iib": {"addr": 50, "format": "f", "size": 4, "egu": "%"},
     "iib_interlocks": {"addr": 51, "format": "I", "size": 4, "egu": ""},
@@ -365,17 +361,17 @@
     "i_load": {"addr": 33, "format": "f", "size": 4, "egu": "A"},
     "v_dclink": {"addr": 34, "format": "f", "size": 4, "egu": "V"},
     "duty_cycle": {"addr": 35, "format": "f", "size": 4, "egu": "p.u."},
-    "v_input_iib": {"addr": 36, "format": "f", "size": 4, "egu": "V"},
-    "i_input_iib": {"addr": 37, "format": "f", "size": 4, "egu": "A"},
-    "i_output_iib": {"addr": 38, "format": "f", "size": 4, "egu": "A"},
-    "temp_igbts_1_iib": {"addr": 39, "format": "f", "size": 4, "egu": "°C"},
-    "temp_igbts_2_iib": {"addr": 40, "format": "f", "size": 4, "egu": "°C"},
-    "temp_inductor_iib": {"addr": 41, "format": "f", "size": 4, "egu": "°C"},
-    "temp_heatsink_iib": {"addr": 42, "format": "f", "size": 4, "egu": "°C"},
-    "v_driver_iib": {"addr": 43, "format": "f", "size": 4, "egu": "V"},
-    "i_driver_1_iib": {"addr": 44, "format": "f", "size": 4, "egu": "A"},
-    "i_driver_2_iib": {"addr": 45, "format": "f", "size": 4, "egu": "A"},
-    "i_leakage_iib": {"addr": 46, "format": "f", "size": 4, "egu": "A"},
+    "i_leakage": {"addr": 36, "format": "f", "size": 4, "egu": "A"},
+    "v_input_iib": {"addr": 37, "format": "f", "size": 4, "egu": "V"},
+    "i_input_iib": {"addr": 38, "format": "f", "size": 4, "egu": "A"},
+    "i_output_iib": {"addr": 39, "format": "f", "size": 4, "egu": "A"},
+    "temp_igbts_1_iib": {"addr": 40, "format": "f", "size": 4, "egu": "°C"},
+    "temp_igbts_2_iib": {"addr": 41, "format": "f", "size": 4, "egu": "°C"},
+    "temp_inductor_iib": {"addr": 42, "format": "f", "size": 4, "egu": "°C"},
+    "temp_heatsink_iib": {"addr": 43, "format": "f", "size": 4, "egu": "°C"},
+    "v_driver_iib": {"addr": 44, "format": "f", "size": 4, "egu": "V"},
+    "i_driver_1_iib": {"addr": 45, "format": "f", "size": 4, "egu": "A"},
+    "i_driver_2_iib": {"addr": 46, "format": "f", "size": 4, "egu": "A"},
     "temp_board_iib": {"addr": 47, "format": "f", "size": 4, "egu": "°C"},
     "rh_iib": {"addr": 48, "format": "f", "size": 4, "egu": "%"},
     "iib_interlocks": {"addr": 49, "format": "I", "size": 4, "egu": ""},