From 96f0057d65fbb90d9faa02a3ae4ae37b357094db Mon Sep 17 00:00:00 2001 From: fulup Date: Mon, 14 Aug 2017 00:58:57 +0200 Subject: Work in Progress --- Controler-afb/ctl-apidef.h | 41 +++-- Controler-afb/ctl-apidef.json | 2 +- Controler-afb/ctl-binding.h | 17 +- Controler-afb/ctl-lua.c | 182 +++++++++++----------- Controler-afb/ctl-misc.c | 35 +++-- Controler-afb/ctl-misc2.c | 74 --------- conf.d/cmake/config.cmake | 1 + conf.d/project/config.d/onload-audio-control.json | 6 +- conf.d/project/lua.d/doscript-helloworld.lua | 36 +++++ conf.d/project/lua.d/helloworld-lua-script.lua | 41 ----- conf.d/project/lua.d/onload-audio-controls.lua | 54 +++++++ conf.d/project/lua.d/onload-audio-oncall.lua | 88 +++++++++++ conf.d/project/lua.d/onload-audio-policy.lua | 49 ------ conf.d/project/lua.d/onload-audio-samples.lua | 93 ----------- conf.d/project/lua.d/onload-audio-utils.lua | 32 ++++ htdocs/audio-control.html | 2 +- nbproject/configurations.xml | 113 ++++++++++++-- 17 files changed, 463 insertions(+), 403 deletions(-) delete mode 100644 Controler-afb/ctl-misc2.c create mode 100644 conf.d/project/lua.d/doscript-helloworld.lua delete mode 100644 conf.d/project/lua.d/helloworld-lua-script.lua create mode 100644 conf.d/project/lua.d/onload-audio-controls.lua create mode 100644 conf.d/project/lua.d/onload-audio-oncall.lua delete mode 100644 conf.d/project/lua.d/onload-audio-policy.lua delete mode 100644 conf.d/project/lua.d/onload-audio-samples.lua create mode 100644 conf.d/project/lua.d/onload-audio-utils.lua diff --git a/Controler-afb/ctl-apidef.h b/Controler-afb/ctl-apidef.h index 0f801cb..1bd80f9 100644 --- a/Controler-afb/ctl-apidef.h +++ b/Controler-afb/ctl-apidef.h @@ -46,21 +46,26 @@ static const char _afb_description_v2_control[] = ",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/navig" "ation\"},\"parameters\":[{\"in\":\"query\",\"name\":\"zone\",\"required\"" ":false,\"schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref" - "\":\"#/components/responses/200\"}}}},\"/lua_docall\":{\"description\":\"" - "Execute LUA string script.\",\"get\":{\"x-permissions\":{\"$ref\":\"#/co" - "mponents/x-permissions/navigation\"},\"parameters\":[{\"in\":\"query\",\"" - "name\":\"func\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"i" - "n\":\"query\",\"name\":\"args\",\"required\":false,\"schema\":{\"type\":" - "\"array\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/2" - "00\"}}}},\"/lua_dostring\":{\"description\":\"Execute LUA string script." + "\":\"#/components/responses/200\"}}}},\"/emergency\":{\"description\":\"" + "Request Access to Navigation Audio Channel.\",\"get\":{\"x-permissions\"" + ":{\"$ref\":\"#/components/x-permissions/navigation\"},\"parameters\":[{\"" + "in\":\"query\",\"name\":\"zone\",\"required\":false,\"schema\":{\"type\"" + ":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses" + "/200\"}}}},\"/lua_docall\":{\"description\":\"Execute LUA string script." "\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/nav" - "igation\"},\"parameters\":[{\"in\":\"query\",\"required\":true,\"schema\"" - ":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components" - "/responses/200\"}}}},\"/lua_doscript\":{\"description\":\"Execute LUA st" - "ring script.\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-per" - "missions/navigation\"},\"parameters\":[{\"in\":\"query\",\"name\":\"file" - "name\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"responses\"" - ":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}}}}" + "igation\"},\"parameters\":[{\"in\":\"query\",\"name\":\"func\",\"require" + "d\":true,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"" + "args\",\"required\":false,\"schema\":{\"type\":\"array\"}}],\"responses\"" + ":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/lua_dostring\"" + ":{\"description\":\"Execute LUA string script.\",\"get\":{\"x-permission" + "s\":{\"$ref\":\"#/components/x-permissions/navigation\"},\"parameters\":" + "[{\"in\":\"query\",\"required\":true,\"schema\":{\"type\":\"string\"}}]," + "\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/l" + "ua_doscript\":{\"description\":\"Execute LUA string script.\",\"get\":{\"" + "x-permissions\":{\"$ref\":\"#/components/x-permissions/navigation\"},\"p" + "arameters\":[{\"in\":\"query\",\"name\":\"filename\",\"required\":true,\"" + "schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/co" + "mponents/responses/200\"}}}}}}" ; static const struct afb_auth _afb_auths_v2_control[] = { @@ -71,6 +76,7 @@ static const struct afb_auth _afb_auths_v2_control[] = { void ctlapi_event_test(struct afb_req req); void ctlapi_navigation(struct afb_req req); void ctlapi_multimedia(struct afb_req req); + void ctlapi_emergency(struct afb_req req); void ctlapi_lua_docall(struct afb_req req); void ctlapi_lua_dostring(struct afb_req req); void ctlapi_lua_doscript(struct afb_req req); @@ -104,6 +110,13 @@ static const struct afb_verb_v2 _afb_verbs_v2_control[] = { .info = NULL, .session = AFB_SESSION_NONE_V2 }, + { + .verb = "emergency", + .callback = ctlapi_emergency, + .auth = &_afb_auths_v2_control[0], + .info = NULL, + .session = AFB_SESSION_NONE_V2 + }, { .verb = "lua_docall", .callback = ctlapi_lua_docall, diff --git a/Controler-afb/ctl-apidef.json b/Controler-afb/ctl-apidef.json index 438a9ef..28b8581 100644 --- a/Controler-afb/ctl-apidef.json +++ b/Controler-afb/ctl-apidef.json @@ -224,7 +224,7 @@ } } }, - "/navigation": { + "/emergency": { "description": "Request Access to Navigation Audio Channel.", "get": { "x-permissions": { diff --git a/Controler-afb/ctl-binding.h b/Controler-afb/ctl-binding.h index 01840b8..70ad0c3 100644 --- a/Controler-afb/ctl-binding.h +++ b/Controler-afb/ctl-binding.h @@ -42,6 +42,14 @@ typedef struct { #define CTL_PLUGIN_REGISTER(pluglabel) CtlPluginMagicT CtlPluginMagic={.magic=CTL_PLUGIN_MAGIC,.label=pluglabel}; struct afb_binding_data_v2; // ctl-misc.c +typedef enum { + CTL_SCAN_FLAT=0, + CTL_SCAN_RECURSIVE=1, +} CtlScanDirModeT; + +PUBLIC const char *GetMidleName(const char*name); +PUBLIC const char *GetBinderName(); +PUBLIC json_object* ScanForConfig (char* searchPath, CtlScanDirModeT mode, char *pre, char *ext); // polctl-binding.c @@ -49,21 +57,12 @@ PUBLIC int CtlBindingInit (); // ctl-timerevt.c // ---------------------- - - PUBLIC int TimerEvtInit (void); PUBLIC afb_event TimerEvtGet(void); PUBLIC void ctlapi_event_test (afb_req request); // ctl-policy // ----------- -typedef enum { - CTL_SCAN_FLAT=0, - CTL_SCAN_RECURSIVE=1, -} CtlScanDirModeT; - -PUBLIC json_object* ScanForConfig (char* searchPath, CtlScanDirModeT mode, char *pre, char *ext); -PUBLIC const char *GetBinderName(); typedef enum { CTL_MODE_NONE=0, diff --git a/Controler-afb/ctl-lua.c b/Controler-afb/ctl-lua.c index c1bc5f3..275b9d3 100644 --- a/Controler-afb/ctl-lua.c +++ b/Controler-afb/ctl-lua.c @@ -104,36 +104,10 @@ STATIC void LuaCtxFree (LuaAfbContextT *afbContext) { free (afbContext->info); } - -STATIC void LuaDumpArgs(lua_State* luaState, int start) { - int count = lua_gettop(luaState); - - for (int idx=start; idx <= count; idx++) { - int luaType = lua_type(luaState, idx); - switch(luaType) { - case LUA_TNUMBER: - AFB_NOTICE ("idx=%d type=%s value=%d", idx, lua_typename(luaState, luaType), (int)lua_tonumber(luaState, idx)); - break; - case LUA_TBOOLEAN: - AFB_NOTICE ("idx=%d type=%s value=%d", idx, lua_typename(luaState, luaType), lua_toboolean(luaState, idx)); - break; - case LUA_TSTRING: - AFB_NOTICE ("idx=%d type=%s value=%s", idx, lua_typename(luaState, luaType), lua_tostring(luaState, idx)); - break; - case LUA_TTABLE: { - AFB_NOTICE ("-++-- START luatable idx=%d ", idx); - (void)LuaDumpArgs(luaState, idx+1); - AFB_NOTICE ("-++-- END luatable idx=%d ", idx); - break; - } - default: - AFB_NOTICE ("PopOneArg: script returned Unknown/Unsupported idx=%d type:%d/%s", idx, luaType, lua_typename(luaState, luaType)); - } - } -} - // Push a json structure on the stack as a LUA table STATIC int LuaPushArgument (json_object *argsJ) { + + AFB_NOTICE("LuaPushArgument argsJ=%s", json_object_get_string(argsJ)); json_type jtype= json_object_get_type(argsJ); switch (jtype) { @@ -183,21 +157,18 @@ STATIC int LuaPushArgument (json_object *argsJ) { STATIC json_object *PopOneArg (lua_State* luaState, int idx); STATIC json_object *LuaTableToJson (lua_State* luaState, int index) { - + int idx; + json_object *tableJ= json_object_new_object(); const char *key; char number[3]; lua_pushnil(luaState); // 1st key - for (int jdx=1; lua_next(luaState, index) != 0; jdx++) { - - //printf("jdx=%d %s - %s\n", jdx, - //lua_typename(luaState, lua_type(luaState, -2)), - //lua_typename(luaState, lua_type(luaState, -1))); + for (idx=1; lua_next(luaState, index) != 0; idx++) { // uses 'key' (at index -2) and 'value' (at index -1) if (lua_type(luaState,-2) == LUA_TSTRING) key= lua_tostring(luaState, -2); else { - snprintf(number, sizeof(number),"%d", jdx); + snprintf(number, sizeof(number),"%d", idx); key=number; } @@ -205,6 +176,11 @@ STATIC json_object *LuaTableToJson (lua_State* luaState, int index) { lua_pop(luaState, 1); // removes 'value'; keeps 'key' for next iteration } + // Query is empty free empty json object + if (idx == 1) { + json_object_put(tableJ); + return NULL; + } return tableJ; } @@ -223,7 +199,6 @@ STATIC json_object *PopOneArg (lua_State* luaState, int idx) { value= json_object_new_string(lua_tostring(luaState, idx)); break; case LUA_TTABLE: { - AFB_NOTICE ("-++-- luatable idx=%d ", idx); value= LuaTableToJson(luaState, idx); break; } @@ -263,9 +238,7 @@ STATIC void LuaFormatMessage(lua_State* luaState, LuaAfbMessageT action) { message="-- Empty Message ???"; goto PrintMessage; } - - AFB_NOTICE ("**** responseJ=%s", json_object_get_string(responseJ)); - + // if we have only on argument just return the value. if (json_object_get_type(responseJ)!=json_type_array || json_object_array_length(responseJ) <2) { message= (char*)json_object_get_string(responseJ); @@ -287,17 +260,17 @@ STATIC void LuaFormatMessage(lua_State* luaState, LuaAfbMessageT action) { switch (format[++idx]) { case 'd': if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%d", json_object_get_int(slotJ)); - else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"Nil"); + else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil"); break; case 'f': if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%f", json_object_get_double(slotJ)); - else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"Nil"); + else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil"); break; case 's': default: if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%s", json_object_get_string(slotJ)); - else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"Nil"); + else targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil"); } } else { @@ -394,9 +367,6 @@ STATIC void LuaAfbServiceCB(void *handle, int iserror, struct json_object *respo count+= LuaPushArgument(responseJ); count+= LuaPushArgument(contextCB->context); - AFB_NOTICE ("*** context=%s", json_object_get_string(contextCB->context)); - - int err=lua_pcall(luaState, count, LUA_MULTRET, 0); if (err) { AFB_ERROR ("LUA-SERICE-CB:FAIL response=%s err=%s", json_object_get_string(responseJ), lua_tostring(luaState,-1) ); @@ -431,6 +401,34 @@ STATIC int LuaAfbService(lua_State* luaState) { return 1; } +STATIC int LuaAfbServiceSync(lua_State* luaState) { + int count = lua_gettop(luaState); + json_object *responseJ; + + // note: argument start at 2 because of AFB: table + if (count <3 || !lua_isstring(luaState, 2) || !lua_isstring(luaState, 3) || !lua_istable(luaState, 4)) { + lua_pushliteral (luaState, "LuaAfbServiceSync-Syntax is error,data=AFB:service_call (api, verb, query)"); + goto OnErrorExit; + } + + // get api/verb+query + const char *api = lua_tostring(luaState,2); + const char *verb= lua_tostring(luaState,3); + json_object *queryJ= LuaTableToJson(luaState, 4); + + int iserror=afb_service_call_sync (api, verb, queryJ, &responseJ); + + // push error status & response + count=1; lua_pushboolean(luaState, iserror); + count+= LuaPushArgument(responseJ); + + return count; // return count values + + OnErrorExit: + lua_error(luaState); + return 1; +} + STATIC int LuaAfbMakeEvent(lua_State* luaState) { int count = lua_gettop(luaState); LuaAfbEvent *afbevt=calloc(1,sizeof(LuaAfbEvent)); @@ -508,16 +506,22 @@ PUBLIC int LuaCallFunc (DispatchActionT *action, json_object *queryJ) { lua_getglobal(luaState, func); // push argsJ on the stack - if (json_object_get_type(argsJ) != json_type_array) { + if (!argsJ) { + lua_pushnil(luaState); + count++; + } else if (json_object_get_type(argsJ) != json_type_array) { count+= LuaPushArgument (argsJ); } else { for (int idx=0; idx - * - * 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. - */ - -#define _GNU_SOURCE -#include -#include -#include - -#include "audio-common.h" -#include "ctl-binding.h" - - - -// Include Binding Stub generated from Json OpenAPI -#include "ctl-apidef.h" - - -PUBLIC void ctlapi_navigation (afb_req request) { - - ctlapi_dispatch ("NAVIGATION", request); -} - -PUBLIC void ctlapi_multimedia (afb_req request) { - - ctlapi_dispatch ("MULTIMEDIA", request); -} - -PUBLIC void ctlapi_emergency (afb_req request) { - - ctlapi_dispatch ("EMERGENCY", request); -} - -PUBLIC void ctlapi_monitor (afb_req request) { - - // subscribe Client to event - int err = afb_req_subscribe(request, TimerEvtGet()); - if (err != 0) { - afb_req_fail_f(request, "register-event", "Fail to subscribe binder event"); - goto OnErrorExit; - } - - afb_req_success(request, NULL, NULL); - - OnErrorExit: - return; -} - -// Create Binding Event at Init -PUBLIC int CtlBindingInit () { - - int errcount=0; - - errcount += TimerEvtInit(); - errcount += DispatchInit(); - errcount += LuaLibInit(); - - AFB_DEBUG ("Audio Policy Control Binding Done errcount=%d", errcount); - return errcount; -} - diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 510eb70..ff8bf38 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -69,6 +69,7 @@ set (PKG_REQUIRED_LIST # --------------------------------------------------------- add_compile_options(-DCONTROL_ONLOAD_DEFAULT="onload-default") add_compile_options(-DCONTROL_MAXPATH_LEN=255) + add_compile_options(-DCONTROL_DOSCRIPT_PRE="doscript") add_compile_options(-DCONTROL_CONFIG_PRE="onload") add_compile_options(-DCONTROL_CONFIG_POST="control" ) add_compile_options(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/config.d:${CMAKE_INSTALL_PREFIX}/controler/config.d") diff --git a/conf.d/project/config.d/onload-audio-control.json b/conf.d/project/config.d/onload-audio-control.json index aecf1b3..c8f9be2 100644 --- a/conf.d/project/config.d/onload-audio-control.json +++ b/conf.d/project/config.d/onload-audio-control.json @@ -39,7 +39,7 @@ "actions": [{ "label": "multimedia-control-lua", "info": "Call Lua Script function Test_Lua_Engin", - "lua": "Audio_Set_Use_Case_Multimedia", + "lua": "Audio_Set_Multimedia", }] }, { "label": "navigation", @@ -61,13 +61,13 @@ }, { "label": "navigation-control-lua", "info": "Call Lua Script to set Navigation", - "lua": "Audio_Set_Use_Case_Navigation", + "lua": "Audio_Set_Navigation", }] }, { "label": "emergency", "actions": [{ "label": "emergency-control-ucm", - "lua": "Audio_Set_Use_Case_Emergency", + "lua": "Audio_Set_Emergency", }] } ], diff --git a/conf.d/project/lua.d/doscript-helloworld.lua b/conf.d/project/lua.d/doscript-helloworld.lua new file mode 100644 index 0000000..b70ba8d --- /dev/null +++ b/conf.d/project/lua.d/doscript-helloworld.lua @@ -0,0 +1,36 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + 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. + + + Simple API script to be use with AGL control LuaDoCall API + - After the script is loaded by lua_docall + - Controller start function=xxxx where xxxx is taken from script filename doscript-xxxx-anything + +--]] + +function helloworld (request, query) + + AFB:notice ("LUA HelloWorld: simple test query=%s", query); + + if (query == nil) then + AFB:error ("LUA HelloWorld:FX query should not be empty"); + AFB:fail (request, "LUA HelloWorld: query should not be empty"); + else + AFB:error ("LUA HelloWorld:OK query=%s", query); + AFB:sucess (request, {arg0="Demat", arg1="Bonjours", arg2="Gootentag", arg3="Morning"}); + end + +end \ No newline at end of file diff --git a/conf.d/project/lua.d/helloworld-lua-script.lua b/conf.d/project/lua.d/helloworld-lua-script.lua deleted file mode 100644 index 7dd0459..0000000 --- a/conf.d/project/lua.d/helloworld-lua-script.lua +++ /dev/null @@ -1,41 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll - - 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. - - - Simple API script ---]] - - -- retrieve calling arguments - args= ... - - print ("Helloworld script arguments:") - - - for key,value in pairs(args) - do - print("args: ", key,value) - end - - -- loop on script arguments - --for i=1,#args - --do - -- print(" -- ", i, args[i]) - --end - - - -- return two arguments on top of status - return true, 1234, "ABCD", 5678 - diff --git a/conf.d/project/lua.d/onload-audio-controls.lua b/conf.d/project/lua.d/onload-audio-controls.lua new file mode 100644 index 0000000..eb6a61b --- /dev/null +++ b/conf.d/project/lua.d/onload-audio-controls.lua @@ -0,0 +1,54 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + 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. + + + Provide sample policy function for AGL Advance Audio Agent +--]] + +function Audio_Init_CB (status, result, context) + print ("***** result=", Dump_Table(result)) + print ("***** context=", Dump_Table(context)) + + -- AFB:notice ("--LUA:Audio_Init_Hal result=%s context=%s", result, context) + +end + +-- Function call at binding load time +function Audio_Init_Hal(args, query) + AFB:notice ("--LUA:Audio_Init_Hal args=%s query=%s", args, query); + + -- query asynchronously loaded HAL + AFB:service ('alsacore', 'hallist', {}, "Audio_Init_CB", {arg1=1234, arg2="toto"}) + +end + +function Audio_Set_Navigation(args, query) + + AFB:notice ("--LUA:Audio_Set_Use_Case args=%s query=%s", args, query); + + -- synchronous call to alsacore service + local error,data= AFB:callsync ('alsacore', 'ping', {}) + if (error) then + AFB:error ("--LUA:Audio_Set_Use_Case FAIL args=%s", args) + else + AFB:notice ("--LUA:Audio_Set_Use_Case DONE args=%s response=%s", args, data["response"]) + end + + -- return OK + return 0 +end + + diff --git a/conf.d/project/lua.d/onload-audio-oncall.lua b/conf.d/project/lua.d/onload-audio-oncall.lua new file mode 100644 index 0000000..22cba85 --- /dev/null +++ b/conf.d/project/lua.d/onload-audio-oncall.lua @@ -0,0 +1,88 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + 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. + + + Provide sample LUA routines to be used with AGL control "lua_docall" API +--]] + +-- global counter to keep track of calls +count=0 + +-- Adjust Volume function of vehicle speed +function Oncall_Helloworld (request, args) + count=count+1 + + AFB:notice("LUA OnCall Helloworld count=%d args=%s", count, args); + AFB:success (request, {"count"=count}) +end + +function Test_Async_CB (request, result, context) + + AFB:notice ("Test_Async_CB result=%s context=%s", result, context) + AFB:success (request, {"response"=result, "context"=context}) +end + +function Test_Call_Async (request, args) + local context={ + "value1"="abcd", + "value2"=1234 + } + + AFB:notice ("Test_Call_Async args=%s", args) + AFB:service("alsacore","ping", args, "Test_Async_CB", context) +end + +function Test_Call_Sync (request, args) + + AFB:notice ("Test_Call_Sync args=%s", args) + local err, response= AFB:service_sync ("alsacore","ping", args) + if (err) then + AFB:fail ("AFB:service_call_sync fail"); + else + AFB:success (request, response) + end +end + +-- create a new event name +function Test_Event_Make (request, args) + + AFB:notice ("Test_Event_Make args=%s", args) + local err eventFD AFB:event (args["evtname"]) + if (err) then + AFB:fail ("AFB:Test_Event_Make fail event=%s", args["evtname"]); + else + AFB:success (request, {}) + end + + local evtData = { + val1="My 1st private Event", + val2=5678 + } + + AFB:notify (eventFD, evtData) +end + +-- send an event on default binder event +function Test_Event_Notify (request, args) + + AFB:notice ("Test_Event_Notify args=%s", args) + local err AFB:notify (args) + if (err) then + AFB:fail ("AFB:Test_Event_Make fail event=%s", args["evtname"]); + else + AFB:success (request, {}) + end +end diff --git a/conf.d/project/lua.d/onload-audio-policy.lua b/conf.d/project/lua.d/onload-audio-policy.lua deleted file mode 100644 index 0b7c358..0000000 --- a/conf.d/project/lua.d/onload-audio-policy.lua +++ /dev/null @@ -1,49 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll - - 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. - - - Provide sample policy function for AGL Advance Audio Agent ---]] - -function Audio_Init_CB (status, result, context) - print ("***** result=", Dump_Table(result)) - print ("***** context=", Dump_Table(context)) - - -- AFB:notice ("--LUA:Audio_Init_Hal result=%s context=%s", result, context) - -end - --- Function call at binding load time -function Audio_Init_Hal(args, query) - AFB:notice ("--LUA:Audio_Init_Hal args=%s query=%s", args, query); - - -- query asynchronously loaded HAL - AFB:service ('alsacore', 'hallist', {}, "Audio_Init_CB", {arg1=1234, arg2="toto"}) - -end - -function Audio_Set_Navigation(args, query) - - AFB:notice ("--LUA:Audio_Set_Use_Case args=%s query=%s", args, query, {myint=1234, mystring="abcd"}); - -- Print_Table("args", args) - - - - -- return OK - return 0 -end - - diff --git a/conf.d/project/lua.d/onload-audio-samples.lua b/conf.d/project/lua.d/onload-audio-samples.lua deleted file mode 100644 index 055a15d..0000000 --- a/conf.d/project/lua.d/onload-audio-samples.lua +++ /dev/null @@ -1,93 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll - - 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. - - - Provide sample policy function for AGL Advance Audio Agent ---]] - -count=0 - --- Adjust Volume function of vehicle speed -function Adjust_Volume_Speed (request, speed_meters_second) - - AFB:notice("In Adjust_Volume_Speed speed=%d", speed_meters_second); - - print (string.format("*****(From Lua) Adjust_Volume_Speed speed=%d count=%d", speed_meters_second, count)); - - -- compute volume - volume = speed_meters_second * 2 - count=count+1 - - AFB:success (request, 1234, volume, count, 5678) -end - - -function Test_Binder_CB (result, context) - - local myTable= { ["arg1"] = "myString", ["arg2"] = 1234, ["arg4"] = true, ["arg5"] = 3.1416 } - - AFB:notice ("In Test_Binder_CB", result, context) - - AFB:success (1234, "ABCD", myTable, 5678) - -end - -function Test_Binder_Call_Async () - - local query= { - ["arg1"] = "myString", - ["arg2"] = 1234, - ["arg4"] = true, - ["arg5"] = 3.1416, - } - - AFB:service("alsacore","ping", query, Test_Binder_CB, "myContext") - -end - -function Test_Binder_Call_Sync () - - local query= { - ["arg1"] = "myString", - ["arg2"] = 1234, - ["arg4"] = true, - ["arg5"] = 3.1416, - } - - err= AFB:service_sync ("alsacore","ping", query) - - if (err) then - AFB:fail ("AFB:service_call_sync fail"); - else - AFB:success (1234, "ABCD", myTable) - end - - -end - --- return serialised version of printable table -function Dump_Table(o) - if type(o) == 'table' then - local s = '{ ' - for k,v in pairs(o) do - if type(k) ~= 'number' then k = '"'..k..'"' end - s = s .. '['..k..'] = ' .. Dump_Table(v) .. ',' - end - return s .. '} ' - else - return tostring(o) - end -end diff --git a/conf.d/project/lua.d/onload-audio-utils.lua b/conf.d/project/lua.d/onload-audio-utils.lua new file mode 100644 index 0000000..40ef8a3 --- /dev/null +++ b/conf.d/project/lua.d/onload-audio-utils.lua @@ -0,0 +1,32 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + 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. + +--]] + + +-- return serialised version of printable table +function Dump_Table(o) + if type(o) == 'table' then + local s = '{ ' + for k,v in pairs(o) do + if type(k) ~= 'number' then k = '"'..k..'"' end + s = s .. '['..k..'] = ' .. Dump_Table(v) .. ',' + end + return s .. '} ' + else + return tostring(o) + end +end diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html index 318caba..2025581 100644 --- a/htdocs/audio-control.html +++ b/htdocs/audio-control.html @@ -27,7 +27,7 @@
    • -
    • +

    • diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 2cf8b1c..6ac0844 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -44,7 +44,11 @@ ctl-binding.c + ctl-dispatch.c + ctl-events.c ctl-lua.c + ctl-misc.c + ctl-plugin-sample.c @@ -136,8 +140,6 @@ /usr/include/p11-kit-1 /usr/include/json-c /usr/include/lua5.3 - Audio-Common - build/Controler-afb CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controler/config.d" @@ -152,7 +154,6 @@ MAX_LINEAR_DB_SCALE=24 MAX_SND_CARD=16 TLV_BYTE_SIZE=256 - control_afb_EXPORTS @@ -203,10 +204,67 @@ + + Audio-Common + build/Controler-afb + + + control_afb_EXPORTS + + + + + + + Audio-Common + build/Controler-afb + + + control_afb_EXPORTS + + + + + + + Audio-Common + build/Controler-afb + + + control_afb_EXPORTS + + + + + + + Audio-Common + build/Controler-afb + + + control_afb_EXPORTS + + + + + + + Audio-Common + build/Controler-afb + + + control_afb_EXPORTS + - + + + build/Controler-afb + + + audio_plugin_sample_EXPORTS + build/Alsa-Plugin/Alsa-Policy-Hook + CONTROL_DOSCRIPT_PRE="doscript" PIC - audio_plugin_sample_EXPORTS policy_hook_cb_EXPORTS @@ -323,27 +381,31 @@ + Audio-Common build/Alsa-afb + CONTROL_DOSCRIPT_PRE="doscript" alsa_lowlevel_EXPORTS - audio_plugin_sample_EXPORTS + Audio-Common build/Audio-Common - audio_plugin_sample_EXPORTS + CONTROL_DOSCRIPT_PRE="doscript" + Audio-Common + build/Controler-afb build/HAL-afb/HAL-plugin /usr/include/alsa build/Common @@ -352,17 +414,14 @@ CONTROL_CDEV_RX="/dev/inic-usb-crx" CONTROL_CDEV_TX="/dev/inic-usb-ctx" audio_plugin_sample_EXPORTS + control_afb_EXPORTS - + - - build/HAL-afb/HAL-plugin - ../../../opt/include/afb - - audio_plugin_sample_EXPORTS + CONTROL_DOSCRIPT_PRE="doscript" @@ -370,18 +429,28 @@ HAL-afb/HAL-interface + Audio-Common build/HAL-afb/HAL-interface + + CONTROL_DOSCRIPT_PRE="doscript" + + Audio-Common + build/Controler-afb + build/HAL-afb/HAL-plugin + ../../../opt/include/afb HAL-afb/HAL-plugin CONTROL_CDEV_RX="/dev/inic-usb-crx" CONTROL_CDEV_TX="/dev/inic-usb-ctx" + audio_plugin_sample_EXPORTS + control_afb_EXPORTS @@ -389,9 +458,11 @@ HAL-afb/HAL-interface + Audio-Common build/HAL-afb/HDA-intel + CONTROL_DOSCRIPT_PRE="doscript" hal_intel_hda_EXPORTS @@ -400,9 +471,11 @@ HAL-afb/HAL-interface + Audio-Common build/HAL-afb/Jabra-Solemate + CONTROL_DOSCRIPT_PRE="doscript" hal_jabra_usb_EXPORTS @@ -411,9 +484,11 @@ HAL-afb/HAL-interface + Audio-Common build/HAL-afb/Scarlett-Focusrite + CONTROL_DOSCRIPT_PRE="doscript" hal_scalett_usb_EXPORTS @@ -421,17 +496,25 @@ + Audio-Common + build/Controler-afb + build/HAL-afb/HAL-plugin + ../../../opt/include/afb HAL-afb/Unicens-USB CONTROL_CDEV_RX="/dev/inic-usb-crx" CONTROL_CDEV_TX="/dev/inic-usb-ctx" + audio_plugin_sample_EXPORTS + control_afb_EXPORTS + Audio-Common + build/Controler-afb build/HAL-afb/HAL-plugin ../../../opt/include/afb HighLevel-afb @@ -440,16 +523,20 @@ audio_plugin_sample_EXPORTS + control_afb_EXPORTS + Audio-Common + build/Controler-afb build/HAL-afb/HAL-plugin audio_plugin_sample_EXPORTS + control_afb_EXPORTS -- cgit 1.2.3-korg