Version 1.5 release

Changelog

@@ -1,5 +1,11 @@
 Changelog:
 
+V1.5 August 3, 2016
+
+	* Made canceling a print and emergency stop more reliable
+	* Added more exeption handling when connecting to the printer
+	* Fixed issue in setting the extruder's current
+
 V1.4 July 29, 2016
 
 	* Really fixed compatibility with OctoPrint V1.2.14

README.md

@@ -6,7 +6,7 @@ OctoPrint plugin that provides the world's first platform independent software s
 ### Description
 M33 Fio is a plugin for [OctoPrint](http://octoprint.org/) that extends its capabilities to make it fully compatible with the Micro 3D printer. Both OctoPrint and M33 Fio can run on Windows, OS X, and Linux, so this solution is the first platform independent option available for this printer.
 
-The latest version of M33 Fio is V1.4 released on July 29th, 2016, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).
+The latest version of M33 Fio is V1.5 released on August 3rd, 2016, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).
 
 ### Features
 * Platform independent

installers/Linux/90-micro-3d-local.rules

@@ -1,5 +1,5 @@
 # Run the following commands to install this rule
-# cp ./90-micro-3d-local.rules /etc/udev/rules.d/
+# sudo cp ./90-micro-3d-local.rules /etc/udev/rules.d/
 # sudo udevadm control --reload-rules
 # sudo udevadm trigger
 

installers/Linux/91-micro-3d-heatbed-local.rules

@@ -1,5 +1,5 @@
 # Run the following commands to install this rule
-# cp ./91-micro-3d-heatbed-local.rules /etc/udev/rules.d/
+# sudo cp ./91-micro-3d-heatbed-local.rules /etc/udev/rules.d/
 # sudo udevadm control --reload-rules
 # sudo udevadm trigger
 

installers/OS X/command line tools installer.bash

@@ -22,6 +22,9 @@ if [[ "$osx_vers" -ge 9 ]]; then
 	#Install the command line tools
 
 	softwareupdate -i "$cmd_line_tools" -v
+	if [ 0 -ne $? ]; then
+		exit 1
+	fi
 
 	# Remove the temp file
 
@@ -47,7 +50,10 @@ if [[ "$osx_vers" -eq 7 ]] || [[ "$osx_vers" -eq 8 ]]; then
 	fi
 
 		TOOLS=cltools.dmg
-		curl "$DMGURL" -o "$TOOLS"
+		curl "$DMGURL" -f -o "$TOOLS"
+		if [ 0 -ne $? ]; then
+			exit 1
+		fi
 		TMPMOUNT=`/usr/bin/mktemp -d /tmp/clitools.XXXX`
 		hdiutil attach "$TOOLS" -mountpoint "$TMPMOUNT" -nobrowse
 		# The "-allowUntrusted" flag has been added to the installer

installers/OS X/install.sh

@@ -20,25 +20,52 @@ else
 
 		# Move to temporary location
 		cd $TMPDIR
+
+		# Stop OctoPrint
+		sudo -u $SUDO_USER launchctl unload /Library/LaunchAgents/com.octoprint.app.plist
 
 		# Install Python
-		curl -o index.html https://www.python.org/downloads/mac-osx/
+		while ! curl -f -o index.html https://www.python.org/downloads/mac-osx/
+		do
+			:
+		done
 		version="$(perl -nle'print $1 if m/Latest Python 2 Release - Python ([0-9\.]*)/' index.html)"
 		rm index.html
-		curl -o python.pkg https://www.python.org/ftp/python/${version}/python-${version}-macosx10.6.pkg
+		while ! curl -f -o python.pkg https://www.python.org/ftp/python/${version}/python-${version}-macosx10.6.pkg
+		do
+			:
+		done
 		installer -pkg python.pkg -target /
 		rm python.pkg
-
+
+		# Update pip
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip install pip --user --upgrade
+		do
+			:
+		done
+
 		# Install command line tools
