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

Return "connecting" state if printer is connected but server has not started yet; other calls will fail just like if no printer exists.

Browse Source
This commit is contained in:
Wouter R 2014-03-09 02:12:36 +01:00
parent e94d238977
commit 0b6de9adba
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ end
function M.temperature(request, response) function M.temperature(request, response)
local argId = request:get("id") local argId = request:get("id")
local printer,msg = printerUtils.createPrinterOrFail(argId, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return false end if not printer or not printer:hasSocket() then return false end
local temperatures,msg = printer:getTemperatures() local temperatures,msg = printer:getTemperatures()
@ -49,7 +49,7 @@ end
function M.progress(request, response) function M.progress(request, response)
local argId = request:get("id") local argId = request:get("id")
local printer,msg = printerUtils.createPrinterOrFail(argId, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return false end if not printer or not printer:hasSocket() then return false end
-- NOTE: despite their names, `currentLine` is still the error indicator and `bufferedLines` the message in such case. -- NOTE: despite their names, `currentLine` is still the error indicator and `bufferedLines` the message in such case.
local currentLine,bufferedLines,totalLines = printer:getProgress() local currentLine,bufferedLines,totalLines = printer:getProgress()
@ -81,6 +81,14 @@ function M.state(request, response, onlyReturnState)
response:addData('state', printerState) response:addData('state', printerState)
end end
return true, printerState return true, printerState
elseif not printer:hasSocket() then
-- while dev is present but no server is running yet, return 'fake' connecting state
local printerState = "connecting"
if not onlyReturnState then
response:setSuccess()
response:addData('state', printerState)
end
return true, printerState
else else
local rv,msg = printer:getState() local rv,msg = printer:getState()
if rv then if rv then
@ -115,7 +123,7 @@ function M.heatup_POST(request, response)
local argId = request:get("id") local argId = request:get("id")
local printer,msg = printerUtils.createPrinterOrFail(argId, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return false end if not printer or not printer:hasSocket() then return false end
local temperature = settings.get('printer.heatup.temperature') local temperature = settings.get('printer.heatup.temperature')
local rv,msg = printer:heatup(temperature) local rv,msg = printer:heatup(temperature)
@ -138,7 +146,7 @@ function M.stop_POST(request, response)
local argId = request:get("id") local argId = request:get("id")
local argGcode = request:get("gcode") local argGcode = request:get("gcode")
local printer,msg = printerUtils.createPrinterOrFail(argId, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return end if not printer or not printer:hasSocket() then return false end
if(argGcode == nil) then if(argGcode == nil) then
argGcode = "" argGcode = ""
@ -176,7 +184,7 @@ function M.print_POST(request, response)
local argStart = utils.toboolean(request:get("start")) local argStart = utils.toboolean(request:get("start"))
local printer,msg = printerUtils.createPrinterOrFail(argId, response) local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return end if not printer or not printer:hasSocket() then return false end
response:addData('id', argId) response:addData('id', argId)