From 825ce525d20ac99cd590d40fc06237c1e363cd7e Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Thu, 9 Nov 2017 23:32:03 +0100 Subject: adds init function and getter for default cfg path Change-Id: I620d485bb935f984efcfeaf29399d184d3261e7d Signed-off-by: Tobias Jahnke --- ucs2-afb/ucs_apidef.h | 81 ++++++++++++++++++++++++------------------------ ucs2-afb/ucs_apidef.json | 3 +- ucs2-afb/ucs_binding.c | 41 +++++++++++++++++++++++- ucs2-afb/ucs_binding.h | 1 + 4 files changed, 84 insertions(+), 42 deletions(-) diff --git a/ucs2-afb/ucs_apidef.h b/ucs2-afb/ucs_apidef.h index f8e9c9c..1dac82a 100644 --- a/ucs2-afb/ucs_apidef.h +++ b/ucs2-afb/ucs_apidef.h @@ -4,45 +4,46 @@ static const char _afb_description_v2_UNICENS[] = "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\":\"\",\"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\":{\"/listconfig\":{\"description\":\"" - "List Config Files\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/" - "x-permissions/config\"},\"parameters\":[{\"in\":\"query\",\"name\":\"cfg" - "path\",\"required\":false,\"schema\":{\"type\":\"string\"}}],\"responses" - "\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/initialise\"" - ":{\"description\":\"configure Unicens2 lib from NetworkConfig.XML.\",\"g" - "et\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/config\"}" - ",\"parameters\":[{\"in\":\"query\",\"name\":\"filename\",\"required\":tr" - "ue,\"schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"" - "#/components/responses/200\"}}}},\"/subscribe\":{\"description\":\"Subsc" - "ribe to UNICENS Events.\",\"get\":{\"x-permissions\":{\"$ref\":\"#/compo" - "nents/x-permissions/monitor\"},\"responses\":{\"200\":{\"$ref\":\"#/comp" - "onents/responses/200\"}}}},\"/writei2c\":{\"description\":\"Writes I2C c" - "ommand to remote node.\",\"get\":{\"x-permissions\":{\"$ref\":\"#/compon" - "ents/x-permissions/monitor\"},\"parameters\":[{\"in\":\"query\",\"name\"" - ":\"node\",\"required\":true,\"schema\":{\"type\":\"integer\",\"format\":" - "\"int32\"}},{\"in\":\"query\",\"name\":\"data\",\"required\":true,\"sche" - "ma\":{\"type\":\"array\",\"format\":\"int32\"},\"style\":\"simple\"}],\"" - "responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}}}}" + "event\":null,\"preinit\":null,\"init\":\"ucs2_initbinding\",\"scope\":\"" + "\",\"private\":false}},\"servers\":[{\"url\":\"ws://{host}:{port}/api/mo" + "nitor\",\"description\":\"Unicens2 API.\",\"variables\":{\"host\":{\"def" + "ault\":\"localhost\"},\"port\":{\"default\":\"1234\"}},\"x-afb-events\":" + "[{\"$ref\":\"#/components/schemas/afb-event\"}]}],\"components\":{\"sche" + "mas\":{\"afb-reply\":{\"$ref\":\"#/components/schemas/afb-reply-v2\"},\"" + "afb-event\":{\"$ref\":\"#/components/schemas/afb-event-v2\"},\"afb-reply" + "-v2\":{\"title\":\"Generic response.\",\"type\":\"object\",\"required\":" + "[\"jtype\",\"request\"],\"properties\":{\"jtype\":{\"type\":\"string\",\"" + "const\":\"afb-reply\"},\"request\":{\"type\":\"object\",\"required\":[\"" + "status\"],\"properties\":{\"status\":{\"type\":\"string\"},\"info\":{\"t" + "ype\":\"string\"},\"token\":{\"type\":\"string\"},\"uuid\":{\"type\":\"s" + "tring\"},\"reqid\":{\"type\":\"string\"}}},\"response\":{\"type\":\"obje" + "ct\"}}},\"afb-event-v2\":{\"type\":\"object\",\"required\":[\"jtype\",\"" + "event\"],\"properties\":{\"jtype\":{\"type\":\"string\",\"const\":\"afb-" + "event\"},\"event\":{\"type\":\"string\"},\"data\":{\"type\":\"object\"}}" + "}},\"x-permissions\":{\"config\":{\"permission\":\"urn:AGL:permission:UN" + "ICENS:public:initialise\"},\"monitor\":{\"permission\":\"urn:AGL:permiss" + "ion:UNICENS:public:monitor\"}},\"responses\":{\"200\":{\"description\":\"" + "A complex object array response\",\"content\":{\"application/json\":{\"s" + "chema\":{\"$ref\":\"#/components/schemas/afb-reply\"}}}}}},\"paths\":{\"" + "/listconfig\":{\"description\":\"List Config Files\",\"get\":{\"x-permis" + "sions\":{\"$ref\":\"#/components/x-permissions/config\"},\"parameters\":" + "[{\"in\":\"query\",\"name\":\"cfgpath\",\"required\":false,\"schema\":{\"" + "type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/res" + "ponses/200\"}}}},\"/initialise\":{\"description\":\"configure Unicens2 l" + "ib from NetworkConfig.XML.\",\"get\":{\"x-permissions\":{\"$ref\":\"#/co" + "mponents/x-permissions/config\"},\"parameters\":[{\"in\":\"query\",\"nam" + "e\":\"filename\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"" + "responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/sub" + "scribe\":{\"description\":\"Subscribe to UNICENS Events.\",\"get\":{\"x-" + "permissions\":{\"$ref\":\"#/components/x-permissions/monitor\"},\"respon" + "ses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/writei2c\"" + ":{\"description\":\"Writes I2C command to remote node.\",\"get\":{\"x-pe" + "rmissions\":{\"$ref\":\"#/components/x-permissions/monitor\"},\"paramete" + "rs\":[{\"in\":\"query\",\"name\":\"node\",\"required\":true,\"schema\":{" + "\"type\":\"integer\",\"format\":\"int32\"}},{\"in\":\"query\",\"name\":\"" + "data\",\"required\":true,\"schema\":{\"type\":\"array\",\"format\":\"int" + "32\"},\"style\":\"simple\"}],\"responses\":{\"200\":{\"$ref\":\"#/compon" + "ents/responses/200\"}}}}}}" ; static const struct afb_auth _afb_auths_v2_UNICENS[] = { @@ -99,7 +100,7 @@ const struct afb_binding_v2 afbBindingV2 = { .info = "", .verbs = _afb_verbs_v2_UNICENS, .preinit = NULL, - .init = NULL, + .init = ucs2_initbinding, .onevent = NULL, .noconcurrency = 0 }; diff --git a/ucs2-afb/ucs_apidef.json b/ucs2-afb/ucs_apidef.json index b8d6311..1a00a97 100644 --- a/ucs2-afb/ucs_apidef.json +++ b/ucs2-afb/ucs_apidef.json @@ -12,7 +12,8 @@ "postfix": "", "start": null , "onevent": null, - "init": null, + "preinit": null, + "init": "ucs2_initbinding", "scope": "", "private": false } diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c index e1451a0..a234410 100644 --- a/ucs2-afb/ucs_binding.c +++ b/ucs2-afb/ucs_binding.c @@ -42,6 +42,8 @@ #define MAX_FILENAME_LEN (100) #define RX_BUFFER (64) +#define XML_CONFIG_FOLDER "/data/" +#define XML_CONFIG_FILE "config_multichannel_audio_kit.xml" /** Internal structure, enabling multiple instances of this component. * \note Do not access any of this variables. @@ -286,6 +288,33 @@ int onReadCB (sd_event_source* src, int fileFd, uint32_t revents, void* pTag) { return 0; } + +STATIC char* GetDefaultConfig(void) { + + char const *data_path = getenv("AFM_APP_INSTALL_DIR"); + + if (!data_path) { + AFB_ERROR("AFM_APP_INSTALL_DIR is not defined"); + } + else { + size_t size; + char * config_path; + + AFB_NOTICE("AFM_APP_INSTALL_DIR is: %s", data_path); + size = strlen(data_path) + strlen(XML_CONFIG_FOLDER) + strlen(XML_CONFIG_FILE) + 2; + config_path = malloc(size); + if (config_path != NULL) { + snprintf(config_path, size, "%s%s%s", data_path, XML_CONFIG_FOLDER, XML_CONFIG_FILE); + if(access(config_path, R_OK ) == 0) { + AFB_NOTICE("Default configuration: %s", config_path); + return config_path; + } + } + } + + return NULL; +} + STATIC UcsXmlVal_t* ParseFile(struct afb_req request) { char *xmlBuffer; ssize_t readSize; @@ -366,7 +395,7 @@ PUBLIC void ucs2_initialise (struct afb_req request) { afb_req_fail_f (request, "UNICENS-init", "Fail to initialize UNICENS"); goto OnErrorExit; } - + afb_req_success(request,NULL,"UNICENS-active"); OnErrorExit: @@ -593,3 +622,13 @@ PUBLIC void ucs2_writei2c (struct afb_req request) { OnErrorExit: return; } + +PUBLIC int ucs2_initbinding(void) { + char *config_file = GetDefaultConfig(); + if (config_file != NULL) { + + free(config_file); + } + + return 0; +} diff --git a/ucs2-afb/ucs_binding.h b/ucs2-afb/ucs_binding.h index d909d41..9874ff4 100644 --- a/ucs2-afb/ucs_binding.h +++ b/ucs2-afb/ucs_binding.h @@ -43,6 +43,7 @@ extern const struct afb_binding_interface *afbIface; extern struct afb_service afbSrv; // API verbs prototype +PUBLIC int ucs2_initbinding(void); PUBLIC void ucs2_configure (struct afb_req request); PUBLIC void ucs2_subscribe (struct afb_req request); PUBLIC void ucs2_writei2c (struct afb_req request); -- cgit 1.2.3-korg