diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4b8adb13..a2bd24b3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,17 +1,7 @@ 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: @@ -19,6 +9,13 @@ 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) ------------------ diff --git a/package-lock.json b/package-lock.json index b34a025f..9e7e3b44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "MantarrayController", - "version": "1.1.4", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "MantarrayController", - "version": "1.1.4", + "version": "1.1.3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 39f505b9..dea73044 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/mantarray_desktop_app/sub_processes/file_writer.py b/src/mantarray_desktop_app/sub_processes/file_writer.py index 08f18b44..6a85e8a1 100644 --- a/src/mantarray_desktop_app/sub_processes/file_writer.py +++ b/src/mantarray_desktop_app/sub_processes/file_writer.py @@ -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 diff --git a/src/mantarray_desktop_app/sub_processes/mc_comm.py b/src/mantarray_desktop_app/sub_processes/mc_comm.py index 4682653c..98ef4bf2 100644 --- a/src/mantarray_desktop_app/sub_processes/mc_comm.py +++ b/src/mantarray_desktop_app/sub_processes/mc_comm.py @@ -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] ) @@ -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 @@ -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()):