diff --git a/PyExpLabSys/drivers/powerwalker_ethernet.py b/PyExpLabSys/drivers/powerwalker_ethernet.py index 2b06fea6..eb4d8925 100644 --- a/PyExpLabSys/drivers/powerwalker_ethernet.py +++ b/PyExpLabSys/drivers/powerwalker_ethernet.py @@ -1,7 +1,6 @@ import datetime import paramiko - class PowerWalkerEthernet(object): """ This driver uses the fact that the PowerWalker allows ssh-access, @@ -31,20 +30,19 @@ def _read_static_data(self): lines = [] for line in raw_lines: - if line.strip(): - lines.append(line.strip()) + lines.append(line.strip()) - nominal_input = int(lines[4][0:3]) - nominal_output = int(lines[4][4:]) + nominal_input = int(lines[5][0:3]) + nominal_output = int(lines[5][4:]) values = { - 'model': lines[2], - 'version': lines[6], + 'model': lines[3], + 'version': lines[7], 'nominal_input_voltage': nominal_input, 'nominal_output_voltage': nominal_output, - 'nominal_output_frequency': int(lines[10]) / 10.0, - 'rated_battery_voltage': int(lines[12]) / 10.0, - 'rated_va': int(lines[8]), - 'rated_output_current': int(lines[11]) / 10.0 + 'nominal_output_frequency': int(lines[11]) / 10.0, + 'rated_battery_voltage': int(lines[13]) / 10.0, + 'rated_va': int(lines[9]), + 'rated_output_current': int(lines[12]) / 10.0 } return values @@ -74,25 +72,24 @@ def device_status(self): lines = [] for line in raw_lines: - if line.strip(): - lines.append(line.strip()) + lines.append(line.strip()) status = [] # TODO! - if not lines[1] == 'Line Mode': + if not lines[2] == 'Line Mode': status.append('Utility Fail') # Compatibility with serial interface values = { - 'input_voltage': int(lines[12]) / 10.0, - 'output_voltage': int(lines[15]) / 10.0, - 'output_current': int(lines[35]) / 10.0, - 'input_frequency': int(lines[11]) / 10.0, - 'battery_voltage': int(lines[8]) / 10.0, - 'temperature': int(lines[2]) / 10.0, + 'input_voltage': int(lines[15]) / 10.0, + 'output_voltage': int(lines[18]) / 10.0, + 'output_current': int(lines[38]) / 10.0, + 'input_frequency': int(lines[14]) / 10.0, + 'battery_voltage': int(lines[11]) / 10.0, + 'temperature': int(lines[3]) / 10.0, 'status': status, - 'battery_capacity': int(lines[9]), - 'remaining_battery': lines[10], # minutes - 'output_frequency': int(lines[14]) / 10.0, - 'load_level': int(lines[17]) + 'battery_capacity': int(lines[12]), + 'remaining_battery': lines[13], # minutes + 'output_frequency': int(lines[17]) / 10.0, + 'load_level': int(lines[20]) } # WARNING (appears in web front-end - find how to read) # FAULT (appears in web front-end - find how to read)