Merge branch 'develop'

Conflicts:
	ReleaseNotes.md
	extra/openwrt-build/openwrt-diffconfig-extramini
	extra/openwrt-build/openwrt-diffconfig-mini
	extra/openwrt-build/openwrt-diffconfig-regular
	src/FIRMWARE-VERSION
	src/conf_defaults.lua

NOTICE.txt

@@ -1,3 +1,5 @@
+Doodle3D overrides the 802.11 regulatory domain such that channels 12 and 13 can be used. In most countries this is desired and accepted behaviour, with the notable exception being the USA.
+
 Doodle3D uses the following external projects:
 
 Lua - Copyright (c) 1994–2013 Lua.org, PUC-Rio. - MIT license

ReleaseNotes.md

@@ -1,3 +1,11 @@
+# 0.10.1 (12th feb 2014)
+- miniFactory support
+- Fixed most Makerbot display issues 
+- Allowing wifi channels 12 and 13
+- Allow floats for retraction amount setting
+- Also preheating reconnected printer
+- Fixed network interface issues
+- added easter-eggs
 
 # 0.10.0 (20th jan 2014)
 - WordArt

extra/openwrt-build/openwrt-diffconfig-extramini

@@ -1,6 +1,7 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 # CONFIG_IPV6 is not set

extra/openwrt-build/openwrt-diffconfig-mini

@@ -1,6 +1,7 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 # CONFIG_IPV6 is not set

extra/openwrt-build/openwrt-diffconfig-regular

@@ -1,6 +1,7 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 CONFIG_PACKAGE_doodle3d-client=y
 CONFIG_PACKAGE_kmod-usb-acm=y

post-install.sh

@@ -78,7 +78,9 @@ $IPKG_INSTROOT/etc/init.d/dhcpcheck enable
 
 if [ -z "$IPKG_INSTROOT" ]; then
 	echo "Enabling wifi device..."
-	uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
+	uci set wireless.@wifi-device[0].disabled=0
+	uci set wireless.radio0.country='NL'
+	uci commit wireless; wifi
 
 	addFirewallNet
 
@@ -97,6 +99,7 @@ else
 	uci set uhttpd.main.lua_prefix='/d3dapi'
 
 	uci set wireless.@wifi-device[0].disabled=0
+	uci set wireless.radio0.country='NL'
 	# TODO: add firewall net
 	uci set network.wlan=interface
 EOM

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1

src/conf_defaults.lua

@@ -106,6 +106,7 @@ M.printer_dimensions_x = {
 	default_delta_rostockmax = 0,
 	default_deltamaker = 0,
 	default_kossel = 0,
+	default_minifactory = 150, 
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -116,6 +117,7 @@ M.printer_dimensions_y = {
 	default_delta_rostockmax = 0,
 	default_deltamaker = 0,
 	default_kossel = 0,
+	default_minifactory = 150,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -123,6 +125,7 @@ M.printer_dimensions_y = {
 }
 M.printer_dimensions_z = {
 	default = 200,
+	default_minifactory = 155,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -132,6 +135,7 @@ M.printer_heatedbed = {
 	default = false,
 	default_ultimaker2 = true,
 	default_makerbot_replicator2x = true,
+	default_minifactory = true,
 	subSection = 'printer_type',
 	type = 'bool',
 	description = 'Printer has heated bed',
@@ -141,7 +145,7 @@ local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)
 local default_deltabot_startcode = ';Generated with Doodle3D (deltabot)\nM109 S{printingTemp} ;set target temperature\n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 ; move to home\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)'
 M.printer_startcode = {
 	default = ';Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)',
-	default_ultimaker2 = ';Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \nM190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n',
+	default_ultimaker2 = ';Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n',
 	default_makerbot_generic = default_makerbot_startcode,
 	default_makerbot_replicator2 = default_makerbot_startcode,
 	default_makerbot_replicator2x = default_makerbot_startcode,
@@ -154,11 +158,11 @@ M.printer_startcode = {
 	description = ''
 }
 
-local default_makerbot_endcode = 'M73 P100\nG92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG1 Z155 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\n{if heatedBed}M140 S{preheatBedTemp} T0\nM104 S{preheatTemp} T0\nM73 P100 (end  build progress )\nM70 P5 (We <3 Making Things!)\nM72 P1  ( Play Ta-Da song )\nM137 (build end notification)'
+local default_makerbot_endcode = 'M73 P100\nG92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG1 Z155 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\n{if heatedBed}M140 S{preheatBedTemp} T0\nM104 S{preheatTemp} T0\nM73 P100 (end  build progress )\nM72 P1  ( Play Ta-Da song )\nM137 (build end notification)'
 local default_deltabot_endcode = 'M107 ;fan offG91 ;relative positioningG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressureG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even moreG28 ;move to homeM84 ;disable axes / steppersG90 ;absolute positioningM109 S0 ; hot end off{if heatedBed}M140 S{preheatBedTemp}M117 Done                 ;display message (20 characters to clear whole screen)'
 M.printer_endcode = {
 	default = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
-	default_ultimaker2 = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\nM140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
+	default_ultimaker2 = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
 	default_makerbot_generic = default_makerbot_endcode,
 	default_makerbot_replicator2 = default_makerbot_endcode,
 	default_makerbot_replicator2x = default_makerbot_endcode,
@@ -294,7 +298,7 @@ M.printer_retraction_minDistance = {
 
 M.printer_retraction_amount = {
 	default = 3,
-	type = 'int',
+	type = 'float',
 	description = '',
 	min = 0
 }

src/rest/response.lua

@@ -46,7 +46,7 @@ function M.new(requestObject)
 	local self = setmetatable({}, M)
 	self.body = { status = nil, data = {} }
 	self:setHttpStatus(200, 'OK')
-	self:setContentType('text/plain;charset=UTF-8')
+	self:setContentType('application/json;charset=UTF-8')
 	--self:setContentType('application/json;charset=UTF-8')
 
 	-- A queue for functions to be executed when the response has been given.

src/util/printer.lua

@@ -44,6 +44,7 @@ local SUPPORTED_PRINTERS = {
 	shapercube = "ShaperCube",
 	tantillus = "Tantillus",
 	vision_3d_printer = "Vision 3D Printer",
+	minifactory = "miniFactory",
 	marlin_generic = "Generic Marlin Printer",
     makerbot_generic = "Generic Makerbot Printer"
 }