From a4899ab57f08aeb2741d08f74d7593c85a0ad3f4 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Wed, 16 Aug 2017 19:18:46 +0200
Subject: Fix DoScript Lua Updated Documentation.

---
 htdocs/audio-control.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'htdocs')

diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html
index 89addcc..d51f527 100644
--- a/htdocs/audio-control.html
+++ b/htdocs/audio-control.html
@@ -31,7 +31,7 @@
     <br>    
     <li><button onclick="callbinder('control','lua_dostring','print(\'Bonjours\'); return true, 1234');">LUA string</button></li>
     <li><button onclick="callbinder('control','lua_docall'  , {'func':'Simple_Echo_Args', 'args':{speed:20}});">LUA function</button></li>
-    <li><button onclick="callbinder('control','lua_doscript', {'script':'helloworld-lua-script.lua', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li>
+    <li><button onclick="callbinder('control','lua_doscript', {'script':'helloworld.lua', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li>
         
     </ol>
     
-- 
cgit 


From 5e919fde0a4c66b0203c46b8f06f303fcceaedde Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Thu, 17 Aug 2017 00:56:43 +0200
Subject: Implemented Timer and Event from Lua

---
 htdocs/audio-control.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'htdocs')

diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html
index d51f527..d51ae55 100644
--- a/htdocs/audio-control.html
+++ b/htdocs/audio-control.html
@@ -32,6 +32,7 @@
     <li><button onclick="callbinder('control','lua_dostring','print(\'Bonjours\'); return true, 1234');">LUA string</button></li>
     <li><button onclick="callbinder('control','lua_docall'  , {'func':'Simple_Echo_Args', 'args':{speed:20}});">LUA function</button></li>
     <li><button onclick="callbinder('control','lua_doscript', {'script':'helloworld.lua', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li>
+    <li><button onclick="callbinder('control','lua_docall'  , {'func':'Simple_Timer_Test', args:{label:'MyTimer', 'delay':3000, 'count':10}});">LUA Timer</button></li>
         
     </ol>
     
-- 
cgit 


From a7d41a6fa1e29d800ce8ac9e95e8f943814463e8 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Fri, 18 Aug 2017 01:09:56 +0200
Subject: Integration with Alsa HookPlugin is now working.

---
 htdocs/AudioBinding.js    |  1 -
 htdocs/alsa-hal.html      | 16 ++++++++--------
 htdocs/audio-control.html | 23 ++++++++++++-----------
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'htdocs')

diff --git a/htdocs/AudioBinding.js b/htdocs/AudioBinding.js
index 607d31c..4d14600 100644
--- a/htdocs/AudioBinding.js
+++ b/htdocs/AudioBinding.js
@@ -94,7 +94,6 @@
         
         var selectobj = document.getElementById(elemid);
         if (!selectobj) {
-            console.log ("****** elemid=%s does not exit in HTML page ****", elemid);
             return;
         }
         
diff --git a/htdocs/alsa-hal.html b/htdocs/alsa-hal.html
index f1d5aaf..013c547 100644
--- a/htdocs/alsa-hal.html
+++ b/htdocs/alsa-hal.html
@@ -27,15 +27,15 @@
     <br>
     <ol>
         
-    <li><button onclick="callbinder(sndcard,'ctl-list')">List Selected HAL Controls </button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-get', {label:'Master_Playback_Volume'})">Get  {label:'Master_Playback_Volume'}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-get', [{tag:4},{tag:5}])">Get[{tag:4},{tag:5}]</button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-get', [4,5])">Get [4,5]</button></li>
+    <li><button onclick="callbinder(sndcard,'ctllist')">List Selected HAL Controls </button></li>
+    <li><button onclick="callbinder(sndcard,'ctlget', {label:'Master_Playback_Volume'})">Get  {label:'Master_Playback_Volume'}</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlget', [{tag:4},{tag:5}])">Get[{tag:4},{tag:5}]</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlget', [4,5])">Get [4,5]</button></li>
     <br>
-    <li><button onclick="callbinder(sndcard,'ctl-set', {label:'Master_Playback_Volume', val:[50]})">Set {label:'Master_Playback_Volume', value=[50]}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-set', {tag: 4, val:5})">Set {tag: 4, val:5}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-set', [{tag:4, val:25},{tag:5, val:25}])">Set[{tag:4, val:25},{tag:5, val:25}]</button></li>
-    <li><button onclick="callbinder(sndcard,'ctl-set', [{tag:4, val:[55,45]},{tag:5, val:[45,55]}])">Set[{tag:4, val:[55,45]},{tag:5, val:[45,55]}]]</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlset', {label:'Master_Playback_Volume', val:[50]})">Set {label:'Master_Playback_Volume', value=[50]}</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlset', {tag: 4, val:5})">Set {tag: 4, val:5}</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlset', [{tag:4, val:25},{tag:5, val:25}])">Set[{tag:4, val:25},{tag:5, val:25}]</button></li>
+    <li><button onclick="callbinder(sndcard,'ctlset', [{tag:4, val:[55,45]},{tag:5, val:[45,55]}])">Set[{tag:4, val:[55,45]},{tag:5, val:[45,55]}]]</button></li>
     <br>
     
     <li>
diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html
index d51ae55..6b7872f 100644
--- a/htdocs/audio-control.html
+++ b/htdocs/audio-control.html
@@ -5,14 +5,15 @@
     <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 Audio Control test</h1>
-    <button id="connected" onclick="init('alsa_registry','alsacore', 'getinfo');">Binder WS Fail</button>
+    <h1>Simple Audio Control Test</h1>
+    <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button>
     <br><br>
- 
+    <b>Selected HAL </b>
+    <select id='hal_registry'></select>
+    
     <b>API Verbosity </b>
     <select id='api_verbosity' onclick='mode=this.value'>
         <option value='0'>Quiet</option>
@@ -21,18 +22,18 @@
         <option value='3'>Full</option>
     </select>    
     <br>
-
     <br>
+   
     <ol>
     
-    <li><button onclick="callbinder('control','navigation' ,{'var': 'nav'});">Select Navigation</button></li>
-    <li><button onclick="callbinder('control','multimedia' ,{'xxx': 'multi'});">Select Mutimedia</button></li>
-    <li><button onclick="callbinder('control','emergency'  ,{'yyy': 'emerg'});">Select Emergency</button></li>
+    <li><button onclick="callbinder('control','dispatch' ,{'target':'navigation','args':{'apihal':sndcard}});">Dispatch Navigation</button></li>
+    <li><button onclick="callbinder('control','dispatch' ,{'target':'multimedia','args':{'apihal':sndcard}});">Dispatch Mutimedia</button></li>
+    <li><button onclick="callbinder('control','dispatch' ,{'target':'emergency' });">Dispatch Emergency</button></li>
     <br>    
     <li><button onclick="callbinder('control','lua_dostring','print(\'Bonjours\'); return true, 1234');">LUA string</button></li>
-    <li><button onclick="callbinder('control','lua_docall'  , {'func':'Simple_Echo_Args', 'args':{speed:20}});">LUA function</button></li>
+    <li><button onclick="callbinder('control','lua_docall'  , {'func':'_Simple_Echo_Args', 'args':{speed:20}});">LUA function</button></li>
     <li><button onclick="callbinder('control','lua_doscript', {'script':'helloworld.lua', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">LUA script</button></li>
-    <li><button onclick="callbinder('control','lua_docall'  , {'func':'Simple_Timer_Test', args:{label:'MyTimer', 'delay':3000, 'count':10}});">LUA Timer</button></li>
+    <li><button onclick="callbinder('control','lua_docall'  , {'func':'_Simple_Timer_Test', args:{label:'MyTimer', 'delay':3000, 'count':10}});">LUA Timer</button></li>
         
     </ol>
     
-- 
cgit 


From 3648e16e17a908e7f08bde789fefe3abc6981544 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Fri, 18 Aug 2017 10:45:11 +0200
Subject: Latest app-templates features integration

- CMake >= 3.6 mandatory
- Change DATA and HTDOCS targets methods to use macro
 add_input_files()
- header generated from OpenAPI file using BINDINGV2 label
 and set_openapi_filename() macro.
- Adjusted README to reflect new cmake requirement

Change-Id: I8da515b98c1877d5be5e51f2bf94d691ac3cefb7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 htdocs/CMakeLists.txt | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'htdocs')

diff --git a/htdocs/CMakeLists.txt b/htdocs/CMakeLists.txt
index e85ca3c..322033d 100644
--- a/htdocs/CMakeLists.txt
+++ b/htdocs/CMakeLists.txt
@@ -25,17 +25,7 @@ PROJECT_TARGET_ADD(htdocs)
 
     file(GLOB SOURCE_FILES "*.html" "*.js" "*.jpg" "*.css")
 
-    add_custom_target(${TARGET_NAME} 
-       DEPENDS  ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
-    ) 
-
-    add_custom_command(
-       DEPENDS  ${SOURCE_FILES}
-       OUTPUT ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
-       COMMAND mkdir -p ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
-       COMMAND touch ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
-       COMMAND cp -r ${SOURCE_FILES} ${PROJECT_PKG_BUILD_DIR}/${TARGET_NAME}
-    )
+	add_input_files("${SOURCE_FILES}")
 
     SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
 	LABELS "HTDOCS"
-- 
cgit