mirror of
https://github.com/Doodle3D/doodle3d-firmware.git
synced 2024-12-22 02:53:49 +01:00
Merge branch 'develop' of github.com:Doodle3D/Doodle3D-firmware into develop
This commit is contained in:
Simon Voordouw
commit
753672e164
@ -1,8 +1,11 @@
|
||||
Changelog
|
||||
# 0.11.0-a
|
||||
- WiFi-Box can now 'fetch' a gcode-file in chunks from a server.
|
||||
# 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.
|
||||
- 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)
|
||||
|
||||
@ -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 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 = '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 = ''
|
||||
@ -262,7 +262,7 @@ M.printer_baudrate = {
|
||||
}
|
||||
|
||||
M.printer_temperature = {
|
||||
default = 230,
|
||||
default = 210,
|
||||
type = 'int',
|
||||
description = 'printing temperature',
|
||||
min = 0
|
||||
@ -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 = ''
|
||||
}
|
||||
|
||||
@ -175,7 +175,6 @@ function M.stop_POST(request, response)
|
||||
local rv,msg = printer:stopPrint(argGcode)
|
||||
|
||||
|
||||
|
||||
response:addData('id', argId)
|
||||
if rv then
|
||||
response:setSuccess()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user