summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md3
m---------conf.d/app-templates0
-rw-r--r--htdocs/UNICENS.html17
-rw-r--r--ucs2-interface/ucs-xml/UcsXml.c23
m---------ucs2-lib/unicens0
-rw-r--r--ucs2-vol/src/setup.cpp8
6 files changed, 20 insertions, 31 deletions
diff --git a/README.md b/README.md
index 877f14c..109d260 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,8 @@ Cloning Audio-Binding from Git
-------------------------------------------------------
```
-git clone https://github.com/iotbzh/unicens2-binding
+git clone --recurse-submodules https://github.com/iotbzh/unicens2-binding
cd unicens2-binding
-git submodule update --recursive --init
```
AFB_daemon dependency on Standard Linux Distributions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 3e30ff523d1f55f68f66d41ddff29a309abdfa4
+Subproject db6a07f636a3f2a381dfcc0f52b16f59127496f
diff --git a/htdocs/UNICENS.html b/htdocs/UNICENS.html
index fe25fe1..73c1b66 100644
--- a/htdocs/UNICENS.html
+++ b/htdocs/UNICENS.html
@@ -11,12 +11,17 @@
<button id="connected" onclick="init()">Binder WS Fail</button></li>
<br>
<ol>
- <li><button onclick="callbinder('UNICENS','configure', {filename:'data/config_multichannel_audio_kit.xml'})">Parse XML and Start UNICENS</button></li>
- <li><button onclick="callbinder('UNICENS','volume', {channel:'master', volume: 255})">Set Master Volume to 255</button></li>
- <li><button onclick="callbinder('UNICENS','volume', {channel:'master', volume: 200})">Set Master Volume to 200</button></li>
- <li><button onclick="callbinder('UNICENS','volume', [[0,200], [1,255]])">Set left=200 right=250</button></li>
- <li><button onclick="callbinder('UNICENS','volume', [[0,255], [1,200]])">Set right=250 left=200</button></li>
- <li><button onclick="callbinder('UNICENS','volume', [[0,255], [1,255]])">Set right=255 left=255</button></li>
+ <li><button onclick="callbinder('UNICENS','initialise', {filename:'data/config_multichannel_audio_kit.xml'})">Parse XML and Start UNICENS</button></li>
+ <li><button onclick="callbinder('UNICENS','setvol', {channel:'master', volume: 255})">Set Master Volume to 255</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 230})">Set Master Volume to 230</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 215})">Set Master Volume to 215</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 200})">Set Master Volume to 200</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 185})">Set Master Volume to 185</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 0})">Set Master Volume to 0</button></li>
+ <br>
+ <li><button onclick="callbinder('UNICENS','setvol', [[0,200], [1,255]])">Set left=200 right=250</button></li>
+ <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,200]])">Set right=250 left=200</button></li>
+ <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,255]])">Set right=255 left=255</button></li>
</ol>
<br>
<div id="main" style="visibility:hidden">
diff --git a/ucs2-interface/ucs-xml/UcsXml.c b/ucs2-interface/ucs-xml/UcsXml.c
index e1d6909..efce887 100644
--- a/ucs2-interface/ucs-xml/UcsXml.c
+++ b/ucs2-interface/ucs-xml/UcsXml.c
@@ -85,11 +85,8 @@ typedef enum
typedef struct
{
Ucs_Rm_Node_t *nod;
- bool usbPortAddedToJobList; /* USB Port must be added only ONCE to connection job lists */
Ucs_Xrm_UsbPort_t *usbPort;
- bool mlbPortAddedToJobList; /* MLB Port must be added only ONCE to connection job lists */
Ucs_Xrm_MlbPort_t *mlbPort;
- bool strmPortsAddedToJobList; /* STRM Ports must be added only ONCE to connection job lists */
Ucs_Xrm_StrmPort_t *strmPortA;
Ucs_Xrm_StrmPort_t *strmPortB;
} NodeData_t;
@@ -885,11 +882,7 @@ static ParseResult_t ParseSocket(mxml_node_t *soc, bool isSource, MSocketType_t
RETURN_ASSERT(Parse_XmlError);
priv->nodeData.usbPort = (Ucs_Xrm_UsbPort_t *)p.usbPort;
}
- if (!priv->nodeData.usbPortAddedToJobList)
- {
- priv->nodeData.usbPortAddedToJobList = true;
- if(!AddJob(jobList, p.usbPort, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
- }
+ if(!AddJob(jobList, p.usbPort, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
if (!GetString(soc, ENDPOINT_ADDRESS, &p.endpointAddress, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetString(soc, FRAMES_PER_TRANSACTION, &p.framesPerTrans, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetUsbSocket((Ucs_Xrm_UsbSocket_t **)targetSock, &p)) RETURN_ASSERT(Parse_XmlError);
@@ -910,11 +903,7 @@ static ParseResult_t ParseSocket(mxml_node_t *soc, bool isSource, MSocketType_t
RETURN_ASSERT(Parse_XmlError);
priv->nodeData.mlbPort = (Ucs_Xrm_MlbPort_t *)p.mlbPort;
}
- if (!priv->nodeData.mlbPortAddedToJobList)
- {
- priv->nodeData.mlbPortAddedToJobList = true;
- if (!AddJob(jobList, p.mlbPort, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
- }
+ if (!AddJob(jobList, p.mlbPort, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
if (!GetUInt16(soc, BANDWIDTH, &p.bandwidth, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetString(soc, CHANNEL_ADDRESS, &p.channelAddress, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetMlbSocket((Ucs_Xrm_MlbSocket_t **)targetSock, &p)) RETURN_ASSERT(Parse_XmlError);
@@ -929,12 +918,8 @@ static ParseResult_t ParseSocket(mxml_node_t *soc, bool isSource, MSocketType_t
p.dataType = priv->conData.dataType;
p.streamPortA = priv->nodeData.strmPortA;
p.streamPortB = priv->nodeData.strmPortB;
- if (!priv->nodeData.strmPortsAddedToJobList)
- {
- priv->nodeData.strmPortsAddedToJobList = true;
- if (!AddJob(jobList, p.streamPortA, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
- if (!AddJob(jobList, p.streamPortB, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
- }
+ if (!AddJob(jobList, p.streamPortA, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
+ if (!AddJob(jobList, p.streamPortB, &priv->objList)) RETURN_ASSERT(Parse_XmlError);
if (!GetUInt16(soc, BANDWIDTH, &p.bandwidth, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetString(soc, STRM_PIN, &p.streamPin, true)) RETURN_ASSERT(Parse_XmlError);
if (!GetStrmSocket((Ucs_Xrm_StrmSocket_t **)targetSock, &p)) RETURN_ASSERT(Parse_XmlError);
diff --git a/ucs2-lib/unicens b/ucs2-lib/unicens
-Subproject 983149ad074e8a0febbf3b6bd1386f4d4da9b07
+Subproject 026fd1ff36f944e308839be387445bc836a40dc
diff --git a/ucs2-vol/src/setup.cpp b/ucs2-vol/src/setup.cpp
index bb54f2f..53b6f8c 100644
--- a/ucs2-vol/src/setup.cpp
+++ b/ucs2-vol/src/setup.cpp
@@ -54,17 +54,17 @@ CSetup::CSetup()
_volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB),
_value_container()
{
- static CDeviceValue* value_list[3] = { &_volume_amp_270_m,
+ static CDeviceValue* value_list[9] = { &_volume_amp_270_m,
&_volume_amp_270_l,
- &_volume_amp_270_r/*,
+ &_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_272_r};
- _value_container.RegisterValues(value_list, 3U);
+ _value_container.RegisterValues(value_list, 9U);
}
CSetup::~CSetup()