diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-14 23:20:41 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-15 15:25:46 +0100 |
commit | 12cb9d534fca1eb57f93462900f305a148fd3f16 (patch) | |
tree | 890f492cf02bf2e05ed006cde1a78c1ddc53dffa /conf.d | |
parent | 9a2be611dfb8fe4d542a67b204e5c61d96db911b (diff) |
Get back on track l2c functions
Adjust to the new controller behavior lua2c functions calls
Change-Id: I52d385101d5205a2dd2c996810feccb1f00c20c7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
-rw-r--r-- | conf.d/project/lua.d/signal-composer-daemon-00-utils.lua | 1 | ||||
-rw-r--r-- | conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/conf.d/project/lua.d/signal-composer-daemon-00-utils.lua b/conf.d/project/lua.d/signal-composer-daemon-00-utils.lua index 29d2c70..943c6c6 100644 --- a/conf.d/project/lua.d/signal-composer-daemon-00-utils.lua +++ b/conf.d/project/lua.d/signal-composer-daemon-00-utils.lua @@ -74,7 +74,6 @@ function Dump_Table(o) end end - -- simulate C prinf function printf = function(s,...) io.write(s:format(...)) diff --git a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua index 581343e..21f516a 100644 --- a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua +++ b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua @@ -42,8 +42,6 @@ function _Unit_Converter(source, args, event) local sourcei, targeti = _positions[sourceunits], _positions[targetunits] assert(sourcei and targeti) - print(event['timestamp']) - if sourcei<targeti then local base=1 @@ -52,8 +50,7 @@ function _Unit_Converter(source, args, event) end event["value"] = value/base - - lua2c["luaSet"](source, event) + _lua2c['setSignalValueWrap'](source, event) elseif sourcei>targeti then @@ -64,7 +61,7 @@ function _Unit_Converter(source, args, event) event["value"] = value/base - lua2c["luaSet"](source, event) + _lua2c["setSignalValueWrap"](source, event) else print("No conversion") |