aboutsummaryrefslogtreecommitdiffstats
path: root/htdocs
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:57:13 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:57:13 +0200
commit3bae3ad28b6bab59e7c893f1c43747c33cf57ddc (patch)
tree4b875317fb07ecd733f0b298c2b70b8e1f55f0e2 /htdocs
parent95a1f9344501b7ffdc7501629208e879c7a33a17 (diff)
Format: Remove spaces at EOL
Change-Id: I50bbf17cfa913b40caf0cb6752a902fb626ec1ad Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'htdocs')
-rw-r--r--htdocs/AFB-websock.js6
-rw-r--r--htdocs/AudioBinding.js80
-rw-r--r--htdocs/README.md2
-rw-r--r--htdocs/index.html20
4 files changed, 54 insertions, 54 deletions
diff --git a/htdocs/AFB-websock.js b/htdocs/AFB-websock.js
index ff9fa60..99ab3b8 100644
--- a/htdocs/AFB-websock.js
+++ b/htdocs/AFB-websock.js
@@ -123,14 +123,14 @@ var AFB_websocket;
switch (code) {
case RETOK:
reply(this.pendings, id, ans, 0);
- break;
+ break;
case RETERR:
reply(this.pendings, id, ans, 1);
- break;
+ break;
case EVENT:
default:
fire(this.awaitens, id, ans);
- break;
+ break;
}
}
diff --git a/htdocs/AudioBinding.js b/htdocs/AudioBinding.js
index 4d14600..0f5caf9 100644
--- a/htdocs/AudioBinding.js
+++ b/htdocs/AudioBinding.js
@@ -37,50 +37,50 @@
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
+
+ // 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);
+ var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
document.getElementById("question").innerHTML = syntaxHighlight(question);
ws.call(api+"/"+verb, query).then(replyok, replyerr);
}
@@ -89,26 +89,26 @@
// 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);
+ 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');
@@ -120,39 +120,39 @@
// 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);
+
+ 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;
-
+
+ if (self.value > 0) return;
+
// onlick update selected HAL api
self.onclick=function(){
- numid = parseInt(self.value);
- console.log ("Default numid=%d", numid);
+ 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');
@@ -160,27 +160,27 @@
// 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);
+ numid = parseInt (self.value);
}
-
- var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
+
+ 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";
@@ -192,6 +192,6 @@
document.getElementById("connected").innerHTML = "Connected Closed";
document.getElementById("connected").style.background = "red";
- }
+ }
ws = new afb.ws(onopen, onabort);
}
diff --git a/htdocs/README.md b/htdocs/README.md
index 0ad2260..7aafea0 100644
--- a/htdocs/README.md
+++ b/htdocs/README.md
@@ -1,7 +1,7 @@
------------------------------------------------------------------------
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/htdocs/index.html b/htdocs/index.html
index 19d5315..52baba3 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -5,31 +5,31 @@
<script type="text/javascript" src="AFB-websock.js"></script>
<script type="text/javascript" src="AudioBinding.js"></script>
</head>
-
+
<body onload="init('hal_registry','alsacore', 'hallist')">
-
+
<h1>Simple Control Test</h1>
<button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button>
<br><br>
-
+
<ol>
-
+
<li><button onclick="callbinder('control','dispatch' ,{'target':'Button-Happy',args:{'var1':1234, 'var2':4567}});">Button Happy (Granted)</button></li>
<li><button onclick="callbinder('control','dispatch' ,{'target':'Button-UnHappy',args:{'var1':1234, 'var2':4567}});">Button UnHappy (Refused)</button></li>
- <br>
+ <br>
<li><button onclick="callbinder('control','request' ,{'target':'_Simple_Timer_Test',args:{'label':'myTimer', 'delay':3000, 'count':10}});">Start Events Timer</button></li>
- <br>
+ <br>
<li><button onclick="callbinder('control','request' ,{'target':'_Simple_Echo_Args', 'args':{speed:20}});">Simple Echo args</button></li>
- <br>
+ <br>
<li><button onclick="callbinder('control','debuglua' ,{'target':'helloworld', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">Lua Debug Script</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>
+ </div>