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

Changes for extra fields in getProgress and rejecting too large chunks of gcode.

Browse Source
This commit is contained in:
Wouter R 2013-10-12 23:18:47 +02:00
parent 1ac2f204fe
commit 5b710dbbcc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ function M.progress(request, response)
if not printer then return false end if not printer 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,bufferSize,bufferSizeMax = printer:getProgress()
response:addData('id', argId) response:addData('id', argId)
if currentLine then if currentLine then
@ -52,6 +52,8 @@ function M.progress(request, response)
response:addData('current_line', currentLine) response:addData('current_line', currentLine)
response:addData('buffered_lines', bufferedLines) response:addData('buffered_lines', bufferedLines)
response:addData('total_lines', totalLines) response:addData('total_lines', totalLines)
response:addData('buffer_size', bufferSize)
response:addData('buffer_size_max', bufferSizeMax)
else else
response:setError(bufferedLines) response:setError(bufferedLines)
return false return false
@ -176,7 +178,10 @@ function M.print_POST(request, response)
if rv then if rv then
--NOTE: this does not report the number of lines, but only the block which has just been added --NOTE: this does not report the number of lines, but only the block which has just been added
response:addData('gcode_append',argGcode:len()) response:addData('gcode_append',argGcode:len())
else elseif rv == false then
response:setFail("could not add gcode - not enough buffer space")
return
else -- this is an actual nil
response:setError("could not add gcode") response:setError("could not add gcode")
response:addData('msg', msg) response:addData('msg', msg)
return return