From dda0abe9314a7c296d62092c2a08e18f37db4e0a Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 19 Dec 2017 16:23:13 +0100
Subject: Get builtin plugin as a normal plugin

- Back in normal configuration file
- Remove builtin special callback as it is just a plugin after all
- Rename main configuration files to get it works on a target
board.

Change-Id: I69165c47e5e58eb519e727cfdd83ee628d90abba
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 conf.d/project/etc/control-daemon.json          | 30 ----------------------
 conf.d/project/etc/control-signal-composer.json | 34 +++++++++++++++++++++++++
 conf.d/project/etc/sig-demoboard.json           |  2 +-
 3 files changed, 35 insertions(+), 31 deletions(-)
 delete mode 100644 conf.d/project/etc/control-daemon.json
 create mode 100644 conf.d/project/etc/control-signal-composer.json

(limited to 'conf.d/project')

diff --git a/conf.d/project/etc/control-daemon.json b/conf.d/project/etc/control-daemon.json
deleted file mode 100644
index 7a7e162..0000000
--- a/conf.d/project/etc/control-daemon.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json",
-	"metadata": {
-		"uid": "Signal Composer",
-		"version": "1.0",
-		"api": "signal-composer",
-		"info": "Signal composer Configuration",
-		"require": ["low-can"]
-	},
-	"plugins": [
-		{
-			"uid": "low-can-callbacks",
-			"ldpath": "lib/plugins",
-			"info": "Manage interaction with low-can service",
-			"basename": "low-can"
-		},
-		{
-			"uid": "gps-callbacks",
-			"ldpath": "lib/plugins",
-			"info": "Manage interaction with gps service",
-			"basename": "gps"
-		}
-	],
-	"signals": {
-		"files": ["sig-doors", "sig-demoboard", "sig-geoloc" ]
-	},
-	"sources": {
-		"files": "sources"
-	}
-}
diff --git a/conf.d/project/etc/control-signal-composer.json b/conf.d/project/etc/control-signal-composer.json
new file mode 100644
index 0000000..d44a8fe
--- /dev/null
+++ b/conf.d/project/etc/control-signal-composer.json
@@ -0,0 +1,34 @@
+{
+	"$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json",
+	"metadata": {
+		"uid": "Signal Composer",
+		"version": "1.0",
+		"api": "signal-composer",
+		"info": "Signal composer Configuration",
+		"require": ["low-can"]
+	},
+	"plugins": [
+		{
+			"uid": "low-can-callbacks",
+			"info": "Manage interaction with low-can service",
+			"basename": "low-can"
+		},
+		{
+			"uid": "gps-callbacks",
+			"info": "Manage interaction with gps service",
+			"basename": "gps"
+		},
+		{
+			"uid": "builtin",
+			"info": "Builtin routine for onReceived or getSignals routines",
+			"basename": "builtin",
+			"lua2c": "setSignalValueWrap"
+		}
+	],
+	"signals": {
+		"files": ["sig-doors", "sig-demoboard", "sig-geoloc" ]
+	},
+	"sources": {
+		"files": "sources"
+	}
+}
diff --git a/conf.d/project/etc/sig-demoboard.json b/conf.d/project/etc/sig-demoboard.json
index bb64fe9..da64a26 100644
--- a/conf.d/project/etc/sig-demoboard.json
+++ b/conf.d/project/etc/sig-demoboard.json
@@ -26,7 +26,7 @@
 			"unit": "rpm",
 			"frequency": 1,
 			"onReceived": {
-				"function": "builtin://defaultOnReceived"
+				"function": "plugin://defaultOnReceived"
 			}
 		},
 		{
-- 
cgit 1.2.3-korg