includes lib-most-volume in HAL UNICENS

16 files changed, 981 insertions, 14 deletions

diff --git a/HAL-afb/hal-most-unicens/CMakeLists.txt b/HAL-afb/hal-most-unicens/CMakeLists.txt
index 828614f..784024a 100644
--- a/HAL-afb/hal-most-unicens/CMakeLists.txt
+++ b/HAL-afb/hal-most-unicens/CMakeLists.txt
@@ -16,6 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
+ADD_SUBDIRECTORY(ucs2-vol)
 
 # Add target to project dependency list
 PROJECT_TARGET_ADD(hal-most-unicens)
@@ -39,4 +40,9 @@ PROJECT_TARGET_ADD(hal-most-unicens)
 
     # installation directory
     INSTALL(TARGETS ${TARGET_NAME}
-        LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
\ No newline at end of file
+        LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
+
+    # Define properties to expose when others use this target
+    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
+       PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc
+    )
diff --git a/HAL-afb/hal-most-unicens/hal_most_unicens.c b/HAL-afb/hal-most-unicens/hal_most_unicens.c
index 394e502..ace9399 100644
--- a/HAL-afb/hal-most-unicens/hal_most_unicens.c
+++ b/HAL-afb/hal-most-unicens/hal_most_unicens.c
@@ -21,12 +21,13 @@
 #include "wrap-json.h"
 #include "string.h"
 #include "wrap_unicens.h"
+#include "wrap_volume.h"
 
 static int master_volume;
 static json_bool master_switch;
 static int pcm_volume[6];
 
