From 2221cd00c0bf1c6031d8b0ae1b370a594cc23233 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Thu, 9 Oct 2014 16:24:55 +0200
Subject: [PATCH 01/12] added 3dison_plus printer type

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

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 9e3ee04..de49b2f 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -146,6 +146,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__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,
 	default_makerbot_replicator2x = default_makerbot_startcode,
@@ -163,6 +164,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__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,
 	default_makerbot_replicator2x = default_makerbot_endcode,
diff --git a/src/util/printer.lua b/src/util/printer.lua
index c7b906e..dadcafe 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -48,8 +48,9 @@ local SUPPORTED_PRINTERS = {
 	builder3d = "Builder 3D",
 	bigbuilder3d = "Big Builder 3D",
 	mamba3d = "Mamba3D",
+	_3Dison_plus = "3Dison plus",
 	marlin_generic = "Generic Marlin Printer",
-    makerbot_generic = "Generic Makerbot Printer"
+  makerbot_generic = "Generic Makerbot Printer"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",

From 35556369edc61e7e5d918dfc986ee22c638a06ea Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Thu, 9 Oct 2014 16:32:19 +0200
Subject: [PATCH 02/12] updated release notes and version

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

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index dd28329..7d5b836 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,8 @@
 Changelog
+# 0.10.4-photoguide (9th oct 2014)
+- Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
+- Added support for the '3Dison plus' printer.
+
 # 0.10.4 (28th may 2014)
 - Pulled  improvements by Ultimaker. 
 - Fixed printing isues with gcode containing whitelines. 
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 1bfc953..1fc5911 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.4
\ No newline at end of file
+0.10.4-photoguide
\ No newline at end of file

From 37bab25420118e12c1ea13d16022b2d4205f33f9 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Thu, 9 Oct 2014 17:39:17 +0200
Subject: [PATCH 03/12] Syntax error fix

---
 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 de49b2f..645018c 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -146,7 +146,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__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__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,
 	default_makerbot_replicator2x = default_makerbot_startcode,

From 036bf778c57ff1845bbf3c0ef1570c24b4256e8c Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Fri, 10 Oct 2014 11:04:25 +0200
Subject: [PATCH 04/12] added default printer dimensions for 3dison plus

---
 src/conf_defaults.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 645018c..65b5846 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -104,6 +104,7 @@ M.printer_type = {
 M.printer_dimensions_x = {
 	default = 200,
 	default_delta_rostockmax = 0,
+	default__3Dison_plus = 227,
 	default_deltamaker = 0,
 	default_kossel = 0,
 	default_minifactory = 150,
@@ -115,6 +116,7 @@ M.printer_dimensions_x = {
 M.printer_dimensions_y = {
 	default = 200,
 	default_delta_rostockmax = 0,
+	default__3Dison_plus = 148,
 	default_deltamaker = 0,
 	default_kossel = 0,
 	default_minifactory = 150,
@@ -126,6 +128,7 @@ M.printer_dimensions_y = {
 M.printer_dimensions_z = {
 	default = 200,
 	default_minifactory = 155,
+	default__3Dison_plus = 150,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',

From 028459c3214f23e0af8fdbf41055b6d3c17790b7 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Fri, 10 Oct 2014 11:07:22 +0200
Subject: [PATCH 05/12] Version bump

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

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 7d5b836..a237b2f 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,5 @@
 Changelog
+# 0.10.4-photoguide2 (9th oct 2014)
 # 0.10.4-photoguide (9th oct 2014)
 - Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
 - Added support for the '3Dison plus' printer.
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 1fc5911..f623d26 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.4-photoguide
\ No newline at end of file
+0.10.4-photoguide2
\ No newline at end of file

From 4b1476100a8114f7f1eacd31819df6347499e0f0 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Fri, 10 Oct 2014 11:08:46 +0200
Subject: [PATCH 06/12] updated version info

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

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index a237b2f..56b92ec 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,5 @@
 Changelog
+# 0.10.4-photoguide3 (10th oct 2014)
 # 0.10.4-photoguide2 (9th oct 2014)
 # 0.10.4-photoguide (9th oct 2014)
 - Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index f623d26..302c77a 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.4-photoguide2
\ No newline at end of file
+0.10.4-photoguide3
\ No newline at end of file

From b840938cbcabafc6fbef75342c45ae749c57ea84 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Fri, 19 Dec 2014 16:10:42 +0100
Subject: [PATCH 07/12] updated release notes and sketch api

---
 ReleaseNotes.md             |  7 +++++
 src/rest/api/api_sketch.lua | 52 +++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 56b92ec..8fd814d 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,11 @@
 Changelog
+# 0.10.5
+- Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
+- Added support for the '3Dison plus' printer.
+- Added a File Manager for downloading, uploading and deleting sketches (can be opened via the Settings Panel)
+- Improved the way sketches are loaded
+- Fixed scrolling issue in Settings Panel
+
 # 0.10.4-photoguide3 (10th oct 2014)
 # 0.10.4-photoguide2 (9th oct 2014)
 # 0.10.4-photoguide (9th oct 2014)
diff --git a/src/rest/api/api_sketch.lua b/src/rest/api/api_sketch.lua
index ad7c263..021548a 100644
--- a/src/rest/api/api_sketch.lua
+++ b/src/rest/api/api_sketch.lua
@@ -169,4 +169,56 @@ function M.clear_POST(request, response)
 	end
 end
 
+-- remove single sketch
+-- function M.delete_POST(request, response)
+-- 	local argId = tonumber(request:get("id")) --to number will raise exception in case of illegal input
+-- 	local filename = M.SKETCH_DIR .. '/' .. constructSketchFilename(argId)
+-- 	local rv = os.execute("rm -f " .. filename)
+-- 	if rv == 0 then response:setSuccess()
+-- 	else response:setFail("could not remove " .. filename)
+-- 	end
+-- end
+
+-- recreate directory sequence by renaming files
+function M.index_POST(request, response)
+	local list = {}
+	local index = 1
+	for item in lfs.dir(M.SKETCH_DIR) do
+		if item ~= '.' and item ~= '..' then
+			local idx = item:match('^(%d+)\.'..SKETCH_FILE_EXTENSION..'$')
+			if idx and idx:len() == NUMBER_PAD_WIDTH then
+				local src = M.SKETCH_DIR .. '/' .. item
+				local dst = M.SKETCH_DIR .. '/' .. constructSketchFilename(index)
+				
+				if src ~= dst then
+					table.insert(list, src .. ' ' .. dst)
+					local rv = os.execute("mv " .. src .. ' ' .. dst)
+				end
+
+				index = index + 1
+				
+			end
+		end
+	end
+
+	response:addData('list',list)
+	response:setSuccess()
+end
+
+-- list files by fileID (not by index)
+function M.list_GET(request, response)
+	response:addData("list",createSketchList())
+	response:setSuccess()
+end
+
+-- remove single sketch by fileID (not by index)
+function M.delete_POST(request, response)
+	local argId = tonumber(request:get("id")) --to number will raise exception in case of illegal input
+	local filename = M.SKETCH_DIR .. '/' .. constructSketchFilename(argId)
+	local rv = os.execute("rm -f " .. filename)
+	if rv == 0 then response:setSuccess()
+	else response:setFail("could not remove " .. filename)
+	end
+end
+
 return M

From 54a0032a556c811763d70b11ca20fa3e9e0e4b3a Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Fri, 19 Dec 2014 21:13:36 +0100
Subject: [PATCH 08/12] firmware version

---
 src/FIRMWARE-VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 302c77a..8877d79 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.4-photoguide3
\ No newline at end of file
+0.10.5
\ No newline at end of file

From 6e5eb097b83d79b7e12b74ed801f31ea1ee6285d Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 2 Feb 2015 17:28:57 +0100
Subject: [PATCH 09/12] increased the value of rsync_timeout in
 publish-wifibox-release

---
 extra/scripts/publish-wifibox-release.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/scripts/publish-wifibox-release.lua b/extra/scripts/publish-wifibox-release.lua
index 8dbeac0..c990021 100755
--- a/extra/scripts/publish-wifibox-release.lua
+++ b/extra/scripts/publish-wifibox-release.lua
@@ -90,7 +90,7 @@ local D3D_REPO_PRINT3D_NAME = 'print3d'
 local IMAGE_BASENAME = 'doodle3d-wifibox'
 local BACKUP_FILE_SUFFIX = 'bkp'
 local RELEASE_NOTES_FILE = "ReleaseNotes.md"
-local RSYNC_TIMEOUT = 2
+local RSYNC_TIMEOUT = 20
 local MAX_VIABLE_IMAGE_SIZE = 3500000
 
 local deviceType = 'tl-mr3020' -- or 'tl-wr703'

From 027f803d54aa551d09b6931095d25ca94add0eb9 Mon Sep 17 00:00:00 2001
From: Rick Companje <rick@companje.nl>
Date: Mon, 2 Feb 2015 20:16:15 +0100
Subject: [PATCH 10/12] updated ReleaseNotes and version

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

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 8fd814d..15a9088 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,13 @@
 Changelog
+
+# 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
+- Added url parameter l=1 which disables parts of the user interface. The 'Print' button 'saves' the sketch instead of sending it to the printer. This is useful for public events where a moderator needs to start prints instead of the user.
+- Fixed a small bug where the last sketch was skipped when pressing the previous button for the first time.
+- changed WordArt font to a self-made single line handwritting font. This font prints faster and is more playful.
+
+
 # 0.10.5
 - Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
 - Added support for the '3Dison plus' printer.
diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION
index 8877d79..21f5626 100644
--- a/src/FIRMWARE-VERSION
+++ b/src/FIRMWARE-VERSION
@@ -1 +1 @@
-0.10.5
\ No newline at end of file
+0.10.5-a
\ No newline at end of file

From 4a054f5d5f54d13c9804148f7043364de17257d6 Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Wed, 27 May 2015 17:53:53 +0200
Subject: [PATCH 11/12] support for lulzbot taz 4 and doodle dream printer

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

diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua
index 65b5846..af57932 100644
--- a/src/conf_defaults.lua
+++ b/src/conf_defaults.lua
@@ -108,6 +108,8 @@ M.printer_dimensions_x = {
 	default_deltamaker = 0,
 	default_kossel = 0,
 	default_minifactory = 150,
+	default_lulzbot_taz_4 = 298,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -120,6 +122,8 @@ M.printer_dimensions_y = {
 	default_deltamaker = 0,
 	default_kossel = 0,
 	default_minifactory = 150,
+	default_lulzbot_taz_4 = 275,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -129,6 +133,8 @@ M.printer_dimensions_z = {
 	default = 200,
 	default_minifactory = 155,
 	default__3Dison_plus = 150,
+	default_lulzbot_taz_4 = 250,
+	default_doodle_dream = 80,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -139,6 +145,7 @@ M.printer_heatedbed = {
 	default_ultimaker2 = true,
 	default_makerbot_replicator2x = true,
 	default_minifactory = true,
+	default_lulzbot_taz_4 = true,
 	subSection = 'printer_type',
 	type = 'bool',
 	description = 'Printer has heated bed',
diff --git a/src/util/printer.lua b/src/util/printer.lua
index dadcafe..320a813 100644
--- a/src/util/printer.lua
+++ b/src/util/printer.lua
@@ -29,6 +29,7 @@ local SUPPORTED_PRINTERS = {
 	kossel = "Kossel",
 	leapfrog_creatr = "LeapFrog Creatr",
 	lulzbot_aO_101 = "LulzBot AO-101",
+	lulzbot_taz_4 = "LulzBot TAZ 4",
 	makergear_m2 = "MakerGear M2",
 	makergear_prusa = "MakerGear Prusa",
 	makibox = "Makibox",
@@ -50,7 +51,8 @@ local SUPPORTED_PRINTERS = {
 	mamba3d = "Mamba3D",
 	_3Dison_plus = "3Dison plus",
 	marlin_generic = "Generic Marlin Printer",
-  makerbot_generic = "Generic Makerbot Printer"
+  makerbot_generic = "Generic Makerbot Printer",
+	doodle_dream = "Doodle Dream"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",

From 623f28f71a7bee20e1e030e7630b80fbfad5bfbd Mon Sep 17 00:00:00 2001
From: Arne Boon <arneboon@gmail.com>
Date: Wed, 27 May 2015 17:59:44 +0200
Subject: [PATCH 12/12] adjust doodle dream filament thickness to 1.75

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

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