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

Remove unnecessary require.

Browse Source 
Change backup log file name in d3dapi script.
This commit is contained in:
Wouter R 2014-06-16 14:19:29 +02:00
parent af76720e54
commit 9fd96740a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ local lfs = require('lfs')
local log = require('util.logger') local log = require('util.logger')
local utils = require('util.utils') local utils = require('util.utils')
local settings = require('util.settings') local settings = require('util.settings')
local printDriver = require('print3d')
local printerUtils = require('util.printer') local printerUtils = require('util.printer')
local accessManager = require('util.access') local accessManager = require('util.access')
@ -165,6 +164,7 @@ end
--accepts: id(string) (the printer ID to append to) --accepts: id(string) (the printer ID to append to)
--accepts: first(bool) (chunks will be concatenated but output file will be cleared first if this argument is true) --accepts: first(bool) (chunks will be concatenated but output file will be cleared first if this argument is true)
--accepts: start(bool) (only when this argument is true will printing be started) --accepts: start(bool) (only when this argument is true will printing be started)
--returns: when the gcode buffer cannot accept the gcode, or the IPC transaction fails, a fail with a (formal, i.e., parseable) status argument will be returned
function M.print_POST(request, response) function M.print_POST(request, response)
log:info(MOD_ABBR, "API:printer/print") log:info(MOD_ABBR, "API:printer/print")

5
src/script/d3dapi
View File

@ -10,15 +10,16 @@
LUA=lua LUA=lua
SCRIPT_PATH=/usr/share/lua/wifibox SCRIPT_PATH=/usr/share/lua/wifibox
LOG_FILE=/tmp/wifibox.log LOG_FILE=/tmp/wifibox.cgi-fallback.log
cd $SCRIPT_PATH cd $SCRIPT_PATH
echo "CGI invocation" >> $LOG_FILE #echo "CGI invocation" >> $LOG_FILE
#strace -o /tmp/trace-$$.log -ff $LUA ./cmdmain.lua $@ 2>> $LOG_FILE #strace -o /tmp/trace-$$.log -ff $LUA ./cmdmain.lua $@ 2>> $LOG_FILE
$LUA ./cmdmain.lua $@ 2>> $LOG_FILE $LUA ./cmdmain.lua $@ 2>> $LOG_FILE
exit $? exit $?
# Code below is for debugging incoming CGI data # Code below is for debugging incoming CGI data
read -n $CONTENT_LENGTH POSTDATA read -n $CONTENT_LENGTH POSTDATA
echo -e "Content-type: text/plain\r\n\r\n" echo -e "Content-type: text/plain\r\n\r\n"