From 9b9513c278da06be153a9d07227ccd9d942e60c3 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 11:07:21 +0200 Subject: [PATCH 1/7] disable heatup and set heatup temperature to 0 by default --- src/conf_defaults.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua index a591ffc..4ccfed9 100644 --- a/src/conf_defaults.lua +++ b/src/conf_defaults.lua @@ -334,19 +334,19 @@ M.printer_bottomEnableTraveling = { } M.printer_heatup_enabled = { - default = true, + default = false, type = 'bool', description = '' } M.printer_heatup_temperature = { - default = 180, + default = 0, type = 'int', description = '' } M.printer_heatup_bed_temperature = { - default = 70, + default = 0, type = 'int', description = '' } From 752bd144cf61b813072b453880115138d503b683 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 11:08:35 +0200 Subject: [PATCH 2/7] add \n to default_deltabot_endcode --- 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 4ccfed9..3dca9c2 100644 --- a/src/conf_defaults.lua +++ b/src/conf_defaults.lua @@ -230,7 +230,7 @@ M.printer_startcode = { } local default_makerbot_endcode = 'G92 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\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_deltabot_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+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;move to home\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM109 S0 ; hot end off\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)' local default_ultimaker2_endcode = 'M10000\nM10000\nM10001 X20 Y28 SDoodle3D done!\nM107 ;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}\n' 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 a5f3ff92cf0e74e80f6e7d80aae4d0e87e9f20e5 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 11:11:53 +0200 Subject: [PATCH 3/7] replace preheatTemp and preheatBedTemp by 0 in default encode for safety --- src/conf_defaults.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf_defaults.lua b/src/conf_defaults.lua index 3dca9c2..9d8b7f2 100644 --- a/src/conf_defaults.lua +++ b/src/conf_defaults.lua @@ -229,14 +229,14 @@ M.printer_startcode = { description = '' } -local default_makerbot_endcode = 'G92 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\nM72 P1 ( Play Ta-Da song )\nM137 (build end notification)' -local default_deltabot_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+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;move to home\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM109 S0 ; hot end off\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)' -local default_ultimaker2_endcode = 'M10000\nM10000\nM10001 X20 Y28 SDoodle3D done!\nM107 ;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}\n' +local default_makerbot_endcode = 'G92 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 S0 T0\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM137 (build end notification)' +local default_deltabot_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+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;move to home\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM109 S0 ; hot end off\n{if heatedBed}M140 S0\nM117 Done ;display message (20 characters to clear whole screen)' +local default_ultimaker2_endcode = 'M10000\nM10000\nM10001 X20 Y28 SDoodle3D done!\nM107 ;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 S0\n{if heatedBed}M140 S0\n' 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 = '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 S0\n{if heatedBed}M140 S0\nM117 Done ;display message (20 characters to clear whole screen)', 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__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 S0 T0\nM104 S0 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, @@ -245,7 +245,7 @@ M.printer_endcode = { default_delta_rostockmax = default_deltabot_endcode, default_deltamaker = default_deltabot_endcode, default_kossel = default_deltabot_endcode, - default_craftbot_plus = '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\nM109 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)', + default_craftbot_plus = '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\nM109 S0\n{if heatedBed}M140 S0\nM117 Done ;display message (20 characters to clear whole screen)', type = 'string', subSection = 'printer_type', description = '' From 18271618f7f53c086a4e4cd76dc92c61f28a4003 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 15:06:23 +0200 Subject: [PATCH 4/7] set default printing temperature to 210 instead of 230 degrees --- 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 9d8b7f2..45b6cb0 100644 --- a/src/conf_defaults.lua +++ b/src/conf_defaults.lua @@ -262,7 +262,7 @@ M.printer_baudrate = { } M.printer_temperature = { - default = 230, + default = 210, type = 'int', description = 'printing temperature', min = 0 From 07d4316a7f0873576ac180864fbe57728d2ce0d6 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 15:34:07 +0200 Subject: [PATCH 5/7] fixed typo in filename /tmp/currentprint --- src/rest/api/api_printer.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rest/api/api_printer.lua b/src/rest/api/api_printer.lua index ad6443e..942757b 100644 --- a/src/rest/api/api_printer.lua +++ b/src/rest/api/api_printer.lua @@ -172,7 +172,7 @@ function M.stop_POST(request, response) local rv,msg = printer:stopPrint(argGcode) io.popen("killall print-fetch") - io.popen("rm /tmp/current-print /tmp/startcode /tmp/endcode") + io.popen("rm /tmp/currentprint /tmp/startcode /tmp/endcode") response:addData('id', argId) @@ -275,7 +275,7 @@ function M.fetch_POST(request, response) response:setError("no id supplied") return end - local cpfile = io.open("/tmp/current-print", 'w+') + local cpfile = io.open("/tmp/currentprint", 'w+') if cpfile == nil then response:setError("could not save id") return From c15b1bd59265baf25b93e30c27a0dba4fc4df446 Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 17:29:28 +0200 Subject: [PATCH 6/7] Update ReleaseNotes.md --- ReleaseNotes.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index a72e7aa..dc28904 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,8 +1,11 @@ Changelog # 0.11.0-a -- WiFi-Box can now 'fetch' a gcode-file in chunks from a server. +- Added 'fetch' functionality to let the WiFi-Box print from a remote server. This enables the WiFi-Box to print large g-code files. (yeah!) - Added support for the Renkforce RF100 printer. -- Updated 'default startcode' to prevent Ultimaker 2 series to bump into platform [#21](https://github.com/Doodle3D/WiFi-Box/issues/21) when Ultimaker (original) is selected. +- Changed 'default startcode' to prevent Ultimaker 2 series to bump into platform [#21](https://github.com/Doodle3D/WiFi-Box/issues/21) when Ultimaker (original) is selected. +- Changed default nozzle temperature from 230 to 210 °C. +- Fixed corrupted endcode for delta printers. +- Changed default endcode to cooldown to 0 after print instead of cooling down to preheat temperature. # 0.10.12 # 0.10.12-b (12 jan 2017) From 01cc6770f6f8a90ed89548ae6ade2b827d4e4fea Mon Sep 17 00:00:00 2001 From: Rick Companje Date: Fri, 23 Jun 2017 17:35:45 +0200 Subject: [PATCH 7/7] Update ReleaseNotes.md --- ReleaseNotes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index dc28904..a9b8edb 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,5 @@ Changelog -# 0.11.0-a +# 0.11.0-a (23 jun 2017) - Added 'fetch' functionality to let the WiFi-Box print from a remote server. This enables the WiFi-Box to print large g-code files. (yeah!) - Added support for the Renkforce RF100 printer. - Changed 'default startcode' to prevent Ultimaker 2 series to bump into platform [#21](https://github.com/Doodle3D/WiFi-Box/issues/21) when Ultimaker (original) is selected.