X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fconfig_multichannel_audio_kit.xml;h=ed1432064bed66e8be8ef6ad33a91c6fab8a1f34;hb=930e93ebef7847911533a5789f9ca687eaccb1af;hp=14da7586b13a0a5a0bae81907a18156c68614237;hpb=81124d50004ee8c0a141771c4b59a79b1a9ec4f1;p=apps%2Fagl-service-unicens.git

diff --git a/data/config_multichannel_audio_kit.xml b/data/config_multichannel_audio_kit.xml
index 14da758..ed14320 100644
--- a/data/config_multichannel_audio_kit.xml
+++ b/data/config_multichannel_audio_kit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Unicens AsyncBandwidth="20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="unicens.xsd">
-  <!-- Server Node -->
-  <Node Address="0x200">
+  <!-- Head Unit -->
+  <Node Address="0x200" Name="Head Unit">
     <SyncConnection MuteMode="NoMuting">
       <USBSocket EndpointAddress="0x1" FramesPerTransaction="42"/>
       <Splitter BytesPerFrame="12">
@@ -10,37 +10,39 @@
         <MOSTSocket Route="5.1 DVD Player Effect" Offset="8" Bandwidth="4"/>
       </Splitter>
     </SyncConnection>
-  </Node>
-  
-  <!-- 1st Microphone -->
-  <Node Address="0x210">
-    <StreamPort ClockConfig="64Fs" DataAlignment="Left24Bit"/>
     <SyncConnection MuteMode="NoMuting">
-      <StreamSocket StreamPinID="SRXA0" Bandwidth="6"/>
-      <MOSTSocket Route="Microphone1" Bandwidth="6"/>
+      <MOSTSocket Bandwidth="4" Route="Route_NoiseCanceled_Microphone" />
+      <USBSocket EndpointAddress="0x81" FramesPerTransaction="128" />
     </SyncConnection>
   </Node>
 
-  <!-- 2nd Microphone -->
-  <Node Address="0x211">
-    <StreamPort ClockConfig="64Fs" DataAlignment="Left24Bit"/>
+  <!-- Microphone Front-End -->
+  <Node Address="0x520">
+    <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit" />
     <SyncConnection MuteMode="NoMuting">
-      <StreamSocket StreamPinID="SRXA0" Bandwidth="6"/>
-      <MOSTSocket Route="Microphone2" Bandwidth="6"/>
+      <StreamSocket StreamPinID="SRXA0" Bandwidth="4" />
+      <MOSTSocket Route="Route_NoiseCanceled_Microphone" Bandwidth="4" />
     </SyncConnection>
   </Node>
 
-  <!-- 3rd Microphone -->
-  <Node Address="0x212">
-    <StreamPort ClockConfig="64Fs" DataAlignment="Left24Bit"/>
+  <!-- Fiberdyne Amplifier -->
+  <Node Address="0x510" Name="Fiberdyne Amplifier">
+    <StreamPort ClockConfig="64Fs" DataAlignment="Seq"/>
+    <SyncConnection MuteMode="NoMuting">
+      <Combiner BytesPerFrame="8">
+        <MOSTSocket Route="5.1 DVD Player Front" Bandwidth="4" Offset="0"/>
+        <MOSTSocket Route="5.1 DVD Player Rear" Bandwidth="4" Offset="4"/>
+      </Combiner>
+      <StreamSocket StreamPinID="SRXA0" Bandwidth="8"/>
+    </SyncConnection>
     <SyncConnection MuteMode="NoMuting">
-      <StreamSocket StreamPinID="SRXA0" Bandwidth="6"/>
-      <MOSTSocket Route="Microphone3" Bandwidth="6"/>
+      <MOSTSocket Route="5.1 DVD Player Effect" Bandwidth="4"/>
+      <StreamSocket StreamPinID="SRXA1" Bandwidth="4"/>
     </SyncConnection>
   </Node>
 
   <!-- 1st Slim Amplifier -->
-  <Node Address="0x270" Script="slim-amp-config">
+  <Node Address="0x270" Script="slim-amp-config" Name="1st Slim Amplifier">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Front" Bandwidth="4"/>
@@ -48,7 +50,7 @@
     </SyncConnection>
   </Node>
   <!-- 2nd Slim Amplifier -->
-  <Node Address="0x271" Script="slim-amp-config">
+  <Node Address="0x271" Script="slim-amp-config" Name="2nd Slim Amplifier">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Rear" Bandwidth="4"/>
@@ -56,7 +58,7 @@
     </SyncConnection>
   </Node>
   <!-- 3rd Slim Amplifier -->
-  <Node Address="0x272" Script="slim-amp-config">
+  <Node Address="0x272" Script="slim-amp-config" Name="3rd Slim Amplifier">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Effect" Bandwidth="4"/>
@@ -74,13 +76,13 @@
     <I2CPortWrite Address="0x2A" Payload="06 00"/>
     <I2CPortWrite Address="0x2A" Payload="05 00"/>
     <!-- Register 7: Master Volume (Max Volume=07 00 00 and Min Volume=07 03 FF) -->
-    <!--   - together with HAL-MOST-UNICENS binding use "07 03 FF" = muted after start -->
+    <!--   - together with "4a-hal-unicens" binding use "07 03 FF" = muted after start -->
     <!--   - otherwise use "07 01 50" = default volume -->
-    <I2CPortWrite Address="0x2A" Payload="07 03 FF"/>
+    <I2CPortWrite Address="0x2A" Payload="07 01 50"/>
   </Script>
 
   <!-- 1st Aux IO -->
-  <Node Address="0x240" Script="aux-io-config">
+  <Node Address="0x240" Script="aux-io-config" Name="1st Aux IO">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Front" Bandwidth="4"/>
@@ -88,7 +90,7 @@
     </SyncConnection>
   </Node>
   <!-- 2nd Aux IO -->
-  <Node Address="0x241" Script="aux-io-config">
+  <Node Address="0x241" Script="aux-io-config" Name="2nd Aux IO">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Rear" Bandwidth="4"/>
@@ -96,7 +98,7 @@
     </SyncConnection>
   </Node>
   <!-- 3rd Aux IO -->
-  <Node Address="0x242" Script="aux-io-config">
+  <Node Address="0x242" Script="aux-io-config" Name="3rd Aux IO">
     <StreamPort ClockConfig="64Fs" DataAlignment="Left16Bit"/>
     <SyncConnection MuteMode="NoMuting">
       <MOSTSocket Route="5.1 DVD Player Effect" Bandwidth="4"/>
@@ -107,7 +109,7 @@
   <Script Name="aux-io-config">
     <I2CPortCreate Speed="FastMode"/>
     <I2CPortWrite Mode="BurstMode" BlockCount="10" Address="0x18" Length="3" Timeout="100"
-                  Payload="00 0f 02 01 00 00 02 a5 df 03 3f 3f 04 02 02 10 00 00 11 00 00 12 00 00 13 00 00 14 00 00"/>
+                  Payload="00 0f 02 01 00 00 02 a5 df 03 3f 3f 04 02 02 10 30 30 11 00 00 12 00 00 13 00 00 14 00 00"/>
     <I2CPortWrite Mode="BurstMode" BlockCount="4" Address="0x18" Length="3" Timeout="100"
                   Payload="20 00 00 21 00 00 22 00 00 23 00 00"/>
   </Script>