starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openwrt: if msec decreased, just update the value in the table, but do not perform any calculations since the AVR might have gone through a reset

This commit is contained in:
Bart Van Der Meerssche 2010-10-01 15:43:51 +02:00
parent 099e00c8f6
commit 6889fa3594
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mote/v1/openwrt/package/flukso/src/flukso.lua
View File

@ -103,7 +103,9 @@ function buffer(child, interval)
end end
if msec then -- we're dealing with a pls xxx:yyy:zzz message so calculate power if msec then -- we're dealing with a pls xxx:yyy:zzz message so calculate power
if prev[meter].msec then -- if msec decreased, just update the value in the table
-- but don't make any calculations since the AVR might have gone through a reset
if prev[meter].msec and msec > prev[meter].msec then
local power = math.floor(diff(prev[meter].value, value) / diff(prev[meter].msec, msec) * 3.6 * 10^6 + 0.5) local power = math.floor(diff(prev[meter].value, value) / diff(prev[meter].msec, msec) * 3.6 * 10^6 + 0.5)
prev[meter].value = value prev[meter].value = value
value = power value = power
@ -140,6 +142,7 @@ function filter(child, span, offset)
end end
function send(child, home, version, method) function send(child, home, version, method)
local url = 'http://' .. home .. '/xmlrpc/' .. version
return coroutine.create(function(measurements) return coroutine.create(function(measurements)
while true do while true do
local auth = auth.new() local auth = auth.new()
@ -147,7 +150,7 @@ function send(child, home, version, method)
auth:hmac(measurements) auth:hmac(measurements)
local status, ret_or_err, res = pcall(xmlrpc.http.call, local status, ret_or_err, res = pcall(xmlrpc.http.call,
'http://' .. home .. '/' .. version, url,
method, method,
auth, auth,
measurements) measurements)