-static uint8_t test[3] = {0x07,0x03,0xFF};
+/*static uint8_t test[3] = {0x07,0x03,0xFF};*/
 
 void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle,  json_object *j_obj) {
 
@@ -109,13 +110,19 @@ STATIC int unicens_service_init() {
     
     err = wrap_ucs_subscribe_sync();
     if (err) {
-        AFB_ERROR("Failed to subscribe to unicensv2-binding");
+        AFB_ERROR("Failed to subscribe to UNICENS binding");
         goto OnErrorExit;
     }
     
     err = wrap_ucs_initialize_sync("/home/agluser/DEVELOPMENT/AGL/BINDING/unicens2-binding/data/config_multichannel_audio_kit.xml");
     if (err) {
-        AFB_ERROR("Failed to initialize unicens-v2 binding");
+        AFB_ERROR("Failed to initialize UNICENS binding");
+        goto OnErrorExit;
+    }
+    
+    err = wrap_volume_init();
+    if (err) {
+        AFB_ERROR("Failed to initialize wrapper for volume library");
         goto OnErrorExit;
     }
     
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt b/HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt
new file mode 100644
index 0000000..8735677
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt
@@ -0,0 +1,26 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# 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 subproject targets    
+ADD_SUBDIRECTORY(src)
+
+
+
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h b/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h
new file mode 100644
index 0000000..5e3b753
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h
@@ -0,0 +1,59 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#ifndef DEVICECONTAINER_H
+#define	DEVICECONTAINER_H
+
+#include "device_value.h"
+#include "libmostvolume.h"
+
+class CDeviceContainer {
+
+public:
+    CDeviceContainer();
+    virtual ~CDeviceContainer();
+
+    void AssignService(lib_most_volume_init_t *init_ptr) {_init_ptr = init_ptr;}
+
+    void RegisterValues(CDeviceValue** list_pptr, uint16_t list_sz);
+    void SetValue(uint16_t key, uint8_t value);
+    void ClearValues();
+    void Update();
+
+private:
+    void RequestService(uint16_t timeout);
+    void IncrementProcIndex(void);
+    void HandleI2cResult(uint8_t result);
+
+    static void OnI2cResult(uint8_t result, void *obj_ptr);
+
+    uint16_t _idx_processing;
+    uint16_t _values_sz;
+    CDeviceValue **_values_pptr;
+    bool _tx_busy;
+    bool _service_requested;
+    lib_most_volume_init_t *_init_ptr;
+};
+
+#endif	/* DEVICECONTAINER_H */
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h b/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h
new file mode 100644
index 0000000..21fdbdc
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h
@@ -0,0 +1,91 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#ifndef DEVICEVALUE_H
+#define	DEVICEVALUE_H
+
+#include <stdint.h>
+#include "libmostvolume.h"
+
+struct SRxMessage {
+    uint32_t devInst;   /*instance if multiple devices are using the same group id*/
+    uint32_t sourceAddr;
+    uint32_t targetAddr;
+    uint32_t nFBlock;
+    uint32_t nInst;
+    uint32_t nFunc;
+    uint32_t nOpType;
+    const uint8_t *pPayload;
+    uint32_t payloadLen;
+};
+
+struct STxMessage {
+    uint32_t devInst;   /*instance if multiple devices are using the same group id*/
+    uint32_t targetAddr;
+    uint32_t nFBlock;
+    uint32_t nInst;
+    uint32_t nFunc;
+    uint32_t nOpType;
+    const uint8_t *pPayload;
+    uint32_t payloadLen;
+};
+
+enum DeviceValueType {
+    DEVICE_VAL_MASTER = 0,
+    DEVICE_VAL_LEFT = 1,
+    DEVICE_VAL_RIGHT = 2
+
+};
+
+class CDeviceValue {
+public:
+    CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key);
+    virtual ~CDeviceValue();
+
+    uint16_t GetKey(){return _key;}
+    DeviceValueType GetType(){return _type;}        // returns the assigned type
+    void SetValue(uint8_t value){_target_value = value;}   // sets desired value
+
+    bool RequiresUpdate();      // returns true if target is not actual value
+                                // returns true if success, false if failed
+                                // -> stop transmission
+    bool FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, 
+                           lib_most_volume_writei2c_result_cb_t result_fptr,
+                           void *result_user_ptr);// fires message & updates actual value
+
+private:
+    void HandleI2cResult(uint8_t result);
+    void ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]);
+
+    bool     _is_initial;       // ensure first update
+    DeviceValueType _type;      // determines the remote i2c command
+    uint16_t _key;              // lookup key
+    uint16_t _address;          // target node/group address
+    uint8_t  _target_value;     // desired value
+    uint8_t  _actual_value;     // value set and confirmed via network
+    uint8_t  _tx_payload[20];
+    uint8_t  _tx_payload_sz;
+};
+
+#endif	/* DEVICEPROPERTY_H */
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h b/HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h
new file mode 100644
index 0000000..1d7249d
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h
@@ -0,0 +1,104 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#ifndef LIB_MOST_VOLUME_H
+#define	LIB_MOST_VOLUME_H
+
+#include <stdint.h>
+
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/** Describes the volume control */
+enum lib_most_volume_channel_t{
+    LIB_MOST_VOLUME_CH_FRONT_LEFT   = 0,
+    LIB_MOST_VOLUME_CH_FRONT_RIGHT  = 1,
+    LIB_MOST_VOLUME_CH_REAR_LEFT    = 2,
+    LIB_MOST_VOLUME_CH_REAR_RIGHT   = 3,
+    LIB_MOST_VOLUME_CH_CENTER       = 4,
+    LIB_MOST_VOLUME_CH_SUB          = 5,
+    LIB_MOST_VOLUME_MASTER          = 6
+};
+
+/** Is fired when the application shall call "lib_most_volume_service()" after a certain time
+  * \param timeout  Time in ms after which the application shall call lib_most_volume_service().
+  *                 Valid values:
+  *                 0x0000: as soon as possible,
+  *                 0x0001..0xFFFE: timeout in ms,
+  *                 0xFFFF: never
+  */
+typedef void (*lib_most_volume_service_cb_t)(uint16_t timeout);
+
+typedef void (*lib_most_volume_writei2c_result_cb_t)(uint8_t result, void *user_ptr);
+
+/** Callback function required to write volume changes to network devices
+  * \param node     The node address
+  * \param data_ptr I2C command data
+  * \param data_sz  Size of the I2C command data
+  * \return         Returns \c 0 for success, other value on failure.
+  */
+typedef int (*lib_most_volume_writei2c_cb_t)(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,
+                                            lib_most_volume_writei2c_result_cb_t result_fptr, 
+                                            void *result_user_ptr);
+
+typedef struct lib_most_volume_init_ {
+    lib_most_volume_service_cb_t  service_cb;
+    lib_most_volume_writei2c_cb_t writei2c_cb;
+    
+} lib_most_volume_init_t;
+
+
+/** Initializes the library
+  * \param   UNICENS_inst       Reference to the UNICENS instance, created by the application.
+  * \param   req_service_fptr   Callback function which is fired if the application shall call
+  *                             lib_most_volume_service.
+  * \return  '0' on success, otherwise value >'0'.
+  */
+extern uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr);
+
+/** Terminates the library
+  * \return  '0' on success, otherwise value >'0'.
+  */
+extern uint8_t lib_most_volume_exit(void);
+
+/** Sets a single volume value.
+  * \param   channel        The volume control to be set.
+  * \param   volume         The volume value to be set. Valid values: 0..255.
+  * \return  '0' on success, otherwise value >'0'.
+  */
+extern uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume);
+
+/** Shall be called either cyclically (e.g. 50ms -> polling) or after "timeout"
+  * when "service_fptr" is fired (-> event triggered).
+  * \return  '0' on success, otherwise value >'0'.
+  */
+extern uint8_t lib_most_volume_service(void);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* LIB_MOST_VOLUME_H */
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h b/HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h
new file mode 100644
index 0000000..63bc0e2
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h
@@ -0,0 +1,70 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#ifndef SETUP_H
+#define	SETUP_H
+
+#include "libmostvolume.h"
+#include "device_value.h"
+#include "device_container.h"
+
+#define MAX_CHANNELS    (LIB_MOST_VOLUME_MASTER + 1u)
+#define MAX_MASTERS     3u
+
+class CSetup {
+
+public:
+    void Configure(lib_most_volume_init_t *init_ptr);
+    void SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume);
+    void Update();
+
+private:
+    CDeviceValue _volume_amp_270_m;
+    CDeviceValue _volume_amp_270_l;
+    CDeviceValue _volume_amp_270_r;
+
+    CDeviceValue _volume_amp_271_m;
+    CDeviceValue _volume_amp_271_l;
+    CDeviceValue _volume_amp_271_r;
+
+    CDeviceValue _volume_amp_272_m;
+    CDeviceValue _volume_amp_272_l;
+    CDeviceValue _volume_amp_272_r;
+
+    CDeviceContainer _value_container;
+    lib_most_volume_init_t init_data;
+
+public:
+    static CSetup* GetInstance();   // singleton
+    static void Release();          // singleton
+
+protected:
+    CSetup();                       // singleton
+    virtual ~CSetup();              // singleton
+
+private:
+    static CSetup* _instance;       // singleton
+};
+
+#endif	/* SETUP_H */
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt b/HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt
new file mode 100644
index 0000000..1be7184
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt
@@ -0,0 +1,39 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# 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.
+###########################################################################
+
+# Add target to project dependency list
+PROJECT_TARGET_ADD(ucs2-volume)
+
+# Define targets source files
+ADD_LIBRARY(${TARGET_NAME} STATIC device_container.cpp  device_value.cpp  libmostvolume.cpp  setup.cpp)
+
+    # Library properties
+    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+        OUTPUT_NAME ${TARGET_NAME}
+    )
+
+    # Library dependencies from PKG_REQUIRED_LIST
+    #TARGET_LINK_LIBRARIES(ucs2-volume     # Library dependencies (include updates automatically)
+    #    ${link_libraries}
+    #)
+
+    # Define properties to expose when others use this target
+    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
+       PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../inc
+    )
+
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp b/HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp
new file mode 100644
index 0000000..cef25b1
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp
@@ -0,0 +1,166 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#include <stddef.h>
+#include "device_container.h"
+
+#define DEVCONT_TIME_RETRIGGER      (uint16_t)100U
+#define DEVCONT_TIME_NOW            (uint16_t)0U
+#define DEVCONT_TIME_STOP           (uint16_t)0xFFFFU
+
+#define DEVCONT_UNUSED(a)     (a = a)
+
+CDeviceContainer::CDeviceContainer()
+{
+    this->_idx_processing = 0U;
+    this->_values_pptr = NULL;
+    this->_values_sz = 0U;
+    this->_tx_busy = false;
+    this->_service_requested = false;
+    this->_init_ptr = NULL;
+}
+
+CDeviceContainer::~CDeviceContainer()
+{
+    /*Clb_RegisterI2CResultCB(NULL, NULL);*/    /* avoid that the result callback is fired after object is destroyed */
+}
+
+void CDeviceContainer::RegisterValues(CDeviceValue** list_pptr, uint16_t list_sz)
+{
+    this->_idx_processing = 0U;
+    this->_values_pptr = list_pptr;
+    this->_values_sz = list_sz;
+    this->_tx_busy = false;
+
+    if ((list_pptr != NULL) && (list_sz > 0U))
+    {
+        this->_idx_processing = (uint16_t)(list_sz - 1U);
+    }
+}
+
+void CDeviceContainer::ClearValues()
+{
+    this->_idx_processing = 0U;
+    this->_values_pptr = NULL;
+    this->_values_sz = 0U;
+    this->_tx_busy = false;
+}
+
+void CDeviceContainer::SetValue(uint16_t key, uint8_t value)
+{
+     uint16_t idx;
+     bool req_update = false;
+
+     for (idx = 0U; idx < this->_values_sz; idx++)
+     {
+         if (this->_values_pptr[idx]->GetKey() == key)
+         {
+            this->_values_pptr[idx]->SetValue(value);
+            if (this->_values_pptr[idx]->RequiresUpdate())
+            {
+                req_update = true;
+            }
+         }
+     }
+
+    if (req_update && (!this->_tx_busy))
+    {
+        RequestService(DEVCONT_TIME_NOW); //fire callback
+    }
+}
+
+void CDeviceContainer::IncrementProcIndex(void)
+{
+    if ((_idx_processing + 1U) >=  this->_values_sz)
+    {
+        _idx_processing = 0U;
+    }
+    else
+    {
+        _idx_processing++;
+    }
+}
+
+// starts at latest position, searches next value to update, waits until response
+void CDeviceContainer::Update()
+{
+    uint16_t cnt;
+    bool error = false;
+    _service_requested = false;
+
+    if (this->_tx_busy)
+    {
+        return;
+    }
+    
+    for (cnt = 0u; cnt < this->_values_sz; cnt++)   /* just run one cycle */
+    {
+        IncrementProcIndex();
+
+        if (_values_pptr[_idx_processing]->RequiresUpdate())
+        {
+            if (_values_pptr[_idx_processing]->FireUpdateMessage(this->_init_ptr->writei2c_cb,
+                                                                 &OnI2cResult,
+                                                                 this))
+            {
+                /*Clb_RegisterI2CResultCB(&OnI2cResult, this);*/
+                this->_tx_busy = true;
+                break;
+            }
+            else
+            {
+                error = true;
+            }
+        }
+    }
+
+    if (error)
+    {
+        RequestService(DEVCONT_TIME_RETRIGGER);
+    }
+}
+
+void CDeviceContainer::HandleI2cResult(uint8_t result)
+{
+    DEVCONT_UNUSED(result);
+    this->_tx_busy = false;
+    this->RequestService(DEVCONT_TIME_NOW);
+}
+
+void CDeviceContainer::OnI2cResult(uint8_t result, void *obj_ptr)
+{
+    ((CDeviceContainer*)obj_ptr)->HandleI2cResult(result);
+}
+
+void CDeviceContainer::RequestService(uint16_t timeout)
+{
+    if (!_service_requested)
+    {
+        _service_requested = true;
+
+        if (this->_init_ptr && this->_init_ptr->service_cb)
+        {
+            this->_init_ptr->service_cb(timeout);
+        }
+    }
+}
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp b/HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp
new file mode 100644
index 0000000..b8c681e
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp
@@ -0,0 +1,130 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#include "device_value.h"
+#include "setup.h"
+
+#define MUTE_VALUE      0x03FFU
+#define MUTE_VALUE_HB   0x03U
+#define MUTE_VALUE_LB   0xFFU
+
+#define CONTROL_MASTER  0x07U
+#define CONTROL_CH_1    0x08U
+#define CONTROL_CH_2    0x09U
+
+CDeviceValue::CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key)
+{
+    this->_is_initial = true;
+    this->_address = address;
+    this->_target_value = 0x01u;
+    this->_actual_value = 0x01u;
+
+    this->_type = type;
+    this->_key = key;
+
+    _tx_payload[0] = CONTROL_MASTER;// 7: master, 8: channel 1, 9: Channel 2
+    _tx_payload[1] = MUTE_VALUE_HB; //HB:Volume
+    _tx_payload[2] = MUTE_VALUE_LB; //LB:Volume
+    _tx_payload_sz = 3u;
+}
+
+CDeviceValue::~CDeviceValue()
+{
+}
+
+void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[])
+{
+    uint16_t tmp = MUTE_VALUE;
+
+    switch (type)
+    {
+        case DEVICE_VAL_LEFT:
+            tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU)));
+            //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF));
+            //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF));
+            tx_payload[0] = CONTROL_CH_1;
+            break;
+        case DEVICE_VAL_RIGHT:
+            tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU)));
+            //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF));
+            //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF));
+            tx_payload[0] = CONTROL_CH_2;
+            break;
+        default:
+            /*std::cerr << "CDeviceValue::ApplyMostValue() error matching incorrect" << std::endl;*/
+        case DEVICE_VAL_MASTER:
+            tmp = (uint16_t)(0x100U + 0x2FFU - (0x2FFU * ((int32_t)value) / (0xFFU)));
+            tx_payload[0] = CONTROL_MASTER;
+            break;
+    }
+
+    tx_payload[1] = (uint8_t)((tmp >> 8U) & (uint16_t)0xFFU); //HB:Volume
+    tx_payload[2] = (uint8_t)(tmp  & (uint16_t)0xFFU); //LB:Volume
+}
+
+// returns true if target is not actual value
+bool CDeviceValue::RequiresUpdate()
+{
+    if (this->_target_value != this->_actual_value)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+bool CDeviceValue::FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, 
+                                     lib_most_volume_writei2c_result_cb_t result_fptr,
+                                     void *result_user_ptr)
+{
+    int ret;
+    ApplyMostValue(this->_target_value, _type, _tx_payload);
+
+    ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, 
+                        result_fptr,
+                        result_user_ptr);
+
+    if (ret == 0)
+    {
+        // Clb_RegisterI2CResultCB(OnI2cResult, this);
+        // mark value as set!
+        this->_actual_value = this->_target_value;
+        return true;
+    }
+
+    return false;
+}
+
+#if 0
+    ret = Ucs_I2c_WritePort( CSetup::GetInstance()->RetrieveUnicensInst(),
+            this->_address,
+            0x0F00u,                /* i2c port handle */
+            UCS_I2C_DEFAULT_MODE,   /* 0 */
+            0u,                     /* block count */
+            0x2Au,                  /* i2c slave address */
+            0x03E8u,                /* timeout 1000 milliseconds */
+            _tx_payload_sz,         /* data length */
+            &_tx_payload[0],        /* data pointer */
+            &Clb_OnWriteI2CPortResult
+            );
+#endif
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp b/HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp
new file mode 100644
index 0000000..a90b5b1
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp
@@ -0,0 +1,86 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+
+#include "libmostvolume.h"
+#include "setup.h"
+/*#include <iostream>*/
+
+static bool _running = false;
+
+extern "C" uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr)
+{
+    uint8_t success = 1U;
+    /*std::cerr << "lib_most_volume_init(): called" << std::endl;*/
+
+    if (!_running && init_ptr)
+    {
+        CSetup::GetInstance()->Configure(init_ptr);
+        success = 0U;
+        _running = true;
+    }
+
+    return success;
+}
+
+extern "C" uint8_t lib_most_volume_exit(void)
+{
+    uint8_t success = 1U;
+    /*std::cerr << "lib_most_volume_exit(): called" << std::endl;*/
+
+    if (_running)
+    {
+        CSetup::Release();
+        success = 0U;
+        _running = false;
+    }
+
+    return success;
+}
+
+extern "C" uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume)
+{
+    uint8_t success = 1U;
+    /*std::cerr << "lib_most_volume_set(): channel=" << channel << ", volume=" << (int)volume << std::endl;*/
+
+    if (_running)
+    {
+        CSetup::GetInstance()->SetVolume(channel, volume);
+        success = 0U;
+    }
+
+    return success;
+}
+
+extern "C" uint8_t lib_most_volume_service(void)
+{   
+    uint8_t success = 1U;
+    /*std::cerr << "lib_most_volume_service(): called" << std::endl;*/
+
+    if (_running)
+    {
+        CSetup::GetInstance()->Update();
+        success = 0U;
+    }
+    
+    return success;
+}
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp b/HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp
new file mode 100644
index 0000000..61b8a68
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp
@@ -0,0 +1,89 @@
+/*
+ * libmostvolume example
+ *
+ * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You may also obtain this software under a propriety license from Microchip.
+ * Please contact Microchip for further information.
+ *
+ */
+#include <stddef.h>
+#include "setup.h"
+
+CSetup* CSetup::_instance = NULL;
+
+// singleton
+CSetup* CSetup::GetInstance() {
+    if (_instance == NULL) {
+        _instance = new CSetup();
+    }
+
+    return _instance;
+}
+
+// singleton
+void CSetup::Release() {
+    if (_instance != NULL) {
+        delete _instance;
+    }
+    _instance = NULL;
+}
+
+CSetup::CSetup()
+    :   _volume_amp_270_m(0x270U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
+        _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT),
+        _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT),
+        _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
+        _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT),
+        _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT),
+        _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
+        _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER),
+        _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB),
+        _value_container()
+{
+    static CDeviceValue* value_list[9] = {  &_volume_amp_270_m,
+                                            &_volume_amp_270_l,
+                                            &_volume_amp_270_r,
+                                            &_volume_amp_271_m,
+                                            &_volume_amp_271_l,
+                                            &_volume_amp_271_r,
+                                            &_volume_amp_272_m,
+                                            &_volume_amp_272_l,
+                                            &_volume_amp_272_r};
+
+    _value_container.RegisterValues(value_list, 9U);
+}
+
+CSetup::~CSetup()
+{
+
+}
+
+void CSetup::Configure(lib_most_volume_init_t *init_ptr)
+{
+    this->init_data = *init_ptr;
+    _value_container.AssignService(&this->init_data);
+}
+
+void CSetup::SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume)
+{
+    _value_container.SetValue((uint16_t)channel, volume);
+}
+
+void CSetup::Update()
+{
+    _value_container.Update();
+}
diff --git a/HAL-afb/hal-most-unicens/wrap_unicens.c b/HAL-afb/hal-most-unicens/wrap_unicens.c
index 15f94a1..2bd1e91 100644
--- a/HAL-afb/hal-most-unicens/wrap_unicens.c
+++ b/HAL-afb/hal-most-unicens/wrap_unicens.c
@@ -25,6 +25,11 @@
 #include "wrap_unicens.h"
 #include "wrap-json.h"
 
