From 01a3f74a836d769f7af9bb2dc4fa631b07b881fb Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Thu, 20 Jul 2017 22:10:58 +0200
Subject: [PATCH] Initial API-V2 ajusted HTML page to fit new commands names

---
 htdocs/UNICENS.html      | 12 ++++-----
 ucs2-afb/ucs_apidef.h    | 66 ++++++++++++++++++++++++------------------------
 ucs2-afb/ucs_apidef.json |  8 +++---
 ucs2-afb/ucs_binding.c   |  9 +++++--
 ucs2-afb/ucs_binding.h   |  5 ++--
 5 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/htdocs/UNICENS.html b/htdocs/UNICENS.html
index 04ad916..fe25fe1 100644
--- a/htdocs/UNICENS.html
+++ b/htdocs/UNICENS.html
@@ -11,12 +11,12 @@
     <button id="connected" onclick="init()">Binder WS Fail</button></li>
     <br>
     <ol>
-    <li><button onclick="callbinder('UNICENS','initialise', {filename:'data/config_multichannel_audio_kit.xml'})">Parse XML and Start UNICENS</button></li>
-    <li><button onclick="callbinder('UNICENS','setvol', {channel:'master', volume: 255})">Set Master Volume to 255</button></li>
-    <li><button onclick="callbinder('UNICENS','setvol', {channel:'master', volume: 200})">Set Master Volume to 200</button></li>
-    <li><button onclick="callbinder('UNICENS','setvol', [[0,200], [1,255]])">Set left=200 right=250</button></li>
-    <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,200]])">Set right=250 left=200</button></li>
-    <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,255]])">Set right=255 left=255</button></li>
+    <li><button onclick="callbinder('UNICENS','configure', {filename:'data/config_multichannel_audio_kit.xml'})">Parse XML and Start UNICENS</button></li>
+    <li><button onclick="callbinder('UNICENS','volume', {channel:'master', volume: 255})">Set Master Volume to 255</button></li>
+    <li><button onclick="callbinder('UNICENS','volume', {channel:'master', volume: 200})">Set Master Volume to 200</button></li>
+    <li><button onclick="callbinder('UNICENS','volume', [[0,200], [1,255]])">Set left=200 right=250</button></li>
+    <li><button onclick="callbinder('UNICENS','volume', [[0,255], [1,200]])">Set right=250 left=200</button></li>
+    <li><button onclick="callbinder('UNICENS','volume', [[0,255], [1,255]])">Set right=255 left=255</button></li>
     </ol>
     <br>
     <div id="main" style="visibility:hidden">
diff --git a/ucs2-afb/ucs_apidef.h b/ucs2-afb/ucs_apidef.h
index 8e1ab13..c8ce266 100644
--- a/ucs2-afb/ucs_apidef.h
+++ b/ucs2-afb/ucs_apidef.h
@@ -3,33 +3,33 @@ static const char _afb_description_v2_UNICENS[] =
     "{\"openapi\":\"3.0.0\",\"$schema\":\"http:iot.bzh/download/openapi/schem"
     "a-3.0/default-schema.json\",\"info\":{\"description\":\"\",\"title\":\"u"
     "cs2\",\"version\":\"1.0\",\"x-binding-c-generator\":{\"api\":\"UNICENS\""
