vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2025-04-20 18:16:30 +02:00
Code Issues Releases Wiki Activity

Do not generate error when printer device exists without accompanying server. Fixes https://github.com/Doodle3D/doodle3d-client/issues/139.

Browse Source
This commit is contained in:
Wouter R 2013-12-20 17:11:58 +01:00
parent fc9460fc82
commit d254beb1ab
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rest/api/api_config.lua
View File

@ -29,10 +29,8 @@ local function operationsAccessOrFail(request, response)
end end
local rv, printerState = printerAPI.state(request, response, true) local rv, printerState = printerAPI.state(request, response, true)
if(rv == false) then -- NOTE: rv being false means a printer device exists but no server is running for it, so it cannot be 'busy'
response:setError("Could not get printer state") if rv == false then return true end
return false
end
if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then
response:setFail("Printer is busy, please wait") response:setFail("Printer is busy, please wait")

6
src/rest/api/api_network.lua
View File

@ -29,10 +29,8 @@ local function operationsAccessOrFail(request, response)
end end
local rv, printerState = printerAPI.state(request, response, true) local rv, printerState = printerAPI.state(request, response, true)
if(rv == false) then -- NOTE: rv being false means a printer device exists but no server is running for it, so it cannot be 'busy'
response:setError("Could not get printer state") if rv == false then return true end
return false
end
if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then
response:setFail("Printer is busy, please wait") response:setFail("Printer is busy, please wait")

6
src/rest/api/api_update.lua
View File

@ -34,10 +34,8 @@ local function operationsAccessOrFail(request, response)
end end
local rv, printerState = printerAPI.state(request, response, true) local rv, printerState = printerAPI.state(request, response, true)
if(rv == false) then -- NOTE: rv being false means a printer device exists but no server is running for it, so it cannot be 'busy'
response:setError("Could not get printer state") if rv == false then return true end
return false
end
if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then if printerState == 'buffering' or printerState == 'printing' or printerState == 'stopping' then
response:setFail("Printer is busy, please wait") response:setFail("Printer is busy, please wait")