Merge "agl-service-unicens: prepare control message transmission in b64 format" into eel

diff --git a/conf.d/app-templates b/conf.d/app-templates
index 8c2b059..6e1a3c3 160000 (submodule)
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit 8c2b05967a3237e624a2cc78e13fcd1c5e72991c
+Subproject commit 6e1a3c37e94f42f5307fd1fa749823b2d160a56b

diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
index 3a1ba5f..83097ab 100755 (executable)
--- a/conf.d/autobuild/agl/autobuild
+++ b/conf.d/autobuild/agl/autobuild
@@ -55,7 +55,7 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/etc
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
-       @mkdir -p ${BUILD_DIR}/$@/data
+       @mkdir -p ${BUILD_DIR}/$@/var
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 

diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
index 3a1ba5f..83097ab 100755 (executable)
--- a/conf.d/autobuild/linux/autobuild
+++ b/conf.d/autobuild/linux/autobuild
@@ -55,7 +55,7 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/etc
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
-       @mkdir -p ${BUILD_DIR}/$@/data
+       @mkdir -p ${BUILD_DIR}/$@/var
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 

diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c
index 4f36576..ddf44b1 100644 (file)
--- a/ucs2-afb/ucs_binding.c
+++ b/ucs2-afb/ucs_binding.c
@@ -44,7 +44,7 @@
 
 #define MAX_FILENAME_LEN (100)
 #define RX_BUFFER (64)
-#define XML_CONFIG_FOLDER "/data/"
+#define XML_CONFIG_FOLDER "/var/"
 #define XML_CONFIG_FILE "config_multichannel_audio_kit.xml"
 
 /** Internal structure, enabling multiple instances of this component.