-    ",\"version\":2,\"prefix\":\"Ucs2\",\"postfix\":\"API\",\"start\":null,\""
-    "onevent\":null,\"init\":null,\"scope\":\"\",\"private\":false}},\"server"
-    "s\":[{\"url\":\"ws://{host}:{port}/api/monitor\",\"description\":\"Unice"
-    "ns2 API.\",\"variables\":{\"host\":{\"default\":\"localhost\"},\"port\":"
-    "{\"default\":\"1234\"}},\"x-afb-events\":[{\"$ref\":\"#/components/schem"
-    "as/afb-event\"}]}],\"components\":{\"schemas\":{\"afb-reply\":{\"$ref\":"
-    "\"#/components/schemas/afb-reply-v2\"},\"afb-event\":{\"$ref\":\"#/compo"
-    "nents/schemas/afb-event-v2\"},\"afb-reply-v2\":{\"title\":\"Generic resp"
-    "onse.\",\"type\":\"object\",\"required\":[\"jtype\",\"request\"],\"prope"
-    "rties\":{\"jtype\":{\"type\":\"string\",\"const\":\"afb-reply\"},\"reque"
-    "st\":{\"type\":\"object\",\"required\":[\"status\"],\"properties\":{\"st"
-    "atus\":{\"type\":\"string\"},\"info\":{\"type\":\"string\"},\"token\":{\""
-    "type\":\"string\"},\"uuid\":{\"type\":\"string\"},\"reqid\":{\"type\":\""
-    "string\"}}},\"response\":{\"type\":\"object\"}}},\"afb-event-v2\":{\"typ"
-    "e\":\"object\",\"required\":[\"jtype\",\"event\"],\"properties\":{\"jtyp"
-    "e\":{\"type\":\"string\",\"const\":\"afb-event\"},\"event\":{\"type\":\""
-    "string\"},\"data\":{\"type\":\"object\"}}}},\"x-permissions\":{\"config\""
-    ":{\"permission\":\"urn:AGL:permission:UNICENS:public:initialise\"},\"mon"
-    "itor\":{\"permission\":\"urn:AGL:permission:UNICENS:public:monitor\"}},\""
-    "responses\":{\"200\":{\"description\":\"A complex object array response\""
+    ",\"version\":2,\"prefix\":\"ucs2_\",\"postfix\":\"\",\"start\":null,\"on"
+    "event\":null,\"init\":null,\"scope\":\"\",\"private\":false}},\"servers\""
+    ":[{\"url\":\"ws://{host}:{port}/api/monitor\",\"description\":\"Unicens2"
+    " API.\",\"variables\":{\"host\":{\"default\":\"localhost\"},\"port\":{\""
+    "default\":\"1234\"}},\"x-afb-events\":[{\"$ref\":\"#/components/schemas/"
+    "afb-event\"}]}],\"components\":{\"schemas\":{\"afb-reply\":{\"$ref\":\"#"
+    "/components/schemas/afb-reply-v2\"},\"afb-event\":{\"$ref\":\"#/componen"
+    "ts/schemas/afb-event-v2\"},\"afb-reply-v2\":{\"title\":\"Generic respons"
+    "e.\",\"type\":\"object\",\"required\":[\"jtype\",\"request\"],\"properti"
+    "es\":{\"jtype\":{\"type\":\"string\",\"const\":\"afb-reply\"},\"request\""
+    ":{\"type\":\"object\",\"required\":[\"status\"],\"properties\":{\"status"
+    "\":{\"type\":\"string\"},\"info\":{\"type\":\"string\"},\"token\":{\"typ"
+    "e\":\"string\"},\"uuid\":{\"type\":\"string\"},\"reqid\":{\"type\":\"str"
+    "ing\"}}},\"response\":{\"type\":\"object\"}}},\"afb-event-v2\":{\"type\""
+    ":\"object\",\"required\":[\"jtype\",\"event\"],\"properties\":{\"jtype\""
+    ":{\"type\":\"string\",\"const\":\"afb-event\"},\"event\":{\"type\":\"str"
+    "ing\"},\"data\":{\"type\":\"object\"}}}},\"x-permissions\":{\"config\":{"
+    "\"permission\":\"urn:AGL:permission:UNICENS:public:initialise\"},\"monit"
+    "or\":{\"permission\":\"urn:AGL:permission:UNICENS:public:monitor\"}},\"r"
+    "esponses\":{\"200\":{\"description\":\"A complex object array response\""
     ",\"content\":{\"application/json\":{\"schema\":{\"$ref\":\"#/components/"
-    "schemas/afb-reply\"}}}}}},\"paths\":{\"/initialise\":{\"description\":\""
-    "Initialise Unicens2 lib from NetworkConfig.XML.\",\"get\":{\"x-permissio"
-    "ns\":{\"$ref\":\"#/components/x-permissions/config\"},\"parameters\":[{\""
-    "in\":\"query\",\"name\":\"filename\",\"required\":true,\"schema\":{\"typ"
-    "e\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/respon"
-    "ses/200\"}}}},\"/volume\":{\"description\":\"Set Master Volume.\",\"get\""
+    "schemas/afb-reply\"}}}}}},\"paths\":{\"/configure\":{\"description\":\"c"
+    "onfigure Unicens2 lib from NetworkConfig.XML.\",\"get\":{\"x-permissions"
+    "\":{\"$ref\":\"#/components/x-permissions/config\"},\"parameters\":[{\"i"
+    "n\":\"query\",\"name\":\"filename\",\"required\":true,\"schema\":{\"type"
+    "\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/respons"
+    "es/200\"}}}},\"/volume\":{\"description\":\"Set Master Volume.\",\"get\""
     ":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/monitor\"},\""
     "parameters\":[{\"in\":\"query\",\"name\":\"value\",\"required\":true,\"s"
     "chema\":{\"type\":\"integer\"}}],\"responses\":{\"200\":{\"$ref\":\"#/co"
