diff --git a/OATFWGUI/gui_logic.py b/OATFWGUI/gui_logic.py index aa8ec89..445e302 100644 --- a/OATFWGUI/gui_logic.py +++ b/OATFWGUI/gui_logic.py @@ -368,7 +368,8 @@ def upload_fw(self): @Slot() def pio_upload_finished(self): log.info(f'platformio upload finished') - self.avr_dude_logwatch.stop() + if self.logic_state.env_is_avr_based(): + self.avr_dude_logwatch.stop() exit_code = external_processes['platformio'].qproc.exitCode() if exit_code == 0: log.info('Normal exit') diff --git a/OATFWGUI/log_utils.py b/OATFWGUI/log_utils.py index 0a19b48..c112927 100644 --- a/OATFWGUI/log_utils.py +++ b/OATFWGUI/log_utils.py @@ -123,6 +123,9 @@ def file_changed(self, _path: str): self.log.info(line) def stop(self): + if self.tempfile is None: + self.log.warning('Can\'t stop watching None file?') + return self.log.debug(f'Cleaning up logged external file {self.tempfile.name}') self.tempfile.close() self.file_watcher.removePath(self.tempfile.name) diff --git a/README.md b/README.md index 5278c41..b0de04b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ OpenAstroTech FirmWare Graphical User Interface -- A graphical way to build and - Linux 64 bit - Requires Python 3.7..3.11, git, libc >= 2.28 (check with `ldd --version`) -MacOS _might_ work, don't have a mac to test on. Drop a line if you're willing to test it! +MacOS support [is in progress](https://github.com/OpenAstroTech/OATFWGUI/commits/feature/js/official-mac-support/), but isn't reliable yet. ## Installing Simply download the [latest release](https://github.com/OpenAstroTech/OATFWGUI/releases), unzip and run: diff --git a/assets/screenshot_Linux.jpg b/assets/screenshot_Linux.jpg index 8f79fa5..ba931c8 100644 Binary files a/assets/screenshot_Linux.jpg and b/assets/screenshot_Linux.jpg differ diff --git a/assets/screenshot_Windows.jpg b/assets/screenshot_Windows.jpg index 06190cb..1dbc768 100644 Binary files a/assets/screenshot_Windows.jpg and b/assets/screenshot_Windows.jpg differ diff --git a/scripts/OATFWGUI_Linux.sh b/scripts/OATFWGUI_Linux.sh index 9f68ff2..6926378 100755 --- a/scripts/OATFWGUI_Linux.sh +++ b/scripts/OATFWGUI_Linux.sh @@ -81,6 +81,9 @@ function set_supported_python_path { # python not available either echo "Could not find a python install. (tried python3, python)." echo "Please install python3" + echo " +If you know you have python installed, try overriding the PYTHON environment variable when starting this script +i.e. PYTHON=/usr/bin/python3.9 ./OATFWGUI_Linux.sh" exit 1 else # python is a command @@ -88,6 +91,9 @@ function set_supported_python_path { if ! check_py_version; then # check_py_version already gives an error message echo "python version is not valid (tried python3, but it's not installed)" + echo " +If you have another version of python installed, try overriding the PYTHON environment variable when starting this script +i.e. PYTHON=/usr/bin/python3.9 ./OATFWGUI_Linux.sh" exit 1 fi # Ok! python is a valid command, and is a supported version @@ -98,6 +104,9 @@ function set_supported_python_path { if ! check_py_version; then # check_py_version already gives an error message echo "python3 version is not valid" + echo " +If you have another version of python installed, try overriding the PYTHON environment variable when starting this script +i.e. PYTHON=/usr/bin/python3.9 ./OATFWGUI_Linux.sh" exit 1 fi fi