vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-12-22 19:13:49 +01:00
Code Issues Releases Wiki Activity

www submodule update to printerdriver branch; fix heatup config names.

Browse Source
This commit is contained in:
Wouter R 2013-09-27 18:25:16 +02:00
parent a88bd8e932
commit 2f04bbb35d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf_defaults.lua
View File

@ -124,7 +124,13 @@ M.printer_firstLayerSlow = {
description = 'Print the first layer slowly to get a more stable start' description = 'Print the first layer slowly to get a more stable start'
} }
M.printer_heatupTemperature = { M.printer_heatup_enabled = {
default = true,
type = 'bool',
description = ''
}
M.printer_heatup_temperature = {
default = 180, default = 180,
type = 'int', type = 'int',
description = '' description = ''
@ -163,12 +169,6 @@ M.printer_enableTraveling = {
description = '' description = ''
} }
M.printer_autoWarmUpCommand = {
default = 'M104 S180',
type = 'string',
description = ''
}
M.printer_startgcode = { M.printer_startgcode = {
default = ';Generated with Doodle3D\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 = ';Generated with Doodle3D\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)',
type = 'string', type = 'string',

4
src/rest/api/api_printer.lua
View File

@ -121,7 +121,7 @@ function M.heatup_POST(request, response)
local printer,msg = createPrinterOrFail(argId, response) local printer,msg = createPrinterOrFail(argId, response)
if not printer then return end if not printer then return end
local temperature = settings.get('printer.heatupTemperature') local temperature = settings.get('printer.heatup.temperature')
local rv,msg = printer:heatup(temperature) local rv,msg = printer:heatup(temperature)
response:addData('id', argId) response:addData('id', argId)
@ -165,7 +165,7 @@ function M.print_POST(request, response)
end end
if argIsFirst == true then if argIsFirst == true then
log:debug("clearing all gcode for " .. printer) log:debug("clearing all gcode for " .. printer:getId())
response:addData('gcode_clear',true) response:addData('gcode_clear',true)
local rv,msg = printer:clearGcode() local rv,msg = printer:clearGcode()

2
src/www

@ -1 +1 @@
Subproject commit 1842ec01b2d455142b8f654323ec92a4e2395753 Subproject commit a45d1ad8edb89902fd4ef2b91d82dec23f8e51cd