+typedef struct async_job_ {
+    wrap_ucs_result_cb_t result_fptr; 
+    void *result_user_ptr;
+} async_job_t; 
+
 /* Subscribes to unicens2-binding events.
  * \return  Returns 0 if successful, otherwise != 0".
  */
@@ -134,12 +139,6 @@ OnErrorExit:
     return err;
 }
 
-
-static void wrap_ucs_i2cwrite_cb(void *closure __attribute__((unused)), int status, struct json_object *j_result) {
-    
-    AFB_NOTICE("wrap_ucs_i2cwrite_cb: status=%d, res=%s", status, json_object_to_json_string(j_result));
-}
-
 /* Write I2C command to a network node.
  * \param   node     Node address
  * \param   data_ptr Reference to command data 
@@ -188,15 +187,34 @@ OnErrorExit:
     return err;  
 }
 
+/* ------------------ ASYNCHRONOUS API ---------------------------------------*/
+
+static void wrap_ucs_i2cwrite_cb(void *closure, int status, struct json_object *j_result) {
+    
+    AFB_NOTICE("wrap_ucs_i2cwrite_cb: closure=%p status=%d, res=%s", closure, status, json_object_to_json_string(j_result));
+    
+    if (closure) {
+        async_job_t *job_ptr = (async_job_t *)closure;
+        
+        if (job_ptr->result_fptr)
+            job_ptr->result_fptr(0U, job_ptr->result_user_ptr);
+        
+        free(closure);
+    }
+}
+
 /* Write I2C command to a network node.
  * \param   node     Node address
  * \param   data_ptr Reference to command data 
  * \param   data_sz  Size of the command data. Valid values: 1..32.
  * \return  Returns 0 if successful, otherwise != 0".
  */
-extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz) {
+extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,
+                             wrap_ucs_result_cb_t result_fptr, 
+                             void *result_user_ptr) {
 
     json_object *j_query, *j_array = NULL;
+    async_job_t *job_ptr = NULL;
     int err;
     uint8_t cnt;
 
@@ -215,8 +233,19 @@ extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz)
     
     json_object_object_add(j_query, "node", json_object_new_int(node));
     json_object_object_add(j_query, "data", j_array);
+    
+    job_ptr = malloc(sizeof(async_job_t));
+    
+    if (!job_ptr) {
+        err = -1;
+        AFB_ERROR("Failed to create async job object");
+        goto OnErrorExit; 
+    }
+    
+    job_ptr->result_fptr = result_fptr;
+    job_ptr->result_user_ptr = result_user_ptr;
  
-    afb_service_call("UNICENS", "writei2c", j_query, wrap_ucs_i2cwrite_cb, NULL);
+    afb_service_call("UNICENS", "writei2c", j_query, wrap_ucs_i2cwrite_cb, job_ptr);
     err = 0;
     j_query = NULL;
 
diff --git a/HAL-afb/hal-most-unicens/wrap_unicens.h b/HAL-afb/hal-most-unicens/wrap_unicens.h
index 27071c7..268fb74 100644
--- a/HAL-afb/hal-most-unicens/wrap_unicens.h
+++ b/HAL-afb/hal-most-unicens/wrap_unicens.h
@@ -17,11 +17,18 @@
  */

 

 #pragma once

