diff options
29 files changed, 2360 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..49dcee7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "conf.d/app-templates"] + path = conf.d/app-templates + url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates +[submodule "afb-helpers"] + path = afb-helpers + url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8574972 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +########################################################################### +# Copyright 2015, 2016, 2017, 2018 IoT.bzh +# +# author: Romain Forlot <romain.forlot@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + +include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) diff --git a/afb-helpers b/afb-helpers new file mode 160000 +Subproject f0ce5b665dd33b285d723720c16ac0542cde4e6 diff --git a/cfg/CMakeLists.txt b/cfg/CMakeLists.txt new file mode 100644 index 0000000..1bf4320 --- /dev/null +++ b/cfg/CMakeLists.txt @@ -0,0 +1,31 @@ +########################################################################### +# Copyright 2017, 2018 IoT.bzh +# +# author: Fulup Ar Foll <fulup@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +################################################## +# Control Policy Config file +################################################## +PROJECT_TARGET_ADD(4a-hal-cfg-unicens) + + file(GLOB CONF_FILES "*.json") + + add_input_files("${CONF_FILES}") + + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + LABELS "BINDING-CONFIG" + OUTPUT_NAME ${TARGET_NAME} + ) diff --git a/cfg/hal-4a-unicens.json b/cfg/hal-4a-unicens.json new file mode 100644 index 0000000..fad22e1 --- /dev/null +++ b/cfg/hal-4a-unicens.json @@ -0,0 +1,237 @@ +{ + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "metadata": { + "uid": "/dev/snd/by-id/usb-Microchip-SMSC_OS81118_0000-0000004C-02", + "version": "0.9", + "api": "4a-hal-unicens", + "require": [ "alsacore", "UNICENS", "smixer" ], + "info": "4a hal for MICROCHIP MOST sound card controlled by UNICENS binding", + "author": "Jonathan Aillet", + "date": "2018-06-15" + }, + "resources": [ + { + "uid": "hal-unicens", + "info": "Unicens hal plugin to handle communication with unicens binder", + "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal", + "libs": ["hal-unicens.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" + } + ], + "events": [ + { + "uid": "UNICENS/node-availibility", + "action": "plugin://hal-unicens#Events" + } + ], + "halmap": [ + { + "uid": "agl-master-playback-volume", + "info": "Sets master playback volume", + "alsa": { + "name": "Master Playback Volume", + "value": 80, + "create": + { + "type": "INTEGER", + "count": 1, + "minval": 0, + "maxval": 100, + "step": 1 + } + }, + "action": "plugin://hal-unicens#MasterVol" + }, + { + "uid": "agl-pcm-playback-volume", + "info": "Sets PCM playback volume", + "alsa": { + "name": "PCM Playback Volume", + "value": 100, + "create": + { + "type": "INTEGER", + "count": 1, + "minval": 0, + "maxval": 100, + "step": 1 + } + }, + "action": "plugin://hal-unicens#PCMVol" + } + ], + "halmixer": { + "uid": "unicens", + "mixerapi": "smixer", + "ramps": [ + { + "uid": "ramp-fast", + "delay": 50, + "up": 2, + "down": 10 + }, + { + "uid": "ramp-normal", + "delay": 50, + "up": 2, + "down": 4 + }, + { + "uid": "ramp-slow", + "delay": 100, + "up": 1, + "down": 1 + } + ], + "playbacks" : { + "uid": "UNICENS", + "path": "/dev/snd/by-id/usb-Microchip-SMSC_OS81118_0000-0000004C-02", + "params": { + "rate": 48000 + }, + "sink": { + "channels": [ + { + "uid": "front-right", + "port": 0 + }, + { + "uid": "front-left", + "port": 1 + }, + { + "uid": "middle-right", + "port": 2 + }, + { + "uid": "middle-left", + "port": 3 + }, + { + "uid": "back-right", + "port": 4 + }, + { + "uid": "back-left", + "port": 5 + } + ] + } + }, + "zones": [ + { + "uid": "full-stereo", + "sink": [ + { + "target": "front-right", + "channel": 0 + }, + { + "target": "front-left", + "channel": 1 + }, + { + "target": "middle-right", + "channel": 0 + }, + { + "target": "middle-left", + "channel": 1 + }, + { + "target": "back-right", + "channel": 0 + }, + { + "target": "back-left", + "channel": 1 + } + ] + }, + { + "uid": "front-seats", + "sink": [ + { + "target": "front-right", + "channel": 0 + }, + { + "target": "front-left", + "channel": 1 + } + ] + }, + { + "uid": "middle-seats", + "sink": [ + { + "target": "middle-right", + "channel": 0 + }, + { + "target": "middle-left", + "channel": 1 + } + ] + }, + { + "uid": "back-seats", + "sink": [ + { + "target": "back-right", + "channel": 0 + }, + { + "target": "back-left", + "channel": 1 + } + ] + } + ], + "streams": [ + { + "uid": "multimedia", + "verb": "multimedia", + "zone": "full-stereo", + "volume": 60, + "mute": false, + "params": { + "rate": 48000 + } + }, + { + "uid": "navigation", + "verb": "navigation", + "zone": "front-seats", + "volume": 70, + "mute": false, + "params": { + "rate": 48000 + } + }, + { + "uid": "emergency", + "verb": "emergency", + "zone": "front-seats", + "volume": 60, + "mute": false, + "params": { + "rate": 48000 + } + } + ] + } +} diff --git a/conf.d/app-templates b/conf.d/app-templates new file mode 160000 +Subproject 3dc85ecc9693a3a4af6d1143507f56b6800d523 diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild new file mode 100755 index 0000000..83097ab --- /dev/null +++ b/conf.d/autobuild/agl/autobuild @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# Copyright (C) 2015, 2016 "IoT.bzh" +# Author "Romain Forlot" <romain.forlot@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +THISFILE := $(lastword $(MAKEFILE_LIST)) +BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) +DEST := ${BUILD_DIR}/target + +.PHONY: all clean distclean configure build package help update + +all: help + +help: + @echo "List of targets available:" + @echo "" + @echo "- all" + @echo "- clean" + @echo "- distclean" + @echo "- configure" + @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- package: output a widget file '*.wgt'" + @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" + @echo "" + @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" + @echo "Don't use your build dir as DEST as wgt file is generated at this location" + +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + +clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean + +distclean: + @rm -rf ${BUILD_DIR} + +configure: ${BUILD_DIR}/Makefile + +build: configure + @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all + +package: build + @mkdir -p ${BUILD_DIR}/$@/bin + @mkdir -p ${BUILD_DIR}/$@/etc + @mkdir -p ${BUILD_DIR}/$@/lib + @mkdir -p ${BUILD_DIR}/$@/htdocs + @mkdir -p ${BUILD_DIR}/$@/var + @cmake --build ${BUILD_DIR} --target widget + @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} + +install: build + @cmake --build ${BUILD_DIR} --target install + +${BUILD_DIR}/Makefile: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild new file mode 100755 index 0000000..83097ab --- /dev/null +++ b/conf.d/autobuild/linux/autobuild @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# Copyright (C) 2015, 2016 "IoT.bzh" +# Author "Romain Forlot" <romain.forlot@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +THISFILE := $(lastword $(MAKEFILE_LIST)) +BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) +DEST := ${BUILD_DIR}/target + +.PHONY: all clean distclean configure build package help update + +all: help + +help: + @echo "List of targets available:" + @echo "" + @echo "- all" + @echo "- clean" + @echo "- distclean" + @echo "- configure" + @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- package: output a widget file '*.wgt'" + @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory" + @echo "" + @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" + @echo "Don't use your build dir as DEST as wgt file is generated at this location" + +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + +clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean + +distclean: + @rm -rf ${BUILD_DIR} + +configure: ${BUILD_DIR}/Makefile + +build: configure + @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all + +package: build + @mkdir -p ${BUILD_DIR}/$@/bin + @mkdir -p ${BUILD_DIR}/$@/etc + @mkdir -p ${BUILD_DIR}/$@/lib + @mkdir -p ${BUILD_DIR}/$@/htdocs + @mkdir -p ${BUILD_DIR}/$@/var + @cmake --build ${BUILD_DIR} --target widget + @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} + +install: build + @cmake --build ${BUILD_DIR} --target install + +${BUILD_DIR}/Makefile: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake new file mode 100644 index 0000000..4042718 --- /dev/null +++ b/conf.d/cmake/00-debian-osconfig.cmake @@ -0,0 +1,2 @@ +list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3) +set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
\ No newline at end of file diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake new file mode 100644 index 0000000..182caeb --- /dev/null +++ b/conf.d/cmake/00-default-osconfig.cmake @@ -0,0 +1 @@ +list(APPEND PKG_REQUIRED_LIST lua>=5.3)
\ No newline at end of file diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake new file mode 100644 index 0000000..d259a21 --- /dev/null +++ b/conf.d/cmake/00-suse-config.cmake @@ -0,0 +1,3 @@ +add_definitions(-DSUSE_LUA_INCDIR) +list(APPEND PKG_REQUIRED_LIST lua>=5.3) +set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
\ No newline at end of file diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake new file mode 100644 index 0000000..10d3975 --- /dev/null +++ b/conf.d/cmake/config.cmake @@ -0,0 +1,213 @@ +########################################################################### +# Copyright 2015, 2016, 2017, 2018 IoT.bzh +# +# author: Fulup Ar Foll <fulup@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Project Info +# ------------------ +set(PROJECT_NAME 4a-hal) +set(PROJECT_PRETTY_NAME "4A-HAL") +set(PROJECT_DESCRIPTION "Hardware Abastraction Layer for AGL Audio Advanced Architecture") +set(PROJECT_VERSION "0.9") +set(PROJECT_URL "https://github.com/iotbzh/4a-hal-generic") +set(PROJECT_ICON "icon.png") +set(PROJECT_AUTHOR "Jonathan Aillet") +set(PROJECT_AUTHOR_MAIL "jonathan.aillet@iot.bzh") +set(PROJECT_LICENSE "APL2.0") +set(PROJECT_LANGUAGES "C") + +# Where are stored default templates files from submodule or subtree app-templates in your project tree +# relative to the root project directory +set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") + +# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain +# but used and must be built and linked. +# set(PROJECT_LIBDIR "libs") + +# Which directories inspect to find CMakeLists.txt target files +# set(PROJECT_SRC_DIR_PATTERN "*") + +# Compilation Mode (DEBUG, RELEASE) +# ---------------------------------- +set(USE_EFENCE 0) + +# Kernel selection if needed. You can choose between a +# mandatory version to impose a minimal version. +# Or check Kernel minimal version and just print a Warning +# about missing features and define a preprocessor variable +# to be used as preprocessor condition in code to disable +# incompatibles features. Preprocessor define is named +# KERNEL_MINIMAL_VERSION_OK. +# +# NOTE*** FOR NOW IT CHECKS KERNEL Yocto environment and +# Yocto SDK Kernel version. +# ----------------------------------------------- +#set (kernel_mandatory_version 4.8) +#set (kernel_minimal_version 4.8) + +# Compiler selection if needed. Impose a minimal version. +# ----------------------------------------------- +set (gcc_minimal_version 4.9) + +# PKG_CONFIG required packages +# ----------------------------- +set (PKG_REQUIRED_LIST + json-c + libsystemd>=222 +# afb-daemon>=6.0 # Goal + afb-daemon>=4.0 + libmicrohttpd>=0.9.55 + uuid + alsa>=1.1.2 +) + +# Prefix path where will be installed the files +# Default: /usr/local (need root permission to write in) +# ------------------------------------------------------ +#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) + +# Customize link option +# ----------------------------- +#list(APPEND link_libraries -an-option) + +# When Present LUA is used by the controller +# --------------------------------------------------------------- +set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") + +# Compilation options definition +# Use CMake generator expressions to specify only for a specific language +# Values are prefilled with default options that is currently used. +# Either separate options with ";", or each options must be quoted separately +# DO NOT PUT ALL OPTION QUOTED AT ONCE , COMPILATION COULD FAILED ! +# ---------------------------------------------------------------------------- +#set(COMPILE_OPTIONS +# -Wall +# -Wextra +# -Wconversion +# -Wno-unused-parameter +# -Wno-sign-compare +# -Wno-sign-conversion +# -Werror=maybe-uninitialized +# -Werror=implicit-function-declaration +# -ffunction-sections +# -fdata-sections +# -fPIC +# CACHE STRING "Compilation flags") +#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.") +#set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.") +#set(PROFILING_COMPILE_OPTIONS +# -g +# -O0 +# -pg +# -Wp,-U_FORTIFY_SOURCE +# CACHE STRING "Compilation flags for PROFILING build type.") +#set(DEBUG_COMPILE_OPTIONS +# -g +# -ggdb +# -Wp,-U_FORTIFY_SOURCE +# CACHE STRING "Compilation flags for DEBUG build type.") +#set(CCOV_COMPILE_OPTIONS +# -g +# -O2 +# --coverage +# CACHE STRING "Compilation flags for CCOV build type.") +#set(RELEASE_COMPILE_OPTIONS +# -g +# -O2 +# CACHE STRING "Compilation flags for RELEASE build type.") + +add_definitions(-DCTL_PLUGIN_MAGIC=7053042648) +add_definitions(-DCONTROL_CONFIG_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/etc:${CMAKE_BINARY_DIR}/package/etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc") +add_definitions(-DCONTROL_PLUGIN_PATH="${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins") +add_definitions(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var") +add_definitions(-DAFB_BINDING_VERSION=3 -DAFB_BINDING_WANT_DYNAPI=1) + +# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] +# --------------------------------------------------------------------- +set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) + +# Optional location for config.xml.in +# ----------------------------------- +#set(WIDGET_ICON "\"conf.d/wgt/${PROJECT_ICON}\"" CACHE PATH "Path to the widget icon") +set(WIDGET_CONFIG_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in" CACHE PATH "Path to widget config file template (config.xml.in)") + +# Mandatory widget Mimetype specification of the main unit +# -------------------------------------------------------------------------- +# Choose between : +#- text/html : HTML application, +# content.src designates the home page of the application +# +#- application/vnd.agl.native : AGL compatible native, +# content.src designates the relative path of the binary. +# +# - application/vnd.agl.service: AGL service, content.src is not used. +# +#- ***application/x-executable***: Native application, +# content.src designates the relative path of the binary. +# For such application, only security setup is made. +# +set(WIDGET_TYPE application/vnd.agl.service) + +# Mandatory Widget entry point file of the main unit +# -------------------------------------------------------------- +# This is the file that will be executed, loaded, +# at launch time by the application framework. +# +set(WIDGET_ENTRY_POINT lib/afb-4a-hal.so) + +# Optional dependencies order +# --------------------------- +#set(EXTRA_DEPENDENCIES_ORDER) + +# Optional Extra global include path +# ----------------------------------- +#set(EXTRA_INCLUDE_DIRS) + +# Optional extra libraries +# ------------------------- +#set(EXTRA_LINK_LIBRARIES) + +# Optional force binding Linking flag +# ------------------------------------ +# set(BINDINGS_LINK_FLAG LinkOptions ) + +# Optional force package prefix generation, like widget +# ----------------------------------------------------- +# set(PKG_PREFIX DestinationPath) + +# Optional Application Framework security token +# and port use for remote debugging. +#------------------------------------------------------------ +set(AFB_TOKEN "" CACHE PATH "Default binder security token") +set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port") + +# Print a helper message when every thing is finished +# ---------------------------------------------------- +set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name=afb-4a --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose") +set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") + +# Optional schema validator about now only XML, LUA and JSON +# are supported +#------------------------------------------------------------ +#set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler") +#set(XML_CHECKER "xmllint" CACHE STRING "XML linter") +#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter") + +# This include is mandatory and MUST happens at the end +# of this file, else you expose you to unexpected behavior +# ----------------------------------------------------------- +include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in new file mode 100644 index 0000000..b93f3d9 --- /dev/null +++ b/conf.d/wgt/config.xml.in @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@"> + <name>@PROJECT_NAME@</name> + <icon src="@PROJECT_ICON@"/> + <content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/> + <description>@PROJECT_DESCRIPTION@</description> + <author>@PROJECT_AUTHOR@ <@PROJECT_AUTHOR_MAIL@></author> + <license>@PROJECT_LICENSE@</license> + +<!-- Feature : required-api ------------------------------------------------------ +#### param name="#target" OPTIONAL + +Declares the name of the unit requiring the listed apis. +Only one instance of the param "#target" is allowed. +When there is not instance of this param, it behave as if +the target main was specified. + +#### param name=[required api name] + +The name is the name of the required API. +The value describes how to connect to the required api. +It is either: + + - local: The binding is a local shared object. + In that case, the name is the relative path of the + shared object to be loaded. + - auto: The framework set automatically the kind of + the connection to the API + - ws: The framework connect using internal websockets + - dbus: The framework connect using internal dbus + - link: The framework connect in memory by dinamically linking + +Example: + <feature name="urn:AGL:widget:required-api"> + <param name="#target" value="low-can" /> + <param name="<a-required-api>" value="auto" /> + <param name="<another-required-api>" value="auto" /> + </feature> +---------------------------------------------------------------------------------> + +<!-- Feature : required-permission ------------------------------------------ + +List of the permissions required by the unit. +Each required permission must be explicited using a <param> entry. + +#### param name="#target" OPTIONAL + +Declares the name of the unit requiring the listed permissions. +Only one instance of the param "#target" is allowed. +When there is not instance of this param, it behave as if +the target main was specified. + +#### param name=[required permission name] + +The value is either: +- required: the permission is mandatorily needed except if the feature +isn't required (required="false") and in that case it is optional. +- optional: the permission is optional + +Example: +<feature name="urn:AGL:widget:required-permission"> + <param name="#target" value="geoloc" /> + <param name="urn:AGL:permission:real-time" value="required" /> + <param name="urn:AGL:permission:syscall:*" value="required" /> +</feature> +---------------------------------------------------------------------------------> + +<!-- Feature : provided-unit ------------------------------------------------- +This feature is made for declaring new units +for the widget. Using this feature, a software publisher +can provide more than one application in the same widget. + +#### param name="#target" REQUIRED + +Declares the name of the unit. The default unit, the unit +of the main of the widget, has the name "main". The value +given here must be unique within the widget file. It will +be used in other places of the widget config.xml file to +designate the unit. + +Only one instance of the param "#target" is allowed. +The value can't be "main". + +#### param name="content.type" REQUIRED + +The mimetype of the provided unit. + +#### param name="content.src" + +A path to the file (subject to localisation), this is the entry point +to that unit. + +#### other parameters + +The items that can be set for the main unit +can also be set using the params if needed. + + - description + - name.content + - name.short + - ... + +Example: +<feature name="urn:AGL:widget:provided-unit"> + <param name="#target" value="geoloc" /> + <param name="description" value="binding of name geoloc" /> + <param name="content.src" value="index.html" /> + <param name="content.type" value="application/vnd.agl.service" /> +</feature> +---------------------------------------------------------------------------------> + +<!-- Feature: provided-api --------------------------------------------------- +Use this feature for exporting one or more API of a unit +to other widgets of the platform. + +This feature is an important feature of the framework. + +#### param name="#target" OPTIONAL + +Declares the name of the unit exporting the listed apis. +Only one instance of the param "#target" is allowed. +When there is not instance of this param, it behave as if +the target main was specified. + +#### param name=[name of exported api] + +The name give the name of the api that is exported. + +The value is one of the following values: + +- ws: export the api using UNIX websocket +- dbus: export the API using dbus +- auto: export the api using the default method(s). + +Example: +<feature name="urn:AGL:widget:provided-api"> + <param name="#target" value="geoloc" /> + <param name="geoloc" value="auto" /> + <param name="moonloc" value="auto" /> +</feature> +---------------------------------------------------------------------------------> +</widget> diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt new file mode 100644 index 0000000..df83eed --- /dev/null +++ b/plugin/CMakeLists.txt @@ -0,0 +1,52 @@ +########################################################################### +# Copyright 2015, 2016, 2017, 2018 IoT.bzh +# +# author: Jonathan Aillet <jonathan.aillet@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +ADD_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" + ) diff --git a/plugin/most_unicens.c b/plugin/most_unicens.c new file mode 100644 index 0000000..0bd8ec4 --- /dev/null +++ b/plugin/most_unicens.c @@ -0,0 +1,195 @@ +/* + * 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 <stdio.h> +#include <string.h> +#include <stdbool.h> + +#include <wrap-json.h> + +#include <ctl-plugin.h> + +#include "wrap_unicens.h" +#include "wrap_volume.h" + +CTLP_CAPI_REGISTER("hal-unicens") + +#define PCM_MAX_CHANNELS 6 + +AFB_ApiT unicensHalApiHandle; + +static uint8_t initialized = 0; + +// Call at initialisation time +CTLP_ONLOAD(plugin, callbacks) +{ + AFB_ApiNotice(plugin->api, "Hal-Unicens Plugin Register: uid='%s' 'info='%s'", plugin->uid, plugin->info); + + unicensHalApiHandle = plugin->api; + + return 0; +} + +CTLP_CAPI(MasterVol, source, argsJ, queryJ) +{ + int master_volume; + + json_object *valueJ; + + 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)); + return -1; + } + + 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)); + return -2; + } + + 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)); + return -3; + } + + master_volume = json_object_get_int(valueJ); + wrap_volume_master(source->api, master_volume); + + return 0; +} + +CTLP_CAPI(MasterSwitch, source, argsJ, queryJ) +{ + json_bool master_switch; + json_object *valueJ; + + if(! initialized) { + AFB_ApiWarning(source->api, "%s: Link to unicens binder is not initialized, can't set master switch, value=%s", __func__, json_object_get_string(queryJ)); + return -1; + } + + 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)); + return -2; + } + + // In case if alsa doesn't return a proper json boolean + valueJ = json_object_array_get_idx(queryJ, 0); + switch(json_object_get_type(valueJ)) { + case json_type_boolean: + master_switch = json_object_get_boolean(valueJ); + break; + + case json_type_int: + master_switch = json_object_get_int(valueJ); + break; + + default: + AFB_ApiError(source->api, "%s: invalid json (should be an array of boolean/int) value=%s", __func__, json_object_get_string(queryJ)); + return -3; + } + + // TBD: implement pause action for Unicens + AFB_ApiWarning(source->api, "%s: Try to set master switch to %i, but function is not implemented", __func__, (int) master_switch); + + return 0; +} + +CTLP_CAPI(PCMVol, source, argsJ, queryJ) +{ + int idx; + int pcm_volume[PCM_MAX_CHANNELS]; + + json_object *valueJ; + + if(! initialized) { + AFB_ApiWarning(source->api, "%s: Link to unicens binder is not initialized, can't set PCM volume, value=%s", __func__, json_object_get_string(queryJ)); + return -1; + } + + 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)); + return -1; + } + + for(idx = 0; idx < json_object_array_length(queryJ); idx++) { + valueJ = json_object_array_get_idx(queryJ, idx); + 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)); + return -2; + } + + pcm_volume[idx] = json_object_get_int(valueJ); + } + + // If control only has one value, then replicate the first value + for(idx = idx; idx < 6; idx ++) + pcm_volume[idx] = pcm_volume[0]; + + wrap_volume_pcm(source->api, pcm_volume, PCM_MAX_CHANNELS); + + return 0; +} + +/* initializes ALSA sound card, UNICENS API */ +CTLP_CAPI(Init, source, argsJ, queryJ) +{ + int err = 0; + int pcm_volume[PCM_MAX_CHANNELS] = { 80, 80, 80, 80, 80, 80 }; + + AFB_ApiNotice(source->api, "Initializing HAL-MOST-UNICENS-BINDING"); + + if((err = wrap_ucs_subscribe_sync(source->api))) { + AFB_ApiError(source->api, "Failed to subscribe to UNICENS binding"); + return err; + } + + if((err = wrap_volume_init())) { + AFB_ApiError(source->api, "Failed to initialize wrapper for volume library"); + return err; + } + + // 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); + + AFB_ApiNotice(source->api, "Initializing HAL-MOST-UNICENS-BINDING done.."); + + initialized = 1; + + return 0; +} + +// This receive UNICENS events +CTLP_CAPI(Events, source, argsJ, queryJ) +{ + int node; + int available; + + if(wrap_json_unpack(queryJ, "{s:i,s:b}", "node", &node, "available", &available)) { + AFB_ApiNotice(source->api, "Node-Availability: node=0x%03X, available=%d", node, available); + wrap_volume_node_avail(source->api, node, available); + } + + return 0; +} diff --git a/plugin/ucs2-vol/CMakeLists.txt b/plugin/ucs2-vol/CMakeLists.txt new file mode 100644 index 0000000..c734639 --- /dev/null +++ b/plugin/ucs2-vol/CMakeLists.txt @@ -0,0 +1,26 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll <fulup@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + + + +# Define subproject targets +ADD_SUBDIRECTORY(src) + + + + diff --git a/plugin/ucs2-vol/inc/device_container.h b/plugin/ucs2-vol/inc/device_container.h new file mode 100644 index 0000000..9fabdb5 --- /dev/null +++ b/plugin/ucs2-vol/inc/device_container.h @@ -0,0 +1,59 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#ifndef DEVICECONTAINER_H +#define DEVICECONTAINER_H + +#include "device_value.h" +#include "libmostvolume.h" + +class CDeviceContainer { + +public: + CDeviceContainer(); + virtual ~CDeviceContainer(); + + void AssignService(lib_most_volume_init_t *init_ptr) {_init_ptr = init_ptr;} + + void RegisterValues(CDeviceValue** list_pptr, uint16_t list_sz); + void SetValue(uint16_t key, uint8_t value); + void ClearValues(); + void Update(); + 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 new file mode 100644 index 0000000..fe6d3a5 --- /dev/null +++ b/plugin/ucs2-vol/inc/device_value.h @@ -0,0 +1,101 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#ifndef DEVICEVALUE_H +#define DEVICEVALUE_H + +#include <stdint.h> +#include "libmostvolume.h" + +struct SRxMessage { + uint32_t devInst; /*instance if multiple devices are using the same group id*/ + uint32_t sourceAddr; + uint32_t targetAddr; + uint32_t nFBlock; + uint32_t nInst; + uint32_t nFunc; + uint32_t nOpType; + const uint8_t *pPayload; + uint32_t payloadLen; +}; + +struct STxMessage { + uint32_t devInst; /*instance if multiple devices are using the same group id*/ + uint32_t targetAddr; + uint32_t nFBlock; + uint32_t nInst; + uint32_t nFunc; + uint32_t nOpType; + const uint8_t *pPayload; + uint32_t payloadLen; +}; + +enum DeviceValueType { + DEVICE_VAL_MASTER = 0, + DEVICE_VAL_LEFT = 1, + DEVICE_VAL_RIGHT = 2 + +}; + +class CDeviceValue { +public: + CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key); + virtual ~CDeviceValue(); + + uint16_t GetKey(){return _key;} + DeviceValueType GetType(){return _type;} // returns the assigned type + void SetValue(uint8_t value){_target_value = value;} // sets desired value + + bool RequiresUpdate(); // returns true if target is not actual value + // returns true if success, false if failed + // -> stop transmission + bool FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, + lib_most_volume_writei2c_result_cb_t result_fptr, + void *result_user_ptr);// fires message & updates actual value + + 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 + 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 new file mode 100644 index 0000000..1147993 --- /dev/null +++ b/plugin/ucs2-vol/inc/libmostvolume.h @@ -0,0 +1,111 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#ifndef LIB_MOST_VOLUME_H +#define LIB_MOST_VOLUME_H + +#include <stdint.h> + + +#ifdef __cplusplus +extern "C" { +#endif + +/** Describes the volume control */ +enum lib_most_volume_channel_t{ + LIB_MOST_VOLUME_CH_FRONT_LEFT = 0, + LIB_MOST_VOLUME_CH_FRONT_RIGHT = 1, + LIB_MOST_VOLUME_CH_REAR_LEFT = 2, + LIB_MOST_VOLUME_CH_REAR_RIGHT = 3, + LIB_MOST_VOLUME_CH_CENTER = 4, + LIB_MOST_VOLUME_CH_SUB = 5, + LIB_MOST_VOLUME_MASTER = 6 +}; + +/** Is fired when the application shall call "lib_most_volume_service()" after a certain time + * \param timeout Time in ms after which the application shall call lib_most_volume_service(). + * Valid values: + * 0x0000: as soon as possible, + * 0x0001..0xFFFE: timeout in ms, + * 0xFFFF: never + */ +typedef void (*lib_most_volume_service_cb_t)(uint16_t timeout); + +typedef void (*lib_most_volume_writei2c_result_cb_t)(uint8_t result, void *user_ptr); + +/** Callback function required to write volume changes to network devices + * \param node The node address + * \param data_ptr I2C command data + * \param data_sz Size of the I2C command data + * \return Returns \c 0 for success, other value on failure. + */ +typedef int (*lib_most_volume_writei2c_cb_t)(uint16_t node, uint8_t *data_ptr, uint8_t data_sz, + lib_most_volume_writei2c_result_cb_t result_fptr, + void *result_user_ptr); + +typedef struct lib_most_volume_init_ { + lib_most_volume_service_cb_t service_cb; + lib_most_volume_writei2c_cb_t writei2c_cb; + +} lib_most_volume_init_t; + + +/** Initializes the library + * \param UNICENS_inst Reference to the UNICENS instance, created by the application. + * \param req_service_fptr Callback function which is fired if the application shall call + * lib_most_volume_service. + * \return '0' on success, otherwise value >'0'. + */ +extern uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr); + +/** Terminates the library + * \return '0' on success, otherwise value >'0'. + */ +extern uint8_t lib_most_volume_exit(void); + +/** Sets a single volume value. + * \param channel The volume control to be set. + * \param volume The volume value to be set. Valid values: 0..255. + * \return '0' on success, otherwise value >'0'. + */ +extern uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume); + +/** 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 new file mode 100644 index 0000000..e7cda01 --- /dev/null +++ b/plugin/ucs2-vol/inc/setup.h @@ -0,0 +1,71 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#ifndef SETUP_H +#define SETUP_H + +#include "libmostvolume.h" +#include "device_value.h" +#include "device_container.h" + +#define MAX_CHANNELS (LIB_MOST_VOLUME_MASTER + 1u) +#define MAX_MASTERS 3u + +class CSetup { + +public: + void Configure(lib_most_volume_init_t *init_ptr); + void SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume); + void Update(); + 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; + + 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 new file mode 100644 index 0000000..1be7184 --- /dev/null +++ b/plugin/ucs2-vol/src/CMakeLists.txt @@ -0,0 +1,39 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll <fulup@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + +# Add target to project dependency list +PROJECT_TARGET_ADD(ucs2-volume) + +# Define targets source files +ADD_LIBRARY(${TARGET_NAME} STATIC device_container.cpp device_value.cpp libmostvolume.cpp setup.cpp) + + # Library properties + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + ) + + # Library dependencies from PKG_REQUIRED_LIST + #TARGET_LINK_LIBRARIES(ucs2-volume # Library dependencies (include updates automatically) + # ${link_libraries} + #) + + # Define properties to expose when others use this target + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../inc + ) + diff --git a/plugin/ucs2-vol/src/device_container.cpp b/plugin/ucs2-vol/src/device_container.cpp new file mode 100644 index 0000000..0639c10 --- /dev/null +++ b/plugin/ucs2-vol/src/device_container.cpp @@ -0,0 +1,187 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#include <stddef.h> +#include "device_container.h" + +#define DEVCONT_TIME_RETRIGGER (uint16_t)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]->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 new file mode 100644 index 0000000..b6ec4d5 --- /dev/null +++ b/plugin/ucs2-vol/src/device_value.cpp @@ -0,0 +1,148 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ +#include <stddef.h> +#include "device_value.h" +#include "setup.h" + +#define MUTE_VALUE 0x03FFU +#define MUTE_VALUE_HB 0x03U +#define MUTE_VALUE_LB 0xFFU + +#define CONTROL_MASTER 0x07U +#define CONTROL_CH_1 0x08U +#define CONTROL_CH_2 0x09U + +CDeviceValue::CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key) +{ + this->_is_available = false; + this->_is_busy = false; + this->_address = address; + 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 + _tx_payload_sz = 3u; +} + +CDeviceValue::~CDeviceValue() +{ +} + +void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]) +{ + uint16_t tmp = MUTE_VALUE; + + switch (type) + { + case DEVICE_VAL_LEFT: + tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU))); + //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF)); + //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF)); + tx_payload[0] = CONTROL_CH_1; + break; + case DEVICE_VAL_RIGHT: + tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU))); + //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF)); + //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF)); + tx_payload[0] = CONTROL_CH_2; + break; + default: + /*std::cerr << "CDeviceValue::ApplyMostValue() error matching incorrect" << std::endl;*/ + case DEVICE_VAL_MASTER: + tmp = (uint16_t)(0x100U + 0x2FFU - (0x2FFU * ((int32_t)value) / (0xFFU))); + tx_payload[0] = CONTROL_MASTER; + break; + } + + tx_payload[1] = (uint8_t)((tmp >> 8U) & (uint16_t)0xFFU); //HB:Volume + tx_payload[2] = (uint8_t)(tmp & (uint16_t)0xFFU); //LB:Volume +} + +// returns true if target is not actual value +bool CDeviceValue::RequiresUpdate() +{ + if (this->_is_available && !this->_is_busy && (this->_target_value != this->_actual_value)) + { + return true; + } + + return false; +} + +bool CDeviceValue::FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr, + lib_most_volume_writei2c_result_cb_t result_fptr, + void *result_user_ptr) +{ + int ret = -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 new file mode 100644 index 0000000..519e2cf --- /dev/null +++ b/plugin/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 <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ + +#include "libmostvolume.h" +#include "setup.h" +/*#include <iostream>*/ + +static bool _running = false; + +extern "C" uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr) +{ + uint8_t success = 1U; + /*std::cerr << "lib_most_volume_init(): called" << std::endl;*/ + + if (!_running && init_ptr) + { + CSetup::GetInstance()->Configure(init_ptr); + success = 0U; + _running = true; + } + + return success; +} + +extern "C" uint8_t lib_most_volume_exit(void) +{ + uint8_t success = 1U; + /*std::cerr << "lib_most_volume_exit(): called" << std::endl;*/ + + if (_running) + { + CSetup::Release(); + success = 0U; + _running = false; + } + + return success; +} + +extern "C" uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume) +{ + uint8_t success = 1U; + /*std::cerr << "lib_most_volume_set(): channel=" << channel << ", volume=" << (int)volume << std::endl;*/ + + if (_running) + { + CSetup::GetInstance()->SetVolume(channel, volume); + success = 0U; + } + + return success; +} + +extern 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 new file mode 100644 index 0000000..dd6675b --- /dev/null +++ b/plugin/ucs2-vol/src/setup.cpp @@ -0,0 +1,94 @@ +/* + * libmostvolume example + * + * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * You may also obtain this software under a propriety license from Microchip. + * Please contact Microchip for further information. + * + */ +#include <stddef.h> +#include "setup.h" + +CSetup* CSetup::_instance = NULL; + +// singleton +CSetup* CSetup::GetInstance() { + if (_instance == NULL) { + _instance = new CSetup(); + } + + return _instance; +} + +// singleton +void CSetup::Release() { + if (_instance != NULL) { + delete _instance; + } + _instance = NULL; +} + +CSetup::CSetup() + : _volume_amp_270_m(0x270U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER), + _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT), + _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT), + _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER), + _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT), + _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT), + _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER), + _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER), + _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB), + _value_container() +{ + static CDeviceValue* value_list[9] = { &_volume_amp_270_m, + &_volume_amp_270_l, + &_volume_amp_270_r, + &_volume_amp_271_m, + &_volume_amp_271_l, + &_volume_amp_271_r, + &_volume_amp_272_m, + &_volume_amp_272_l, + &_volume_amp_272_r}; + + _value_container.RegisterValues(value_list, 9U); +} + +CSetup::~CSetup() +{ + +} + +void CSetup::Configure(lib_most_volume_init_t *init_ptr) +{ + this->init_data = *init_ptr; + _value_container.AssignService(&this->init_data); +} + +void CSetup::SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume) +{ + _value_container.SetValue((uint16_t)channel, volume); +} + +void CSetup::Update() +{ + _value_container.Update(); +} + +void CSetup::SetNodeAvailable(uint16_t address, bool available) +{ + _value_container.ChangeNodeAvailable(address, available); +} diff --git a/plugin/wrap_unicens.c b/plugin/wrap_unicens.c new file mode 100644 index 0000000..1b9a913 --- /dev/null +++ b/plugin/wrap_unicens.c @@ -0,0 +1,174 @@ +/* + * 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 <stdio.h> +#include <string.h> +#include <stdbool.h> + +#include <wrap-json.h> + +#include <ctl-plugin.h> + +#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; +} + +/* ---------------------------- 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 new file mode 100644 index 0000000..aeb0da9 --- /dev/null +++ b/plugin/wrap_unicens.h @@ -0,0 +1,43 @@ +/* + * 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 <stdio.h> +#include <string.h> +#include <stdbool.h> + +#include <ctl-plugin.h> + +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); diff --git a/plugin/wrap_volume.c b/plugin/wrap_volume.c new file mode 100644 index 0000000..61b752f --- /dev/null +++ b/plugin/wrap_volume.c @@ -0,0 +1,137 @@ +/* + * 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 <stdio.h> +#include <string.h> +#include <stdbool.h> + +#include <time.h> +#include <assert.h> + +#include <wrap-json.h> + +#include <ctl-plugin.h> + +#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; + + 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 new file mode 100644 index 0000000..7cdcd93 --- /dev/null +++ b/plugin/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 <stdio.h> +#include <string.h> +#include <stdbool.h> + +#include <systemd/sd-event.h> + +#include <ctl-plugin.h> + +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 |