From 27e5b89b2c6f80dde91c099bfdec845a8275b5d9 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 2 Jun 2014 17:43:54 +0200
Subject: [PATCH 01/25] New Makerbot start gcode

---
 src/conf_defaults.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 9e3ee04..1f9528e 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -141,7 +141,7 @@ M.printer_heatedbed = {
 	description = 'Printer has heated bed',
 }
 
-local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)\nM73 P0\nG162 X Y F2000(home XY axes maximum)\nG161 Z F900(home Z axis minimum)\nG92 X0 Y0 Z-5 A0 B0 (set Z to -5)\nG1 Z0.0 F900(move Z to '0')\nG161 Z F100(home Z axis minimum)\nM132 X Y Z A B (Recall stored home offsets for XYZAB axis)\nG92 X152 Y72 Z0 A0 B0\nG1 X-112 Y-73 Z0.5 F3300.0 (move to front left 'zero' position)\nG92 X0 Y0 Z0.5 A0 B0\nG1 X0 Y0 Z0.5 F3300.0 (move to waiting position)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed};M109 S{printingBedTemp} T0\n{if heatedBed}M140 S{printingBedTemp} T0\nM104 S{printingTemp} T0\n;M134 T0\nM135 T0\nM104 S{printingTemp} T0\nM133 T0\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 ;extrude 10mm\nG92 A0 ;reset again\nG0 Z20"
+local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)\nM73 P0 (Set build percentage to 0)\nG162 X Y F2000 (home XY axes to maximum)\nG161 Z F900 (home Z axis to minimum quick)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z5.0 F900 (move Z axis down)\nG161 Z F100 (home Z axis to minimum more precise)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z2.0 F900 (move Z axis to safety height)\nG1 X-264 Y-145 Z0 F3300.0 (move XY to start position)\nG92 X0 Y0 Z0 A0 B0 (set axis position to 0)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed}M140 S{printingBedTemp} T0 (Set bed temp)\nM135 T0 (use first extruder)\nM104 S{printingTemp} T0 (set extruder temp)\nM133 T0 (Wait for extruder)\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 (extrude 10mm)\nG92 A0 (reset extruder)\nG0 Z20 (move up, to lose filament)"
 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)',

