Merge branch 'develop'

.settings/org.eclipse.koneki.ldt.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.dltk.coretasks.case_sensitive=true
+org.eclipse.dltk.coretasks.enabled=true
+org.eclipse.dltk.coretasks.tags=FIXME;HIGH,TODO;NORMAL,XXX;NORMAL,@fixme;HIGH,@todo;NORMAL,@warning;NORMAL

ReleaseNotes.md

@@ -1,3 +1,10 @@
+Changelog
+# 0.10.3 (9th apr 2014)
+- Fixed Makerbot issue where printer driver didn't get past connecting state
+
+# 0.10.2-makerbotfix (27th mar 2014)
+- Fixed Makerbot issue where printer driver didn't get past connecting state
+
 Changelog
 # 0.10.2 (14th mar 2014)
 - Fixed connection issues to networks with multiple routers sharing the same ssid

extra/license-headers/header-cstyle

@@ -1,7 +1,7 @@
 /*
  * This file is part of the Doodle3D project (http://doodle3d.com).
  *
- * Copyright (c) 2013, Doodle3D
+ * Copyright (c) 2013-2014, Doodle3D
  * This software is licensed under the terms of the GNU GPL v2 or later.
  * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
  */

extra/license-headers/header-lua

@@ -1,7 +1,7 @@
 --
 -- This file is part of the Doodle3D project (http://doodle3d.com).
 --
--- @copyright 2013, Doodle3D
+-- @copyright 2013-2014, Doodle3D
 -- @license This software is licensed under the terms of the GNU GPL v2 or later.
 -- See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 

extra/license-headers/header-sh

@@ -1,6 +1,6 @@
 # This file is part of the Doodle3D project (http://doodle3d.com).
 #
-# Copyright (c) 2013, Doodle3D
+# Copyright (c) 2013-2014, Doodle3D
 # This software is licensed under the terms of the GNU GPL v2 or later.
 # See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 

extra/openwrt-build/feeds.conf.template

@@ -0,0 +1,3 @@
+src-git packages git://git.openwrt.org/packages.git^e5f758e0729d094441aad849bbab4117b816567d
+# Edit the path below to point to the directory of the Doodle3D feed.
+src-link wifibox /Users/USERNAME/xxxFiles/doodle3d_feed_path

extra/openwrt-build/gen-feeds-conf.sh

@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# This script generates a file feeds.conf and places it in the OpenWrt buildroot directory.
+# It deduces the location of your Doodle3D feed by looking at its own path and,
+# on OSX, tries to find the OpenWrt buildroot by looking for something mounted in a
+# directory containing the word 'openwrt'; specify the path with -p <path> if that fails.
+
+SYSNAME=`uname -s`
+WRT_PATH=
+FEED_PATH=
+PACKAGES_FEED_SHA5=e5f758e0729d094441aad849bbab4117b816567d
+
+nextIsWrtPath=0
+for arg in "$@"; do
+	if [ $nextIsWrtPath -eq 1 ]; then
+		WRT_PATH="$arg"
+		nextIsWrtPath=0
+		continue
+	fi
+
+	case "$arg" in
+	-p)
+		nextIsWrtPath=1
+		;;
+	-h)
+		echo "This script generates an OpenWrt feeds.conf file for building Doodle3D, it works automatically."
+		echo "If the wrt buildroot path cannot be determined, specify it using '-p <path>'."
+		echo "If you want the file contents to be shown instead of written out to a file, use '-c'."
+		exit 0
+		;;
+	*)
+		echo "! Error: unknown argument '$arg' found"
+		exit 1
+		;;
+	esac
+done
+if [ $nextIsWrtPath -eq 1 ]; then
+	echo "! Error: missing argument for -p option"
+	exit 1
+fi
+
+
+if [ "x$WRT_PATH" = "x" ]; then
+	if [ "x$SYSNAME" != "xDarwin" ]; then
+		echo "! Error: it looks like you are not using OSX, please specify the OpenWrt buildroot path with '-p <path>'."
+		exit 1
+
+	elif [ "x$SYSNAME" = "xDarwin" ]; then
+		mountPath=`mount | sed -n 's|^.* \([^ ]*[Oo][Pp][Ee][Nn][Ww][Rr][Tt][^ ]*\).*$|\1|p'`
+		if [ -z "$mountPath" ]; then
+			echo "! Error: could not find openwrt-like path in list of mount points."
+			echo "! Please mount the image an rerun, or specify the path using '-p <path>'."
+			exit 2
+		fi
+
+		# Looking for the word 'openwrt' in a README file in a direct subdir...is this a reasonable 'detect' approach?
+		for i in $(ls -d $mountPath/*/); do
+			dirname=${i%%/}
+			grep -sqi openwrt "$dirname/README"
+			if [ $? -eq 0 ]; then
+				WRT_PATH="$dirname"
+			fi
+		done
+
+		if [ -z "$WRT_PATH" ]; then
+			echo "! Error: could not find buildroot path in what looks like an OpenWrt image ('$mountPath'), please rerun with '-p <path>'."
+			exit 3
+		fi
+	fi
+fi
+
+
+echo "===== Doodle3D OpenWrt feeds.conf generator"
+echo "* Using OpenWrt buildroot path: '$WRT_PATH'"
+
+FEED_PATH="$0"
+FEED_PATH=`dirname "$FEED_PATH"` # Ok, so after this we've got a non-normalized path to the script dir
+FEED_PATH="$FEED_PATH/../../.." # go back to just outside the doodle3d-firmware repo, which should be the feed root
+
+echo "$FEED_PATH" | grep -sq "^\/"
+if [ $? -ne 0 ]; then FEED_PATH="`pwd`/$FEED_PATH"; fi
+
+#NOTE: and normalize the path...this method feels a bit fragile (spurious output, special user env conditions and whatnot)
+pushd "$FEED_PATH" > /dev/null 2>&1
+FEED_PATH="`pwd`"
+popd > /dev/null 2>&1
+
+echo "* Using Doodle3D feed path: '$FEED_PATH'"
+
+echo "$FEED_PATH" | grep -sq ' '
+if [ $? -eq 0 ]; then
+	echo "! Error: the feed path contains spaces, which OpenWrt cannot handle. Exiting..."
+	exit 4
+fi
+
+FILE_CONTENTS=$( cat << EOT
+src-git packages git://git.openwrt.org/packages.git^$PACKAGES_FEED_SHA5
+src-link wifibox $FEED_PATH
+EOT
+)
+
+echo "* Contents to be written:\n$FILE_CONTENTS\n"
+
+while true; do
+	read -p "? Proceed to write a new feeds.conf? " yn
+    case $yn in
+        [Yy]*) break;;
+        [Nn]*)
+			echo "* Ok, feeds.conf will not be generated. Exiting..."
+			exit 0;;
+		*) echo "! Please answer yes or no.";;
+    esac
+done
+
+OUT_PATH="$WRT_PATH/feeds.conf"
+BKP_PATH="$WRT_PATH/feeds.conf.d3dbkp"
+if [ -f "$OUT_PATH" ]; then
+	echo "* Backing up $OUT_PATH to $BKP_PATH"
+	cp "$OUT_PATH" "$BKP_PATH"
+fi
+
+echo "* Generating $OUT_PATH"
+echo "$FILE_CONTENTS" > "$OUT_PATH"
+
+exit 0

extra/scripts/publish-wifibox-release.lua

@@ -6,8 +6,14 @@
 -- then synchronized to the release repository online.
 --
 -- USAGE:
--- The only dependency of this script is the penlight library, which can be installed using
--- LuaRocks (http://luarocks.org/) as follows: 'sudo luarocks install penlight'.
+-- The only dependency of this script are the penlight and luafilesystem libraries, which can be installed using
+-- LuaRocks (http://luarocks.org/) as follows: 
+-- sudo luarocks install penlight
+-- If the penlight libary is not found you might need to add the following to /etc/launchd.conf
+-- setenv LUA_CPATH /opt/local/share/luarocks/lib/lua/5.2/?.so
+-- setenv LUA_PATH /opt/local/share/luarocks/share/lua/5.2/?.lua
+-- Reboot
+--
 -- This script will automatically locate the Doodle3D repo's. 
 -- Index files are fetched from the online repository.
 -- For synchronizing, rsync must have passwordless SSH access to the server, for a

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

src/script/d3d-updater.lua

@@ -463,7 +463,7 @@ function M.getStatus(withBetas)
 	if cEnt then
 		result.currentReleaseTimestamp = cEnt.timestamp
 	else
-		D("warning: could not find current wifibox version in release index, beta setting disabled after having beta installed?")
+		D("warning: could not find current wifibox version in release indexes")
 	end
 
 	if result.stateCode == M.STATE.DOWNLOADING then