Updated Readme and info zone for monitoring

5 files changed, 53 insertions, 21 deletions

diff --git a/Alsa-afb/Alsa-ApiHat.c b/Alsa-afb/Alsa-ApiHat.c
index e22f2d5..bbb3959 100644
--- a/Alsa-afb/Alsa-ApiHat.c
+++ b/Alsa-afb/Alsa-ApiHat.c
@@ -42,20 +42,20 @@ STATIC int AlsaInit(void) {
  */
 static const struct afb_verb_v2 api_verbs[] = {
     /* VERB'S NAME          FUNCTION TO CALL  */
-    { .verb = "ping", .callback = pingtest},
-    { .verb = "getinfo", .callback = alsaGetInfo},
-    { .verb = "getctl", .callback = alsaGetCtls},
-    { .verb = "setctl", .callback = alsaSetCtls},
-    { .verb = "subscribe", .callback = alsaEvtSubcribe},
-    { .verb = "getcardid", .callback = alsaGetCardId},
-    { .verb = "halregister", .callback = alsaRegisterHal},
-    { .verb = "hallist", .callback = alsaActiveHal},
-    { .verb = "ucmquery", .callback = alsaUseCaseQuery},
-    { .verb = "ucmset", .callback = alsaUseCaseSet},
-    { .verb = "ucmget", .callback = alsaUseCaseGet},
-    { .verb = "ucmreset", .callback = alsaUseCaseReset},
-    { .verb = "ucmclose", .callback = alsaUseCaseClose},
-    { .verb = "addcustomctl", .callback = alsaAddCustomCtls},
+    { .verb = "ping", .callback = pingtest, .info="Ping Presence Check on API"},
+    { .verb = "getinfo", .callback = alsaGetInfo, .info="Return sound cards list"},
+    { .verb = "getctl", .callback = alsaGetCtls, .info="Get one or many control values"},
+    { .verb = "setctl", .callback = alsaSetCtls, .info="Set one control or more"},
+    { .verb = "subscribe", .callback = alsaEvtSubcribe, .info="subscribe to alsa events"},
+    { .verb = "getcardid", .callback = alsaGetCardId, .info="get sound card id"},
+    { .verb = "halregister", .callback = alsaRegisterHal, .info="register a new HAL in alsacore"},
+    { .verb = "hallist", .callback = alsaActiveHal, .info="Get list of currently active HAL"},
+    { .verb = "ucmquery", .callback = alsaUseCaseQuery,.info="Use Case Manager Query"},
+    { .verb = "ucmset", .callback = alsaUseCaseSet,.info="Use Case Manager set"},
+    { .verb = "ucmget", .callback = alsaUseCaseGet,.info="Use Case Manager Get"},
+    { .verb = "ucmreset", .callback = alsaUseCaseReset, .info="Use Case Manager Reset"},
+    { .verb = "ucmclose", .callback = alsaUseCaseClose, .info="Use Case Manager Close"},
+    { .verb = "addcustomctl", .callback = alsaAddCustomCtls, .info="Add Software Alsa Custom Control"},
     { .verb = NULL} /* marker for end of the array */
 };
 
diff --git a/README.md b/README.md
index a07a8d1..34984ff 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,13 @@ as today latest stable is 1.1.4.
     cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX ..
     make
 
-    afb-daemon --workdir=. --ldpaths=. --port=1234  --roothttp=../htdocs --token="" --verbose
+    # Note: 
+      1) Controller is now a standalone project and should added on top of project bindings
+      2) If you want monitoring add '--alias=/monitoring:$HOME/opt/afb-monitoring'  (should point to monitoring HTML5 pages)
+      3) To expose AAAA control interface add '--ws-server=unix:/var/tmp/afb-ws/ctl-aaaa'
+
+    afb-daemon --workdir=. --ldpaths=. --binding=../../afb-controller/build/afb-source/afb-control-afb.so --port=1234  --roothttp=../htdocs --token="" --verbose
+    
 
     Warning: See below net on GDB requiring (--workdir=.)
 ```
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 7edac5d..e4b095b 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,7 +18,7 @@
 
 # Project Info
 # ------------------
-set(PROJECT_NAME audio-bindings)
+set(PROJECT_NAME afb-aaaa)
 set(PROJECT_VERSION "0.1")
 set(PROJECT_PRETTY_NAME "Audio Agent")
 set(PROJECT_DESCRIPTION "Expose Alsa through AGL AppFw")
@@ -98,7 +98,12 @@ set(COMPILE_OPTIONS
 if(IS_DIRECTORY $ENV{HOME}/opt/afb-monitoring)
 set(MONITORING_ALIAS "--alias=/monitoring:$ENV{HOME}/opt/afb-monitoring")
 endif()
-set(CLOSING_MESSAGE "Debug from afb-daemon --port=1234 ${MONITORING_ALIAS} --ldpaths=. --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose ")
+
+if(EXISTS ${CMAKE_SOURCE_DIR}/../afb-controller/build/afb-source/afb-control-afb.so)
+set(CTL_BUILD_PATH "--binding=../../afb-controller/build/afb-source/afb-control-afb.so")
+endif()
+
+set(CLOSING_MESSAGE "Debug from afb-daemon --port=1234 ${MONITORING_ALIAS} --ldpaths=. ${CTL_BUILD_PATH} --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose ")
 set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
 
 # Optional location for config.xml.in
diff --git a/htdocs/index.html b/htdocs/index.html
index 4b842c1..e424feb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -7,3 +7,4 @@
      <li><a href="alsa-core.html">AlsaCore Low Level Binding</a>
      <li><a href="alsa-hal.html" >AlsaHAL  Hardware Abstraction Layer</a>
      <li><a href="audio-control.html">AudioControl Control/Policy API</a>
+     <li><a href="/monitoring/monitor.html">Binding Monitoring Dashboard</a>
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 0b0cdfb..b2f550e 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -2925,7 +2925,7 @@
       <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="4">
         <ccTool flags="1">
           <incDir>
             <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
@@ -2936,7 +2936,7 @@
       <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="4">
         <ccTool flags="1">
           <incDir>
             <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
@@ -2947,7 +2947,7 @@
       <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="4">
         <ccTool flags="1">
           <incDir>
             <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
@@ -2958,7 +2958,7 @@
       <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="4">
         <ccTool flags="1">
           <incDir>
             <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
@@ -3081,6 +3081,25 @@
       </item>
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
+      <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>afb-utilities</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>build/afb-utilities</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>afb-utilities</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>build/afb-utilities</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <folder path="0/Alsa-Plugin">
         <cTool>
           <incDir>
@@ -3177,6 +3196,7 @@
             <pElem>/usr/include/lua5.3</pElem>
             <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
             <pElem>build/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
           </incDir>
           <preprocessorList>
             <Elem>CONTROL_MAXPATH_LEN=255</Elem>