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

Add option to update/install to not retain any files in flash memory.

Browse Source
This commit is contained in:
Wouter R 2013-12-04 17:40:43 +01:00
parent c4c9957cb5
commit c33cc73b85
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ local wifi = require('network.wlanconfig')
local netconf = require('network.netconfig') local netconf = require('network.netconfig')
local settings = require('util.settings') local settings = require('util.settings')
-- NOTE: the module 'detects' command-line invocation by existence of 'arg', so we have to make sure it is not defined. -- NOTE: the updater module 'detects' command-line invocation by existence of 'arg', so we have to make sure it is not defined.
argStash = arg argStash = arg
arg = nil arg = nil
local updater = require('script.d3d-updater') local updater = require('script.d3d-updater')
@ -140,18 +140,21 @@ function M.download_POST(request, response)
end end
-- if successful, this call won't return since the device will flash its memory and reboot -- if successful, this call won't return since the device will flash its memory and reboot
-- accepts: version (string, will try to use most recent if not specified)
-- accepts: no_retain (bool, device will be completely cleaned if true (aka '-n' flag to sysupgrade))
function M.install_POST(request, response) function M.install_POST(request, response)
local argVersion = request:get("version") local argVersion = request:get("version")
local argNoRetain = request:get("no_retain")
log:info("API:update/install") log:info("API:update/install")
if not operationsAccessOrFail(request, response) then return end if not operationsAccessOrFail(request, response) then return end
updater.setLogger(log) updater.setLogger(log)
updater.setState(updater.STATE.INSTALLING,"") updater.setState(updater.STATE.INSTALLING,"")
local ssid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid')) local ssid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
local rv,msg = netconf.enableAccessPoint(ssid) local rv,msg = netconf.enableAccessPoint(ssid)
if not argVersion then if not argVersion then
local success,status,msg = updater.getStatus() local success,status,msg = updater.getStatus()
if not success then if not success then
@ -174,7 +177,7 @@ function M.install_POST(request, response)
return return
end end
local rv,msg = updater.flashImageVersion(vEnt) local rv,msg = updater.flashImageVersion(vEnt, argNoRetain)
if not rv then if not rv then
updater.setState(updater.STATE.INSTALL_FAILED, "installation failed (" .. msg .. ")") updater.setState(updater.STATE.INSTALL_FAILED, "installation failed (" .. msg .. ")")