Skip to content

Commit

Permalink
Merge pull request #106 from donovan6000/devel
Browse files Browse the repository at this point in the history
Version 0.28.2 release
  • Loading branch information
donovan6000 committed Mar 5, 2016
2 parents 4326dda + 9b7e471 commit 9f9ebdf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Changelog:

V0.28.2 March 4, 2016

* Fixed read/write message error when using Windows

V0.28.1 March 4, 2016

* Fixed issue where the layer numbers shown in OctoPrint's G-code viewer would differ from those used in the mid-print filament change pre-processor stage
Expand Down
8 changes: 4 additions & 4 deletions octoprint_m3dfio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3976,8 +3976,8 @@ def on_printer_add_log(self, data) :
connection = None
time.sleep(1)

# Check if user lacks read/write access to the printer
if not os.access(currentPort, os.R_OK | os.W_OK) :
# Check if using OS X or Linux and the user lacks read/write access to the printer
if (platform.uname()[0].startswith("Darwin") or platform.uname()[0].startswith("Linux")) and not os.access(currentPort, os.R_OK | os.W_OK) :

# Send message
self._plugin_manager.send_plugin_message(self._identifier, dict(value = "Show Message", message = "You don't have read/write access to " + str(port), confirm = True))
Expand Down Expand Up @@ -7641,8 +7641,8 @@ def autoConnect(self, comm_instance, port, baudrate, read_timeout, *args, **kwar
connection = None
time.sleep(1)

# Check if user lacks read/write access to the printer
if not os.access(str(port), os.R_OK | os.W_OK) :
# Check if using OS X or Linux and the user lacks read/write access to the printer
if (platform.uname()[0].startswith("Darwin") or platform.uname()[0].startswith("Linux")) and not os.access(str(port), os.R_OK | os.W_OK) :

# Send message
self._plugin_manager.send_plugin_message(self._identifier, dict(value = "Show Message", message = "You don't have read/write access to " + str(port), confirm = True))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
plugin_identifier = "m3dfio"
plugin_package = "octoprint_%s" % plugin_identifier
plugin_name = "OctoPrint-M3DFio"
plugin_version = "0.28.1"
plugin_version = "0.28.2"
plugin_description = "Makes OctoPrint fully compatible with the Micro 3D printer"
plugin_author = "donovan6000"
plugin_author_email = "[email protected]"
Expand Down

0 comments on commit 9f9ebdf

Please sign in to comment.