-

 #include <stdint.h>

 

+/* Asynchronous API: result callback */

+typedef void (*wrap_ucs_result_cb_t)(uint8_t result, void *user_ptr);

+

+/* Asynchronous API: functions */

+extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,

+                             wrap_ucs_result_cb_t result_fptr, 

+                             void *result_user_ptr);

+

+/* Synchronous API: functions */

 extern int wrap_ucs_subscribe_sync();

 extern int wrap_ucs_getconfig_sync(const char *config_path);

 extern int wrap_ucs_initialize_sync(const char* file_name);

 extern int wrap_ucs_i2cwrite_sync(uint16_t node, uint8_t *data_ptr, uint8_t data_sz);

-extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz);

diff --git a/HAL-afb/hal-most-unicens/wrap_volume.c b/HAL-afb/hal-most-unicens/wrap_volume.c
new file mode 100644
index 0000000..811879f
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/wrap_volume.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.
+ * Author Tobias Jahnke
+ *
+ * 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 
+#define AFB_BINDING_VERSION 2
+
+#include <string.h>
+#include <json-c/json.h>
+#include <afb/afb-binding.h>
+
+#include "wrap_volume.h"
+#include "wrap_unicens.h"
+
+extern int wrap_volume_init(void) {
+    
+    /*lib_most_volume_init_t mv_init;
+    mv_init.writei2c_cb = &wrap_ucs_i2cwrite;
+    mv_init.service_cb = NULL;
+    lib_most_volume_init(NULL);*/
+    
+    return -1;
+}
\ No newline at end of file
diff --git a/HAL-afb/hal-most-unicens/wrap_volume.h b/HAL-afb/hal-most-unicens/wrap_volume.h
new file mode 100644
index 0000000..92fae48
--- /dev/null
+++ b/HAL-afb/hal-most-unicens/wrap_volume.h
@@ -0,0 +1,22 @@
+/*

+ * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.

+ * Author Tobias Jahnke

+ *

+ * 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.

+ * 

+ */

+

+#pragma once

+#include <stdint.h>

+

+extern int wrap_volume_init(void);