Skip to content

Commit

Permalink
Set dtype for well statuses to int64, handshake response reset status…
Browse files Browse the repository at this point in the history
… beacon timer (#547)

- set dtype for well statuses to int64
- reset status beacon timeout after handshake reponses
  • Loading branch information
tannermpeterson authored May 25, 2023
1 parent 7a394f3 commit e2bc8a0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
19 changes: 8 additions & 11 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
Changelog for Mantarray Desktop App
===================================

1.1.4 (unreleased)
------------------

Fixed:
^^^^^^

- Issue with buttons being unresponsive after press.
- Return custom error when magnet finding fails to converge for recording snapshot.


1.1.3 (2023-05-22)
1.1.3 (unreleased)
------------------

Changed:
^^^^^^^^
- Stimulation pulse editor now greys out disabled inputs.
- New user login flow.

Fixed:
^^^^^^
- Error when running stim and live view together for over ~35 minutes.
- Issue with buttons being unresponsive after press.
- Issue with buttons being unresponsive after press.
- Return custom error when magnet finding fails to converge for recording snapshot.


1.1.2 (2023-05-03)
------------------
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MantarrayController",
"version": "1.1.4",
"version": "1.1.3",
"description": "Desktop application for controlling the Mantarray instrument.",
"author": {
"name": "Curi Bio",
Expand Down
2 changes: 1 addition & 1 deletion src/mantarray_desktop_app/sub_processes/file_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ def _reduce_subprotocol_chunks(self, well_statuses: Dict[int, Any]) -> Dict[int,
timepoint_well_status_pairs.append((timepoint, original_subprotocol_idx))

if timepoint_well_status_pairs:
reduced_well_statuses[well_idx] = np.array(timepoint_well_status_pairs, dtype=int).T
reduced_well_statuses[well_idx] = np.array(timepoint_well_status_pairs, dtype=np.int64).T

return reduced_well_statuses

Expand Down
5 changes: 2 additions & 3 deletions src/mantarray_desktop_app/sub_processes/mc_comm.py
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,6 @@ def _process_comm_from_instrument(self, packet_type: int, packet_payload: bytes)

def _process_status_beacon(self, packet_payload: bytes) -> None:
board_idx = 0
self._time_of_last_beacon_secs = perf_counter()
status_codes_dict = convert_status_code_bytes_to_dict(
packet_payload[:SERIAL_COMM_STATUS_CODE_LENGTH_BYTES]
)
Expand Down Expand Up @@ -1212,6 +1211,8 @@ def _check_firmware_update_status(self) -> None:
raise FirmwareUpdateTimeoutError(self._firmware_update_type)

def _handle_status_codes(self, status_codes_dict: Dict[str, int], comm_type: str) -> None:
self._time_of_last_beacon_secs = perf_counter()

board_idx = 0
if (
self._time_of_reboot_start is not None
Expand All @@ -1225,8 +1226,6 @@ def _handle_status_codes(self, status_codes_dict: Dict[str, int], comm_type: str
"message": "Instrument completed reboot",
}
)
# Tanner (9/15/22): reset this value now that comm has been received from the instrument following the reboot
self._time_of_last_beacon_secs = perf_counter()

status_codes_msg = f"{comm_type} received from instrument. Status Codes: {status_codes_dict}"
if any(status_codes_dict.values()):
Expand Down

0 comments on commit e2bc8a0

Please sign in to comment.