Change from wait mode to disable

code/drv_ea/src/wattrex_driver_ea/drv_ea.py

@@ -111,8 +111,8 @@ def __init__(self, config: DrvScpiSerialConfC) -> None:
         self.__tx_chan.send_data(add_msg)
         self.__rx_chan.delete_until_last()
         self.__wait_4_response: bool = False
-        self.__last_mode: DrvBasePwrModeE = DrvBasePwrModeE.WAIT
-        self.last_data: DrvEaDataC = DrvEaDataC(mode = DrvBasePwrModeE.WAIT,
+        self.__last_mode: DrvBasePwrModeE = DrvBasePwrModeE.DISABLE
+        self.last_data: DrvEaDataC = DrvEaDataC(mode = DrvBasePwrModeE.DISABLE,
                                                 status = DrvBaseStatusE.OK,
                                                 current = 0, voltage = 0, power = 0)
 
@@ -157,8 +157,10 @@ def read_buffer(self) -> None: #pylint: disable=too-many-branches, too-many-stat
                         elif all (x in data for x in ("error", "Error", "ERROR")):
                             self.last_data.status = DrvBaseStatusE.COMM_ERROR #pylint: disable=attribute-defined-outside-init
                         elif 'OFF' in data:
-                            self.last_data.mode = DrvBasePwrModeE.WAIT #pylint: disable=attribute-defined-outside-init
-                        elif 'ON' in data and self.last_data.mode == DrvBasePwrModeE.WAIT:
+                            self.last_data.mode = self.__last_mode #pylint: disable=attribute-defined-outside-init
+                        elif ('ON' in data and
+                              (self.last_data.mode == DrvBasePwrModeE.WAIT or
+                               self.last_data.mode == DrvBasePwrModeE.DISABLE)):
                             self.last_data.mode = self.__last_mode #pylint: disable=attribute-defined-outside-init
                         elif data.startswith('EA'):
                             data = data.split(',')
@@ -186,7 +188,7 @@ def read_buffer(self) -> None: #pylint: disable=too-many-branches, too-many-stat
                             if power > 0:
                                 self.last_data.mode = self.__last_mode #pylint: disable=attribute-defined-outside-init
                             else:
-                                self.last_data.mode = DrvBasePwrModeE.WAIT #pylint: disable=attribute-defined-outside-init
+                                self.last_data.mode = DrvBasePwrModeE.DISABLE #pylint: disable=attribute-defined-outside-init
                             self.__wait_4_response = False
                         log.debug(f"Response: {data}")
             elif msg is None:
@@ -269,7 +271,7 @@ def get_data(self) -> DrvEaDataC:
         return self.last_data
 
 
-    def set_cc_mode(self, curr_ref: int, voltage_limit: int= None) -> None:
+    def set_cc_mode(self, curr_ref: int, voltage_limit: int|None= None) -> None:
         '''
         Use source in constant current mode.
         Sink mode will be set with negative current values.
@@ -314,7 +316,7 @@ def set_cc_mode(self, curr_ref: int, voltage_limit: int= None) -> None:
         self.read_buffer()
 
 
-    def set_cv_mode(self, volt_ref: int, current_limit: int= None) -> None:
+    def set_cv_mode(self, volt_ref: int, current_limit: int|None= None) -> None:
         '''
         Use source in constant voltage mode .
         Security current limit can be also set for both sink and source modes. 
@@ -364,6 +366,7 @@ def disable(self) -> None:
         Raises:
             - None 
         '''
+        self.__last_mode = DrvBasePwrModeE.DISABLE
         msg = DrvScpiCmdDataC(data_type = DrvScpiCmdTypeE.WRITE,
                                 port = self.__port,
                                 payload = _ScpiCmds.OUTPUT_OFF.value)

code/drv_ea/tests/example.py

@@ -35,7 +35,7 @@ def main():
     '''
     Example usage of drv_ea with a source_ea device.
     '''
-    ea_scpi_conf = DrvScpiSerialConfC(port = '/dev/ttyACM0', separator='\n', baudrate=38400,
+    ea_scpi_conf = DrvScpiSerialConfC(port = '/dev/wattrex/source/EA_2963640425', separator='\n', baudrate=38400,
                                             timeout=1, write_timeout=1)
 
     source = DrvEaDeviceC(config = ea_scpi_conf)