vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-07-01 13:41:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-firmware into feature/printerdriver

Browse Source 
Conflicts:
	src/rest/api/api_info.lua
This commit is contained in:
Wouter R 2013-10-10 17:05:45 +02:00
commit 6e80ca8aa2
1 changed files with 32 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/rest/api/api_info.lua
View File

@ -4,7 +4,7 @@ local utils = require('util.utils')
local accessManager = require('util.access') local accessManager = require('util.access')
local printDriver = require('print3d') local printDriver = require('print3d')
local printerUtils = require('util.printer') local printerUtils = require('util.printer')
--local printerAPI = require('rest.api.api_printer') local printerAPI = require('rest.api.api_printer')
local TMP_DIR = '/tmp' local TMP_DIR = '/tmp'
local LOG_COLLECT_DIRNAME = 'wifibox-logs' local LOG_COLLECT_DIRNAME = 'wifibox-logs'
@ -55,9 +55,9 @@ function M.logfiles(request, response)
if file:find(PRINT3D_LOG_FILENAME_PREFIX) == 1 and file:find(PRINT3D_LOG_FILENAME_SUFFIX) ~= nil then if file:find(PRINT3D_LOG_FILENAME_PREFIX) == 1 and file:find(PRINT3D_LOG_FILENAME_SUFFIX) ~= nil then
local srcLogFile = PRINT3D_BASEPATH .. '/' .. file local srcLogFile = PRINT3D_BASEPATH .. '/' .. file
local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file
local rv,sig,code = redirectedExecute('cp ' .. srcLogFile .. ' ' .. tgtLogFile) local rv,sig,code = redirectedExecute('cp ' .. srcLogFile .. ' ' .. tgtLogFile)
end
end end
end
local rv,sig,code = redirectedExecute('tar czf ' .. LOG_COLLECT_ARCHIVE_FILE .. ' ' .. LOG_COLLECT_DIRNAME) --returns 0 success, 1 error local rv,sig,code = redirectedExecute('tar czf ' .. LOG_COLLECT_ARCHIVE_FILE .. ' ' .. LOG_COLLECT_DIRNAME) --returns 0 success, 1 error
@ -121,60 +121,13 @@ function M.access(request, response)
end end
function M.status(request, response) function M.status(request, response)
--[[
local argId = request:get("id")
local printer,msg = printerUtils.createPrinterOrFail(argId, response)
if not printer then return end
response:addData('id', argId) printerAPI.temperature(request, response)
printerAPI.progress(request, response)
-- Temperature printerAPI.state(request, response)
local temperatures,msg = printer:getTemperatures()
if temperatures then
response:setSuccess()
response:addData('hotend', temperatures.hotend)
response:addData('hotend_target', temperatures.hotend_target)
response:addData('bed', temperatures.bed)
response:addData('bed_target', temperatures.bed_target)
else
response:setError(msg)
return
end
--TODO: reuse printer/temperature api
-- Progress
-- NOTE: despite their names, `currentLine` is still the error indicator and `numLines` the message in such case.
local currentLine,numLines = printer:getProgress()
if currentLine then
response:setSuccess()
response:addData('current_line', currentLine)
response:addData('num_lines', numLines)
else
response:setError(numLines)
return
end
--TODO: reuse printer/progress api
-- State
local rv,msg = printer:getState()
if rv then
response:setSuccess()
response:addData('state', rv)
else
response:setError(msg)
return
end
]]---
----TODO: reuse printer/state api
--printerAPI.temperature(request, response)
--printerAPI.progress(request, response)
--printerAPI.state(request, response)
-- access
M.access(request, response) M.access(request, response)
response:addData('v', 8) response:addData('v', 9)
end end