Index: leahi_dialin/dd/proxies/ro_proxy.py =================================================================== diff -u -rb5aa0da384c5cc177f83d59aa221ae28881cd26a -rad1d08ef189799e3f31dcf4e630c21d9f98c33d7 --- leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision b5aa0da384c5cc177f83d59aa221ae28881cd26a) +++ leahi_dialin/dd/proxies/ro_proxy.py (.../ro_proxy.py) (revision ad1d08ef189799e3f31dcf4e630c21d9f98c33d7) @@ -40,7 +40,7 @@ # no current registered call back methods - def cmd_dd_send_ro_start_stop_request(self, start: bool = 0, ro_rate: float = 0): + def cmd_dd_send_ro_start_stop_request(self, cmdID: int = 0, start: bool = 0, ro_rate: float = 0): """ Constructs and sends a DD command response to the RO. @@ -49,9 +49,10 @@ @param: rejection_code: The rejection reason. @return: none """ + cmd = integer_to_bytearray(cmdID) stt = integer_to_bytearray(start) rtt = float_to_bytearray(ro_rate) - payload = rtt + stt + payload = cmd + stt + rtt message = DenaliMessage.build_message(channel_id=DenaliChannels.dd_to_ro_ch_id, message_id=MsgIds.MSG_ID_DD_RO_START_STOP_CMD_REQUEST.value, payload=payload) Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -r5b9473d9ca6a66d4d03c509fae6051710895b498 -rad1d08ef189799e3f31dcf4e630c21d9f98c33d7 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 5b9473d9ca6a66d4d03c509fae6051710895b498) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision ad1d08ef189799e3f31dcf4e630c21d9f98c33d7) @@ -80,7 +80,7 @@ self.p16_temp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.fp_flows_timestamp = timestamp + self.fp_flow_timestamp = timestamp def cmd_flow_sensor_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r71216b08590dd4b556c10b3384dddc26c8d29a99 -rad1d08ef189799e3f31dcf4e630c21d9f98c33d7 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 71216b08590dd4b556c10b3384dddc26c8d29a99) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision ad1d08ef189799e3f31dcf4e630c21d9f98c33d7) @@ -42,12 +42,12 @@ if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id + channel_id = DenaliChannels.fp_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_RO_TEMPERATURE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_temperature_sensors_sync) - self.fp_temperature_sensors_timestamp = 0.0 + self.fp_temperature_sensors_timestamp = 0 self.fp_temperatures = {FPTemperaturesNames.P23_TEMP.name: 0.0, FPTemperaturesNames.P22_TEMP.name: 0.0, FPTemperaturesNames.P10_TEMP.name: 0.0, @@ -77,7 +77,9 @@ self.fp_temperatures[FPTemperaturesNames.FP_BOARD_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.fp_temperature_sensors_timestamp = timestamp + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval.