From 5770713075119f42d3486fa8db616efa8231a336 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Mon, 10 Dec 2018 17:18:01 +0100 Subject: Rename unicens plugin as output unicens plugin Move all files according plugin name changes. Update cmake files. Update unicens configuration file. Change-Id: I468430dfbc885ec0bfa03a179a9dd4f14de3f1d0 Signed-off-by: Jonathan Aillet --- cfg/hal-4a-unicens-coax.json | 19 +- cfg/hal-4a-unicens-utp.json | 19 +- plugin/CMakeLists.txt | 42 +---- plugin/most_unicens.c | 170 ----------------- plugin/ucs2-vol/CMakeLists.txt | 26 --- plugin/ucs2-vol/inc/device_container.h | 59 ------ plugin/ucs2-vol/inc/device_value.h | 104 ---------- plugin/ucs2-vol/inc/libmostvolume.h | 114 ----------- plugin/ucs2-vol/inc/setup.h | 73 ------- plugin/ucs2-vol/src/CMakeLists.txt | 39 ---- plugin/ucs2-vol/src/device_container.cpp | 194 ------------------- plugin/ucs2-vol/src/device_value.cpp | 175 ----------------- plugin/ucs2-vol/src/libmostvolume.cpp | 99 ---------- plugin/ucs2-vol/src/setup.cpp | 96 ---------- plugin/unicens-output/CMakeLists.txt | 52 +++++ plugin/unicens-output/most_unicens.c | 170 +++++++++++++++++ plugin/unicens-output/ucs2-vol/CMakeLists.txt | 26 +++ .../unicens-output/ucs2-vol/inc/device_container.h | 59 ++++++ plugin/unicens-output/ucs2-vol/inc/device_value.h | 104 ++++++++++ plugin/unicens-output/ucs2-vol/inc/libmostvolume.h | 114 +++++++++++ plugin/unicens-output/ucs2-vol/inc/setup.h | 73 +++++++ plugin/unicens-output/ucs2-vol/src/CMakeLists.txt | 39 ++++ .../ucs2-vol/src/device_container.cpp | 194 +++++++++++++++++++ .../unicens-output/ucs2-vol/src/device_value.cpp | 175 +++++++++++++++++ .../unicens-output/ucs2-vol/src/libmostvolume.cpp | 99 ++++++++++ plugin/unicens-output/ucs2-vol/src/setup.cpp | 96 ++++++++++ plugin/unicens-output/wrap_unicens.c | 210 +++++++++++++++++++++ plugin/unicens-output/wrap_unicens.h | 45 +++++ plugin/unicens-output/wrap_volume.c | 138 ++++++++++++++ plugin/unicens-output/wrap_volume.h | 34 ++++ plugin/wrap_unicens.c | 210 --------------------- plugin/wrap_unicens.h | 45 ----- plugin/wrap_volume.c | 138 -------------- plugin/wrap_volume.h | 34 ---- 34 files changed, 1646 insertions(+), 1638 deletions(-) delete mode 100644 plugin/most_unicens.c delete mode 100644 plugin/ucs2-vol/CMakeLists.txt delete mode 100644 plugin/ucs2-vol/inc/device_container.h delete mode 100644 plugin/ucs2-vol/inc/device_value.h delete mode 100644 plugin/ucs2-vol/inc/libmostvolume.h delete mode 100644 plugin/ucs2-vol/inc/setup.h delete mode 100644 plugin/ucs2-vol/src/CMakeLists.txt delete mode 100644 plugin/ucs2-vol/src/device_container.cpp delete mode 100644 plugin/ucs2-vol/src/device_value.cpp delete mode 100644 plugin/ucs2-vol/src/libmostvolume.cpp delete mode 100644 plugin/ucs2-vol/src/setup.cpp create mode 100644 plugin/unicens-output/CMakeLists.txt create mode 100644 plugin/unicens-output/most_unicens.c create mode 100644 plugin/unicens-output/ucs2-vol/CMakeLists.txt create mode 100644 plugin/unicens-output/ucs2-vol/inc/device_container.h create mode 100644 plugin/unicens-output/ucs2-vol/inc/device_value.h create mode 100644 plugin/unicens-output/ucs2-vol/inc/libmostvolume.h create mode 100644 plugin/unicens-output/ucs2-vol/inc/setup.h create mode 100644 plugin/unicens-output/ucs2-vol/src/CMakeLists.txt create mode 100644 plugin/unicens-output/ucs2-vol/src/device_container.cpp create mode 100644 plugin/unicens-output/ucs2-vol/src/device_value.cpp create mode 100644 plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp create mode 100644 plugin/unicens-output/ucs2-vol/src/setup.cpp create mode 100644 plugin/unicens-output/wrap_unicens.c create mode 100644 plugin/unicens-output/wrap_unicens.h create mode 100644 plugin/unicens-output/wrap_volume.c create mode 100644 plugin/unicens-output/wrap_volume.h delete mode 100644 plugin/wrap_unicens.c delete mode 100644 plugin/wrap_unicens.h delete mode 100644 plugin/wrap_volume.c delete mode 100644 plugin/wrap_volume.h diff --git a/cfg/hal-4a-unicens-coax.json b/cfg/hal-4a-unicens-coax.json index e6ef3ba..85fbff1 100644 --- a/cfg/hal-4a-unicens-coax.json +++ b/cfg/hal-4a-unicens-coax.json @@ -11,30 +11,23 @@ }, "resources": [ { - "uid": "hal-unicens", - "info": "UNICENS HAL plugin", + "uid": "hal-unicens-output", + "info": "UNICENS HAL plugin for output audio", "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal", - "libs": ["hal-unicens.ctlso"] + "libs": ["hal-unicens-output.ctlso"] } ], "onload": [ { "uid": "init-audio-hal", "info": "Init current HAL", - "action": "plugin://hal-unicens#Init" - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" + "action": "plugin://hal-unicens-output#Init" } ], "events": [ { "uid": "UNICENS/node-availibility", - "action": "plugin://hal-unicens#Events" + "action": "plugin://hal-unicens-output#Events" } ], "halmap": [ @@ -53,7 +46,7 @@ "step": 1 } }, - "action": "plugin://hal-unicens#MasterVol" + "action": "plugin://hal-unicens-output#MasterVol" } ], "halmixer": { diff --git a/cfg/hal-4a-unicens-utp.json b/cfg/hal-4a-unicens-utp.json index db04b5b..0cb93d7 100644 --- a/cfg/hal-4a-unicens-utp.json +++ b/cfg/hal-4a-unicens-utp.json @@ -11,30 +11,23 @@ }, "resources": [ { - "uid": "hal-unicens", - "info": "UNICENS HAL plugin", + "uid": "hal-unicens-output", + "info": "UNICENS HAL plugin for output audio", "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal", - "libs": ["hal-unicens.ctlso"] + "libs": ["hal-unicens-output.ctlso"] } ], "onload": [ { "uid": "init-audio-hal", "info": "Init current HAL", - "action": "plugin://hal-unicens#Init" - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" + "action": "plugin://hal-unicens-output#Init" } ], "events": [ { "uid": "UNICENS/node-availibility", - "action": "plugin://hal-unicens#Events" + "action": "plugin://hal-unicens-output#Events" } ], "halmap": [ @@ -53,7 +46,7 @@ "step": 1 } }, - "action": "plugin://hal-unicens#MasterVol" + "action": "plugin://hal-unicens-output#MasterVol" } ], "halmixer": { diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 2672f72..3fd93ec 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -1,13 +1,13 @@ ########################################################################### -# Copyright 2015, 2016, 2017, 2018 IoT.bzh +# Copyright 2015, 2016, 2017 IoT.bzh # -# author: Jonathan Aillet +# 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 +# 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, @@ -16,37 +16,7 @@ # limitations under the License. ########################################################################### -ADD_SUBDIRECTORY(ucs2-vol) -PROJECT_TARGET_ADD(hal-unicens) - - # Define targets - ADD_LIBRARY(${TARGET_NAME} MODULE - most_unicens.c - wrap_unicens.c - wrap_volume.c - ) - - # Alsa Plugin properties - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - LABELS "PLUGIN" - PREFIX "" - SUFFIX ".ctlso" - OUTPUT_NAME ${TARGET_NAME} - ) - - # Library dependencies (include updates automatically) - TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-helpers - ctl-utilities - ucs2-volume - ${link_libraries} - ) - - target_include_directories(${TARGET_NAME} - PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib" - #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers" - #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager" - #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities" - PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc" - ) +# Include any directory not starting with _ +# ----------------------------------------------------- +PROJECT_SUBDIRS_ADD() diff --git a/plugin/most_unicens.c b/plugin/most_unicens.c deleted file mode 100644 index a0d040b..0000000 --- a/plugin/most_unicens.c +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2018, "IoT.bzh", Microchip Technology Inc. and its subsidiaries. - * Author Jonathan Aillet - * Author Tobias Jahnke - * Contrib 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. - * - */ - -#define _GNU_SOURCE - -#include -#include -#include -#include - -#include -#include -#include - -#include "wrap_unicens.h" -#include "wrap_volume.h" - -#define PCM_MAX_CHANNELS 6 -#define UCS_PLUGIN_NAME "hal-unicens" - -CTLP_CAPI_REGISTER(UCS_PLUGIN_NAME) - -AFB_ApiT unicensHalApiHandle; -static uint8_t initialized = 0; - - -/* Call at initialization time, binder is not running yet, - * communication to other bindings not possible now. */ -CTLP_ONLOAD(plugin, callbacks) -{ - unicensHalApiHandle = plugin->api; - AFB_ApiNotice(unicensHalApiHandle, "4A-HAL-UNICENS: Plugin Register: uid='%s' 'info='%s'", plugin->uid, plugin->info); - return 0; -} - - -/* initializes ALSA sound card, UNICENS API */ -CTLP_CAPI(Init, source, argsJ, queryJ) -{ - int err = 0; - int pcm_volume[PCM_MAX_CHANNELS] = { 100, 100, 100, 100, 100, 100 }; - - AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing 4a plugin"); - - if((err = wrap_volume_init())) { - AFB_ApiError(source->api, "Failed to initialize wrapper for volume library"); - goto Abort_Exit; - } - - if((err = wrap_ucs_subscribe_sync(source->api))) { - AFB_ApiError(source->api, "Failed to subscribe to UNICENS binding"); - goto Abort_Exit; - } - - // Set output volume to pre-defined level in order to - // avoid muted volume to be persistent after boot. - //wrap_volume_master(source->api, 80); - wrap_volume_pcm(source->api, pcm_volume, PCM_MAX_CHANNELS); - initialized = 1; - -Abort_Exit: - AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing plugin done, err=%d", err); - err = 0; /* avoid returning non-zero value, to force loading the plugin */ - return err; -} - - -/* Is called when master volume is incremented by ALSA */ -CTLP_CAPI(MasterVol, source, argsJ, queryJ) -{ - int master_volume; - json_object *valueJ; - int err = 0; - - AFB_ApiNotice(source->api, "4A-HAL-UNICENS: MasterVolume=%s", json_object_to_json_string(queryJ)); - if(! initialized) { - AFB_ApiWarning(source->api, "%s: Link to unicens binder is not initialized, can't set master volume, value=%s", __func__, json_object_get_string(queryJ)); - err = -1; - goto Abort_Exit; - } - - if(! json_object_is_type(queryJ, json_type_array) || json_object_array_length(queryJ) <= 0) { - AFB_ApiError(source->api, "%s: invalid json (should be a non empty json array) value=%s", __func__, json_object_get_string(queryJ)); - err = -2; - goto Abort_Exit; - } - - valueJ = json_object_array_get_idx(queryJ, 0); - if(! json_object_is_type(valueJ, json_type_int)) { - AFB_ApiError(source->api, "%s: invalid json (should be an array of int) value=%s", __func__, json_object_get_string(queryJ)); - err = -3; - goto Abort_Exit; - } - - master_volume = json_object_get_int(valueJ); - wrap_volume_master(source->api, master_volume); - -Abort_Exit: - err = 0; /* avoid returning non-zero value, to force loading the plugin */ - return err; -} - - -/* not used at the moment, disabled in JSON configuration */ -CTLP_CAPI(PCMVol, source, argsJ, queryJ) -{ - AFB_ApiNotice(source->api, "4A-HAL-UNICENS: PCMVolume=%s", json_object_to_json_string(queryJ)); - return 0; -} - - -/* Is called on UNICENS events */ -CTLP_CAPI(Events, source, argsJ, queryJ) -{ - uint16_t node = 0U; - bool available = false; - int err = 0; - json_object *j_tmp = NULL; - - AFB_ApiError(source->api, "4A-HAL-UNICENS: receiving event query=%s", json_object_to_json_string(queryJ)); - - if (initialized == 0) { - AFB_ApiError(source->api, "4A-HAL-UNICENS: Not initialized while receiving event query=%s", json_object_to_json_string(queryJ)); - err = 0; - goto Abort_Exit; - } - - if (json_object_object_get_ex(queryJ, "node", &j_tmp)) { - node = (uint16_t)json_object_get_int(j_tmp); - } - else { - err = -1; - } - - if (json_object_object_get_ex(queryJ, "available", &j_tmp)) { - available = (bool)json_object_get_boolean(j_tmp); - } - else { - err = -2; - } - - if(err == 0) { - AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Node-Availability: node=0x%03X, available=%d", node, available); - wrap_volume_node_avail(source->api, node, available); - } - else { - AFB_ApiError(source->api, "4A-HAL-UNICENS: Failed to parse events query=%s", json_object_to_json_string(queryJ)); - } - -Abort_Exit: - err = 0; /* avoid returning non-zero value now */ - return err; -} diff --git a/plugin/ucs2-vol/CMakeLists.txt b/plugin/ucs2-vol/CMakeLists.txt deleted file mode 100644 index c734639..0000000 --- a/plugin/ucs2-vol/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 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. -########################################################################### - - - -# Define subproject targets -ADD_SUBDIRECTORY(src) - - - - diff --git a/plugin/ucs2-vol/inc/device_container.h b/plugin/ucs2-vol/inc/device_container.h deleted file mode 100644 index 9fabdb5..0000000 --- a/plugin/ucs2-vol/inc/device_container.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 . - * - * 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(); - void ChangeNodeAvailable(uint16_t address, bool available); - -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/plugin/ucs2-vol/inc/device_value.h b/plugin/ucs2-vol/inc/device_value.h deleted file mode 100644 index ef57003..0000000 --- a/plugin/ucs2-vol/inc/device_value.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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 . - * - * 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 -#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, - DEVICE_VAL_FIBERDYNE_MASTER = 3 - -}; - -class CDeviceValue { -public: - CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key, bool is_i2c); - 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 - bool FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr); - - void SetAvailable(bool active){this->_is_available = active; _actual_value = 0x01u;} - bool IsAvailable() {return this->_is_available;} - uint16_t GetAddress() {return this->_address;} - -private: - void ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]); - void HandleI2cResult(uint8_t result); - static void OnI2cResult(uint8_t result, void *obj_ptr); - - bool _is_available; // related node is available - bool _is_busy; // do not update while busy - bool _is_i2c; - 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 _transmitted_value;// value pending during transmission - uint8_t _actual_value; // value set and confirmed via network - uint8_t _tx_payload[20]; - uint8_t _tx_payload_sz; - - lib_most_volume_writei2c_result_cb_t _result_fptr; - void *_result_user_ptr; -}; - -#endif /* DEVICEPROPERTY_H */ - diff --git a/plugin/ucs2-vol/inc/libmostvolume.h b/plugin/ucs2-vol/inc/libmostvolume.h deleted file mode 100644 index 5335754..0000000 --- a/plugin/ucs2-vol/inc/libmostvolume.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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 . - * - * 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 - - -#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 int (*lib_most_volume_sendmessage_cb_t)(uint16_t node, uint16_t msgid, uint8_t *data_ptr, uint8_t data_sz); - -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_sendmessage_cb_t sendmsg_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); - -/** Must be called when the availability of a node has changed - * \param address The node address - * \param available Availability: 0 - not available, 1 - available - * \return '0' on success, otherwise value >'0'. - */ -extern uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available); - -/** 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/plugin/ucs2-vol/inc/setup.h b/plugin/ucs2-vol/inc/setup.h deleted file mode 100644 index 3be8bf4..0000000 --- a/plugin/ucs2-vol/inc/setup.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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 . - * - * 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(); - void SetNodeAvailable(uint16_t address, bool available); - -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; - - CDeviceValue _volume_amp_510_m; - - 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/plugin/ucs2-vol/src/CMakeLists.txt b/plugin/ucs2-vol/src/CMakeLists.txt deleted file mode 100644 index 1be7184..0000000 --- a/plugin/ucs2-vol/src/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 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. -########################################################################### - -# 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/plugin/ucs2-vol/src/device_container.cpp b/plugin/ucs2-vol/src/device_container.cpp deleted file mode 100644 index f804a42..0000000 --- a/plugin/ucs2-vol/src/device_container.cpp +++ /dev/null @@ -1,194 +0,0 @@ -/* - * 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 . - * - * You may also obtain this software under a propriety license from Microchip. - * Please contact Microchip for further information. - * - */ - -#include -#include "device_container.h" - -#define DEVCONT_TIME_RETRIGGER (uint16_t)30U -#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]->GetType() == DEVICE_VAL_FIBERDYNE_MASTER) - { - _values_pptr[_idx_processing]->FireControlMessage(this->_init_ptr->sendmsg_cb); - } - else - { - if (_values_pptr[_idx_processing]->FireUpdateMessage(this->_init_ptr->writei2c_cb, - &OnI2cResult, - this)) - { - this->_tx_busy = true; - error = false; - break; - } - else - { - error = true; - break; - } - } - } - } - - if (error) - { - RequestService(DEVCONT_TIME_RETRIGGER); - } -} - -void CDeviceContainer::HandleI2cResult(uint8_t result) -{ - this->_tx_busy = false; - if (result == 0) - this->RequestService(DEVCONT_TIME_NOW); - else - this->RequestService(DEVCONT_TIME_RETRIGGER); -} - -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); - } - } -} - -void CDeviceContainer::ChangeNodeAvailable(uint16_t address, bool available) -{ - uint16_t idx; - - for (idx = 0U; idx < this->_values_sz; idx++) - { - if (this->_values_pptr[idx]->GetAddress() == address) - { - this->_values_pptr[idx]->SetAvailable(available); - } - } - - if (available) - { - RequestService(DEVCONT_TIME_RETRIGGER); - } -} diff --git a/plugin/ucs2-vol/src/device_value.cpp b/plugin/ucs2-vol/src/device_value.cpp deleted file mode 100644 index 4031778..0000000 --- a/plugin/ucs2-vol/src/device_value.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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 . - * - * You may also obtain this software under a propriety license from Microchip. - * Please contact Microchip for further information. - * - */ -#include -#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, bool is_i2c) -{ - this->_is_available = false; - this->_is_busy = false; - this->_address = address; - this->_is_i2c = is_i2c; - this->_target_value = 0x01u; - this->_actual_value = 0x01u; - - this->_result_fptr = NULL; - this->_result_user_ptr = NULL; - - 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 - - if (type == DEVICE_VAL_FIBERDYNE_MASTER) - _tx_payload_sz = 2u; - else - _tx_payload_sz = 3u; -} - -CDeviceValue::~CDeviceValue() -{ -} - -void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]) -{ - uint16_t tmp = MUTE_VALUE; - - if (type == DEVICE_VAL_FIBERDYNE_MASTER) - { - tx_payload[0] = 0x00U; - tx_payload[1] = value; - - return; - } - - 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->_is_available && !this->_is_busy && (this->_target_value != this->_actual_value)) - { - return true; - } - - return false; -} - -bool CDeviceValue::FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr) -{ - ApplyMostValue(this->_target_value, _type, _tx_payload); - - if (this->_is_available && !this->_is_busy) - { - sendmsg_fptr(this->_address, 0x100U, _tx_payload, _tx_payload_sz); - - this->_actual_value = this->_target_value; - } - - return true; -} - -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 = -1; - ApplyMostValue(this->_target_value, _type, _tx_payload); - - if (this->_is_available && !this->_is_busy) - { - ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, - &OnI2cResult, - this); - - if (ret == 0) - { - this->_transmitted_value = this->_target_value; - this->_is_busy = true; - this->_result_fptr = result_fptr; - this->_result_user_ptr = result_user_ptr; - return true; - } - } - - return false; -} - -void CDeviceValue::HandleI2cResult(uint8_t result) -{ - if (result == 0) - { - /* transmission succeeded - now apply transmitted value */ - this->_actual_value = this->_transmitted_value; - } - - if (this->_result_fptr) - { - /* notify container */ - this->_result_fptr(result, this->_result_user_ptr); - } - - this->_result_fptr = NULL; - this->_result_user_ptr = NULL; - this->_is_busy = false; -} - -void CDeviceValue::OnI2cResult(uint8_t result, void *obj_ptr) -{ - ((CDeviceValue*)obj_ptr)->HandleI2cResult(result); -} diff --git a/plugin/ucs2-vol/src/libmostvolume.cpp b/plugin/ucs2-vol/src/libmostvolume.cpp deleted file mode 100644 index 519e2cf..0000000 --- a/plugin/ucs2-vol/src/libmostvolume.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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 . - * - * 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 */ - -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 uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available) -{ - uint8_t success = 1U; - - if (_running) - { - CSetup::GetInstance()->SetNodeAvailable(address, available); - 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/plugin/ucs2-vol/src/setup.cpp b/plugin/ucs2-vol/src/setup.cpp deleted file mode 100644 index ad841ab..0000000 --- a/plugin/ucs2-vol/src/setup.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* - * 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 . - * - * You may also obtain this software under a propriety license from Microchip. - * Please contact Microchip for further information. - * - */ -#include -#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, true), - _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT, true), - _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT, true), - _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true), - _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT, true), - _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT, true), - _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true), - _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER, true), - _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB, true), - _volume_amp_510_m(0x510U, DEVICE_VAL_FIBERDYNE_MASTER, LIB_MOST_VOLUME_MASTER, false), - _value_container() -{ - static CDeviceValue* value_list[10] = { &_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, - &_volume_amp_510_m}; - - _value_container.RegisterValues(value_list, 10U); -} - -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(); -} - -void CSetup::SetNodeAvailable(uint16_t address, bool available) -{ - _value_container.ChangeNodeAvailable(address, available); -} diff --git a/plugin/unicens-output/CMakeLists.txt b/plugin/unicens-output/CMakeLists.txt new file mode 100644 index 0000000..b6e9977 --- /dev/null +++ b/plugin/unicens-output/CMakeLists.txt @@ -0,0 +1,52 @@ +########################################################################### +# Copyright 2015, 2016, 2017, 2018 IoT.bzh +# +# author: Jonathan Aillet +# +# 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_SUBDIRECTORY(ucs2-vol) + +PROJECT_TARGET_ADD(hal-unicens-output) + + # Define targets + ADD_LIBRARY(${TARGET_NAME} MODULE + most_unicens.c + wrap_unicens.c + wrap_volume.c + ) + + # Alsa Plugin properties + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + LABELS "PLUGIN" + PREFIX "" + SUFFIX ".ctlso" + OUTPUT_NAME ${TARGET_NAME} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + afb-helpers + ctl-utilities + ucs2-volume + ${link_libraries} + ) + + target_include_directories(${TARGET_NAME} + PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib" + #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers" + #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager" + #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities" + PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc" + ) diff --git a/plugin/unicens-output/most_unicens.c b/plugin/unicens-output/most_unicens.c new file mode 100644 index 0000000..a0d040b --- /dev/null +++ b/plugin/unicens-output/most_unicens.c @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2018, "IoT.bzh", Microchip Technology Inc. and its subsidiaries. + * Author Jonathan Aillet + * Author Tobias Jahnke + * Contrib 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. + * + */ + +#define _GNU_SOURCE + +#include +#include +#include +#include + +#include +#include +#include + +#include "wrap_unicens.h" +#include "wrap_volume.h" + +#define PCM_MAX_CHANNELS 6 +#define UCS_PLUGIN_NAME "hal-unicens" + +CTLP_CAPI_REGISTER(UCS_PLUGIN_NAME) + +AFB_ApiT unicensHalApiHandle; +static uint8_t initialized = 0; + + +/* Call at initialization time, binder is not running yet, + * communication to other bindings not possible now. */ +CTLP_ONLOAD(plugin, callbacks) +{ + unicensHalApiHandle = plugin->api; + AFB_ApiNotice(unicensHalApiHandle, "4A-HAL-UNICENS: Plugin Register: uid='%s' 'info='%s'", plugin->uid, plugin->info); + return 0; +} + + +/* initializes ALSA sound card, UNICENS API */ +CTLP_CAPI(Init, source, argsJ, queryJ) +{ + int err = 0; + int pcm_volume[PCM_MAX_CHANNELS] = { 100, 100, 100, 100, 100, 100 }; + + AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing 4a plugin"); + + if((err = wrap_volume_init())) { + AFB_ApiError(source->api, "Failed to initialize wrapper for volume library"); + goto Abort_Exit; + } + + if((err = wrap_ucs_subscribe_sync(source->api))) { + AFB_ApiError(source->api, "Failed to subscribe to UNICENS binding"); + goto Abort_Exit; + } + + // Set output volume to pre-defined level in order to + // avoid muted volume to be persistent after boot. + //wrap_volume_master(source->api, 80); + wrap_volume_pcm(source->api, pcm_volume, PCM_MAX_CHANNELS); + initialized = 1; + +Abort_Exit: + AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Initializing plugin done, err=%d", err); + err = 0; /* avoid returning non-zero value, to force loading the plugin */ + return err; +} + + +/* Is called when master volume is incremented by ALSA */ +CTLP_CAPI(MasterVol, source, argsJ, queryJ) +{ + int master_volume; + json_object *valueJ; + int err = 0; + + AFB_ApiNotice(source->api, "4A-HAL-UNICENS: MasterVolume=%s", json_object_to_json_string(queryJ)); + if(! initialized) { + AFB_ApiWarning(source->api, "%s: Link to unicens binder is not initialized, can't set master volume, value=%s", __func__, json_object_get_string(queryJ)); + err = -1; + goto Abort_Exit; + } + + if(! json_object_is_type(queryJ, json_type_array) || json_object_array_length(queryJ) <= 0) { + AFB_ApiError(source->api, "%s: invalid json (should be a non empty json array) value=%s", __func__, json_object_get_string(queryJ)); + err = -2; + goto Abort_Exit; + } + + valueJ = json_object_array_get_idx(queryJ, 0); + if(! json_object_is_type(valueJ, json_type_int)) { + AFB_ApiError(source->api, "%s: invalid json (should be an array of int) value=%s", __func__, json_object_get_string(queryJ)); + err = -3; + goto Abort_Exit; + } + + master_volume = json_object_get_int(valueJ); + wrap_volume_master(source->api, master_volume); + +Abort_Exit: + err = 0; /* avoid returning non-zero value, to force loading the plugin */ + return err; +} + + +/* not used at the moment, disabled in JSON configuration */ +CTLP_CAPI(PCMVol, source, argsJ, queryJ) +{ + AFB_ApiNotice(source->api, "4A-HAL-UNICENS: PCMVolume=%s", json_object_to_json_string(queryJ)); + return 0; +} + + +/* Is called on UNICENS events */ +CTLP_CAPI(Events, source, argsJ, queryJ) +{ + uint16_t node = 0U; + bool available = false; + int err = 0; + json_object *j_tmp = NULL; + + AFB_ApiError(source->api, "4A-HAL-UNICENS: receiving event query=%s", json_object_to_json_string(queryJ)); + + if (initialized == 0) { + AFB_ApiError(source->api, "4A-HAL-UNICENS: Not initialized while receiving event query=%s", json_object_to_json_string(queryJ)); + err = 0; + goto Abort_Exit; + } + + if (json_object_object_get_ex(queryJ, "node", &j_tmp)) { + node = (uint16_t)json_object_get_int(j_tmp); + } + else { + err = -1; + } + + if (json_object_object_get_ex(queryJ, "available", &j_tmp)) { + available = (bool)json_object_get_boolean(j_tmp); + } + else { + err = -2; + } + + if(err == 0) { + AFB_ApiNotice(source->api, "4A-HAL-UNICENS: Node-Availability: node=0x%03X, available=%d", node, available); + wrap_volume_node_avail(source->api, node, available); + } + else { + AFB_ApiError(source->api, "4A-HAL-UNICENS: Failed to parse events query=%s", json_object_to_json_string(queryJ)); + } + +Abort_Exit: + err = 0; /* avoid returning non-zero value now */ + return err; +} diff --git a/plugin/unicens-output/ucs2-vol/CMakeLists.txt b/plugin/unicens-output/ucs2-vol/CMakeLists.txt new file mode 100644 index 0000000..c734639 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/CMakeLists.txt @@ -0,0 +1,26 @@ +########################################################################### +# Copyright 2015, 2016, 2017 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. +########################################################################### + + + +# Define subproject targets +ADD_SUBDIRECTORY(src) + + + + diff --git a/plugin/unicens-output/ucs2-vol/inc/device_container.h b/plugin/unicens-output/ucs2-vol/inc/device_container.h new file mode 100644 index 0000000..9fabdb5 --- /dev/null +++ b/plugin/unicens-output/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 . + * + * 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(); + void ChangeNodeAvailable(uint16_t address, bool available); + +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/plugin/unicens-output/ucs2-vol/inc/device_value.h b/plugin/unicens-output/ucs2-vol/inc/device_value.h new file mode 100644 index 0000000..ef57003 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/inc/device_value.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 . + * + * 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 +#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, + DEVICE_VAL_FIBERDYNE_MASTER = 3 + +}; + +class CDeviceValue { +public: + CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key, bool is_i2c); + 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 + bool FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr); + + void SetAvailable(bool active){this->_is_available = active; _actual_value = 0x01u;} + bool IsAvailable() {return this->_is_available;} + uint16_t GetAddress() {return this->_address;} + +private: + void ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]); + void HandleI2cResult(uint8_t result); + static void OnI2cResult(uint8_t result, void *obj_ptr); + + bool _is_available; // related node is available + bool _is_busy; // do not update while busy + bool _is_i2c; + 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 _transmitted_value;// value pending during transmission + uint8_t _actual_value; // value set and confirmed via network + uint8_t _tx_payload[20]; + uint8_t _tx_payload_sz; + + lib_most_volume_writei2c_result_cb_t _result_fptr; + void *_result_user_ptr; +}; + +#endif /* DEVICEPROPERTY_H */ + diff --git a/plugin/unicens-output/ucs2-vol/inc/libmostvolume.h b/plugin/unicens-output/ucs2-vol/inc/libmostvolume.h new file mode 100644 index 0000000..5335754 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/inc/libmostvolume.h @@ -0,0 +1,114 @@ +/* + * 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 . + * + * 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 + + +#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 int (*lib_most_volume_sendmessage_cb_t)(uint16_t node, uint16_t msgid, uint8_t *data_ptr, uint8_t data_sz); + +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_sendmessage_cb_t sendmsg_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); + +/** Must be called when the availability of a node has changed + * \param address The node address + * \param available Availability: 0 - not available, 1 - available + * \return '0' on success, otherwise value >'0'. + */ +extern uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available); + +/** 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/plugin/unicens-output/ucs2-vol/inc/setup.h b/plugin/unicens-output/ucs2-vol/inc/setup.h new file mode 100644 index 0000000..3be8bf4 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/inc/setup.h @@ -0,0 +1,73 @@ +/* + * 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 . + * + * 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(); + void SetNodeAvailable(uint16_t address, bool available); + +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; + + CDeviceValue _volume_amp_510_m; + + 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/plugin/unicens-output/ucs2-vol/src/CMakeLists.txt b/plugin/unicens-output/ucs2-vol/src/CMakeLists.txt new file mode 100644 index 0000000..1be7184 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/src/CMakeLists.txt @@ -0,0 +1,39 @@ +########################################################################### +# Copyright 2015, 2016, 2017 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. +########################################################################### + +# 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/plugin/unicens-output/ucs2-vol/src/device_container.cpp b/plugin/unicens-output/ucs2-vol/src/device_container.cpp new file mode 100644 index 0000000..f804a42 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/src/device_container.cpp @@ -0,0 +1,194 @@ +/* + * 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 . + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#include +#include "device_container.h" + +#define DEVCONT_TIME_RETRIGGER (uint16_t)30U +#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]->GetType() == DEVICE_VAL_FIBERDYNE_MASTER) + { + _values_pptr[_idx_processing]->FireControlMessage(this->_init_ptr->sendmsg_cb); + } + else + { + if (_values_pptr[_idx_processing]->FireUpdateMessage(this->_init_ptr->writei2c_cb, + &OnI2cResult, + this)) + { + this->_tx_busy = true; + error = false; + break; + } + else + { + error = true; + break; + } + } + } + } + + if (error) + { + RequestService(DEVCONT_TIME_RETRIGGER); + } +} + +void CDeviceContainer::HandleI2cResult(uint8_t result) +{ + this->_tx_busy = false; + if (result == 0) + this->RequestService(DEVCONT_TIME_NOW); + else + this->RequestService(DEVCONT_TIME_RETRIGGER); +} + +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); + } + } +} + +void CDeviceContainer::ChangeNodeAvailable(uint16_t address, bool available) +{ + uint16_t idx; + + for (idx = 0U; idx < this->_values_sz; idx++) + { + if (this->_values_pptr[idx]->GetAddress() == address) + { + this->_values_pptr[idx]->SetAvailable(available); + } + } + + if (available) + { + RequestService(DEVCONT_TIME_RETRIGGER); + } +} diff --git a/plugin/unicens-output/ucs2-vol/src/device_value.cpp b/plugin/unicens-output/ucs2-vol/src/device_value.cpp new file mode 100644 index 0000000..4031778 --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/src/device_value.cpp @@ -0,0 +1,175 @@ +/* + * 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 . + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ +#include +#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, bool is_i2c) +{ + this->_is_available = false; + this->_is_busy = false; + this->_address = address; + this->_is_i2c = is_i2c; + this->_target_value = 0x01u; + this->_actual_value = 0x01u; + + this->_result_fptr = NULL; + this->_result_user_ptr = NULL; + + 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 + + if (type == DEVICE_VAL_FIBERDYNE_MASTER) + _tx_payload_sz = 2u; + else + _tx_payload_sz = 3u; +} + +CDeviceValue::~CDeviceValue() +{ +} + +void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]) +{ + uint16_t tmp = MUTE_VALUE; + + if (type == DEVICE_VAL_FIBERDYNE_MASTER) + { + tx_payload[0] = 0x00U; + tx_payload[1] = value; + + return; + } + + 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->_is_available && !this->_is_busy && (this->_target_value != this->_actual_value)) + { + return true; + } + + return false; +} + +bool CDeviceValue::FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr) +{ + ApplyMostValue(this->_target_value, _type, _tx_payload); + + if (this->_is_available && !this->_is_busy) + { + sendmsg_fptr(this->_address, 0x100U, _tx_payload, _tx_payload_sz); + + this->_actual_value = this->_target_value; + } + + return true; +} + +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 = -1; + ApplyMostValue(this->_target_value, _type, _tx_payload); + + if (this->_is_available && !this->_is_busy) + { + ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, + &OnI2cResult, + this); + + if (ret == 0) + { + this->_transmitted_value = this->_target_value; + this->_is_busy = true; + this->_result_fptr = result_fptr; + this->_result_user_ptr = result_user_ptr; + return true; + } + } + + return false; +} + +void CDeviceValue::HandleI2cResult(uint8_t result) +{ + if (result == 0) + { + /* transmission succeeded - now apply transmitted value */ + this->_actual_value = this->_transmitted_value; + } + + if (this->_result_fptr) + { + /* notify container */ + this->_result_fptr(result, this->_result_user_ptr); + } + + this->_result_fptr = NULL; + this->_result_user_ptr = NULL; + this->_is_busy = false; +} + +void CDeviceValue::OnI2cResult(uint8_t result, void *obj_ptr) +{ + ((CDeviceValue*)obj_ptr)->HandleI2cResult(result); +} diff --git a/plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp b/plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp new file mode 100644 index 0000000..519e2cf --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp @@ -0,0 +1,99 @@ +/* + * 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 . + * + * 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 */ + +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 uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available) +{ + uint8_t success = 1U; + + if (_running) + { + CSetup::GetInstance()->SetNodeAvailable(address, available); + 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/plugin/unicens-output/ucs2-vol/src/setup.cpp b/plugin/unicens-output/ucs2-vol/src/setup.cpp new file mode 100644 index 0000000..ad841ab --- /dev/null +++ b/plugin/unicens-output/ucs2-vol/src/setup.cpp @@ -0,0 +1,96 @@ +/* + * 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 . + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ +#include +#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, true), + _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT, true), + _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT, true), + _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true), + _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT, true), + _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT, true), + _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true), + _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER, true), + _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB, true), + _volume_amp_510_m(0x510U, DEVICE_VAL_FIBERDYNE_MASTER, LIB_MOST_VOLUME_MASTER, false), + _value_container() +{ + static CDeviceValue* value_list[10] = { &_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, + &_volume_amp_510_m}; + + _value_container.RegisterValues(value_list, 10U); +} + +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(); +} + +void CSetup::SetNodeAvailable(uint16_t address, bool available) +{ + _value_container.ChangeNodeAvailable(address, available); +} diff --git a/plugin/unicens-output/wrap_unicens.c b/plugin/unicens-output/wrap_unicens.c new file mode 100644 index 0000000..382eea7 --- /dev/null +++ b/plugin/unicens-output/wrap_unicens.c @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2018, "IoT.bzh", Microchip Technology Inc. and its subsidiaries. + * Author Jonathan Aillet + * Author Tobias Jahnke + * Contrib 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. + * + */ + +#define _GNU_SOURCE + +#include +#include +#include + +#include + +#include + +#include "wrap_unicens.h" + +typedef struct async_job_ { + wrap_ucs_result_cb_t result_fptr; + void *result_user_ptr; +} async_job_t; + +typedef struct parse_result_ { + int done; + char *str_result; +} parse_result_t; + +/* + * Subscribes to unicens2-binding events. + * \return Returns 0 if successful, otherwise != 0". + */ +extern int wrap_ucs_subscribe_sync(AFB_ApiT apiHandle) +{ + int err; + + json_object *j_response, *j_query = NULL; + + /* Build an empty JSON object */ + if((err = wrap_json_pack(&j_query, "{}"))) { + AFB_ApiError(apiHandle, "Failed to create subscribe json object"); + return err; + } + + if((err = AFB_ServiceSync(apiHandle, "UNICENS", "subscribe", j_query, &j_response))) { + AFB_ApiError(apiHandle, "Fail subscribing to UNICENS events"); + return err; + } + else { + AFB_ApiNotice(apiHandle, "Subscribed to UNICENS events, res=%s", json_object_to_json_string(j_response)); + json_object_put(j_response); + } + + return 0; +} + +/* + * Write I2C command to a network node. + * \param node Node address + * \param ata_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_sync(AFB_ApiT apiHandle, uint16_t node, uint8_t *data_ptr, uint8_t data_sz) +{ + int err; + uint8_t cnt; + + json_object *j_response, *j_query, *j_array = NULL; + + j_query = json_object_new_object(); + j_array = json_object_new_array(); + + if(! j_query || ! j_array) { + AFB_ApiError(apiHandle, "Failed to create writei2c json objects"); + return -1; + } + + for(cnt = 0U; cnt < data_sz; cnt++) + json_object_array_add(j_array, json_object_new_int(data_ptr[cnt])); + + json_object_object_add(j_query, "node", json_object_new_int(node)); + json_object_object_add(j_query, "data", j_array); + + if((err = AFB_ServiceSync(apiHandle, "UNICENS", "writei2c", j_query, &j_response))) { + AFB_ApiError(apiHandle, "Failed to call writei2c_sync"); + return err; + } + else { + AFB_ApiInfo(apiHandle, "Called writei2c_sync, res=%s", json_object_to_json_string(j_response)); + json_object_put(j_response); + } + + return 0; +} + +extern int wrap_ucs_sendmessage_sync(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz) { + + json_object *j_query, *j_response = NULL; + int err = 1; + int node = (int)src_addr; + int msgid = (int)msg_id; + size_t data_size = (size_t)data_sz; + + AFB_ApiNotice(unicensHalApiHandle, "--- HAL triggering send message ---"); + + /* skip data attribute if possible, wrap_json_unpack may fail to deal with + * an empty Base64 string */ + if (data_size > 0) + wrap_json_pack(&j_query, "{s:i, s:i, s:Y}", "node", node, "msgid", msgid, "data", data_ptr, data_size); + else + wrap_json_pack(&j_query, "{s:i, s:i}", "node", node, "msgid", msgid); + + AFB_ApiNotice(unicensHalApiHandle, "wrap_ucs_sendmessage: jquery=%s", json_object_to_json_string(j_query)); + + err = AFB_ServiceSync(unicensHalApiHandle, "UNICENS", "sendmessage", j_query, &j_response); + + if (err != 0) { + AFB_ApiError(unicensHalApiHandle, "Failed to call wrap_ucs_sendmessage ret=%d", err); + } + else { + AFB_ApiNotice(unicensHalApiHandle, "Called wrap_ucs_sendmessage, successful"); + } + + if (j_response != NULL) { + AFB_ApiNotice(unicensHalApiHandle, "wrap_ucs_sendmessage, response=%s", json_object_to_json_string(j_response)); + json_object_put(j_response); + } + + return err; +} + +/* ---------------------------- ASYNCHRONOUS API ---------------------------- */ +static void wrap_ucs_i2cwrite_cb(void *closure, int status, struct json_object *j_result, AFB_ApiT apiHandle) +{ + async_job_t *job_ptr; + + AFB_ApiInfo(apiHandle, "%s: closure=%p status=%d, res=%s", __func__, closure, status, json_object_to_json_string(j_result)); + + if(closure) { + job_ptr = (async_job_t *) closure; + + if(job_ptr->result_fptr) + job_ptr->result_fptr((uint8_t) abs(status), 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, + wrap_ucs_result_cb_t result_fptr, + void *result_user_ptr) +{ + uint8_t cnt; + + json_object *j_query, *j_array = NULL; + async_job_t *job_ptr = NULL; + + j_query = json_object_new_object(); + j_array = json_object_new_array(); + + if(! j_query || ! j_array) { + AFB_ApiError(unicensHalApiHandle, "Failed to create writei2c json objects"); + return -1; + } + + for(cnt = 0U; cnt < data_sz; cnt++) + json_object_array_add(j_array, json_object_new_int(data_ptr[cnt])); + + 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) { + AFB_ApiError(unicensHalApiHandle, "Failed to create async job object"); + json_object_put(j_query); + return -2; + } + + job_ptr->result_fptr = result_fptr; + job_ptr->result_user_ptr = result_user_ptr; + + AFB_ServiceCall(unicensHalApiHandle, "UNICENS", "writei2c", j_query, wrap_ucs_i2cwrite_cb, job_ptr); + return 0; +} + diff --git a/plugin/unicens-output/wrap_unicens.h b/plugin/unicens-output/wrap_unicens.h new file mode 100644 index 0000000..6199476 --- /dev/null +++ b/plugin/unicens-output/wrap_unicens.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2018,, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". + * Author Tobias Jahnke + * Author Jonathan Aillet + * Contrib 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. + * + */ + +#pragma once + +#include +#include +#include + +#include + +extern AFB_ApiT unicensHalApiHandle; + +/* 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(AFB_ApiT apiHandle); +extern int wrap_ucs_i2cwrite_sync(AFB_ApiT apiHandle, uint16_t node, uint8_t *data_ptr, uint8_t data_sz); +extern int wrap_ucs_sendmessage_sync(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz); + diff --git a/plugin/unicens-output/wrap_volume.c b/plugin/unicens-output/wrap_volume.c new file mode 100644 index 0000000..9c3d7a1 --- /dev/null +++ b/plugin/unicens-output/wrap_volume.c @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2018, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". + * Author Tobias Jahnke + * Author Jonathan Aillet + * Contrib 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. + * + */ + +#define _GNU_SOURCE + +#include +#include +#include + +#include +#include + +#include + +#include + +#include "wrap_volume.h" +#include "wrap_unicens.h" + +#include "libmostvolume.h" + +#define MAX_PCM_CHANNELS 6 + +static int wrap_volume_service_timeout_cb(sd_event_source* source, + uint64_t timer __attribute__((__unused__)), + void *userdata __attribute__((__unused__))) +{ + uint8_t ret; + + sd_event_source_unref(source); + + if((ret = lib_most_volume_service())) + AFB_ApiError(unicensHalApiHandle, "lib_most_volume_service returns %d", ret); + + return 0; +} + +static void wrap_volume_service_cb(uint16_t timeout) +{ + uint64_t usec; + + sd_event_now(AFB_GetEventLoop(unicensHalApiHandle), CLOCK_BOOTTIME, &usec); + + sd_event_add_time(AFB_GetEventLoop(unicensHalApiHandle), + NULL, + CLOCK_MONOTONIC, + usec + (timeout*1000), + 250, + wrap_volume_service_timeout_cb, + NULL); +} + +/* Retrieves a new value adapted to a new maximum value. Minimum value is + * always zero. */ +static int wrap_volume_calculate(int value, int max_old, int max_new) +{ + if(value > max_old) + value = max_old; + + value = (value * max_new) / max_old; /* calculate range: 0..255 */ + assert(value <= max_new); + + return value; +} + +extern int wrap_volume_init(void) +{ + uint8_t ret = 0; + + lib_most_volume_init_t mv_init; + + mv_init.writei2c_cb = &wrap_ucs_i2cwrite; + mv_init.service_cb = &wrap_volume_service_cb; + mv_init.sendmsg_cb = &wrap_ucs_sendmessage_sync; + + ret = lib_most_volume_init(&mv_init); + + return -ret; +} + +extern int wrap_volume_master(AFB_ApiT apiHandle, int volume) +{ + int ret; + + if((ret = lib_most_volume_set(LIB_MOST_VOLUME_MASTER, + (uint8_t) wrap_volume_calculate(volume, 100, 255)))) { + AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); + } + + return -ret; +} + +extern int wrap_volume_pcm(AFB_ApiT apiHandle, int *volume_ptr, int volume_sz) +{ + int cnt, new_value, ret = 0; + + assert(volume_ptr != NULL); + assert(volume_sz <= MAX_PCM_CHANNELS); + + for(cnt = 0; cnt < volume_sz; cnt ++) { + new_value = wrap_volume_calculate(volume_ptr[cnt], 100, 255); + + if((ret = lib_most_volume_set((enum lib_most_volume_channel_t) cnt, (uint8_t) new_value))) { + AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); + break; + } + } + + return -ret; +} + +extern int wrap_volume_node_avail(AFB_ApiT apiHandle, int node, int available) +{ + int ret; + + if((ret = lib_most_volume_node_available((uint16_t) node, (uint8_t) available))) + AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); + + return -ret; +} + diff --git a/plugin/unicens-output/wrap_volume.h b/plugin/unicens-output/wrap_volume.h new file mode 100644 index 0000000..7cdcd93 --- /dev/null +++ b/plugin/unicens-output/wrap_volume.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2018, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". + * Author Tobias Jahnke + * Author Jonathan Aillet + * Contrib 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. + * + */ + +#pragma once + +#include +#include +#include + +#include + +#include + +extern int wrap_volume_init(void); +extern int wrap_volume_master(AFB_ApiT apiHandle, int volume); +extern int wrap_volume_pcm(AFB_ApiT apiHandle, int *volume_ptr, int volume_sz); +extern int wrap_volume_node_avail(AFB_ApiT apiHandle, int node, int available); \ No newline at end of file diff --git a/plugin/wrap_unicens.c b/plugin/wrap_unicens.c deleted file mode 100644 index 382eea7..0000000 --- a/plugin/wrap_unicens.c +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright (C) 2018, "IoT.bzh", Microchip Technology Inc. and its subsidiaries. - * Author Jonathan Aillet - * Author Tobias Jahnke - * Contrib 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. - * - */ - -#define _GNU_SOURCE - -#include -#include -#include - -#include - -#include - -#include "wrap_unicens.h" - -typedef struct async_job_ { - wrap_ucs_result_cb_t result_fptr; - void *result_user_ptr; -} async_job_t; - -typedef struct parse_result_ { - int done; - char *str_result; -} parse_result_t; - -/* - * Subscribes to unicens2-binding events. - * \return Returns 0 if successful, otherwise != 0". - */ -extern int wrap_ucs_subscribe_sync(AFB_ApiT apiHandle) -{ - int err; - - json_object *j_response, *j_query = NULL; - - /* Build an empty JSON object */ - if((err = wrap_json_pack(&j_query, "{}"))) { - AFB_ApiError(apiHandle, "Failed to create subscribe json object"); - return err; - } - - if((err = AFB_ServiceSync(apiHandle, "UNICENS", "subscribe", j_query, &j_response))) { - AFB_ApiError(apiHandle, "Fail subscribing to UNICENS events"); - return err; - } - else { - AFB_ApiNotice(apiHandle, "Subscribed to UNICENS events, res=%s", json_object_to_json_string(j_response)); - json_object_put(j_response); - } - - return 0; -} - -/* - * Write I2C command to a network node. - * \param node Node address - * \param ata_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_sync(AFB_ApiT apiHandle, uint16_t node, uint8_t *data_ptr, uint8_t data_sz) -{ - int err; - uint8_t cnt; - - json_object *j_response, *j_query, *j_array = NULL; - - j_query = json_object_new_object(); - j_array = json_object_new_array(); - - if(! j_query || ! j_array) { - AFB_ApiError(apiHandle, "Failed to create writei2c json objects"); - return -1; - } - - for(cnt = 0U; cnt < data_sz; cnt++) - json_object_array_add(j_array, json_object_new_int(data_ptr[cnt])); - - json_object_object_add(j_query, "node", json_object_new_int(node)); - json_object_object_add(j_query, "data", j_array); - - if((err = AFB_ServiceSync(apiHandle, "UNICENS", "writei2c", j_query, &j_response))) { - AFB_ApiError(apiHandle, "Failed to call writei2c_sync"); - return err; - } - else { - AFB_ApiInfo(apiHandle, "Called writei2c_sync, res=%s", json_object_to_json_string(j_response)); - json_object_put(j_response); - } - - return 0; -} - -extern int wrap_ucs_sendmessage_sync(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz) { - - json_object *j_query, *j_response = NULL; - int err = 1; - int node = (int)src_addr; - int msgid = (int)msg_id; - size_t data_size = (size_t)data_sz; - - AFB_ApiNotice(unicensHalApiHandle, "--- HAL triggering send message ---"); - - /* skip data attribute if possible, wrap_json_unpack may fail to deal with - * an empty Base64 string */ - if (data_size > 0) - wrap_json_pack(&j_query, "{s:i, s:i, s:Y}", "node", node, "msgid", msgid, "data", data_ptr, data_size); - else - wrap_json_pack(&j_query, "{s:i, s:i}", "node", node, "msgid", msgid); - - AFB_ApiNotice(unicensHalApiHandle, "wrap_ucs_sendmessage: jquery=%s", json_object_to_json_string(j_query)); - - err = AFB_ServiceSync(unicensHalApiHandle, "UNICENS", "sendmessage", j_query, &j_response); - - if (err != 0) { - AFB_ApiError(unicensHalApiHandle, "Failed to call wrap_ucs_sendmessage ret=%d", err); - } - else { - AFB_ApiNotice(unicensHalApiHandle, "Called wrap_ucs_sendmessage, successful"); - } - - if (j_response != NULL) { - AFB_ApiNotice(unicensHalApiHandle, "wrap_ucs_sendmessage, response=%s", json_object_to_json_string(j_response)); - json_object_put(j_response); - } - - return err; -} - -/* ---------------------------- ASYNCHRONOUS API ---------------------------- */ -static void wrap_ucs_i2cwrite_cb(void *closure, int status, struct json_object *j_result, AFB_ApiT apiHandle) -{ - async_job_t *job_ptr; - - AFB_ApiInfo(apiHandle, "%s: closure=%p status=%d, res=%s", __func__, closure, status, json_object_to_json_string(j_result)); - - if(closure) { - job_ptr = (async_job_t *) closure; - - if(job_ptr->result_fptr) - job_ptr->result_fptr((uint8_t) abs(status), 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, - wrap_ucs_result_cb_t result_fptr, - void *result_user_ptr) -{ - uint8_t cnt; - - json_object *j_query, *j_array = NULL; - async_job_t *job_ptr = NULL; - - j_query = json_object_new_object(); - j_array = json_object_new_array(); - - if(! j_query || ! j_array) { - AFB_ApiError(unicensHalApiHandle, "Failed to create writei2c json objects"); - return -1; - } - - for(cnt = 0U; cnt < data_sz; cnt++) - json_object_array_add(j_array, json_object_new_int(data_ptr[cnt])); - - 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) { - AFB_ApiError(unicensHalApiHandle, "Failed to create async job object"); - json_object_put(j_query); - return -2; - } - - job_ptr->result_fptr = result_fptr; - job_ptr->result_user_ptr = result_user_ptr; - - AFB_ServiceCall(unicensHalApiHandle, "UNICENS", "writei2c", j_query, wrap_ucs_i2cwrite_cb, job_ptr); - return 0; -} - diff --git a/plugin/wrap_unicens.h b/plugin/wrap_unicens.h deleted file mode 100644 index 6199476..0000000 --- a/plugin/wrap_unicens.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2018,, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". - * Author Tobias Jahnke - * Author Jonathan Aillet - * Contrib 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. - * - */ - -#pragma once - -#include -#include -#include - -#include - -extern AFB_ApiT unicensHalApiHandle; - -/* 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(AFB_ApiT apiHandle); -extern int wrap_ucs_i2cwrite_sync(AFB_ApiT apiHandle, uint16_t node, uint8_t *data_ptr, uint8_t data_sz); -extern int wrap_ucs_sendmessage_sync(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz); - diff --git a/plugin/wrap_volume.c b/plugin/wrap_volume.c deleted file mode 100644 index 9c3d7a1..0000000 --- a/plugin/wrap_volume.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (C) 2018, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". - * Author Tobias Jahnke - * Author Jonathan Aillet - * Contrib 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. - * - */ - -#define _GNU_SOURCE - -#include -#include -#include - -#include -#include - -#include - -#include - -#include "wrap_volume.h" -#include "wrap_unicens.h" - -#include "libmostvolume.h" - -#define MAX_PCM_CHANNELS 6 - -static int wrap_volume_service_timeout_cb(sd_event_source* source, - uint64_t timer __attribute__((__unused__)), - void *userdata __attribute__((__unused__))) -{ - uint8_t ret; - - sd_event_source_unref(source); - - if((ret = lib_most_volume_service())) - AFB_ApiError(unicensHalApiHandle, "lib_most_volume_service returns %d", ret); - - return 0; -} - -static void wrap_volume_service_cb(uint16_t timeout) -{ - uint64_t usec; - - sd_event_now(AFB_GetEventLoop(unicensHalApiHandle), CLOCK_BOOTTIME, &usec); - - sd_event_add_time(AFB_GetEventLoop(unicensHalApiHandle), - NULL, - CLOCK_MONOTONIC, - usec + (timeout*1000), - 250, - wrap_volume_service_timeout_cb, - NULL); -} - -/* Retrieves a new value adapted to a new maximum value. Minimum value is - * always zero. */ -static int wrap_volume_calculate(int value, int max_old, int max_new) -{ - if(value > max_old) - value = max_old; - - value = (value * max_new) / max_old; /* calculate range: 0..255 */ - assert(value <= max_new); - - return value; -} - -extern int wrap_volume_init(void) -{ - uint8_t ret = 0; - - lib_most_volume_init_t mv_init; - - mv_init.writei2c_cb = &wrap_ucs_i2cwrite; - mv_init.service_cb = &wrap_volume_service_cb; - mv_init.sendmsg_cb = &wrap_ucs_sendmessage_sync; - - ret = lib_most_volume_init(&mv_init); - - return -ret; -} - -extern int wrap_volume_master(AFB_ApiT apiHandle, int volume) -{ - int ret; - - if((ret = lib_most_volume_set(LIB_MOST_VOLUME_MASTER, - (uint8_t) wrap_volume_calculate(volume, 100, 255)))) { - AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); - } - - return -ret; -} - -extern int wrap_volume_pcm(AFB_ApiT apiHandle, int *volume_ptr, int volume_sz) -{ - int cnt, new_value, ret = 0; - - assert(volume_ptr != NULL); - assert(volume_sz <= MAX_PCM_CHANNELS); - - for(cnt = 0; cnt < volume_sz; cnt ++) { - new_value = wrap_volume_calculate(volume_ptr[cnt], 100, 255); - - if((ret = lib_most_volume_set((enum lib_most_volume_channel_t) cnt, (uint8_t) new_value))) { - AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); - break; - } - } - - return -ret; -} - -extern int wrap_volume_node_avail(AFB_ApiT apiHandle, int node, int available) -{ - int ret; - - if((ret = lib_most_volume_node_available((uint16_t) node, (uint8_t) available))) - AFB_ApiError(apiHandle, "%s: volume library not ready.", __func__); - - return -ret; -} - diff --git a/plugin/wrap_volume.h b/plugin/wrap_volume.h deleted file mode 100644 index 7cdcd93..0000000 --- a/plugin/wrap_volume.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2018, Microchip Technology Inc. and its subsidiaries, "IoT.bzh". - * Author Tobias Jahnke - * Author Jonathan Aillet - * Contrib 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. - * - */ - -#pragma once - -#include -#include -#include - -#include - -#include - -extern int wrap_volume_init(void); -extern int wrap_volume_master(AFB_ApiT apiHandle, int volume); -extern int wrap_volume_pcm(AFB_ApiT apiHandle, int *volume_ptr, int volume_sz); -extern int wrap_volume_node_avail(AFB_ApiT apiHandle, int node, int available); \ No newline at end of file -- cgit 1.2.3-korg