Merge branch 'master' into develop

ReleaseNotes.md

@@ -1,4 +1,26 @@
 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.
+- 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)
+- 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. 

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'

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.4
+0.10.5-a

src/conf_defaults.lua

@@ -104,9 +104,12 @@ 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,
+	default_lulzbot_taz_4 = 298,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -115,9 +118,12 @@ 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,
+	default_lulzbot_taz_4 = 275,
+	default_doodle_dream = 120,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -126,6 +132,9 @@ M.printer_dimensions_y = {
 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 = '',
@@ -136,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',
@@ -146,6 +156,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 +174,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,
@@ -229,6 +241,7 @@ M.printer_travelSpeed = {
 
 M.printer_filamentThickness = {
 	default = 2.89,
+	default_doodle_dream = 1.75,
 	type = 'float',
 	description = '',
 	min = 0.0

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

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",
@@ -48,8 +49,10 @@ 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",
+	doodle_dream = "Doodle Dream"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",