Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -rb5dd582bf53a0b479c273de643759f6dfec3d2de -r63551aca47d43cfa87a154f94f00485605db6a68 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision b5dd582bf53a0b479c273de643759f6dfec3d2de) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 63551aca47d43cfa87a154f94f00485605db6a68) @@ -117,9 +117,8 @@ if dutyCycle < 0 or dutyCycle > 100: return 0 - power = int((dutyCycle/100) * MAX_AIR_PUMP_POWER_LEVEL) sts = integer_to_bytearray(state) - pwr = integer_to_bytearray(power) + pwr = float_to_bytearray(power) payload = sts + pwr state_name = 'start with power' if state == 2 else 'stopped' Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r63551aca47d43cfa87a154f94f00485605db6a68 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 63551aca47d43cfa87a154f94f00485605db6a68) @@ -66,6 +66,7 @@ td_enum_repository.TDAirTrapValveNames.H20_VALV.name: 0 } self.air_control = 0 + self.airTrapState = 0 self.td_air_trap_timestamp = 0.0 @@ -96,6 +97,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) controlling = struct.unpack('i', bytearray( 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])) 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] @@ -104,6 +107,7 @@ self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H13_VALV.name] = h13_vlv_st[0] 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.td_air_trap_timestamp = timestamp