@@ -44,28 +44,28 @@ static const struct afb_auth _afb_auths_v2_UNICENS[] = {
 	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:UNICENS:public:monitor" }
 };
 
- void Ucs2initialiseAPI(struct afb_req req);
- void Ucs2volumeAPI(struct afb_req req);
- void Ucs2monitorAPI(struct afb_req req);
+ void ucs2_configure(struct afb_req req);
+ void ucs2_volume(struct afb_req req);
+ void ucs2_monitor(struct afb_req req);
 
 static const struct afb_verb_v2 _afb_verbs_v2_UNICENS[] = {
     {
-        .verb = "initialise",
-        .callback = Ucs2initialiseAPI,
+        .verb = "configure",
+        .callback = ucs2_configure,
         .auth = &_afb_auths_v2_UNICENS[0],
         .info = NULL,
         .session = AFB_SESSION_NONE_V2
     },
     {
         .verb = "volume",
-        .callback = Ucs2volumeAPI,
+        .callback = ucs2_volume,
         .auth = &_afb_auths_v2_UNICENS[1],
         .info = NULL,
         .session = AFB_SESSION_NONE_V2
     },
     {
         .verb = "monitor",
-        .callback = Ucs2monitorAPI,
+        .callback = ucs2_monitor,
         .auth = &_afb_auths_v2_UNICENS[1],
         .info = NULL,
         .session = AFB_SESSION_NONE_V2
diff --git a/ucs2-afb/ucs_apidef.json b/ucs2-afb/ucs_apidef.json
index 9936004..274ce73 100644
--- a/ucs2-afb/ucs_apidef.json
+++ b/ucs2-afb/ucs_apidef.json
@@ -8,8 +8,8 @@
     "x-binding-c-generator": {
       "api": "UNICENS",
       "version": 2,
-      "prefix": "Ucs2",
-      "postfix": "API",
+      "prefix": "ucs2_",
+      "postfix": "",
       "start": null ,
       "onevent": null,
       "init": null,
@@ -102,8 +102,8 @@
     }
   },
   "paths": {
-    "/initialise": {
-      "description": "Initialise Unicens2 lib from NetworkConfig.XML.",
+    "/configure": {
+      "description": "configure Unicens2 lib from NetworkConfig.XML.",
       "get": {
         "x-permissions": {
           "$ref": "#/components/x-permissions/config"
diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c
index 8ccc02f..efb4928 100644
--- a/ucs2-afb/ucs_binding.c
+++ b/ucs2-afb/ucs_binding.c
@@ -380,7 +380,7 @@ STATIC int volSndCmd (struct afb_req request, struct json_object *commandJ, ucsC
 }
 
 
-PUBLIC void ucs2SetVol (struct afb_req request) {
+PUBLIC void ucs2_volume (struct afb_req request) {
     struct json_object *queryJ;
     int err;
 
@@ -423,7 +423,7 @@ PUBLIC void ucs2SetVol (struct afb_req request) {
 }
 
 
-PUBLIC void ucs2Configure (struct afb_req request) {
+PUBLIC void ucs2_configure (struct afb_req request) {
     static UcsXmlVal_t *ucsConfig;
     static ucsContextT ucsContext;
 
@@ -472,3 +472,8 @@ PUBLIC void ucs2Configure (struct afb_req request) {
  OnErrorExit:
     return;
 }
+
+PUBLIC void ucs2_monitor (struct afb_req request) {
+    
+   afb_req_success(request,NULL,"UNICENS-to_be_done"); 
+}
\ No newline at end of file
diff --git a/ucs2-afb/ucs_binding.h b/ucs2-afb/ucs_binding.h
index 082f6cc..4265762 100644
--- a/ucs2-afb/ucs_binding.h
+++ b/ucs2-afb/ucs_binding.h
@@ -43,8 +43,9 @@ extern const struct afb_binding_interface *afbIface;
 extern struct afb_service afbSrv;
 
 // API verbs prototype
-PUBLIC void ucs2Configure (struct afb_req request);
-PUBLIC void ucs2SetVol (struct afb_req request);
+PUBLIC void ucs2_configure (struct afb_req request);
+PUBLIC void ucs2_volume    (struct afb_req request);
+PUBLIC void ucs2_monitor   (struct afb_req request);
 
 
 #endif /* UCS2BINDING_H */
-- 
2.16.6