Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd -r3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 95a7bdcce8c5ffed0de3fbfb09f7f6999ad0f1bd) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6) @@ -466,7 +466,7 @@ SPEED = 3 # Current Speed attribute for pumps TARGET_PRES = 4 # Target Pressure attribute for pumps TARGET_FLOW = 5 # Target Flow attribute for pumps - TARGET_DUTY_CYCLE = 6 # Target Duty Cycle attribute for pumps + TARGET_DUTY_CYCLE_PCT = 6 # Target Duty Cycle attribute for pumps DUTY_CYCLE_PCT = 7 # Duty Cycle Percentage attribute for pumps FB_DUTY_CYCLE_PCT = 8 # Feedback Duty Cycle Percentage attribute for pumps NUM_OF_RO_PUMP_ATTRIBUTES = 9 # Number of pump attributes Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -rec471897a5388e629d5d7dda9e4ec3c82b524914 -r3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6 --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision ec471897a5388e629d5d7dda9e4ec3c82b524914) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6) @@ -53,7 +53,7 @@ fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0, fp_enum_repository.FPPumpAttributes.TARGET_PRES.name: 0.0, fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name: 0.0, - fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0, + fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name: 0.0, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0 } @@ -82,7 +82,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray( + self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.boost_pump[fp_enum_repository.FPBoostPumpNames.P40_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6 --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 3d9e3c5cc1bcd5ce23187a5a627e1ff4177f38d6) @@ -53,7 +53,7 @@ fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0, fp_enum_repository.FPPumpAttributes.TARGET_PRES.name: 0.0, fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name: 0.0, - fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0, + fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name: 0.0, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0 } @@ -84,7 +84,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray( + self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]