From 7f56af0dfc8d386f241d3ccaf60d9a93f5bc6248 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Wed, 3 Jun 2015 11:56:37 +0200
Subject: [PATCH 02/25] Remove custom filament thickness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t support custom filament thickness per printer on the client
yet. https://github.com/Doodle3D/doodle3d-client/issues/162
---
 src/conf_defaults.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index a16c26e..932a51c 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -241,7 +241,6 @@ M.printer_travelSpeed = {
 
 M.printer_filamentThickness = {
 	default = 2.89,
-	default_doodle_dream = 1.75,
 	type = 'float',
 	description = '',
 	min = 0.0

From d30dc8fe3178a7ef105b710934557d7bc7155210 Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Mon, 8 Jun 2015 11:52:23 +0200
Subject: [PATCH 03/25] undo doodle dream implementation: first fully implement
 the filament thickness
 (https://github.com/Doodle3D/doodle3d-client/issues/284)

---
 src/conf_defaults.lua | 7 ++++---
 src/util/printer.lua  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 932a51c..8c8f068 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -109,7 +109,7 @@ M.printer_dimensions_x = {
 	default_kossel = 0,
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 298,
-	default_doodle_dream = 120,
+	--default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -123,7 +123,7 @@ M.printer_dimensions_y = {
 	default_kossel = 0,
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 275,
-	default_doodle_dream = 120,
+	--default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -134,7 +134,7 @@ M.printer_dimensions_z = {
 	default_minifactory = 155,
 	default__3Dison_plus = 150,
 	default_lulzbot_taz_4 = 250,
-	default_doodle_dream = 80,
+	--default_doodle_dream = 80,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -241,6 +241,7 @@ M.printer_travelSpeed = {
 
 M.printer_filamentThickness = {
 	default = 2.89,
+	--default_doodle_dream = 1,75,
 	type = 'float',
 	description = '',
 	min = 0.0
diff --git a/src/util/printer.lua b/src/util/printer.lua
index 320a813..0cba7ea 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -52,7 +52,7 @@ local SUPPORTED_PRINTERS = {
 	_3Dison_plus = "3Dison plus",
 	marlin_generic = "Generic Marlin Printer",
   makerbot_generic = "Generic Makerbot Printer",
-	doodle_dream = "Doodle Dream"
+	--doodle_dream = "Doodle Dream"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",

From 3e2cac9c6243cdd0df9e19c11387f5682473b75c Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Mon, 8 Jun 2015 15:34:07 +0200
Subject: [PATCH 04/25] add ultimaker 2 go settings to supported printers

---
 src/conf_defaults.lua | 5 +++++
 src/util/printer.lua  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 8c8f068..1dd2696 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -109,6 +109,7 @@ M.printer_dimensions_x = {
 	default_kossel = 0,
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 298,
+	default_ultimaker2go = 120,
 	--default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
@@ -123,6 +124,7 @@ M.printer_dimensions_y = {
 	default_kossel = 0,
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 275,
+	default_ultimaker2go = 120,
 	--default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
@@ -134,6 +136,7 @@ M.printer_dimensions_z = {
 	default_minifactory = 155,
 	default__3Dison_plus = 150,
 	default_lulzbot_taz_4 = 250,
+	default_ultimaker2go = 115,
 	--default_doodle_dream = 80,
 	subSection = 'printer_type',
 	type = 'int',
@@ -156,6 +159,7 @@ local default_deltabot_startcode = ';Generated with Doodle3D (deltabot)\nM109 S{
 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 \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_ultimaker2go = default_ultimaker2,
 	default__3Dison_plus = ';@printer {printerType}\nM136 (enable build)\nM73 P0\nG21\nG90\nM103\n;M109 S50 T0\nM140 S50 T0\nM104 S{printingTemp} T0\n;M134 T0\nM135 T0\nM104 S{printingTemp} T0\nG162 X Y F2000(home XY axes maximum)\nG161 Z F900(home Z axis minimum)\nG92 X113.5 Y74 Z-5 A0 B0 (set Z to -5)\nG1 Z0.0 F900(move Z to 0)\nG161 Z F100(home Z axis minimum)\nM132 X Y Z A B (Recall stored home offsets for XYZAB axis)\nG1 Z50 F3300\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\nM133 T0\nM6 T0\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG0 Z0.2 F3000\nG1 Z0 F100 A10 ;extrude 10mm\nG92 X227 Y148 Z0 A0 ;reset again\nG1 X227 Y148 Z0',
 	default_makerbot_generic = default_makerbot_startcode,
 	default_makerbot_replicator2 = default_makerbot_startcode,
@@ -174,6 +178,7 @@ local default_deltabot_endcode = 'M107 ;fan offG91 ;relative positioningG1 E-1 F
 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}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
+	default_ultimaker2go = default_ultimaker2,
 	default__3Dison_plus = '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)\nM140 S35 T0\nM104 S180 T0\nM73 P100 (end build progress )\nM72 P1 ( Play Ta-Da song )\nM137 (build end notification)\n',
 	default_makerbot_generic = default_makerbot_endcode,
 	default_makerbot_replicator2 = default_makerbot_endcode,
diff --git a/src/util/printer.lua b/src/util/printer.lua
index 0cba7ea..9a7bb0d 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -13,7 +13,8 @@ local printDriver = require('print3d')
 local SUPPORTED_PRINTERS = {
 	rigidbot = "Rigidbot",
 	ultimaker = "Ultimaker",
-	ultimaker2 = "Ultimaker2",
+	ultimaker2 = "Ultimaker 2",
+	ultimaker2go = "Ultimaker 2 Go",
 	makerbot_replicator2 = "MakerBot Replicator2",
 	makerbot_replicator2x = "MakerBot Replicator2x",
 	makerbot_thingomatic = "MakerBot Thing-o-matic",

From 798f9bcf800091db84fb83dae9cefd5f41efc73f Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Mon, 8 Jun 2015 16:11:44 +0200
Subject: [PATCH 05/25] decrease max z (tested a print of 115. the nozzle
 scraps the top when traveling home after print. giving 3mm space for a safe
 travel home)

---
 src/conf_defaults.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 1dd2696..6e45d68 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -136,7 +136,7 @@ M.printer_dimensions_z = {
 	default_minifactory = 155,
 	default__3Dison_plus = 150,
 	default_lulzbot_taz_4 = 250,
-	default_ultimaker2go = 115,
+	default_ultimaker2go = 112,
 	--default_doodle_dream = 80,
 	subSection = 'printer_type',
 	type = 'int',

From 84f244b8d74deb95cc601701a0f475a177d7daef Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Tue, 9 Jun 2015 16:12:56 +0200
Subject: [PATCH 06/25] doodle dream config settings

---
 src/conf_defaults.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 6e45d68..f4d6694 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -110,7 +110,7 @@ M.printer_dimensions_x = {
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 298,
 	default_ultimaker2go = 120,
-	--default_doodle_dream = 120,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -125,7 +125,7 @@ M.printer_dimensions_y = {
 	default_minifactory = 150,
 	default_lulzbot_taz_4 = 275,
 	default_ultimaker2go = 120,
-	--default_doodle_dream = 120,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -137,7 +137,7 @@ M.printer_dimensions_z = {
 	default__3Dison_plus = 150,
 	default_lulzbot_taz_4 = 250,
 	default_ultimaker2go = 112,
-	--default_doodle_dream = 80,
+	default_doodle_dream = 80,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -246,7 +246,7 @@ M.printer_travelSpeed = {
 
 M.printer_filamentThickness = {
 	default = 2.89,
-	--default_doodle_dream = 1,75,
+	default_doodle_dream = 1.75,
 	type = 'float',
 	description = '',
 	min = 0.0

From 8318bd265c0b0b07ba32b0118422dae0cfec0fba Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Tue, 9 Jun 2015 16:13:58 +0200
Subject: [PATCH 07/25] add doodle dream printer type

---
 src/util/printer.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/printer.lua b/src/util/printer.lua
index 9a7bb0d..6bf2438 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -52,8 +52,8 @@ local SUPPORTED_PRINTERS = {
 	mamba3d = "Mamba3D",
 	_3Dison_plus = "3Dison plus",
 	marlin_generic = "Generic Marlin Printer",
-  makerbot_generic = "Generic Makerbot Printer",
-	--doodle_dream = "Doodle Dream"
+	makerbot_generic = "Generic Makerbot Printer",
+	doodle_dream = "Doodle Dream"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",

From d75d1402bc89ed28679edc7f29232c0e516ea83b Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Tue, 9 Jun 2015 17:11:02 +0200
Subject: [PATCH 08/25] feature: filament thickness default settings per
 printer type

---
 src/conf_defaults.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index f4d6694..002b418 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -153,6 +153,14 @@ M.printer_heatedbed = {
 	type = 'bool',
 	description = 'Printer has heated bed',
 }
+M.printer_filamentThickness = {
+	default = 2.89,
+	default_doodle_dream = 1.75,
+	type = 'float',
+	description = '',
+	min = 0.0,
+	subSection = 'printer_type'
+}
 
 local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)\nM73 P0 (Set build percentage to 0)\nG162 X Y F2000 (home XY axes to maximum)\nG161 Z F900 (home Z axis to minimum quick)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z5.0 F900 (move Z axis down)\nG161 Z F100 (home Z axis to minimum more precise)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z2.0 F900 (move Z axis to safety height)\nG1 X-264 Y-145 Z0 F3300.0 (move XY to start position)\nG92 X0 Y0 Z0 A0 B0 (set axis position to 0)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed}M140 S{printingBedTemp} T0 (Set bed temp)\nM135 T0 (use first extruder)\nM104 S{printingTemp} T0 (set extruder temp)\nM133 T0 (Wait for extruder)\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 (extrude 10mm)\nG92 A0 (reset extruder)\nG0 Z20 (move up, to lose filament)"
 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)'
@@ -244,14 +252,6 @@ M.printer_travelSpeed = {
 	min = 0
 }
 
-M.printer_filamentThickness = {
-	default = 2.89,
-	default_doodle_dream = 1.75,
-	type = 'float',
-	description = '',
-	min = 0.0
-}
-
 M.printer_useSubLayers = {
 	default = true,
 	type = 'bool',

From 798031f9cd152fc29906c7a115c07dcf4f448377 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Tue, 9 Jun 2015 17:12:59 +0200
Subject: [PATCH 09/25] Comments on settings system

---
 src/util/settings.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/util/settings.lua b/src/util/settings.lua
index dde2666..52c52d5 100644
--- a/src/util/settings.lua
+++ b/src/util/settings.lua
@@ -161,22 +161,27 @@ end]]--
 function M.get(key)
 	--log:info("settings:get: "..utils.dump(key))
 	key = replaceDots(key)
+	
+	-- retrieve settings's base settings from conf_defaults.lua
 	local base = getBaseKeyTable(key)
-
 	if not base then return nil,ERR_NO_SUCH_KEY end
 
+	-- check which uci section to read. 
+	-- By default it will read from the general section, but if a base setting contains a subSection it will check that subSection
 	local section = UCI_CONFIG_SECTION;
 	if base.subSection ~= nil then
 		section = M.get(base.subSection)
 	end
-
+	
+	-- get setting from uci 
 	local uciV,msg = uci:get(UCI_CONFIG_NAME, section, key)
 	if not uciV and msg ~= nil then
 		local errorMSG = "Issue reading setting '"..utils.dump(key).."': "..utils.dump(msg);
 		log:info(errorMSG)
 		return nil, errorMSG;
 	end
-
+	
+	-- convert uci value into proper lua value 
 	local uciV = fromUciValue(uciV, base.type)
 	if uciV ~= nil then
 		-- returning value from uci

From 0b2eb5d230f617272ff661c9e05ab36cda7a493e Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Wed, 10 Jun 2015 17:48:09 +0200
Subject: [PATCH 10/25] add wanhao duplicator 4 printer type and configuration
 (heated bed, xyz, filament, startcode, endcode)

---
 src/conf_defaults.lua | 7 +++++++
 src/util/printer.lua  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 002b418..b11291d 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -111,6 +111,7 @@ M.printer_dimensions_x = {
 	default_lulzbot_taz_4 = 298,
 	default_ultimaker2go = 120,
 	default_doodle_dream = 120,
+	default_wanhao_duplicator4 = 210,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -126,6 +127,7 @@ M.printer_dimensions_y = {
 	default_lulzbot_taz_4 = 275,
 	default_ultimaker2go = 120,
 	default_doodle_dream = 120,
+	default_wanhao_duplicator4 = 140,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -138,6 +140,7 @@ M.printer_dimensions_z = {
 	default_lulzbot_taz_4 = 250,
 	default_ultimaker2go = 112,
 	default_doodle_dream = 80,
+	default_wanhao_duplicator4 = 140,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -149,6 +152,7 @@ M.printer_heatedbed = {
 	default_makerbot_replicator2x = true,
 	default_minifactory = true,
 	default_lulzbot_taz_4 = true,
+	default_wanhao_duplicator4 = true,
 	subSection = 'printer_type',
 	type = 'bool',
 	description = 'Printer has heated bed',
@@ -156,6 +160,7 @@ M.printer_heatedbed = {
 M.printer_filamentThickness = {
 	default = 2.89,
 	default_doodle_dream = 1.75,
+	default_wanhao_duplicator4 = 1.75,
 	type = 'float',
 	description = '',
 	min = 0.0,
@@ -173,6 +178,7 @@ M.printer_startcode = {
 	default_makerbot_replicator2 = default_makerbot_startcode,
 	default_makerbot_replicator2x = default_makerbot_startcode,
 	default_makerbot_thingomatic = default_makerbot_startcode,
+	default_wanhao_duplicator4 = default_makerbot_startcode,
 	default_delta_rostockmax = default_deltabot_startcode,
 	default_deltamaker = default_deltabot_startcode,
 	default_kossel = default_deltabot_startcode,
@@ -192,6 +198,7 @@ M.printer_endcode = {
 	default_makerbot_replicator2 = default_makerbot_endcode,
 	default_makerbot_replicator2x = default_makerbot_endcode,
 	default_makerbot_thingomatic = default_makerbot_endcode,
+	default_wanhao_duplicator4 = default_makerbot_endcode,
 	default_delta_rostockmax = default_deltabot_endcode,
 	default_deltamaker = default_deltabot_endcode,
 	default_kossel = default_deltabot_endcode,
diff --git a/src/util/printer.lua b/src/util/printer.lua
index 6bf2438..5edd5e9 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -18,6 +18,7 @@ local SUPPORTED_PRINTERS = {
 	makerbot_replicator2 = "MakerBot Replicator2",
 	makerbot_replicator2x = "MakerBot Replicator2x",
 	makerbot_thingomatic = "MakerBot Thing-o-matic",
+	wanhao_duplicator4 = "Wanhao Duplicator 4",
 	printrbot = "Printrbot",
 	bukobot = "Bukobot",
 	cartesio = "Cartesio",

From df4f1702a921527ba7001526fac04a79f5b1aee6 Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Wed, 10 Jun 2015 17:50:05 +0200
Subject: [PATCH 11/25] adjust default makerbot endcode: move z downwards after
 print. safer choice. wanhao shows that head travels through print, print is z
 lifted when stopping.

---
 src/conf_defaults.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index b11291d..91c869e 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -187,7 +187,7 @@ 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 )\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)\nG162 Z 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)',

From 067689d64b36047ec8ba8d8d9fbbd388e9aac93f Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Fri, 12 Jun 2015 14:46:38 +0200
Subject: [PATCH 12/25] WiFi related logging

---
 src/main.lua               | 7 ++++---
 src/network/wlanconfig.lua | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main.lua b/src/main.lua
index e529eb3..ff4d324 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -48,18 +48,19 @@ local function setupAutoWifiMode()
 
 	local wifiState = wifi.getDeviceState()
 	local netName, netMode = wifiState.ssid, wifiState.mode
+	log:info("current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode)
 
 	local apSsid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
 	local apMode = (apSsid == netName) and (netMode == 'ap')
+	log:info("ssid of self: " .. apSsid)
 
 	local scanList,msg = wifi.getScanInfo()
-	local knownSsids = wifi.getConfigs()
-
 	if not scanList then
 		return nil, "autowifi: could not scan wifi networks (" .. msg .. ")"
 	end
 
-	log:info("current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode .. ", ssid of self: " .. apSsid)
+	local knownSsids = wifi.getConfigs()
+	-- log:info("current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode .. ", ssid of self: " .. apSsid)
 	local visNet, knownNet = {}, {}
 	for _,sn in ipairs(scanList) do
 		table.insert(visNet, sn.ssid)
diff --git a/src/network/wlanconfig.lua b/src/network/wlanconfig.lua
index 4087a9d..1e72933 100644
--- a/src/network/wlanconfig.lua
+++ b/src/network/wlanconfig.lua
@@ -137,9 +137,10 @@ end
 -- @param ssid	return data for given SSID or for all networks if SSID not given
 -- @return data for all or requested network; false+error on failure or nil when requested network not found
 function M.getScanInfo(ssid)
-
 	local iw = iwinfo[deviceApi]
+	log:info("start wifi scan")
 	local sr = iw.scanlist(deviceName)
+	log:info("wifi scan done")
 	local si, se
 
 	if ssid == nil then

From 2ff4080ea49a77e97fac916b51de1c3f5188b408 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Fri, 12 Jun 2015 16:01:39 +0200
Subject: [PATCH 13/25] Removing custom wifi country #28

---
 post-install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/post-install.sh b/post-install.sh
index 983fba2..0dd48c4 100644
--- a/post-install.sh
+++ b/post-install.sh
@@ -79,7 +79,6 @@ $IPKG_INSTROOT/etc/init.d/dhcpcheck enable
 if [ -z "$IPKG_INSTROOT" ]; then
 	echo "Enabling and configuring wifi device..."
 	uci set wireless.@wifi-device[0].disabled=0
-	uci set wireless.radio0.country='NL'
 	uci commit wireless; wifi
 
 	echo "Disabling default route and DNS server for lan network interface..."
@@ -104,7 +103,6 @@ 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
 

From 6a546bcca569bdc59d857b04fcd7434b08df991b Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Fri, 12 Jun 2015 16:02:35 +0200
Subject: [PATCH 14/25] Removing wifi channel setting #28

---
 post-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/post-install.sh b/post-install.sh
index 0dd48c4..18945a9 100644
--- a/post-install.sh
+++ b/post-install.sh
@@ -79,6 +79,7 @@ $IPKG_INSTROOT/etc/init.d/dhcpcheck enable
 if [ -z "$IPKG_INSTROOT" ]; then
 	echo "Enabling and configuring wifi device..."
 	uci set wireless.@wifi-device[0].disabled=0
+	uci delete wireless.radio0.channel
 	uci commit wireless; wifi
 
 	echo "Disabling default route and DNS server for lan network interface..."
@@ -103,6 +104,7 @@ else
 	uci set uhttpd.main.lua_prefix='/d3dapi'
 
 	uci set wireless.@wifi-device[0].disabled=0
+	uci delete wireless.radio0.channel
 	# TODO: add firewall net
 	uci set network.wlan=interface
 

From 4ca599e962fd5166ec780e5931f378a1502abebc Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 15 Jun 2015 10:37:51 +0200
Subject: [PATCH 15/25] ID generation logging

---
 src/network/wlanconfig.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/network/wlanconfig.lua b/src/network/wlanconfig.lua
index 1e72933..637b586 100644
--- a/src/network/wlanconfig.lua
+++ b/src/network/wlanconfig.lua
@@ -25,14 +25,14 @@ local deviceName, deviceApi
 local cachedApSsid, baseApSsid = nil, nil
 
 function M.getSubstitutedSsid(unformattedSsid)
+	log:debug("getSubstitutedSsid unformattedSsid:'" .. unformattedSsid .. "' baseApSsid:'" .. (baseApSsid or "nil") .. "' cachedApSsid:'" .. (cachedApSsid or "nil"))
 	if unformattedSsid == baseApSsid and cachedApSsid ~= nil then return cachedApSsid end
 	if not unformattedSsid or type(unformattedSsid) ~= 'string' then return nil end
 
 	local macTail = M.getMacAddress():sub(7)
-
+	log:debug("  macTail:'" .. macTail)
 	baseApSsid = unformattedSsid
 	cachedApSsid = unformattedSsid:gsub('%%%%MAC_ADDR_TAIL%%%%', macTail)
-
 	return cachedApSsid
 end
 
@@ -107,7 +107,9 @@ end
 --returns the wireless device's MAC address (as string, without colons)
 --(lua numbers on openWrt seem to be 32bit so they cannot represent a MAC address as one number)
 function M.getMacAddress()
+	log:debug("getMacAddress")
 	local macText = utils.readFile('/sys/class/net/' .. deviceName .. '/address')
+	log:debug("  macText: '" .. (macText or "nil") .. "'")
 	local out = ''
 
 	-- Hack to prevent failure in case the MAC address could not be obtained.

From 92ea5faceb99e78ace0175ce036342eeb76e07a7 Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Mon, 15 Jun 2015 14:03:28 +0200
Subject: [PATCH 16/25] fix: ultimaker2go startcode and endcode inherit from
 ultimaker2 startcode (plus quotes replace on makerbot startcode)

---
 src/conf_defaults.lua | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 91c869e..34a3392 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -167,12 +167,13 @@ M.printer_filamentThickness = {
 	subSection = 'printer_type'
 }
 
-local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)\nM73 P0 (Set build percentage to 0)\nG162 X Y F2000 (home XY axes to maximum)\nG161 Z F900 (home Z axis to minimum quick)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z5.0 F900 (move Z axis down)\nG161 Z F100 (home Z axis to minimum more precise)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z2.0 F900 (move Z axis to safety height)\nG1 X-264 Y-145 Z0 F3300.0 (move XY to start position)\nG92 X0 Y0 Z0 A0 B0 (set axis position to 0)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed}M140 S{printingBedTemp} T0 (Set bed temp)\nM135 T0 (use first extruder)\nM104 S{printingTemp} T0 (set extruder temp)\nM133 T0 (Wait for extruder)\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 (extrude 10mm)\nG92 A0 (reset extruder)\nG0 Z20 (move up, to lose filament)"
+local default_makerbot_startcode = ';@printer {printerType}\nM136 (enable build)\nM73 P0 (Set build percentage to 0)\nG162 X Y F2000 (home XY axes to maximum)\nG161 Z F900 (home Z axis to minimum quick)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z5.0 F900 (move Z axis down)\nG161 Z F100 (home Z axis to minimum more precise)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z2.0 F900 (move Z axis to safety height)\nG1 X-264 Y-145 Z0 F3300.0 (move XY to start position)\nG92 X0 Y0 Z0 A0 B0 (set axis position to 0)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed}M140 S{printingBedTemp} T0 (Set bed temp)\nM135 T0 (use first extruder)\nM104 S{printingTemp} T0 (set extruder temp)\nM133 T0 (Wait for extruder)\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 (extrude 10mm)\nG92 A0 (reset extruder)\nG0 Z20 (move up, to lose filament)'
 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)'
+local default_ultimaker2_startcode = ';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'
 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 \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_ultimaker2go = default_ultimaker2,
+	default_ultimaker2 = default_ultimaker2_startcode,
+	default_ultimaker2go = default_ultimaker2_startcode,
 	default__3Dison_plus = ';@printer {printerType}\nM136 (enable build)\nM73 P0\nG21\nG90\nM103\n;M109 S50 T0\nM140 S50 T0\nM104 S{printingTemp} T0\n;M134 T0\nM135 T0\nM104 S{printingTemp} T0\nG162 X Y F2000(home XY axes maximum)\nG161 Z F900(home Z axis minimum)\nG92 X113.5 Y74 Z-5 A0 B0 (set Z to -5)\nG1 Z0.0 F900(move Z to 0)\nG161 Z F100(home Z axis minimum)\nM132 X Y Z A B (Recall stored home offsets for XYZAB axis)\nG1 Z50 F3300\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\nM133 T0\nM6 T0\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG0 Z0.2 F3000\nG1 Z0 F100 A10 ;extrude 10mm\nG92 X227 Y148 Z0 A0 ;reset again\nG1 X227 Y148 Z0',
 	default_makerbot_generic = default_makerbot_startcode,
 	default_makerbot_replicator2 = default_makerbot_startcode,
@@ -189,10 +190,11 @@ M.printer_startcode = {
 
 local default_makerbot_endcode = 'M73 P100\nG92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG162 Z 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)'
+local default_ultimaker2_endcode = '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)'
 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}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
-	default_ultimaker2go = default_ultimaker2,
+	default_ultimaker2 = default_ultimaker2_endcode,
+	default_ultimaker2go = default_ultimaker2_endcode,
 	default__3Dison_plus = '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)\nM140 S35 T0\nM104 S180 T0\nM73 P100 (end build progress )\nM72 P1 ( Play Ta-Da song )\nM137 (build end notification)\n',
 	default_makerbot_generic = default_makerbot_endcode,
 	default_makerbot_replicator2 = default_makerbot_endcode,

From 93e2ce1cb771338ef1596f71ae5f2e1394f9258f Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 15 Jun 2015 15:08:11 +0200
Subject: [PATCH 17/25] Increate wifibox timeout

Also see: https://github.com/Doodle3D/doodle3d-firmware/issues/32
---
 src/script/wifibox_init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/wifibox_init b/src/script/wifibox_init
index d157d7d..903ad60 100644
--- a/src/script/wifibox_init
+++ b/src/script/wifibox_init
@@ -12,7 +12,7 @@ START=61
 LOGGER="logger -t autowifi -p 6"
 
 boot() {
-	sleep 1
+	sleep 5
 
 	$LOGGER "Invoking Doodle3D WiFi box network auto-initialization..."
 	/usr/share/lua/wifibox/script/d3dapi autowifi

From cb6ddf9900f9cb35ca61ae78a5e73cdbec69ebe8 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 15 Jun 2015 17:08:09 +0200
Subject: [PATCH 18/25] Fixed concatenation of empty unformattedSsid

---
 src/network/wlanconfig.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/wlanconfig.lua b/src/network/wlanconfig.lua
index 637b586..ad2a5aa 100644
--- a/src/network/wlanconfig.lua
+++ b/src/network/wlanconfig.lua
@@ -25,7 +25,7 @@ local deviceName, deviceApi
 local cachedApSsid, baseApSsid = nil, nil
 
 function M.getSubstitutedSsid(unformattedSsid)
-	log:debug("getSubstitutedSsid unformattedSsid:'" .. unformattedSsid .. "' baseApSsid:'" .. (baseApSsid or "nil") .. "' cachedApSsid:'" .. (cachedApSsid or "nil"))
+	log:debug("getSubstitutedSsid unformattedSsid:'" .. (unformattedSsid or "nil") .. "' baseApSsid:'" .. (baseApSsid or "nil") .. "' cachedApSsid:'" .. (cachedApSsid or "nil"))
 	if unformattedSsid == baseApSsid and cachedApSsid ~= nil then return cachedApSsid end
 	if not unformattedSsid or type(unformattedSsid) ~= 'string' then return nil end
 

From 4c033a6215147114564333a42f3f48963dfc5028 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Tue, 16 Jun 2015 12:19:27 +0200
Subject: [PATCH 19/25] Version and Releasenotes update

---
 ReleaseNotes.md      | 25 +++++++++++++++++++++++++
 src/FIRMWARE-VERSION |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 15a9088..f9d6376 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,30 @@
 Changelog
 
+# 0.10.6-rc1 (16 jun 2015)
+This release sees several connectivity bugs resolved as we continue to look to create the most stable experience we can offer for Doodle3D users. A new addition that has been realized in that the filament thickness is now printer dependent. This is important for printers that use 1,75mm filament. When changing the printer type it switches automatically. Please contact us for better filament thickness defaults. For more details please review the notes below: 
+
+General:
+- Updated OpenWRT (the operating system) to 14.07.
+- Fixed several big issues around connecting to printers.
+- Big files for Marlin based printers are processed faster.
+- Target temperature retrieval is improved.
+- Changed the Accesspoint's settings to the default because of startup issues (country: NL to US, channel: 11 to 1).
+- Improved 404 page. 
+
+Additions
+- Filament thickness is now printer type dependent and automatically change when selecting a printer. (Please contact us for better filament thickness defaults.)
+
+Support for more 3D printers:
+- DoodleDream
+- 3Dison
+- LulzBot TAZ 4
+- Wanhao Duplicator 4
+- Ultimaker 2 Go
+
+Improvements for Makerbot based printers (like the Wanhao printer):
+- Prevent that the nozzle bumps into the bed when starting a new print.
+- Prevent that the nozzle moves though a print after printing. 
+
 # 0.10.5-a (2 Feb 2015)
 - Removed gray lines where printer needs to 'travel' (move without printing)
 - Enabled traveling also for first couple of layers. This prevents straight lines crossing your print
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 21f5626..7c684c6 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.5-a
\ No newline at end of file
+0.10.6-rc1
\ No newline at end of file

From 2d0254dc1e28e3d92df9a7ceef0e3d69956558d6 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Tue, 16 Jun 2015 16:48:05 +0200
Subject: [PATCH 20/25] Manual line breaks in release notes

---
 ReleaseNotes.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index f9d6376..7c7b146 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,7 +1,12 @@
 Changelog
 
 # 0.10.6-rc1 (16 jun 2015)
-This release sees several connectivity bugs resolved as we continue to look to create the most stable experience we can offer for Doodle3D users. A new addition that has been realized in that the filament thickness is now printer dependent. This is important for printers that use 1,75mm filament. When changing the printer type it switches automatically. Please contact us for better filament thickness defaults. For more details please review the notes below: 
+This release sees several connectivity bugs resolved as we continue to look to 
+create the most stable experience we can offer for Doodle3D users. A new 
+addition that has been realized in that the filament thickness is now 
+printer dependent. This is important for printers that use 1,75mm filament. 
+When changing the printer type it switches automatically. Please contact us for 
+better filament thickness defaults. For more details please review the notes below: 
 
 General:
 - Updated OpenWRT (the operating system) to 14.07.

From eedc6d3c6b1ea49c0da62c6f37182e25650b7011 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Tue, 16 Jun 2015 16:49:18 +0200
Subject: [PATCH 21/25] Update network status after boot when no action was
 needed

When it already was connected to a WiFi network or it already was a
access point.
---
 src/main.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main.lua b/src/main.lua
index ff4d324..12260cd 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -73,6 +73,15 @@ local function setupAutoWifiMode()
 
 	-- if the currently active network is client mode and is also visible, do nothing since it will connect automatically further along the boot process
 	if netMode == 'sta' and netName ~= nil and netName ~= "" and findSsidInList(scanList, netName) then
+		-- signin to connect.doodle3d.com
+		local success, output = Signin.signin()
+		if success then
+				log:info("Signed in")
+		else 
+			log:info("Signing in failed")
+		end
+		-- report we are connected after signin attempt
+		netconf.setStatus(netconf.CONNECTED,"Connected");
 		return true, "autowifi: no action - existing configuration found for currently wifi visible network (" .. netName .. ")"
 	end
 
@@ -102,6 +111,7 @@ local function setupAutoWifiMode()
 			return nil, "autowifi: failed to configure as access point with ssid '" .. apSsid .. "' (" .. msg .. ")"
 		end
 	else
+		netconf.setStatus(netconf.CREATED,"Access point created");
 		return true, "autowifi: no action - no known networks found, already in access point mode"
 	end
 

From fd167ee11e95910da421721126dc2dbb71684d2a Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Tue, 16 Jun 2015 16:50:31 +0200
Subject: [PATCH 22/25] 0.10.6-rc2 version and release notes

---
 ReleaseNotes.md      | 1 +
 src/FIRMWARE-VERSION | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 7c7b146..6e88dec 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,6 @@
 Changelog
 
+# 0.10.6-rc2 (16 jun 2015)
 # 0.10.6-rc1 (16 jun 2015)
 This release sees several connectivity bugs resolved as we continue to look to 
 create the most stable experience we can offer for Doodle3D users. A new 
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 7c684c6..68af17a 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.6-rc1
\ No newline at end of file
+0.10.6-rc2
\ No newline at end of file

From 6038eac72a45437069d271effe64d9fd70fd7937 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Wed, 17 Jun 2015 13:31:23 +0200
Subject: [PATCH 23/25] Adapted release script to new buildroot system

---
 extra/scripts/publish-wifibox-release.lua | 95 ++++++++++-------------
 1 file changed, 40 insertions(+), 55 deletions(-)

diff --git a/extra/scripts/publish-wifibox-release.lua b/extra/scripts/publish-wifibox-release.lua
index c990021..6cbcacd 100755
--- a/extra/scripts/publish-wifibox-release.lua
+++ b/extra/scripts/publish-wifibox-release.lua
@@ -13,6 +13,7 @@
 -- 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
+-- Also see: https://github.com/keplerproject/luarocks/wiki/Using-LuaRocks#rocks-trees-and-the-lua-libraries-path
 --
 -- This script will automatically locate the Doodle3D repo's. 
 -- Index files are fetched from the online repository.
@@ -66,8 +67,11 @@ end
 pl = pl()
 local um --- update manager module, will be loaded later through @{loadUpdateManager}
 
-local lfs = require('lfs') -- assume this exists since it's required by penlight as well
-
+local ok, lfs = pcall(require, 'lfs')
+if not ok then
+	ERR('This script requires the LuaFileSystem library')
+	os.exit(2)
+end
 
 -----------------------------
 -- CONSTANTS AND VARIABLES --
@@ -148,13 +152,17 @@ local function findInFile(needle, file)
 	return not not t:find(needle, 1, true)
 end
 
-local function detectOpenWrtRoot()
-	local f = io.open('Makefile', 'r')
-	local line = f and f:read('*line')
-	local rv = (line and line:find('# Makefile for OpenWrt') == 1) and true or false
+local function fileExists(path)
+    local attr = lfs.attributes (path)
+    return attr ~= nil
+end
 
-	if f then f:close() end
-	return rv
+local function detectBuildroot()
+	if not fileExists("customfeeds") or not fileExists("bin") then 
+		return false 
+	else 
+		return true
+	end
 end
 
 -- returns uri (file path) of the wifibox feed, nil if not found or nil+msg on error
@@ -244,24 +252,15 @@ end
 local function prepare()
 	local msg = nil
 
-	io.write("* Checking if working directory is the OpenWrt root... ")
-	local isOpenWrtRoot = detectOpenWrtRoot()
-	if isOpenWrtRoot then
-		paths.wrt = pl.path.currentdir()
-		print("found " .. paths.wrt)
-	else
-		print("unrecognized directory, try changing directories or using -wrt-root")
-		return nil
-	end
-
 	io.write("* Looking for Doodle3D feed path... ")
-	local d3dFeed,msg = getWifiboxFeedRoot('feeds.conf')
-	if d3dFeed then
-		print("found " .. d3dFeed)
-	else
-		if msg then print("not found: " .. msg) else print("not found.") end
-		return nil
-	end
+	-- local d3dFeed,msg = getWifiboxFeedRoot('feeds.conf')
+	-- if d3dFeed then
+	-- 	print("found " .. d3dFeed)
+	-- else
+	-- 	if msg then print("not found: " .. msg) else print("not found.") end
+	-- 	return nil
+	-- end
+	local d3dFeed = "customfeeds"
 
 	paths.firmware = pl.path.join(d3dFeed, D3D_REPO_FIRMWARE_NAME)
 	paths.client = pl.path.join(d3dFeed, D3D_REPO_CLIENT_NAME)
@@ -315,8 +314,8 @@ local function collectLocalInfo()
 	local info = {}
 
 	-- temporary fields required for copying image files
-	info.factoryImgPath = pl.path.join(paths.wrt, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-factory.bin')
-	info.sysupgradeImgPath = pl.path.join(paths.wrt, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-sysupgrade.bin')
+	info.factoryImgPath = pl.path.join(paths.root, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-factory.bin')
+	info.sysupgradeImgPath = pl.path.join(paths.root, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-sysupgrade.bin')
 
 	info.version = um.parseVersion(pl.file.read(pl.path.join(paths.firmware, 'src/FIRMWARE-VERSION')))
 	if not info.version then return nil,"could not determine current firmware version" end
@@ -410,7 +409,7 @@ end
 -- TODO: the packages are not really used and the openwrt script to generate the
 -- package index requires all packages to be present so this has been skipped for now
 local function buildFeedDir()
-	local scriptPath = pl.path.join(paths.wrt, 'scripts/ipkg-make-index.sh')
+	local scriptPath = pl.path.join(paths.root, 'scripts/ipkg-make-index.sh')
 
 	return nil
 end
@@ -424,26 +423,6 @@ local function uploadFiles()
 	return rv and true or nil,("rsync failed, exit status: " .. ev)
 end
 
-local function checkWrtConfig()
-	local goodConfigPath = pl.path.join(paths.firmware, "extra/openwrt-build/openwrt-diffconfig-extramini")
-	local wrtConfigPath = pl.path.tmpname()
-	--print("diffonfig output file: " .. wrtConfigPath)
-
-	local rv,ev = pl.utils.execute('./scripts/diffconfig.sh > "' .. wrtConfigPath .. '" 2> /dev/null')
-	if not rv then return nil,"could not run diffconfig script (exit status: " .. ev .. ")" end
-
-	local _,rv,output = pl.utils.executeex('diff "' .. wrtConfigPath .. '" "' .. goodConfigPath .. '"')
-
-	if rv == 0 then
-		return true
-	elseif rv == 1 then
-		print("configurations differ:\n-----------------------\n" .. output .. "\n-----------------------")
-		--ask for confirmation?
-	else
-		return nil,"unexpected exit status from diff (" .. rv .. ")"
-	end
-end
-
 local function main()
 	print("\nDoodle3D release script")
 	if detectRootPrivileges() then
@@ -457,6 +436,16 @@ local function main()
 --	if opts['cache-dir'] then paths.cache = opts['cache-dir'] end
 -- more options: clear cache, rebuild (download all and generate index from actual files), dry-run, force
 
+	io.write("* Checking if working directory is the Buildroot... ")
+	local isBuildroot = detectBuildroot()
+	if isBuildroot then
+		paths.root = pl.path.currentdir()
+		print("found " .. paths.root)
+	else
+		print("unrecognized directory, try changing directories or using -wrt-root")
+		return nil
+	end
+
 	if not prepare() then quit(1) end
 
 
@@ -465,7 +454,7 @@ local function main()
 		print("Error: could not collect local version information (" .. msg .. ")")
 		quit(3)
 	end
-
+	
 	local stables,betas = fetchVersionInfo()
 	if not stables then
 		print("Error: could not get version information (" .. betas .. ")")
@@ -474,7 +463,6 @@ local function main()
 
 	--TODO: if requested, fetch images and packages (i.e., mirror whole directory)
 
-
 --	pl.pretty.dump(newVersion)
 --	print("stables: "); pl.pretty.dump(stables)
 --	print("===========================");
@@ -488,8 +476,6 @@ local function main()
 		return not (um.findVersion(newVersion.version, nil, stables) or um.findVersion(newVersion.version, nil, betas)) and true or nil
 	end)
 
-	runAction("Checking OpenWrt config", "failed", 3, checkWrtConfig)
-
 	--TODO: check git repos (`git log -n 1 --pretty=format:%ct` gives commit date of last commit (not author date))
 
 	local isStable = (newVersion.version.suffix == nil)
@@ -516,8 +502,7 @@ local function main()
 	print("skipped - not implemented")
 --	runAction("Building package feed directory", "failed", 5, buildFeedDir)
 
-
-	local answer = getYesNo("? Local updates cache will be synced to remote server, proceed? (y/n) ")
+	local answer = getYesNo("? Are you SURE you want to publish? (y/n) ")
 	if answer ~= true then
 		print("Did not get green light, quitting.")
 		quit(5)
@@ -525,7 +510,7 @@ local function main()
 
 	runAction("About to sync files to server", "could not upload files", 6, uploadFiles)
 
-	print("Done.")
+	print("Released version " .. um.formatVersion(newVersion.version) .. "!")
 	quit()
 end
 

From b26b7376ca9afc49459f9f92ae13e2821f1e268a Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Wed, 17 Jun 2015 13:32:50 +0200
Subject: [PATCH 24/25] updated version and release notes for 0.10.6-rc3

---
 ReleaseNotes.md      | 1 +
 src/FIRMWARE-VERSION | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 6e88dec..cde4652 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,6 @@
 Changelog
 
+# 0.10.6-rc3 (17 jun 2015)
 # 0.10.6-rc2 (16 jun 2015)
 # 0.10.6-rc1 (16 jun 2015)
 This release sees several connectivity bugs resolved as we continue to look to 
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 68af17a..a08f332 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.6-rc2
\ No newline at end of file
+0.10.6-rc3
\ No newline at end of file

From 5979eb841a209314a449915ee61a67e59de81a18 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Wed, 17 Jun 2015 14:12:21 +0200
Subject: [PATCH 25/25] updated version and release notes for 0.10.6

---
 ReleaseNotes.md      | 1 +
 src/FIRMWARE-VERSION | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index cde4652..d0ccbf5 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,6 @@
 Changelog
 
+# 0.10.6 (17 jun 2015)
 # 0.10.6-rc3 (17 jun 2015)
 # 0.10.6-rc2 (16 jun 2015)
 # 0.10.6-rc1 (16 jun 2015)
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index a08f332..6348c0f 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.6-rc3
\ No newline at end of file
+0.10.6
\ No newline at end of file