Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bad timestamp for API print event #140

Merged
merged 3 commits into from
Mar 27, 2025
Merged

fix bad timestamp for API print event #140

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
770fb03
add missing parentheses
alustig3 Mar 20, 2025
60f090f
prevent latest timestamp from going back in time
alustig3 Mar 20, 2025
ce0f80b
remove time_of_processing temporary variable
alustig3 Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions source/communication/pycboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,21 +481,23 @@ def process_data(self):
ID = int.from_bytes(content_bytes[:2], "little")
data = array(self.sm_info.analog_inputs[ID]["dtype"], content_bytes[2:])
content = (ID, data)
message_sum = sum(message[:8]) + sum(data)
msg_sum = sum(message[:8]) + sum(data)
else:
message_sum = sum(message)
msg_sum = sum(message)
# Process message.
if checksum == message_sum & 0xFFFF: # Checksum OK.
self.last_message_time = time.time()
self.timestamp = int.from_bytes(message[:4], "little")
if checksum == (msg_sum & 0xFFFF): # Checksum OK.
msg_timestamp = int.from_bytes(message[:4], "little")
if msg_timestamp > self.timestamp:
self.last_message_time = time.time()
self.timestamp = msg_timestamp
if msg_type in (MsgType.EVENT, MsgType.STATE):
content = int(content_bytes.decode()) # Event/state ID.
elif msg_type in (MsgType.PRINT, MsgType.WARNG):
content = content_bytes.decode() # Print or error string.
elif msg_type == MsgType.VARBL:
content = content_bytes.decode() # JSON string
self.sm_info.variables.update(json.loads(content))
new_data.append(Datatuple(time=self.timestamp, type=msg_type, subtype=msg_subtype, content=content))
new_data.append(Datatuple(time=msg_timestamp, type=msg_type, subtype=msg_subtype, content=content))
else: # Bad checksum
new_data.append(
Datatuple(time=self.get_timestamp(), type=MsgType.WARNG, content="Bad data checksum.")
Expand Down Expand Up @@ -526,7 +528,7 @@ def trigger_event(self, event_name, source="u"):
def get_timestamp(self):
"""Get the current pyControl timestamp in ms since start of framework run."""
seconds_elapsed = time.time() - self.last_message_time
return self.timestamp + round(1000 * (seconds_elapsed))
return self.timestamp + round(1000 * seconds_elapsed)

def send_serial_data(self, data, command, cmd_type=""):
"""Send data to the pyboard while framework is running."""
Expand Down