-		curl -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/command%20line%20tools%20installer.bash'
-		bash 'command%20line%20tools%20installer.bash'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/command%20line%20tools%20installer.bash'
+		do
+			:
+		done
+		while ! bash 'command%20line%20tools%20installer.bash'
+		do
+			:
+		done
 		rm 'command%20line%20tools%20installer.bash'
 
 		# Install PyObjC core
-		curl -o index.html https://pypi.python.org/pypi/pyobjc-core
+		while ! curl -f -o index.html https://pypi.python.org/pypi/pyobjc-core
+		do
+			:
+		done
 		version="$(perl -nle'print $1 if m/pyobjc-core-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
-		curl -o pyobjc-core.tar.gz https://pypi.python.org/packages/source/p/pyobjc-core/pyobjc-core-${version}.tar.gz
+		while ! curl -f -o pyobjc-core.tar.gz https://pypi.python.org/packages/source/p/pyobjc-core/pyobjc-core-${version}.tar.gz
+		do
+			:
+		done
 		sudo -u $SUDO_USER tar zxvf pyobjc-core.tar.gz
 		rm pyobjc-core.tar.gz
 		cd pyobjc-core-${version}
@@ -49,61 +76,96 @@ else
 		sudo -u $SUDO_USER sed -i '' -e 's/\(universal_newlines=True.*\)/\1\
                 except subprocess.CalledProcessError as e:\
                     self.sdk_root = \'"'"'\/\'"'"'/g' setup.py
-
-		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		do
+			:
+		done
 		cd ..
 		rm -rf pyobjc-core-${version}
 
 		# Install PyObjC Cocoa framework
-		curl -o index.html https://pypi.python.org/pypi/pyobjc-framework-Cocoa
+		while ! curl -f -o index.html https://pypi.python.org/pypi/pyobjc-framework-Cocoa
+		do
+			:
+		done
 		version="$(perl -nle'print $1 if m/pyobjc-framework-Cocoa-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
-		curl -o pyobjc-framework-Cocoa.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Cocoa/pyobjc-framework-Cocoa-${version}.tar.gz
+		while ! curl -f -o pyobjc-framework-Cocoa.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Cocoa/pyobjc-framework-Cocoa-${version}.tar.gz
+		do
+			:
+		done
 		sudo -u $SUDO_USER tar zxvf pyobjc-framework-Cocoa.tar.gz
 		rm pyobjc-framework-Cocoa.tar.gz
 		cd pyobjc-framework-Cocoa-${version}
-		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		do
+			:
+		done
 		cd ..
 		rm -rf pyobjc-framework-Cocoa-${version}
 
 		# Install PyObjC Quartz framework
-		curl -o index.html https://pypi.python.org/pypi/pyobjc-framework-Quartz
+		while ! curl -f -o index.html https://pypi.python.org/pypi/pyobjc-framework-Quartz
+		do
+			:
+		done
 		version="$(perl -nle'print $1 if m/pyobjc-framework-Quartz-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
-		curl -o pyobjc-framework-Quartz.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Quartz/pyobjc-framework-Quartz-${version}.tar.gz
+		while ! curl -f -o pyobjc-framework-Quartz.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Quartz/pyobjc-framework-Quartz-${version}.tar.gz
+		do
+			:
+		done
 		sudo -u $SUDO_USER tar zxvf pyobjc-framework-Quartz.tar.gz
 		rm pyobjc-framework-Quartz.tar.gz
 		cd pyobjc-framework-Quartz-${version}
-		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		do
+			:
+		done
 		cd ..
 		rm -rf pyobjc-framework-Quartz-${version}
 
 		# Install PyObjC QTKit framework
-		curl -o index.html https://pypi.python.org/pypi/pyobjc-framework-QTKit
+		while ! curl -f -o index.html https://pypi.python.org/pypi/pyobjc-framework-QTKit
+		do
+			:
+		done
 		version="$(perl -nle'print $1 if m/pyobjc-framework-QTKit-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
