summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-07-05 18:42:53 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-07-10 17:12:30 +0200
commit90e56dd22eba15bf71e3e0042080c2213ae39920 (patch)
tree889d89bd0f751832eb6e5fc9211d17a5221c74cc
parent179196fc65315bf9e8cade8137e9786e2e0b0fed (diff)
Files reorganization and rename project to AFT
Change-Id: I2e4adc51bdf5fcb9001c68fb4fc71f4987da47e0 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--conf.d/cmake/config.cmake8
-rw-r--r--conf.d/controller/CMakeLists.txt (renamed from conf.d/project/CMakeLists.txt)0
-rw-r--r--conf.d/controller/etc/CMakeLists.txt (renamed from conf.d/project/etc/CMakeLists.txt)2
-rw-r--r--conf.d/controller/etc/aft-mapis.json (renamed from conf.d/project/etc/aft-mapis.json)2
-rw-r--r--conf.d/controller/etc/aft-test.json (renamed from conf.d/project/etc/aft-test.json)2
-rw-r--r--conf.d/controller/lua.d/CMakeLists.txt (renamed from conf.d/project/lua.d/CMakeLists.txt)2
-rw-r--r--conf.d/controller/lua.d/aft.lua (renamed from conf.d/project/lua.d/aft.lua)0
-rw-r--r--conf.d/controller/lua.d/helloworld.lua (renamed from conf.d/project/lua.d/helloworld.lua)0
-rwxr-xr-xconf.d/controller/lua.d/luaunit.lua (renamed from conf.d/project/lua.d/luaunit.lua)0
-rw-r--r--conf.d/controller/lua.d/mapi_low-can.lua (renamed from conf.d/project/lua.d/mapi_low-can.lua)0
-rw-r--r--conf.d/controller/lua.d/mapi_tests.lua (renamed from conf.d/project/lua.d/mapi_tests.lua)0
-rw-r--r--conf.d/project/htdocs/AFB-websock.js177
-rw-r--r--conf.d/project/htdocs/CMakeLists.txt34
-rw-r--r--conf.d/project/htdocs/README.md7
-rw-r--r--conf.d/project/htdocs/TestBinding.css7
-rw-r--r--conf.d/project/htdocs/TestBinding.js197
-rw-r--r--conf.d/project/htdocs/index.html43
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/aft.c (renamed from src/test-binding.c)2
-rw-r--r--src/aft.h (renamed from src/test-binding.h)0
20 files changed, 14 insertions, 473 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index f26476b..f3850df 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -76,7 +76,13 @@ set (PKG_REQUIRED_LIST
# Prefix path where will be installed the files
# Default: /usr/local (need root permission to write in)
# ------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+execute_process(
+ COMMAND pkg-config --variable binding_install_dir afb-daemon
+ OUTPUT_VARIABLE afb_binding_install_dir
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(CMAKE_INSTALL_PREFIX ${afb_binding_install_dir})
# Customize link option
# -----------------------------
diff --git a/conf.d/project/CMakeLists.txt b/conf.d/controller/CMakeLists.txt
index 28a0609..28a0609 100644
--- a/conf.d/project/CMakeLists.txt
+++ b/conf.d/controller/CMakeLists.txt
diff --git a/conf.d/project/etc/CMakeLists.txt b/conf.d/controller/etc/CMakeLists.txt
index 3789646..8c79746 100644
--- a/conf.d/project/etc/CMakeLists.txt
+++ b/conf.d/controller/etc/CMakeLists.txt
@@ -19,7 +19,7 @@
##################################################
# Control Policy Config file
##################################################
-PROJECT_TARGET_ADD(afb-test-config)
+PROJECT_TARGET_ADD(aftest-config)
file(GLOB CONF_FILES "*.json")
diff --git a/conf.d/project/etc/aft-mapis.json b/conf.d/controller/etc/aft-mapis.json
index f68e05f..4aeeb74 100644
--- a/conf.d/project/etc/aft-mapis.json
+++ b/conf.d/controller/etc/aft-mapis.json
@@ -4,7 +4,7 @@
"metadata": {
"uid": "Test",
"version": "1.0",
- "api": "test",
+ "api": "afTest",
"info": "Configuration to test an emulated api",
"require": [
"low-can"
diff --git a/conf.d/project/etc/aft-test.json b/conf.d/controller/etc/aft-test.json
index eabe877..8c7b7da 100644
--- a/conf.d/project/etc/aft-test.json
+++ b/conf.d/controller/etc/aft-test.json
@@ -4,7 +4,7 @@
"metadata": {
"uid": "Test",
"version": "1.0",
- "api": "test",
+ "api": "afTest",
"info": "Binding made to tests other bindings",
"require": [
"hello"
diff --git a/conf.d/project/lua.d/CMakeLists.txt b/conf.d/controller/lua.d/CMakeLists.txt
index 82b8612..723000e 100644
--- a/conf.d/project/lua.d/CMakeLists.txt
+++ b/conf.d/controller/lua.d/CMakeLists.txt
@@ -20,7 +20,7 @@
##################################################
# Soft Mixer Lua Scripts
##################################################
-PROJECT_TARGET_ADD(test-lua)
+PROJECT_TARGET_ADD(afTest-lua)
file(GLOB LUA_FILES "*.lua")
diff --git a/conf.d/project/lua.d/aft.lua b/conf.d/controller/lua.d/aft.lua
index 5032929..5032929 100644
--- a/conf.d/project/lua.d/aft.lua
+++ b/conf.d/controller/lua.d/aft.lua
diff --git a/conf.d/project/lua.d/helloworld.lua b/conf.d/controller/lua.d/helloworld.lua
index 1c2ec1d..1c2ec1d 100644
--- a/conf.d/project/lua.d/helloworld.lua
+++ b/conf.d/controller/lua.d/helloworld.lua
diff --git a/conf.d/project/lua.d/luaunit.lua b/conf.d/controller/lua.d/luaunit.lua
index 02377c9..02377c9 100755
--- a/conf.d/project/lua.d/luaunit.lua
+++ b/conf.d/controller/lua.d/luaunit.lua
diff --git a/conf.d/project/lua.d/mapi_low-can.lua b/conf.d/controller/lua.d/mapi_low-can.lua
index f7cd99a..f7cd99a 100644
--- a/conf.d/project/lua.d/mapi_low-can.lua
+++ b/conf.d/controller/lua.d/mapi_low-can.lua
diff --git a/conf.d/project/lua.d/mapi_tests.lua b/conf.d/controller/lua.d/mapi_tests.lua
index 1111a2d..1111a2d 100644
--- a/conf.d/project/lua.d/mapi_tests.lua
+++ b/conf.d/controller/lua.d/mapi_tests.lua
diff --git a/conf.d/project/htdocs/AFB-websock.js b/conf.d/project/htdocs/AFB-websock.js
deleted file mode 100644
index 99ab3b8..0000000
--- a/conf.d/project/htdocs/AFB-websock.js
+++ /dev/null
@@ -1,177 +0,0 @@
-var urlws;
-var urlhttp;
-
-AFB = function(base, initialtoken){
-
-urlws = "ws://"+window.location.host+"/"+base;
-urlhttp = "http://"+window.location.host+"/"+base;
-
-/*********************************************/
-/**** ****/
-/**** AFB_context ****/
-/**** ****/
-/*********************************************/
-var AFB_context;
-{
- var UUID = undefined;
- var TOKEN = initialtoken;
-
- var context = function(token, uuid) {
- this.token = token;
- this.uuid = uuid;
- }
-
- context.prototype = {
- get token() {return TOKEN;},
- set token(tok) {if(tok) TOKEN=tok;},
- get uuid() {return UUID;},
- set uuid(id) {if(id) UUID=id;}
- };
-
- AFB_context = new context();
-}
-/*********************************************/
-/**** ****/
-/**** AFB_websocket ****/
-/**** ****/
-/*********************************************/
-var AFB_websocket;
-{
- var CALL = 2;
- var RETOK = 3;
- var RETERR = 4;
- var EVENT = 5;
-
- var PROTO1 = "x-afb-ws-json1";
-
- AFB_websocket = function(onopen, onabort) {
- var u = urlws;
- if (AFB_context.token) {
- u = u + '?x-afb-token=' + AFB_context.token;
- if (AFB_context.uuid)
- u = u + '&x-afb-uuid=' + AFB_context.uuid;
- }
- this.ws = new WebSocket(u, [ PROTO1 ]);
- this.pendings = {};
- this.awaitens = {};
- this.counter = 0;
- this.ws.onopen = onopen.bind(this);
- this.ws.onerror = onerror.bind(this);
- this.ws.onclose = onclose.bind(this);
- this.ws.onmessage = onmessage.bind(this);
- this.onopen = onopen;
- this.onabort = onabort;
- this.onclose = onabort;
- }
-
- function onerror(event) {
- var f = this.onabort;
- if (f) {
- delete this.onopen;
- delete this.onabort;
- f && f(this);
- }
- this.onerror && this.onerror(this);
- }
-
- function onopen(event) {
- var f = this.onopen;
- delete this.onopen;
- delete this.onabort;
- f && f(this);
- }
-
- function onclose(event) {
- for (var id in this.pendings) {
- var ferr = this.pendings[id].onerror;
- ferr && ferr(null, this);
- }
- this.pendings = {};
- this.onclose && this.onclose();
- }
-
- function fire(awaitens, name, data) {
- var a = awaitens[name];
- if (a)
- a.forEach(function(handler){handler(data);});
- var i = name.indexOf("/");
- if (i >= 0) {
- a = awaitens[name.substring(0,i)];
- if (a)
- a.forEach(function(handler){handler(data);});
- }
- a = awaitens["*"];
- if (a)
- a.forEach(function(handler){handler(data);});
- }
-
- function reply(pendings, id, ans, offset) {
- if (id in pendings) {
- var p = pendings[id];
- delete pendings[id];
- var f = p[offset];
- f(ans);
- }
- }
-
- function onmessage(event) {
- var obj = JSON.parse(event.data);
- var code = obj[0];
- var id = obj[1];
- var ans = obj[2];
- AFB_context.token = obj[3];
- switch (code) {
- case RETOK:
- reply(this.pendings, id, ans, 0);
- break;
- case RETERR:
- reply(this.pendings, id, ans, 1);
- break;
- case EVENT:
- default:
- fire(this.awaitens, id, ans);
- break;
- }
- }
-
- function close() {
- this.ws.close();
- this.onabort();
- }
-
- function call(method, request) {
- return new Promise((function(resolve, reject){
- var id, arr;
- do {
- id = String(this.counter = 4095 & (this.counter + 1));
- } while (id in this.pendings);
- this.pendings[id] = [ resolve, reject ];
- arr = [CALL, id, method, request ];
- if (AFB_context.token) arr.push(AFB_context.token);
- this.ws.send(JSON.stringify(arr));
- }).bind(this));
- }
-
- function onevent(name, handler) {
- var id = name;
- var list = this.awaitens[id] || (this.awaitens[id] = []);
- list.push(handler);
- }
-
- AFB_websocket.prototype = {
- close: close,
- call: call,
- onevent: onevent
- };
-}
-/*********************************************/
-/**** ****/
-/**** ****/
-/**** ****/
-/*********************************************/
-return {
- context: AFB_context,
- ws: AFB_websocket
-};
-};
-
diff --git a/conf.d/project/htdocs/CMakeLists.txt b/conf.d/project/htdocs/CMakeLists.txt
deleted file mode 100644
index c228d74..0000000
--- a/conf.d/project/htdocs/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-
-
-##################################################
-# HTML Testing Files
-##################################################
-PROJECT_TARGET_ADD(afb-test-html5)
-
- file(GLOB SOURCE_FILES "*.html" "*.js" "*.jpg" "*.css")
-
- add_input_files("${SOURCE_FILES}")
-
- SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
- LABELS "HTDOCS"
- OUTPUT_NAME ${TARGET_NAME}
- )
-
diff --git a/conf.d/project/htdocs/README.md b/conf.d/project/htdocs/README.md
deleted file mode 100644
index 7aafea0..0000000
--- a/conf.d/project/htdocs/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-------------------------------------------------------------------------
- Basic HTML & WS test
-------------------------------------------------------------------------
-
- # Load bindings directly from development tree for debug
- AFB_BINDER_NAME='sample' afb-daemon --verbose --verbose --token="" --ldpaths=build --port=1234 --roothttp=htdocs
-
diff --git a/conf.d/project/htdocs/TestBinding.css b/conf.d/project/htdocs/TestBinding.css
deleted file mode 100644
index 1052aa7..0000000
--- a/conf.d/project/htdocs/TestBinding.css
+++ /dev/null
@@ -1,7 +0,0 @@
-pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
-.string { color: green; }
-.number { color: darkorange; }
-.boolean { color: blue; }
-.null { color: magenta; }
-.key { color: red; }
-
diff --git a/conf.d/project/htdocs/TestBinding.js b/conf.d/project/htdocs/TestBinding.js
deleted file mode 100644
index 0f5caf9..0000000
--- a/conf.d/project/htdocs/TestBinding.js
+++ /dev/null
@@ -1,197 +0,0 @@
- var afb = new AFB("api", "mysecret");
- var ws;
- var sndcard="HALNotSelected";
- var evtidx=0;
- var numid=0;
-
- function syntaxHighlight(json) {
- if (typeof json !== 'string') {
- json = JSON.stringify(json, undefined, 2);
- }
- json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
- return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
- var cls = 'number';
- if (/^"/.test(match)) {
- if (/:$/.test(match)) {
- cls = 'key';
- } else {
- cls = 'string';
- }
- } else if (/true|false/.test(match)) {
- cls = 'boolean';
- } else if (/null/.test(match)) {
- cls = 'null';
- }
- return '<span class="' + cls + '">' + match + '</span>';
- });
- }
-
- function getParameterByName(name, url) {
- if (!url) {
- url = window.location.href;
- }
- name = name.replace(/[\[\]]/g, "\\$&");
- var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
- results = regex.exec(url);
- if (!results) return null;
- if (!results[2]) return '';
- return decodeURIComponent(results[2].replace(/\+/g, " "));
- }
-
- // default soundcard is "PCH"
- var devid=getParameterByName("devid");
- if (!devid) devid="hw:1";
-
- var haldev=getParameterByName("haldev");
- if (!haldev) haldev="scarlett-usb";
-
- var sndname=getParameterByName("sndname");
- if (!sndname) sndname="PCH";
-
- var mode=getParameterByName("mode");
- if (!mode) mode="0";
-
-
-
-
- function replyok(obj) {
- console.log("replyok:" + JSON.stringify(obj));
- document.getElementById("output").innerHTML = "OK: "+ syntaxHighlight(obj);
- }
-
- function replyerr(obj) {
- console.log("replyerr:" + JSON.stringify(obj));
- document.getElementById("output").innerHTML = "ERROR: "+ syntaxHighlight(obj);
- }
-
- function gotevent(obj) {
- console.log("gotevent:" + JSON.stringify(obj));
- document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
- }
-
- function send(message) {
- var api = document.getElementById("api").value;
- var verb = document.getElementById("verb").value;
- document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")";
- ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
- }
-
-
- // On button click from HTML page
- function callbinder(api, verb, query) {
- console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
- var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
- document.getElementById("question").innerHTML = syntaxHighlight(question);
- ws.call(api+"/"+verb, query).then(replyok, replyerr);
- }
-
-
- // Retreive Select value and Text from the binder
- // Note: selection of value/text for a given context is huggly!!!
- function querySelectList (elemid, api, verb, query) {
-
- console.log("querySelectList elemid=%s api=%s verb=%s query=%s", elemid, api, verb, query);
-
- var selectobj = document.getElementById(elemid);
- if (!selectobj) {
- return;
- }
-
- // onlick update selected HAL api
- selectobj.onclick=function(){
- sndcard= this.value;
- console.log ("Default Selection=" + sndcard);
- };
-
- function gotit (result) {
-
- // display response as for normal onclick action
- replyok(result);
- var response=result.response;
-
- // fulfill select with avaliable active HAL
- for (idx=0; idx<response.length; idx++) {
- var opt = document.createElement('option');
-
- // Alsa LowLevel selection mode
- if (response[idx].name) opt.text = response[idx].name;
- if (response[idx].devid) opt.value = response[idx].devid;
-
- // HAL selection mode
- if (response[idx].shortname) opt.text = response[idx].shortname;
- if (response[idx].api) opt.value = response[idx].api;
-
- selectobj.appendChild(opt);
- }
-
- sndcard= selectobj.value;
- }
-
- var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
- document.getElementById("question").innerHTML = syntaxHighlight(question);
-
- // request lowlevel ALSA to get API list
- ws.call(api+"/"+verb, query).then(gotit, replyerr);
- }
-
- function refresh_list (self, api, verb, query) {
- console.log("refresh_list id=%s api=%s verb=%s query=%s", self.id, api, verb, query);
-
- if (self.value > 0) return;
-
- // onlick update selected HAL api
- self.onclick=function(){
- numid = parseInt(self.value);
- console.log ("Default numid=%d", numid);
- };
-
- function gotit (result) {
-
- // display response as for normal onclick action
- replyok(result);
- var response=result.response;
-
-
-
- // fulfill select with avaliable active HAL
- for (idx=0; idx<response.length; idx++) {
- var opt = document.createElement('option');
-
- // Alsa LowLevel selection mode
- opt.text = response[idx].name + ' id=' + response[idx].id;
- opt.value = response[idx].id;
-
- self.appendChild(opt);
- }
- self.selectedIndex=2;
- numid = parseInt (self.value);
- }
-
- var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
- document.getElementById("question").innerHTML = syntaxHighlight(question);
-
- // request lowlevel ALSA to get API list
- ws.call(api+"/"+verb, query).then(gotit, replyerr);
- }
-
-
- function init(elemid, api, verb, query) {
-
- function onopen() {
- // check for active HALs
- querySelectList (elemid, api, verb, query);
-
- document.getElementById("main").style.visibility = "visible";
- document.getElementById("connected").innerHTML = "Binder WS Active";
- document.getElementById("connected").style.background = "lightgreen";
- ws.onevent("*", gotevent);
- }
-
- function onabort() {
- document.getElementById("main").style.visibility = "hidden";
- document.getElementById("connected").innerHTML = "Connected Closed";
- document.getElementById("connected").style.background = "red";
-
- }
- ws = new afb.ws(onopen, onabort);
- }
diff --git a/conf.d/project/htdocs/index.html b/conf.d/project/htdocs/index.html
deleted file mode 100644
index 3593d11..0000000
--- a/conf.d/project/htdocs/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<head>
- <title>Simple COntroller Test</title>
- <link rel="stylesheet" href="TestBinding.css">
- <script type="text/javascript" src="AFB-websock.js"></script>
- <script type="text/javascript" src="TestBinding.js"></script>
-</head>
-
-<body onload="init('hal_registry','alsacore', 'hallist')">
-
- <h1>Simple Control Test</h1>
- <button id="connected" onclick="init()">Binder WS Fail</button>
- <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_ctl')">Debug/Monitoring</a></button>
- <br><br>
-
- <h2>V2 API CALL</h2>
- <ol>
- <li><button onclick="callbinder('pol4a','request', {'uid':'navigation-role'});">Navigation Open</button></li>
- <li><button onclick="callbinder('pol4a','request', {'uid':'emergency-role'});">Emergency Open</button></li>
- <br>
- <li><button onclick="callbinder('pol4a', 'request', {'uid':'release-current'});">Release Current Role</button></li>
- </ol>
-
- <h2>V3 API CALL</h2>
- <ol>
- <li><button onclick="callbinder('pol4a','navigation-role');">Navigation Open</button></li>
- <li><button onclick="callbinder('pol4a','emergency-role');">Emergency Open</button></li>
- <br>
- <li><button onclick="callbinder('pol4a','release-current');">Release Current Role</button></li>
- </ol>
-
- <h2>Signal/Timeout</h2>
- <ol>
- <li><button onclick="callbinder('pol4a','signal-timeout', {'timeout':3, 'data':'state', 'event':'quit'});">Get Signal in 3s</button></li>
- </ol>
-
- <div id="main" style="visibility:hidden">
- <ol>
- <li>Question <pre id="question"></pre>
- <li>Response <pre id="output"></pre>
- <li>Events: <pre id="outevt"></pre>
- </ol>
- </div>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a7380e..5bbe7e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,7 +18,7 @@
# Add target to project dependency list
-PROJECT_TARGET_ADD(test-binding)
+PROJECT_TARGET_ADD(aft)
# Define project Targets
ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.c mapis.c)
@@ -32,7 +32,7 @@ PROJECT_TARGET_ADD(test-binding)
TARGET_LINK_LIBRARIES(${TARGET_NAME}
afb-helpers
- ctl-utilities
+ ctl-utilities
${link_libraries}
)
diff --git a/src/test-binding.c b/src/aft.c
index 39e90c4..1a3eb54 100644
--- a/src/test-binding.c
+++ b/src/aft.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <time.h>
-#include "test-binding.h"
+#include "aft.h"
#include "mapis.h"
// default api to print log when apihandle not avaliable
afb_dynapi *AFB_default;
diff --git a/src/test-binding.h b/src/aft.h
index 7ac00a0..7ac00a0 100644
--- a/src/test-binding.h
+++ b/src/aft.h