Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r63551aca47d43cfa87a154f94f00485605db6a68 -re8bdeec38984b4b800f6d0eca8b9097800efbf40 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 63551aca47d43cfa87a154f94f00485605db6a68) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision e8bdeec38984b4b800f6d0eca8b9097800efbf40) @@ -67,6 +67,10 @@ } self.air_control = 0 self.airTrapState = 0 + # TODO remove after testing + self.AirPumpLowerPowerLevel = 0 + # TODO remove after testing + self.AirPumpRaisePowerLevel = 0 self.td_air_trap_timestamp = 0.0 @@ -99,6 +103,12 @@ message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) air_trap_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + #TODO remove after testing + lower_power = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + # TODO remove after testing + raise_power = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = lower[0] self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = upper[0] @@ -108,6 +118,8 @@ self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H20_VALV.name] = h20_vlv_st[0] self.air_control = controlling[0] self.airTrapState = air_trap_state[0] + self.AirPumpLowerPowerLevel = lower_power[0] + self.AirPumpRaisePowerLevel = raise_power[0] self.td_air_trap_timestamp = timestamp