Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -ra0e7107b30e4d6fc631784e249f59038aefeb04f --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) @@ -56,8 +56,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + self.msg_id_fp_valves_states_data = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} @@ -123,6 +123,7 @@ return DEENERGIZED @publish([ + "msg_id_fp_valves_states_data", "fp_valves_states_timestamp", "valve_states_all", "m4_valv", @@ -208,13 +209,13 @@ Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID - @param state: int - valve state + @param state: int - valve state (0=de-energized/closed, 1=energized/open) @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) - ste = integer_to_bytearray(int(state)) + ste = integer_to_bytearray(state) vlv = integer_to_bytearray(valve) payload = rst + ste + vlv