-		curl -o pyobjc-framework-QTKit.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-QTKit/pyobjc-framework-QTKit-${version}.tar.gz
+		while ! curl -f -o pyobjc-framework-QTKit.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-QTKit/pyobjc-framework-QTKit-${version}.tar.gz
+		do
+			:
+		done
 		sudo -u $SUDO_USER tar zxvf pyobjc-framework-QTKit.tar.gz
 		rm pyobjc-framework-QTKit.tar.gz
 		cd pyobjc-framework-QTKit-${version}
-		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		do
+			:
+		done
 		cd ..
 		rm -rf pyobjc-framework-QTKit-${version}
 
 		# Install OctoPrint
-		sudo -u $SUDO_USER launchctl unload /Library/LaunchAgents/com.octoprint.app.plist
-		while echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall OctoPrint
+		while ! curl -f -LOk https://github.com/foosel/OctoPrint/archive/master.zip
 		do
 			:
 		done
-		curl -LOk https://github.com/foosel/OctoPrint/archive/master.zip
 		sudo -u $SUDO_USER unzip master.zip
 		cd OctoPrint-master
-		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/python setup.py install --user
+		do
+			:
+		done
 		cd ..
 		sudo -u $SUDO_USER mkdir -p '/Users/'"$SUDO_USER"'/Library/Application Support/OctoPrint'
 		rm -rf '/Users/'"$SUDO_USER"'/Library/Application Support/OctoPrint/checkout'
-		sudo -u $SUDO_USER mv OctoPrint-master '/Users/'"$SUDO_USER"'/Library/Application Support/OctoPrint/checkout'
+		#sudo -u $SUDO_USER mv OctoPrint-master '/Users/'"$SUDO_USER"'/Library/Application Support/OctoPrint/checkout'
+		rm -rf OctoPrint-master
 		rm master.zip
 
 		# Install M33 Fio
@@ -115,25 +177,37 @@ else
 		do
 			:
 		done
-		curl -LOk https://github.com/donovan6000/M33-Fio/archive/master.zip
+		while ! curl -f -LOk https://github.com/donovan6000/M33-Fio/archive/master.zip
+		do
+			:
+		done
 		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip install master.zip --user
 		do
 			:
 		done
 		rm master.zip
 
 		# Install heatbed drivers
-		curl -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/CH34x_Install.pkg'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/CH34x_Install.pkg'
+		do
+			:
+		done
 		installer -pkg CH34x_Install.pkg -target /
 		rm CH34x_Install.pkg
 
 		# Add OctoPrint to startup programs
-		curl -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/com.octoprint.app.plist'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/com.octoprint.app.plist'
+		do
+			:
+		done
 		sed -i '' -e 's/path to octoprint/\/Users\/'"$SUDO_USER"'\/Library\/Python\/2.7\/bin\/octoprint/g' com.octoprint.app.plist
 		mv com.octoprint.app.plist '/Library/LaunchAgents'
 
 		# Create URL link on desktop
-		curl -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/shortcut.zip'
+		while ! curl -f -O 'https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/OS%20X/shortcut.zip'
+		do
+			:
+		done
 		sudo -u $SUDO_USER ditto -x -k --sequesterRsrc --rsrc shortcut.zip '/Users/'"$SUDO_USER"'/Desktop'
 
 		# Start OctoPrint

installers/OS X/uninstall.sh

@@ -35,16 +35,28 @@ else
 	rm -rf '/Users/'"$SUDO_USER"'/Library/Application Support/OctoPrint'
 
 	# Uninstall PyObjC QTKit framework
-	echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-QTKit
+	while echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-QTKit
+	do
+		:
+	done
 
 	# Uninstall PyObjC Quartz framework
-	echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-Quartz
+	while echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-Quartz
+	do
+		:
+	done
 
 	# Uninstall PyObjC Cocoa framework
-	echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-Cocoa
+	while echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-framework-Cocoa
+	do
+		:
+	done
 
 	# Uninstall PyObjC core
-	echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-core
+	while echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/2.7/bin/pip uninstall pyobjc-core
+	do
+		:
+	done
 
 	# TODO Uninstall command line tools