From 130553bae078a5c761a16ce5c93a9fdb578dc558 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Thu, 29 Jan 2015 15:46:21 +0000
Subject: [PATCH 01/11] White space in preprocessor item only

---
 module_usb_audio/endpoint0/descriptors.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 0ffe3c9b..8f1a9fc3 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -1831,7 +1831,7 @@ typedef struct
     // USB_Descriptor_Audio_MixerUnit_t          Audio_MixerUnit;
     unsigned char configDesc_MixerUnit[MIXER_LENGTH];
 #endif
-#if defined (SPDIF_RX) || defined (ADAT_RX)
+#if defined(SPDIF_RX) || defined(ADAT_RX)
     /* Interrupt EP */
     USB_Descriptor_Endpoint_t                   Audio_Int_Endpoint;
 #endif

From ea931680adb3bf90f211320ba5a62f9b2f363e8e Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 15:56:01 +0000
Subject: [PATCH 02/11] Fixed trap when SPDIF_TX and ADAT_TX both enabled -
 caused by sharing clock block

---
 module_usb_audio/audio.xc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 6929e9f5..8c5aea29 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -963,17 +963,20 @@ chanend ?c_config, chanend ?c)
         EnableBufferedPort(p_dsd_dac[i], 32);
     }
 #endif
-
+#ifdef ADAT_TX
+    /* Share SPDIF clk blk */
+    configure_clock_src(clk_mst_spd, p_mclk_in);
+    configure_out_port_no_ready(p_adat_tx, clk_mst_spd, 0);
+    set_clock_fall_delay(clk_mst_spd, 7);
+#ifndef SPDIF
+    start_clock(clk_mst_spd);
+#endif
+#endif
     /* Configure ADAT/SPDIF tx ports */
 #ifdef SPDIF
     SpdifTransmitPortConfig(p_spdif_tx, clk_mst_spd, p_mclk_in);
 #endif
-#ifdef ADAT_TX
-    configure_clock_src(clk_mst_spd, p_mclk_in);
-    configure_out_port_no_ready(p_adat_tx, clk_mst_spd, 0);
-    set_clock_fall_delay(clk_mst_spd, 7);
-    start_clock(clk_mst_spd);
-#endif
+
 
     /* Perform required CODEC/ADC/DAC initialisation */
     AudioHwInit(c_config);

From 389546a2b5e329acad60f78e1babbcb05c32d192 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 15:59:52 +0000
Subject: [PATCH 03/11] Fixed hard-coded adat/mclk multiplier

---
 module_usb_audio/audio.xc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 8c5aea29..0ecb47f1 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -907,6 +907,7 @@ chanend ?c_config, chanend ?c)
 #ifdef ADAT_TX
     chan c_adat_out;
     unsigned adatSmuxMode = 0;
+    unsigned adatMultiple = 0;
 #endif
 
     unsigned curSamFreq = DEFAULT_FREQ;
@@ -990,6 +991,7 @@ chanend ?c_config, chanend ?c)
 #ifdef ADAT_TX 
             /* Calculate ADAT SMUX mode (1, 2, 4) */
             adatSmuxMode = curSamFreq / 44100; 
+            adatMultiple = mClk / 44100; 
 #endif
         }
         else if ((MCLK_48 % curSamFreq) == 0)
@@ -998,6 +1000,7 @@ chanend ?c_config, chanend ?c)
 #ifdef ADAT_TX 
             /* Calculate ADAT SMUX mode (1, 2, 4) */
             adatSmuxMode = curSamFreq / 48000; 
+            adatMultiple = mClk / 48000; 
 #endif
         }
 
@@ -1147,7 +1150,7 @@ chanend ?c_config, chanend ?c)
                 // adatSmuxMode   = 1 for FS =  44K1 or  48K0
                 //                = 2 for FS =  88K2 or  96K0
                 //                = 4 for FS = 176K4 or 192K0
-                outuint(c_adat_out, mClk/curSamFreq);
+                outuint(c_adat_out, adatMultiple);
                 outuint(c_adat_out, adatSmuxMode);
 #endif
                 command = deliver(c_mix_out,

From 0796ecb86e3036e23e263b9f7d2cf2e84a9ec278 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:02:54 +0000
Subject: [PATCH 04/11] Changelog updates for 6.11.1

---
 CHANGELOG.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2a6666e1..c75d1dea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,9 @@
 sc_usb_audio Change Log
 =======================
 
-HEAD
-----
+6.11.1
+------
+    - ADDED:      ADAT transmit functionality, inclusing SMUX. See ADAT_TX and ADAT_TX_INDEX. 
     - RESOLVED:   Build issue with CODEC_MASTER (xCore is I2S slave) enabled
     - RESOLVED:   Channel ordering issue in when TDM and CODEC_MASTER mode enabled
     - RESOLVED:   DFU fails when SPDIF_RX enabled due to clock block being shared between SPDIF

From a28fccdcb738d8450cef98bb8ff9a17403c799ac Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:10:04 +0000
Subject: [PATCH 05/11] xpd: Patched version number

---
 module_dfu/.cproject             | 18 +++++++++++++++---
 module_usb_audio/devicedefines.h |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/module_dfu/.cproject b/module_dfu/.cproject
index da068095..bb778c83 100644
--- a/module_dfu/.cproject
+++ b/module_dfu/.cproject
@@ -156,7 +156,11 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.23684077" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -271,7 +275,11 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.18653743" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -392,7 +400,11 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
+<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 39d247ef..ce3f747d 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -462,7 +462,7 @@
  * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
  */
 #ifndef BCD_DEVICE_N
-#define BCD_DEVICE_N             0
+#define BCD_DEVICE_N             1
 #endif
 
 /**

From 6eaa986eb9b385a4be9de719fd906daa8b36a6bf Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:10:04 +0000
Subject: [PATCH 06/11] xpd: Cleaned up whitespace

---
 module_usb_audio/audio.xc                |   64 +-
 module_usb_audio/endpoint0/chanstrings.h | 2978 +++++++++++-----------
 module_usb_audio/uac_hwresources.h       |    4 +-
 3 files changed, 1523 insertions(+), 1523 deletions(-)

diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 0ecb47f1..296996e8 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -172,7 +172,7 @@ static inline void TransferAdatTxSamples(chanend c_adat_out, const unsigned samp
     unsafe
     {
         unsigned * unsafe samplesFromHostAdat = &samplesFromHost[ADAT_TX_INDEX];
-        
+
         /* Note, when smux == 1 this loop just does a straight 1:1 copy */
         //if(smux != 1)
         {
@@ -181,31 +181,31 @@ static inline void TransferAdatTxSamples(chanend c_adat_out, const unsigned samp
             {
                 adatSamples[adatSampleIndex] = samplesFromHostAdat[i];
                 adatSampleIndex += smux;
-            }   
+            }
         }
     }
-    
+
     adatCounter++;
-    
+
     if(adatCounter == smux)
     {
 
 #ifdef ADAT_TX_USE_SHARED_BUFF
         unsafe
-        {       
-            /* Wait for ADAT core to be done with buffer */ 
+        {
+            /* Wait for ADAT core to be done with buffer */
             /* Note, we are "running ahead" of the ADAT core */
             inuint(c_adat_out);
- 
+
             /* Send buffer pointer over to ADAT core */
             volatile unsigned * unsafe samplePtr = &adatSamples;
-            outuint(c_adat_out, (unsigned) samplePtr);                        
+            outuint(c_adat_out, (unsigned) samplePtr);
         }
-#else            
+#else
 #pragma loop unroll
         for (int i = 0; i < 8; i++)
         {
-            outuint(c_adat_out, samplesFromHost[ADAT_TX_INDEX + i]); 
+            outuint(c_adat_out, samplesFromHost[ADAT_TX_INDEX + i]);
         }
 #endif
         adatCounter = 0;
@@ -411,8 +411,8 @@ static inline void InitPorts(unsigned divide)
     p_lrclk when pinseq(1) :> void @ tmp;
 #else
     p_lrclk when pinseq(0) :> void @ tmp;
-#endif  
-   
+#endif
+
     tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ;
     /* E.g. 2 * 32 - 32 + 1 = 33 for stereo */
     /* E..g 8 * 32 - 32 + 1 = 225 for 8 chan TDM */
@@ -439,10 +439,10 @@ static inline void InitPorts(unsigned divide)
 
 /* I2S delivery thread */
 #pragma unsafe arrays
-unsigned static deliver(chanend c_out, chanend ?c_spd_out, 
+unsigned static deliver(chanend c_out, chanend ?c_spd_out,
 #ifdef ADAT_TX
     chanend c_adat_out,
-    unsigned adatSmuxMode, 
+    unsigned adatSmuxMode,
 #endif
     unsigned divide, unsigned curSamFreq,
 #if(defined(SPDIF_RX) || defined(ADAT_RX))
@@ -495,17 +495,17 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
 
     unsigned command = DoSampleTransfer(c_out, readBuffNo, underflowWord);
 #ifdef ADAT_TX
-    unsafe{ 
+    unsafe{
     //TransferAdatTxSamples(c_adat_out, samplesOut, adatSmuxMode, 0);
     volatile unsigned * unsafe samplePtr = &samplesOut[ADAT_TX_INDEX];
-    outuint(c_adat_out, (unsigned) samplePtr); 
+    outuint(c_adat_out, (unsigned) samplePtr);
     }
-#endif 
+#endif
     if(command)
     {
         return command;
     }
- 
+
     InitPorts(divide);
 
     /* TODO In master mode, the i/o loop assumes L/RCLK = 32bit clocks.  We should check this every interation
@@ -650,9 +650,9 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
             /* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */
             doI2SClocks(divide);
 #endif
-  
-          
-         
+
+
+
 
 #if (I2S_CHANS_ADC != 0)
             /* Input previous L sample into L in buffer */
@@ -675,10 +675,10 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
                     samplesIn_0[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
             }
 #endif
-            
-#ifdef ADAT_TX 
+
+#ifdef ADAT_TX
              TransferAdatTxSamples(c_adat_out, samplesOut, adatSmuxMode, 1);
-#endif 
+#endif
 
         if(frameCount == 0)
         {
@@ -741,7 +741,7 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
 #ifndef CODEC_MASTER
             doI2SClocks(divide);
 #endif
-            
+
 #if (I2S_CHANS_ADC != 0)
             index = 0;
             /* Channels 0, 2, 4.. on each line */
@@ -988,19 +988,19 @@ chanend ?c_config, chanend ?c)
         if ((MCLK_441 % curSamFreq) == 0)
         {
             mClk = MCLK_441;
-#ifdef ADAT_TX 
+#ifdef ADAT_TX
             /* Calculate ADAT SMUX mode (1, 2, 4) */
-            adatSmuxMode = curSamFreq / 44100; 
-            adatMultiple = mClk / 44100; 
+            adatSmuxMode = curSamFreq / 44100;
+            adatMultiple = mClk / 44100;
 #endif
         }
         else if ((MCLK_48 % curSamFreq) == 0)
         {
             mClk = MCLK_48;
-#ifdef ADAT_TX 
+#ifdef ADAT_TX
             /* Calculate ADAT SMUX mode (1, 2, 4) */
-            adatSmuxMode = curSamFreq / 48000; 
-            adatMultiple = mClk / 48000; 
+            adatSmuxMode = curSamFreq / 48000;
+            adatMultiple = mClk / 48000;
 #endif
         }
 
@@ -1161,7 +1161,7 @@ chanend ?c_config, chanend ?c)
 #endif
 #ifdef ADAT_TX
                    c_adat_out,
-                   adatSmuxMode, 
+                   adatSmuxMode,
 #endif
                    divide, curSamFreq,
 #if defined (ADAT_RX) || defined (SPDIF_RX)
diff --git a/module_usb_audio/endpoint0/chanstrings.h b/module_usb_audio/endpoint0/chanstrings.h
index 1c2e35d6..01f8afb2 100644
--- a/module_usb_audio/endpoint0/chanstrings.h
+++ b/module_usb_audio/endpoint0/chanstrings.h
@@ -1,2490 +1,2490 @@
-/* AUTOGENERATED using stringtable.py */ 
+/* AUTOGENERATED using stringtable.py */
 
 /* Not very nice looking but the standard preprocessor is not very powerful
  and we save some memory over doing this all at runtime */
 /* Output Strings */
 
 
-#if (NUM_USB_CHAN_OUT > 1-1) 
+#if (NUM_USB_CHAN_OUT > 1-1)
     .outputChanStr_1          = ""
-    #if (1 < I2S_CHANS_DAC+1) 
-        "Analogue 1" 
-    #endif 
-    #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (1 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(1 - SPDIF_TX_INDEX == 1) 
+    #if (1 < I2S_CHANS_DAC+1)
+        "Analogue 1"
+    #endif
+    #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (1 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(1 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(1 - SPDIF_TX_INDEX == 2) 
+        #elif(1 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((1 < ADAT_TX_INDEX+8+1) && (1 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (1 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(1 - ADAT_TX_INDEX == 1) 
+    #if ((1 < ADAT_TX_INDEX+8+1) && (1 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((1 < SPDIF_TX_INDEX+2+1) && (1 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (1 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(1 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(1 - ADAT_TX_INDEX == 2) 
+        #elif(1 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(1 - ADAT_TX_INDEX == 3) 
+        #elif(1 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(1 - ADAT_TX_INDEX == 4) 
+        #elif(1 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(1 - ADAT_TX_INDEX == 5) 
+        #elif(1 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(1 - ADAT_TX_INDEX == 6) 
+        #elif(1 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(1 - ADAT_TX_INDEX == 7) 
+        #elif(1 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(1 - ADAT_TX_INDEX == 8) 
+        #elif(1 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 2-1) 
+#if (NUM_USB_CHAN_OUT > 2-1)
     .outputChanStr_2          = ""
-    #if (2 < I2S_CHANS_DAC+1) 
-        "Analogue 2" 
-    #endif 
-    #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (2 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(2 - SPDIF_TX_INDEX == 1) 
+    #if (2 < I2S_CHANS_DAC+1)
+        "Analogue 2"
+    #endif
+    #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (2 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(2 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(2 - SPDIF_TX_INDEX == 2) 
+        #elif(2 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((2 < ADAT_TX_INDEX+8+1) && (2 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (2 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(2 - ADAT_TX_INDEX == 1) 
+    #if ((2 < ADAT_TX_INDEX+8+1) && (2 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((2 < SPDIF_TX_INDEX+2+1) && (2 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (2 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(2 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(2 - ADAT_TX_INDEX == 2) 
+        #elif(2 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(2 - ADAT_TX_INDEX == 3) 
+        #elif(2 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(2 - ADAT_TX_INDEX == 4) 
+        #elif(2 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(2 - ADAT_TX_INDEX == 5) 
+        #elif(2 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(2 - ADAT_TX_INDEX == 6) 
+        #elif(2 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(2 - ADAT_TX_INDEX == 7) 
+        #elif(2 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(2 - ADAT_TX_INDEX == 8) 
+        #elif(2 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 3-1) 
+#if (NUM_USB_CHAN_OUT > 3-1)
     .outputChanStr_3          = ""
-    #if (3 < I2S_CHANS_DAC+1) 
-        "Analogue 3" 
-    #endif 
-    #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (3 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(3 - SPDIF_TX_INDEX == 1) 
+    #if (3 < I2S_CHANS_DAC+1)
+        "Analogue 3"
+    #endif
+    #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (3 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(3 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(3 - SPDIF_TX_INDEX == 2) 
+        #elif(3 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((3 < ADAT_TX_INDEX+8+1) && (3 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (3 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(3 - ADAT_TX_INDEX == 1) 
+    #if ((3 < ADAT_TX_INDEX+8+1) && (3 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((3 < SPDIF_TX_INDEX+2+1) && (3 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (3 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(3 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(3 - ADAT_TX_INDEX == 2) 
+        #elif(3 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(3 - ADAT_TX_INDEX == 3) 
+        #elif(3 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(3 - ADAT_TX_INDEX == 4) 
+        #elif(3 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(3 - ADAT_TX_INDEX == 5) 
+        #elif(3 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(3 - ADAT_TX_INDEX == 6) 
+        #elif(3 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(3 - ADAT_TX_INDEX == 7) 
+        #elif(3 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(3 - ADAT_TX_INDEX == 8) 
+        #elif(3 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 4-1) 
+#if (NUM_USB_CHAN_OUT > 4-1)
     .outputChanStr_4          = ""
-    #if (4 < I2S_CHANS_DAC+1) 
-        "Analogue 4" 
-    #endif 
-    #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (4 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(4 - SPDIF_TX_INDEX == 1) 
+    #if (4 < I2S_CHANS_DAC+1)
+        "Analogue 4"
+    #endif
+    #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (4 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(4 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(4 - SPDIF_TX_INDEX == 2) 
+        #elif(4 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((4 < ADAT_TX_INDEX+8+1) && (4 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (4 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(4 - ADAT_TX_INDEX == 1) 
+    #if ((4 < ADAT_TX_INDEX+8+1) && (4 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((4 < SPDIF_TX_INDEX+2+1) && (4 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (4 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(4 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(4 - ADAT_TX_INDEX == 2) 
+        #elif(4 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(4 - ADAT_TX_INDEX == 3) 
+        #elif(4 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(4 - ADAT_TX_INDEX == 4) 
+        #elif(4 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(4 - ADAT_TX_INDEX == 5) 
+        #elif(4 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(4 - ADAT_TX_INDEX == 6) 
+        #elif(4 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(4 - ADAT_TX_INDEX == 7) 
+        #elif(4 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(4 - ADAT_TX_INDEX == 8) 
+        #elif(4 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 5-1) 
+#if (NUM_USB_CHAN_OUT > 5-1)
     .outputChanStr_5          = ""
-    #if (5 < I2S_CHANS_DAC+1) 
-        "Analogue 5" 
-    #endif 
-    #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (5 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(5 - SPDIF_TX_INDEX == 1) 
+    #if (5 < I2S_CHANS_DAC+1)
+        "Analogue 5"
+    #endif
+    #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (5 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(5 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(5 - SPDIF_TX_INDEX == 2) 
+        #elif(5 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((5 < ADAT_TX_INDEX+8+1) && (5 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (5 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(5 - ADAT_TX_INDEX == 1) 
+    #if ((5 < ADAT_TX_INDEX+8+1) && (5 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((5 < SPDIF_TX_INDEX+2+1) && (5 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (5 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(5 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(5 - ADAT_TX_INDEX == 2) 
+        #elif(5 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(5 - ADAT_TX_INDEX == 3) 
+        #elif(5 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(5 - ADAT_TX_INDEX == 4) 
+        #elif(5 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(5 - ADAT_TX_INDEX == 5) 
+        #elif(5 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(5 - ADAT_TX_INDEX == 6) 
+        #elif(5 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(5 - ADAT_TX_INDEX == 7) 
+        #elif(5 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(5 - ADAT_TX_INDEX == 8) 
+        #elif(5 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 6-1) 
+#if (NUM_USB_CHAN_OUT > 6-1)
     .outputChanStr_6          = ""
-    #if (6 < I2S_CHANS_DAC+1) 
-        "Analogue 6" 
-    #endif 
-    #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (6 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(6 - SPDIF_TX_INDEX == 1) 
+    #if (6 < I2S_CHANS_DAC+1)
+        "Analogue 6"
+    #endif
+    #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (6 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(6 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(6 - SPDIF_TX_INDEX == 2) 
+        #elif(6 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((6 < ADAT_TX_INDEX+8+1) && (6 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (6 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(6 - ADAT_TX_INDEX == 1) 
+    #if ((6 < ADAT_TX_INDEX+8+1) && (6 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((6 < SPDIF_TX_INDEX+2+1) && (6 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (6 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(6 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(6 - ADAT_TX_INDEX == 2) 
+        #elif(6 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(6 - ADAT_TX_INDEX == 3) 
+        #elif(6 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(6 - ADAT_TX_INDEX == 4) 
+        #elif(6 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(6 - ADAT_TX_INDEX == 5) 
+        #elif(6 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(6 - ADAT_TX_INDEX == 6) 
+        #elif(6 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(6 - ADAT_TX_INDEX == 7) 
+        #elif(6 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(6 - ADAT_TX_INDEX == 8) 
+        #elif(6 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 7-1) 
+#if (NUM_USB_CHAN_OUT > 7-1)
     .outputChanStr_7          = ""
-    #if (7 < I2S_CHANS_DAC+1) 
-        "Analogue 7" 
-    #endif 
-    #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (7 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(7 - SPDIF_TX_INDEX == 1) 
+    #if (7 < I2S_CHANS_DAC+1)
+        "Analogue 7"
+    #endif
+    #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (7 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(7 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(7 - SPDIF_TX_INDEX == 2) 
+        #elif(7 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((7 < ADAT_TX_INDEX+8+1) && (7 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (7 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(7 - ADAT_TX_INDEX == 1) 
+    #if ((7 < ADAT_TX_INDEX+8+1) && (7 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((7 < SPDIF_TX_INDEX+2+1) && (7 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (7 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(7 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(7 - ADAT_TX_INDEX == 2) 
+        #elif(7 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(7 - ADAT_TX_INDEX == 3) 
+        #elif(7 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(7 - ADAT_TX_INDEX == 4) 
+        #elif(7 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(7 - ADAT_TX_INDEX == 5) 
+        #elif(7 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(7 - ADAT_TX_INDEX == 6) 
+        #elif(7 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(7 - ADAT_TX_INDEX == 7) 
+        #elif(7 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(7 - ADAT_TX_INDEX == 8) 
+        #elif(7 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 8-1) 
+#if (NUM_USB_CHAN_OUT > 8-1)
     .outputChanStr_8          = ""
-    #if (8 < I2S_CHANS_DAC+1) 
-        "Analogue 8" 
-    #endif 
-    #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (8 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(8 - SPDIF_TX_INDEX == 1) 
+    #if (8 < I2S_CHANS_DAC+1)
+        "Analogue 8"
+    #endif
+    #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (8 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(8 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(8 - SPDIF_TX_INDEX == 2) 
+        #elif(8 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((8 < ADAT_TX_INDEX+8+1) && (8 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (8 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(8 - ADAT_TX_INDEX == 1) 
+    #if ((8 < ADAT_TX_INDEX+8+1) && (8 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((8 < SPDIF_TX_INDEX+2+1) && (8 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (8 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(8 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(8 - ADAT_TX_INDEX == 2) 
+        #elif(8 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(8 - ADAT_TX_INDEX == 3) 
+        #elif(8 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(8 - ADAT_TX_INDEX == 4) 
+        #elif(8 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(8 - ADAT_TX_INDEX == 5) 
+        #elif(8 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(8 - ADAT_TX_INDEX == 6) 
+        #elif(8 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(8 - ADAT_TX_INDEX == 7) 
+        #elif(8 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(8 - ADAT_TX_INDEX == 8) 
+        #elif(8 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 9-1) 
+#if (NUM_USB_CHAN_OUT > 9-1)
     .outputChanStr_9          = ""
-    #if (9 < I2S_CHANS_DAC+1) 
-        "Analogue 9" 
-    #endif 
-    #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (9 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(9 - SPDIF_TX_INDEX == 1) 
+    #if (9 < I2S_CHANS_DAC+1)
+        "Analogue 9"
+    #endif
+    #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (9 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(9 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(9 - SPDIF_TX_INDEX == 2) 
+        #elif(9 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((9 < ADAT_TX_INDEX+8+1) && (9 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (9 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(9 - ADAT_TX_INDEX == 1) 
+    #if ((9 < ADAT_TX_INDEX+8+1) && (9 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((9 < SPDIF_TX_INDEX+2+1) && (9 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (9 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(9 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(9 - ADAT_TX_INDEX == 2) 
+        #elif(9 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(9 - ADAT_TX_INDEX == 3) 
+        #elif(9 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(9 - ADAT_TX_INDEX == 4) 
+        #elif(9 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(9 - ADAT_TX_INDEX == 5) 
+        #elif(9 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(9 - ADAT_TX_INDEX == 6) 
+        #elif(9 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(9 - ADAT_TX_INDEX == 7) 
+        #elif(9 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(9 - ADAT_TX_INDEX == 8) 
+        #elif(9 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 10-1) 
+#if (NUM_USB_CHAN_OUT > 10-1)
     .outputChanStr_10          = ""
-    #if (10 < I2S_CHANS_DAC+1) 
-        "Analogue 10" 
-    #endif 
-    #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (10 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(10 - SPDIF_TX_INDEX == 1) 
+    #if (10 < I2S_CHANS_DAC+1)
+        "Analogue 10"
+    #endif
+    #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (10 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(10 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(10 - SPDIF_TX_INDEX == 2) 
+        #elif(10 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((10 < ADAT_TX_INDEX+8+1) && (10 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (10 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(10 - ADAT_TX_INDEX == 1) 
+    #if ((10 < ADAT_TX_INDEX+8+1) && (10 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((10 < SPDIF_TX_INDEX+2+1) && (10 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (10 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(10 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(10 - ADAT_TX_INDEX == 2) 
+        #elif(10 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(10 - ADAT_TX_INDEX == 3) 
+        #elif(10 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(10 - ADAT_TX_INDEX == 4) 
+        #elif(10 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(10 - ADAT_TX_INDEX == 5) 
+        #elif(10 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(10 - ADAT_TX_INDEX == 6) 
+        #elif(10 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(10 - ADAT_TX_INDEX == 7) 
+        #elif(10 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(10 - ADAT_TX_INDEX == 8) 
+        #elif(10 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 11-1) 
+#if (NUM_USB_CHAN_OUT > 11-1)
     .outputChanStr_11          = ""
-    #if (11 < I2S_CHANS_DAC+1) 
-        "Analogue 11" 
-    #endif 
-    #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (11 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(11 - SPDIF_TX_INDEX == 1) 
+    #if (11 < I2S_CHANS_DAC+1)
+        "Analogue 11"
+    #endif
+    #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (11 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(11 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(11 - SPDIF_TX_INDEX == 2) 
+        #elif(11 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((11 < ADAT_TX_INDEX+8+1) && (11 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (11 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(11 - ADAT_TX_INDEX == 1) 
+    #if ((11 < ADAT_TX_INDEX+8+1) && (11 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((11 < SPDIF_TX_INDEX+2+1) && (11 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (11 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(11 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(11 - ADAT_TX_INDEX == 2) 
+        #elif(11 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(11 - ADAT_TX_INDEX == 3) 
+        #elif(11 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(11 - ADAT_TX_INDEX == 4) 
+        #elif(11 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(11 - ADAT_TX_INDEX == 5) 
+        #elif(11 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(11 - ADAT_TX_INDEX == 6) 
+        #elif(11 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(11 - ADAT_TX_INDEX == 7) 
+        #elif(11 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(11 - ADAT_TX_INDEX == 8) 
+        #elif(11 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 12-1) 
+#if (NUM_USB_CHAN_OUT > 12-1)
     .outputChanStr_12          = ""
-    #if (12 < I2S_CHANS_DAC+1) 
-        "Analogue 12" 
-    #endif 
-    #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (12 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(12 - SPDIF_TX_INDEX == 1) 
+    #if (12 < I2S_CHANS_DAC+1)
+        "Analogue 12"
+    #endif
+    #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (12 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(12 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(12 - SPDIF_TX_INDEX == 2) 
+        #elif(12 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((12 < ADAT_TX_INDEX+8+1) && (12 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (12 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(12 - ADAT_TX_INDEX == 1) 
+    #if ((12 < ADAT_TX_INDEX+8+1) && (12 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((12 < SPDIF_TX_INDEX+2+1) && (12 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (12 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(12 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(12 - ADAT_TX_INDEX == 2) 
+        #elif(12 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(12 - ADAT_TX_INDEX == 3) 
+        #elif(12 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(12 - ADAT_TX_INDEX == 4) 
+        #elif(12 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(12 - ADAT_TX_INDEX == 5) 
+        #elif(12 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(12 - ADAT_TX_INDEX == 6) 
+        #elif(12 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(12 - ADAT_TX_INDEX == 7) 
+        #elif(12 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(12 - ADAT_TX_INDEX == 8) 
+        #elif(12 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 13-1) 
+#if (NUM_USB_CHAN_OUT > 13-1)
     .outputChanStr_13          = ""
-    #if (13 < I2S_CHANS_DAC+1) 
-        "Analogue 13" 
-    #endif 
-    #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (13 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(13 - SPDIF_TX_INDEX == 1) 
+    #if (13 < I2S_CHANS_DAC+1)
+        "Analogue 13"
+    #endif
+    #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (13 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(13 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(13 - SPDIF_TX_INDEX == 2) 
+        #elif(13 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((13 < ADAT_TX_INDEX+8+1) && (13 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (13 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(13 - ADAT_TX_INDEX == 1) 
+    #if ((13 < ADAT_TX_INDEX+8+1) && (13 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((13 < SPDIF_TX_INDEX+2+1) && (13 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (13 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(13 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(13 - ADAT_TX_INDEX == 2) 
+        #elif(13 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(13 - ADAT_TX_INDEX == 3) 
+        #elif(13 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(13 - ADAT_TX_INDEX == 4) 
+        #elif(13 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(13 - ADAT_TX_INDEX == 5) 
+        #elif(13 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(13 - ADAT_TX_INDEX == 6) 
+        #elif(13 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(13 - ADAT_TX_INDEX == 7) 
+        #elif(13 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(13 - ADAT_TX_INDEX == 8) 
+        #elif(13 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 14-1) 
+#if (NUM_USB_CHAN_OUT > 14-1)
     .outputChanStr_14          = ""
-    #if (14 < I2S_CHANS_DAC+1) 
-        "Analogue 14" 
-    #endif 
-    #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (14 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(14 - SPDIF_TX_INDEX == 1) 
+    #if (14 < I2S_CHANS_DAC+1)
+        "Analogue 14"
+    #endif
+    #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (14 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(14 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(14 - SPDIF_TX_INDEX == 2) 
+        #elif(14 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((14 < ADAT_TX_INDEX+8+1) && (14 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (14 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(14 - ADAT_TX_INDEX == 1) 
+    #if ((14 < ADAT_TX_INDEX+8+1) && (14 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((14 < SPDIF_TX_INDEX+2+1) && (14 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (14 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(14 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(14 - ADAT_TX_INDEX == 2) 
+        #elif(14 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(14 - ADAT_TX_INDEX == 3) 
+        #elif(14 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(14 - ADAT_TX_INDEX == 4) 
+        #elif(14 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(14 - ADAT_TX_INDEX == 5) 
+        #elif(14 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(14 - ADAT_TX_INDEX == 6) 
+        #elif(14 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(14 - ADAT_TX_INDEX == 7) 
+        #elif(14 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(14 - ADAT_TX_INDEX == 8) 
+        #elif(14 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 15-1) 
+#if (NUM_USB_CHAN_OUT > 15-1)
     .outputChanStr_15          = ""
-    #if (15 < I2S_CHANS_DAC+1) 
-        "Analogue 15" 
-    #endif 
-    #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (15 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(15 - SPDIF_TX_INDEX == 1) 
+    #if (15 < I2S_CHANS_DAC+1)
+        "Analogue 15"
+    #endif
+    #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (15 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(15 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(15 - SPDIF_TX_INDEX == 2) 
+        #elif(15 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((15 < ADAT_TX_INDEX+8+1) && (15 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (15 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(15 - ADAT_TX_INDEX == 1) 
+    #if ((15 < ADAT_TX_INDEX+8+1) && (15 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((15 < SPDIF_TX_INDEX+2+1) && (15 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (15 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(15 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(15 - ADAT_TX_INDEX == 2) 
+        #elif(15 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(15 - ADAT_TX_INDEX == 3) 
+        #elif(15 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(15 - ADAT_TX_INDEX == 4) 
+        #elif(15 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(15 - ADAT_TX_INDEX == 5) 
+        #elif(15 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(15 - ADAT_TX_INDEX == 6) 
+        #elif(15 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(15 - ADAT_TX_INDEX == 7) 
+        #elif(15 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(15 - ADAT_TX_INDEX == 8) 
+        #elif(15 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 16-1) 
+#if (NUM_USB_CHAN_OUT > 16-1)
     .outputChanStr_16          = ""
-    #if (16 < I2S_CHANS_DAC+1) 
-        "Analogue 16" 
-    #endif 
-    #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (16 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(16 - SPDIF_TX_INDEX == 1) 
+    #if (16 < I2S_CHANS_DAC+1)
+        "Analogue 16"
+    #endif
+    #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (16 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(16 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(16 - SPDIF_TX_INDEX == 2) 
+        #elif(16 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((16 < ADAT_TX_INDEX+8+1) && (16 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (16 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(16 - ADAT_TX_INDEX == 1) 
+    #if ((16 < ADAT_TX_INDEX+8+1) && (16 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((16 < SPDIF_TX_INDEX+2+1) && (16 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (16 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(16 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(16 - ADAT_TX_INDEX == 2) 
+        #elif(16 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(16 - ADAT_TX_INDEX == 3) 
+        #elif(16 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(16 - ADAT_TX_INDEX == 4) 
+        #elif(16 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(16 - ADAT_TX_INDEX == 5) 
+        #elif(16 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(16 - ADAT_TX_INDEX == 6) 
+        #elif(16 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(16 - ADAT_TX_INDEX == 7) 
+        #elif(16 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(16 - ADAT_TX_INDEX == 8) 
+        #elif(16 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 17-1) 
+#if (NUM_USB_CHAN_OUT > 17-1)
     .outputChanStr_17          = ""
-    #if (17 < I2S_CHANS_DAC+1) 
-        "Analogue 17" 
-    #endif 
-    #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (17 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(17 - SPDIF_TX_INDEX == 1) 
+    #if (17 < I2S_CHANS_DAC+1)
+        "Analogue 17"
+    #endif
+    #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (17 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(17 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(17 - SPDIF_TX_INDEX == 2) 
+        #elif(17 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((17 < ADAT_TX_INDEX+8+1) && (17 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (17 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(17 - ADAT_TX_INDEX == 1) 
+    #if ((17 < ADAT_TX_INDEX+8+1) && (17 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((17 < SPDIF_TX_INDEX+2+1) && (17 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (17 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(17 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(17 - ADAT_TX_INDEX == 2) 
+        #elif(17 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(17 - ADAT_TX_INDEX == 3) 
+        #elif(17 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(17 - ADAT_TX_INDEX == 4) 
+        #elif(17 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(17 - ADAT_TX_INDEX == 5) 
+        #elif(17 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(17 - ADAT_TX_INDEX == 6) 
+        #elif(17 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(17 - ADAT_TX_INDEX == 7) 
+        #elif(17 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(17 - ADAT_TX_INDEX == 8) 
+        #elif(17 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 18-1) 
+#if (NUM_USB_CHAN_OUT > 18-1)
     .outputChanStr_18          = ""
-    #if (18 < I2S_CHANS_DAC+1) 
-        "Analogue 18" 
-    #endif 
-    #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (18 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(18 - SPDIF_TX_INDEX == 1) 
+    #if (18 < I2S_CHANS_DAC+1)
+        "Analogue 18"
+    #endif
+    #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (18 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(18 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(18 - SPDIF_TX_INDEX == 2) 
+        #elif(18 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((18 < ADAT_TX_INDEX+8+1) && (18 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (18 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(18 - ADAT_TX_INDEX == 1) 
+    #if ((18 < ADAT_TX_INDEX+8+1) && (18 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((18 < SPDIF_TX_INDEX+2+1) && (18 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (18 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(18 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(18 - ADAT_TX_INDEX == 2) 
+        #elif(18 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(18 - ADAT_TX_INDEX == 3) 
+        #elif(18 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(18 - ADAT_TX_INDEX == 4) 
+        #elif(18 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(18 - ADAT_TX_INDEX == 5) 
+        #elif(18 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(18 - ADAT_TX_INDEX == 6) 
+        #elif(18 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(18 - ADAT_TX_INDEX == 7) 
+        #elif(18 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(18 - ADAT_TX_INDEX == 8) 
+        #elif(18 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 19-1) 
+#if (NUM_USB_CHAN_OUT > 19-1)
     .outputChanStr_19          = ""
-    #if (19 < I2S_CHANS_DAC+1) 
-        "Analogue 19" 
-    #endif 
-    #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (19 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(19 - SPDIF_TX_INDEX == 1) 
+    #if (19 < I2S_CHANS_DAC+1)
+        "Analogue 19"
+    #endif
+    #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (19 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(19 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(19 - SPDIF_TX_INDEX == 2) 
+        #elif(19 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((19 < ADAT_TX_INDEX+8+1) && (19 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (19 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(19 - ADAT_TX_INDEX == 1) 
+    #if ((19 < ADAT_TX_INDEX+8+1) && (19 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((19 < SPDIF_TX_INDEX+2+1) && (19 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (19 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(19 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(19 - ADAT_TX_INDEX == 2) 
+        #elif(19 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(19 - ADAT_TX_INDEX == 3) 
+        #elif(19 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(19 - ADAT_TX_INDEX == 4) 
+        #elif(19 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(19 - ADAT_TX_INDEX == 5) 
+        #elif(19 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(19 - ADAT_TX_INDEX == 6) 
+        #elif(19 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(19 - ADAT_TX_INDEX == 7) 
+        #elif(19 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(19 - ADAT_TX_INDEX == 8) 
+        #elif(19 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 20-1) 
+#if (NUM_USB_CHAN_OUT > 20-1)
     .outputChanStr_20          = ""
-    #if (20 < I2S_CHANS_DAC+1) 
-        "Analogue 20" 
-    #endif 
-    #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (20 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(20 - SPDIF_TX_INDEX == 1) 
+    #if (20 < I2S_CHANS_DAC+1)
+        "Analogue 20"
+    #endif
+    #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (20 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(20 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(20 - SPDIF_TX_INDEX == 2) 
+        #elif(20 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((20 < ADAT_TX_INDEX+8+1) && (20 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (20 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(20 - ADAT_TX_INDEX == 1) 
+    #if ((20 < ADAT_TX_INDEX+8+1) && (20 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((20 < SPDIF_TX_INDEX+2+1) && (20 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (20 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(20 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(20 - ADAT_TX_INDEX == 2) 
+        #elif(20 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(20 - ADAT_TX_INDEX == 3) 
+        #elif(20 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(20 - ADAT_TX_INDEX == 4) 
+        #elif(20 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(20 - ADAT_TX_INDEX == 5) 
+        #elif(20 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(20 - ADAT_TX_INDEX == 6) 
+        #elif(20 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(20 - ADAT_TX_INDEX == 7) 
+        #elif(20 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(20 - ADAT_TX_INDEX == 8) 
+        #elif(20 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 21-1) 
+#if (NUM_USB_CHAN_OUT > 21-1)
     .outputChanStr_21          = ""
-    #if (21 < I2S_CHANS_DAC+1) 
-        "Analogue 21" 
-    #endif 
-    #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (21 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(21 - SPDIF_TX_INDEX == 1) 
+    #if (21 < I2S_CHANS_DAC+1)
+        "Analogue 21"
+    #endif
+    #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (21 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(21 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(21 - SPDIF_TX_INDEX == 2) 
+        #elif(21 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((21 < ADAT_TX_INDEX+8+1) && (21 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (21 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(21 - ADAT_TX_INDEX == 1) 
+    #if ((21 < ADAT_TX_INDEX+8+1) && (21 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((21 < SPDIF_TX_INDEX+2+1) && (21 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (21 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(21 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(21 - ADAT_TX_INDEX == 2) 
+        #elif(21 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(21 - ADAT_TX_INDEX == 3) 
+        #elif(21 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(21 - ADAT_TX_INDEX == 4) 
+        #elif(21 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(21 - ADAT_TX_INDEX == 5) 
+        #elif(21 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(21 - ADAT_TX_INDEX == 6) 
+        #elif(21 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(21 - ADAT_TX_INDEX == 7) 
+        #elif(21 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(21 - ADAT_TX_INDEX == 8) 
+        #elif(21 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 22-1) 
+#if (NUM_USB_CHAN_OUT > 22-1)
     .outputChanStr_22          = ""
-    #if (22 < I2S_CHANS_DAC+1) 
-        "Analogue 22" 
-    #endif 
-    #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (22 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(22 - SPDIF_TX_INDEX == 1) 
+    #if (22 < I2S_CHANS_DAC+1)
+        "Analogue 22"
+    #endif
+    #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (22 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(22 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(22 - SPDIF_TX_INDEX == 2) 
+        #elif(22 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((22 < ADAT_TX_INDEX+8+1) && (22 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (22 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(22 - ADAT_TX_INDEX == 1) 
+    #if ((22 < ADAT_TX_INDEX+8+1) && (22 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((22 < SPDIF_TX_INDEX+2+1) && (22 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (22 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(22 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(22 - ADAT_TX_INDEX == 2) 
+        #elif(22 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(22 - ADAT_TX_INDEX == 3) 
+        #elif(22 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(22 - ADAT_TX_INDEX == 4) 
+        #elif(22 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(22 - ADAT_TX_INDEX == 5) 
+        #elif(22 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(22 - ADAT_TX_INDEX == 6) 
+        #elif(22 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(22 - ADAT_TX_INDEX == 7) 
+        #elif(22 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(22 - ADAT_TX_INDEX == 8) 
+        #elif(22 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 23-1) 
+#if (NUM_USB_CHAN_OUT > 23-1)
     .outputChanStr_23          = ""
-    #if (23 < I2S_CHANS_DAC+1) 
-        "Analogue 23" 
-    #endif 
-    #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (23 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(23 - SPDIF_TX_INDEX == 1) 
+    #if (23 < I2S_CHANS_DAC+1)
+        "Analogue 23"
+    #endif
+    #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (23 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(23 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(23 - SPDIF_TX_INDEX == 2) 
+        #elif(23 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((23 < ADAT_TX_INDEX+8+1) && (23 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (23 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(23 - ADAT_TX_INDEX == 1) 
+    #if ((23 < ADAT_TX_INDEX+8+1) && (23 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((23 < SPDIF_TX_INDEX+2+1) && (23 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (23 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(23 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(23 - ADAT_TX_INDEX == 2) 
+        #elif(23 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(23 - ADAT_TX_INDEX == 3) 
+        #elif(23 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(23 - ADAT_TX_INDEX == 4) 
+        #elif(23 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(23 - ADAT_TX_INDEX == 5) 
+        #elif(23 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(23 - ADAT_TX_INDEX == 6) 
+        #elif(23 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(23 - ADAT_TX_INDEX == 7) 
+        #elif(23 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(23 - ADAT_TX_INDEX == 8) 
+        #elif(23 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 24-1) 
+#if (NUM_USB_CHAN_OUT > 24-1)
     .outputChanStr_24          = ""
-    #if (24 < I2S_CHANS_DAC+1) 
-        "Analogue 24" 
-    #endif 
-    #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (24 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(24 - SPDIF_TX_INDEX == 1) 
+    #if (24 < I2S_CHANS_DAC+1)
+        "Analogue 24"
+    #endif
+    #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (24 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(24 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(24 - SPDIF_TX_INDEX == 2) 
+        #elif(24 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((24 < ADAT_TX_INDEX+8+1) && (24 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (24 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(24 - ADAT_TX_INDEX == 1) 
+    #if ((24 < ADAT_TX_INDEX+8+1) && (24 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((24 < SPDIF_TX_INDEX+2+1) && (24 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (24 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(24 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(24 - ADAT_TX_INDEX == 2) 
+        #elif(24 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(24 - ADAT_TX_INDEX == 3) 
+        #elif(24 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(24 - ADAT_TX_INDEX == 4) 
+        #elif(24 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(24 - ADAT_TX_INDEX == 5) 
+        #elif(24 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(24 - ADAT_TX_INDEX == 6) 
+        #elif(24 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(24 - ADAT_TX_INDEX == 7) 
+        #elif(24 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(24 - ADAT_TX_INDEX == 8) 
+        #elif(24 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 25-1) 
+#if (NUM_USB_CHAN_OUT > 25-1)
     .outputChanStr_25          = ""
-    #if (25 < I2S_CHANS_DAC+1) 
-        "Analogue 25" 
-    #endif 
-    #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (25 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(25 - SPDIF_TX_INDEX == 1) 
+    #if (25 < I2S_CHANS_DAC+1)
+        "Analogue 25"
+    #endif
+    #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (25 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(25 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(25 - SPDIF_TX_INDEX == 2) 
+        #elif(25 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((25 < ADAT_TX_INDEX+8+1) && (25 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (25 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(25 - ADAT_TX_INDEX == 1) 
+    #if ((25 < ADAT_TX_INDEX+8+1) && (25 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((25 < SPDIF_TX_INDEX+2+1) && (25 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (25 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(25 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(25 - ADAT_TX_INDEX == 2) 
+        #elif(25 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(25 - ADAT_TX_INDEX == 3) 
+        #elif(25 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(25 - ADAT_TX_INDEX == 4) 
+        #elif(25 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(25 - ADAT_TX_INDEX == 5) 
+        #elif(25 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(25 - ADAT_TX_INDEX == 6) 
+        #elif(25 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(25 - ADAT_TX_INDEX == 7) 
+        #elif(25 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(25 - ADAT_TX_INDEX == 8) 
+        #elif(25 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 26-1) 
+#if (NUM_USB_CHAN_OUT > 26-1)
     .outputChanStr_26          = ""
-    #if (26 < I2S_CHANS_DAC+1) 
-        "Analogue 26" 
-    #endif 
-    #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (26 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(26 - SPDIF_TX_INDEX == 1) 
+    #if (26 < I2S_CHANS_DAC+1)
+        "Analogue 26"
+    #endif
+    #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (26 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(26 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(26 - SPDIF_TX_INDEX == 2) 
+        #elif(26 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((26 < ADAT_TX_INDEX+8+1) && (26 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (26 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(26 - ADAT_TX_INDEX == 1) 
+    #if ((26 < ADAT_TX_INDEX+8+1) && (26 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((26 < SPDIF_TX_INDEX+2+1) && (26 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (26 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(26 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(26 - ADAT_TX_INDEX == 2) 
+        #elif(26 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(26 - ADAT_TX_INDEX == 3) 
+        #elif(26 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(26 - ADAT_TX_INDEX == 4) 
+        #elif(26 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(26 - ADAT_TX_INDEX == 5) 
+        #elif(26 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(26 - ADAT_TX_INDEX == 6) 
+        #elif(26 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(26 - ADAT_TX_INDEX == 7) 
+        #elif(26 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(26 - ADAT_TX_INDEX == 8) 
+        #elif(26 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 27-1) 
+#if (NUM_USB_CHAN_OUT > 27-1)
     .outputChanStr_27          = ""
-    #if (27 < I2S_CHANS_DAC+1) 
-        "Analogue 27" 
-    #endif 
-    #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (27 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(27 - SPDIF_TX_INDEX == 1) 
+    #if (27 < I2S_CHANS_DAC+1)
+        "Analogue 27"
+    #endif
+    #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (27 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(27 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(27 - SPDIF_TX_INDEX == 2) 
+        #elif(27 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((27 < ADAT_TX_INDEX+8+1) && (27 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (27 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(27 - ADAT_TX_INDEX == 1) 
+    #if ((27 < ADAT_TX_INDEX+8+1) && (27 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((27 < SPDIF_TX_INDEX+2+1) && (27 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (27 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(27 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(27 - ADAT_TX_INDEX == 2) 
+        #elif(27 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(27 - ADAT_TX_INDEX == 3) 
+        #elif(27 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(27 - ADAT_TX_INDEX == 4) 
+        #elif(27 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(27 - ADAT_TX_INDEX == 5) 
+        #elif(27 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(27 - ADAT_TX_INDEX == 6) 
+        #elif(27 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(27 - ADAT_TX_INDEX == 7) 
+        #elif(27 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(27 - ADAT_TX_INDEX == 8) 
+        #elif(27 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 28-1) 
+#if (NUM_USB_CHAN_OUT > 28-1)
     .outputChanStr_28          = ""
-    #if (28 < I2S_CHANS_DAC+1) 
-        "Analogue 28" 
-    #endif 
-    #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (28 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(28 - SPDIF_TX_INDEX == 1) 
+    #if (28 < I2S_CHANS_DAC+1)
+        "Analogue 28"
+    #endif
+    #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (28 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(28 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(28 - SPDIF_TX_INDEX == 2) 
+        #elif(28 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((28 < ADAT_TX_INDEX+8+1) && (28 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (28 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(28 - ADAT_TX_INDEX == 1) 
+    #if ((28 < ADAT_TX_INDEX+8+1) && (28 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((28 < SPDIF_TX_INDEX+2+1) && (28 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (28 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(28 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(28 - ADAT_TX_INDEX == 2) 
+        #elif(28 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(28 - ADAT_TX_INDEX == 3) 
+        #elif(28 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(28 - ADAT_TX_INDEX == 4) 
+        #elif(28 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(28 - ADAT_TX_INDEX == 5) 
+        #elif(28 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(28 - ADAT_TX_INDEX == 6) 
+        #elif(28 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(28 - ADAT_TX_INDEX == 7) 
+        #elif(28 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(28 - ADAT_TX_INDEX == 8) 
+        #elif(28 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 29-1) 
+#if (NUM_USB_CHAN_OUT > 29-1)
     .outputChanStr_29          = ""
-    #if (29 < I2S_CHANS_DAC+1) 
-        "Analogue 29" 
-    #endif 
-    #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (29 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(29 - SPDIF_TX_INDEX == 1) 
+    #if (29 < I2S_CHANS_DAC+1)
+        "Analogue 29"
+    #endif
+    #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (29 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(29 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(29 - SPDIF_TX_INDEX == 2) 
+        #elif(29 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((29 < ADAT_TX_INDEX+8+1) && (29 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (29 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(29 - ADAT_TX_INDEX == 1) 
+    #if ((29 < ADAT_TX_INDEX+8+1) && (29 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((29 < SPDIF_TX_INDEX+2+1) && (29 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (29 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(29 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(29 - ADAT_TX_INDEX == 2) 
+        #elif(29 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(29 - ADAT_TX_INDEX == 3) 
+        #elif(29 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(29 - ADAT_TX_INDEX == 4) 
+        #elif(29 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(29 - ADAT_TX_INDEX == 5) 
+        #elif(29 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(29 - ADAT_TX_INDEX == 6) 
+        #elif(29 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(29 - ADAT_TX_INDEX == 7) 
+        #elif(29 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(29 - ADAT_TX_INDEX == 8) 
+        #elif(29 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 30-1) 
+#if (NUM_USB_CHAN_OUT > 30-1)
     .outputChanStr_30          = ""
-    #if (30 < I2S_CHANS_DAC+1) 
-        "Analogue 30" 
-    #endif 
-    #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (30 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(30 - SPDIF_TX_INDEX == 1) 
+    #if (30 < I2S_CHANS_DAC+1)
+        "Analogue 30"
+    #endif
+    #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (30 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(30 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(30 - SPDIF_TX_INDEX == 2) 
+        #elif(30 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((30 < ADAT_TX_INDEX+8+1) && (30 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (30 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(30 - ADAT_TX_INDEX == 1) 
+    #if ((30 < ADAT_TX_INDEX+8+1) && (30 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((30 < SPDIF_TX_INDEX+2+1) && (30 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (30 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(30 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(30 - ADAT_TX_INDEX == 2) 
+        #elif(30 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(30 - ADAT_TX_INDEX == 3) 
+        #elif(30 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(30 - ADAT_TX_INDEX == 4) 
+        #elif(30 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(30 - ADAT_TX_INDEX == 5) 
+        #elif(30 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(30 - ADAT_TX_INDEX == 6) 
+        #elif(30 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(30 - ADAT_TX_INDEX == 7) 
+        #elif(30 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(30 - ADAT_TX_INDEX == 8) 
+        #elif(30 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_OUT > 31-1) 
+#if (NUM_USB_CHAN_OUT > 31-1)
     .outputChanStr_31          = ""
-    #if (31 < I2S_CHANS_DAC+1) 
-        "Analogue 31" 
-    #endif 
-    #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (31 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(31 - SPDIF_TX_INDEX == 1) 
+    #if (31 < I2S_CHANS_DAC+1)
+        "Analogue 31"
+    #endif
+    #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (31 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(31 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(31 - SPDIF_TX_INDEX == 2) 
+        #elif(31 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((31 < ADAT_TX_INDEX+8+1) && (31 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (31 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(31 - ADAT_TX_INDEX == 1) 
+    #if ((31 < ADAT_TX_INDEX+8+1) && (31 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((31 < SPDIF_TX_INDEX+2+1) && (31 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (31 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(31 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(31 - ADAT_TX_INDEX == 2) 
+        #elif(31 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(31 - ADAT_TX_INDEX == 3) 
+        #elif(31 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(31 - ADAT_TX_INDEX == 4) 
+        #elif(31 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(31 - ADAT_TX_INDEX == 5) 
+        #elif(31 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(31 - ADAT_TX_INDEX == 6) 
+        #elif(31 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(31 - ADAT_TX_INDEX == 7) 
+        #elif(31 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(31 - ADAT_TX_INDEX == 8) 
+        #elif(31 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
 /* Input Strings */
 
 
-#if (NUM_USB_CHAN_IN > 1-1) 
+#if (NUM_USB_CHAN_IN > 1-1)
     .inputChanStr_1          = ""
-    #if (1 < I2S_CHANS_ADC+1) 
-        "Analogue 1" 
-    #endif 
-    #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (1 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(1 - SPDIF_TX_INDEX == 1) 
+    #if (1 < I2S_CHANS_ADC+1)
+        "Analogue 1"
+    #endif
+    #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (1 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(1 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(1 - SPDIF_TX_INDEX == 2) 
+        #elif(1 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((1 < ADAT_RX_INDEX+8+1) && (1 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (1 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(1 - ADAT_TX_INDEX == 1) 
+    #if ((1 < ADAT_RX_INDEX+8+1) && (1 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((1 < SPDIF_RX_INDEX+2+1) && (1 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (1 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(1 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(1 - ADAT_TX_INDEX == 2) 
+        #elif(1 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(1 - ADAT_TX_INDEX == 3) 
+        #elif(1 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(1 - ADAT_TX_INDEX == 4) 
+        #elif(1 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(1 - ADAT_TX_INDEX == 5) 
+        #elif(1 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(1 - ADAT_TX_INDEX == 6) 
+        #elif(1 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(1 - ADAT_TX_INDEX == 7) 
+        #elif(1 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(1 - ADAT_TX_INDEX == 8) 
+        #elif(1 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 2-1) 
+#if (NUM_USB_CHAN_IN > 2-1)
     .inputChanStr_2          = ""
-    #if (2 < I2S_CHANS_ADC+1) 
-        "Analogue 2" 
-    #endif 
-    #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (2 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(2 - SPDIF_TX_INDEX == 1) 
+    #if (2 < I2S_CHANS_ADC+1)
+        "Analogue 2"
+    #endif
+    #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (2 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(2 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(2 - SPDIF_TX_INDEX == 2) 
+        #elif(2 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((2 < ADAT_RX_INDEX+8+1) && (2 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (2 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(2 - ADAT_TX_INDEX == 1) 
+    #if ((2 < ADAT_RX_INDEX+8+1) && (2 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((2 < SPDIF_RX_INDEX+2+1) && (2 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (2 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(2 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(2 - ADAT_TX_INDEX == 2) 
+        #elif(2 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(2 - ADAT_TX_INDEX == 3) 
+        #elif(2 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(2 - ADAT_TX_INDEX == 4) 
+        #elif(2 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(2 - ADAT_TX_INDEX == 5) 
+        #elif(2 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(2 - ADAT_TX_INDEX == 6) 
+        #elif(2 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(2 - ADAT_TX_INDEX == 7) 
+        #elif(2 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(2 - ADAT_TX_INDEX == 8) 
+        #elif(2 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 3-1) 
+#if (NUM_USB_CHAN_IN > 3-1)
     .inputChanStr_3          = ""
-    #if (3 < I2S_CHANS_ADC+1) 
-        "Analogue 3" 
-    #endif 
-    #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (3 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(3 - SPDIF_TX_INDEX == 1) 
+    #if (3 < I2S_CHANS_ADC+1)
+        "Analogue 3"
+    #endif
+    #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (3 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(3 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(3 - SPDIF_TX_INDEX == 2) 
+        #elif(3 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((3 < ADAT_RX_INDEX+8+1) && (3 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (3 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(3 - ADAT_TX_INDEX == 1) 
+    #if ((3 < ADAT_RX_INDEX+8+1) && (3 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((3 < SPDIF_RX_INDEX+2+1) && (3 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (3 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(3 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(3 - ADAT_TX_INDEX == 2) 
+        #elif(3 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(3 - ADAT_TX_INDEX == 3) 
+        #elif(3 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(3 - ADAT_TX_INDEX == 4) 
+        #elif(3 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(3 - ADAT_TX_INDEX == 5) 
+        #elif(3 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(3 - ADAT_TX_INDEX == 6) 
+        #elif(3 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(3 - ADAT_TX_INDEX == 7) 
+        #elif(3 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(3 - ADAT_TX_INDEX == 8) 
+        #elif(3 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 4-1) 
+#if (NUM_USB_CHAN_IN > 4-1)
     .inputChanStr_4          = ""
-    #if (4 < I2S_CHANS_ADC+1) 
-        "Analogue 4" 
-    #endif 
-    #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (4 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(4 - SPDIF_TX_INDEX == 1) 
+    #if (4 < I2S_CHANS_ADC+1)
+        "Analogue 4"
+    #endif
+    #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (4 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(4 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(4 - SPDIF_TX_INDEX == 2) 
+        #elif(4 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((4 < ADAT_RX_INDEX+8+1) && (4 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (4 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(4 - ADAT_TX_INDEX == 1) 
+    #if ((4 < ADAT_RX_INDEX+8+1) && (4 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((4 < SPDIF_RX_INDEX+2+1) && (4 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (4 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(4 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(4 - ADAT_TX_INDEX == 2) 
+        #elif(4 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(4 - ADAT_TX_INDEX == 3) 
+        #elif(4 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(4 - ADAT_TX_INDEX == 4) 
+        #elif(4 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(4 - ADAT_TX_INDEX == 5) 
+        #elif(4 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(4 - ADAT_TX_INDEX == 6) 
+        #elif(4 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(4 - ADAT_TX_INDEX == 7) 
+        #elif(4 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(4 - ADAT_TX_INDEX == 8) 
+        #elif(4 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 5-1) 
+#if (NUM_USB_CHAN_IN > 5-1)
     .inputChanStr_5          = ""
-    #if (5 < I2S_CHANS_ADC+1) 
-        "Analogue 5" 
-    #endif 
-    #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (5 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(5 - SPDIF_TX_INDEX == 1) 
+    #if (5 < I2S_CHANS_ADC+1)
+        "Analogue 5"
+    #endif
+    #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (5 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(5 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(5 - SPDIF_TX_INDEX == 2) 
+        #elif(5 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((5 < ADAT_RX_INDEX+8+1) && (5 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (5 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(5 - ADAT_TX_INDEX == 1) 
+    #if ((5 < ADAT_RX_INDEX+8+1) && (5 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((5 < SPDIF_RX_INDEX+2+1) && (5 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (5 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(5 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(5 - ADAT_TX_INDEX == 2) 
+        #elif(5 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(5 - ADAT_TX_INDEX == 3) 
+        #elif(5 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(5 - ADAT_TX_INDEX == 4) 
+        #elif(5 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(5 - ADAT_TX_INDEX == 5) 
+        #elif(5 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(5 - ADAT_TX_INDEX == 6) 
+        #elif(5 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(5 - ADAT_TX_INDEX == 7) 
+        #elif(5 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(5 - ADAT_TX_INDEX == 8) 
+        #elif(5 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 6-1) 
+#if (NUM_USB_CHAN_IN > 6-1)
     .inputChanStr_6          = ""
-    #if (6 < I2S_CHANS_ADC+1) 
-        "Analogue 6" 
-    #endif 
-    #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (6 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(6 - SPDIF_TX_INDEX == 1) 
+    #if (6 < I2S_CHANS_ADC+1)
+        "Analogue 6"
+    #endif
+    #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (6 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(6 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(6 - SPDIF_TX_INDEX == 2) 
+        #elif(6 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((6 < ADAT_RX_INDEX+8+1) && (6 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (6 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(6 - ADAT_TX_INDEX == 1) 
+    #if ((6 < ADAT_RX_INDEX+8+1) && (6 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((6 < SPDIF_RX_INDEX+2+1) && (6 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (6 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(6 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(6 - ADAT_TX_INDEX == 2) 
+        #elif(6 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(6 - ADAT_TX_INDEX == 3) 
+        #elif(6 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(6 - ADAT_TX_INDEX == 4) 
+        #elif(6 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(6 - ADAT_TX_INDEX == 5) 
+        #elif(6 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(6 - ADAT_TX_INDEX == 6) 
+        #elif(6 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(6 - ADAT_TX_INDEX == 7) 
+        #elif(6 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(6 - ADAT_TX_INDEX == 8) 
+        #elif(6 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 7-1) 
+#if (NUM_USB_CHAN_IN > 7-1)
     .inputChanStr_7          = ""
-    #if (7 < I2S_CHANS_ADC+1) 
-        "Analogue 7" 
-    #endif 
-    #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (7 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(7 - SPDIF_TX_INDEX == 1) 
+    #if (7 < I2S_CHANS_ADC+1)
+        "Analogue 7"
+    #endif
+    #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (7 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(7 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(7 - SPDIF_TX_INDEX == 2) 
+        #elif(7 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((7 < ADAT_RX_INDEX+8+1) && (7 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (7 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(7 - ADAT_TX_INDEX == 1) 
+    #if ((7 < ADAT_RX_INDEX+8+1) && (7 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((7 < SPDIF_RX_INDEX+2+1) && (7 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (7 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(7 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(7 - ADAT_TX_INDEX == 2) 
+        #elif(7 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(7 - ADAT_TX_INDEX == 3) 
+        #elif(7 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(7 - ADAT_TX_INDEX == 4) 
+        #elif(7 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(7 - ADAT_TX_INDEX == 5) 
+        #elif(7 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(7 - ADAT_TX_INDEX == 6) 
+        #elif(7 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(7 - ADAT_TX_INDEX == 7) 
+        #elif(7 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(7 - ADAT_TX_INDEX == 8) 
+        #elif(7 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 8-1) 
+#if (NUM_USB_CHAN_IN > 8-1)
     .inputChanStr_8          = ""
-    #if (8 < I2S_CHANS_ADC+1) 
-        "Analogue 8" 
-    #endif 
-    #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (8 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(8 - SPDIF_TX_INDEX == 1) 
+    #if (8 < I2S_CHANS_ADC+1)
+        "Analogue 8"
+    #endif
+    #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (8 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(8 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(8 - SPDIF_TX_INDEX == 2) 
+        #elif(8 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((8 < ADAT_RX_INDEX+8+1) && (8 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (8 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(8 - ADAT_TX_INDEX == 1) 
+    #if ((8 < ADAT_RX_INDEX+8+1) && (8 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((8 < SPDIF_RX_INDEX+2+1) && (8 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (8 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(8 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(8 - ADAT_TX_INDEX == 2) 
+        #elif(8 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(8 - ADAT_TX_INDEX == 3) 
+        #elif(8 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(8 - ADAT_TX_INDEX == 4) 
+        #elif(8 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(8 - ADAT_TX_INDEX == 5) 
+        #elif(8 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(8 - ADAT_TX_INDEX == 6) 
+        #elif(8 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(8 - ADAT_TX_INDEX == 7) 
+        #elif(8 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(8 - ADAT_TX_INDEX == 8) 
+        #elif(8 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 9-1) 
+#if (NUM_USB_CHAN_IN > 9-1)
     .inputChanStr_9          = ""
-    #if (9 < I2S_CHANS_ADC+1) 
-        "Analogue 9" 
-    #endif 
-    #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (9 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(9 - SPDIF_TX_INDEX == 1) 
+    #if (9 < I2S_CHANS_ADC+1)
+        "Analogue 9"
+    #endif
+    #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (9 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(9 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(9 - SPDIF_TX_INDEX == 2) 
+        #elif(9 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((9 < ADAT_RX_INDEX+8+1) && (9 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (9 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(9 - ADAT_TX_INDEX == 1) 
+    #if ((9 < ADAT_RX_INDEX+8+1) && (9 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((9 < SPDIF_RX_INDEX+2+1) && (9 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (9 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(9 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(9 - ADAT_TX_INDEX == 2) 
+        #elif(9 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(9 - ADAT_TX_INDEX == 3) 
+        #elif(9 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(9 - ADAT_TX_INDEX == 4) 
+        #elif(9 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(9 - ADAT_TX_INDEX == 5) 
+        #elif(9 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(9 - ADAT_TX_INDEX == 6) 
+        #elif(9 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(9 - ADAT_TX_INDEX == 7) 
+        #elif(9 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(9 - ADAT_TX_INDEX == 8) 
+        #elif(9 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 10-1) 
+#if (NUM_USB_CHAN_IN > 10-1)
     .inputChanStr_10          = ""
-    #if (10 < I2S_CHANS_ADC+1) 
-        "Analogue 10" 
-    #endif 
-    #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (10 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(10 - SPDIF_TX_INDEX == 1) 
+    #if (10 < I2S_CHANS_ADC+1)
+        "Analogue 10"
+    #endif
+    #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (10 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(10 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(10 - SPDIF_TX_INDEX == 2) 
+        #elif(10 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((10 < ADAT_RX_INDEX+8+1) && (10 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (10 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(10 - ADAT_TX_INDEX == 1) 
+    #if ((10 < ADAT_RX_INDEX+8+1) && (10 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((10 < SPDIF_RX_INDEX+2+1) && (10 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (10 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(10 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(10 - ADAT_TX_INDEX == 2) 
+        #elif(10 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(10 - ADAT_TX_INDEX == 3) 
+        #elif(10 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(10 - ADAT_TX_INDEX == 4) 
+        #elif(10 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(10 - ADAT_TX_INDEX == 5) 
+        #elif(10 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(10 - ADAT_TX_INDEX == 6) 
+        #elif(10 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(10 - ADAT_TX_INDEX == 7) 
+        #elif(10 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(10 - ADAT_TX_INDEX == 8) 
+        #elif(10 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 11-1) 
+#if (NUM_USB_CHAN_IN > 11-1)
     .inputChanStr_11          = ""
-    #if (11 < I2S_CHANS_ADC+1) 
-        "Analogue 11" 
-    #endif 
-    #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (11 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(11 - SPDIF_TX_INDEX == 1) 
+    #if (11 < I2S_CHANS_ADC+1)
+        "Analogue 11"
+    #endif
+    #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (11 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(11 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(11 - SPDIF_TX_INDEX == 2) 
+        #elif(11 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((11 < ADAT_RX_INDEX+8+1) && (11 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (11 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(11 - ADAT_TX_INDEX == 1) 
+    #if ((11 < ADAT_RX_INDEX+8+1) && (11 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((11 < SPDIF_RX_INDEX+2+1) && (11 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (11 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(11 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(11 - ADAT_TX_INDEX == 2) 
+        #elif(11 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(11 - ADAT_TX_INDEX == 3) 
+        #elif(11 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(11 - ADAT_TX_INDEX == 4) 
+        #elif(11 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(11 - ADAT_TX_INDEX == 5) 
+        #elif(11 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(11 - ADAT_TX_INDEX == 6) 
+        #elif(11 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(11 - ADAT_TX_INDEX == 7) 
+        #elif(11 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(11 - ADAT_TX_INDEX == 8) 
+        #elif(11 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 12-1) 
+#if (NUM_USB_CHAN_IN > 12-1)
     .inputChanStr_12          = ""
-    #if (12 < I2S_CHANS_ADC+1) 
-        "Analogue 12" 
-    #endif 
-    #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (12 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(12 - SPDIF_TX_INDEX == 1) 
+    #if (12 < I2S_CHANS_ADC+1)
+        "Analogue 12"
+    #endif
+    #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (12 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(12 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(12 - SPDIF_TX_INDEX == 2) 
+        #elif(12 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((12 < ADAT_RX_INDEX+8+1) && (12 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (12 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(12 - ADAT_TX_INDEX == 1) 
+    #if ((12 < ADAT_RX_INDEX+8+1) && (12 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((12 < SPDIF_RX_INDEX+2+1) && (12 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (12 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(12 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(12 - ADAT_TX_INDEX == 2) 
+        #elif(12 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(12 - ADAT_TX_INDEX == 3) 
+        #elif(12 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(12 - ADAT_TX_INDEX == 4) 
+        #elif(12 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(12 - ADAT_TX_INDEX == 5) 
+        #elif(12 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(12 - ADAT_TX_INDEX == 6) 
+        #elif(12 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(12 - ADAT_TX_INDEX == 7) 
+        #elif(12 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(12 - ADAT_TX_INDEX == 8) 
+        #elif(12 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 13-1) 
+#if (NUM_USB_CHAN_IN > 13-1)
     .inputChanStr_13          = ""
-    #if (13 < I2S_CHANS_ADC+1) 
-        "Analogue 13" 
-    #endif 
-    #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (13 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(13 - SPDIF_TX_INDEX == 1) 
+    #if (13 < I2S_CHANS_ADC+1)
+        "Analogue 13"
+    #endif
+    #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (13 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(13 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(13 - SPDIF_TX_INDEX == 2) 
+        #elif(13 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((13 < ADAT_RX_INDEX+8+1) && (13 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (13 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(13 - ADAT_TX_INDEX == 1) 
+    #if ((13 < ADAT_RX_INDEX+8+1) && (13 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((13 < SPDIF_RX_INDEX+2+1) && (13 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (13 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(13 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(13 - ADAT_TX_INDEX == 2) 
+        #elif(13 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(13 - ADAT_TX_INDEX == 3) 
+        #elif(13 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(13 - ADAT_TX_INDEX == 4) 
+        #elif(13 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(13 - ADAT_TX_INDEX == 5) 
+        #elif(13 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(13 - ADAT_TX_INDEX == 6) 
+        #elif(13 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(13 - ADAT_TX_INDEX == 7) 
+        #elif(13 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(13 - ADAT_TX_INDEX == 8) 
+        #elif(13 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 14-1) 
+#if (NUM_USB_CHAN_IN > 14-1)
     .inputChanStr_14          = ""
-    #if (14 < I2S_CHANS_ADC+1) 
-        "Analogue 14" 
-    #endif 
-    #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (14 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(14 - SPDIF_TX_INDEX == 1) 
+    #if (14 < I2S_CHANS_ADC+1)
+        "Analogue 14"
+    #endif
+    #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (14 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(14 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(14 - SPDIF_TX_INDEX == 2) 
+        #elif(14 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((14 < ADAT_RX_INDEX+8+1) && (14 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (14 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(14 - ADAT_TX_INDEX == 1) 
+    #if ((14 < ADAT_RX_INDEX+8+1) && (14 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((14 < SPDIF_RX_INDEX+2+1) && (14 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (14 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(14 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(14 - ADAT_TX_INDEX == 2) 
+        #elif(14 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(14 - ADAT_TX_INDEX == 3) 
+        #elif(14 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(14 - ADAT_TX_INDEX == 4) 
+        #elif(14 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(14 - ADAT_TX_INDEX == 5) 
+        #elif(14 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(14 - ADAT_TX_INDEX == 6) 
+        #elif(14 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(14 - ADAT_TX_INDEX == 7) 
+        #elif(14 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(14 - ADAT_TX_INDEX == 8) 
+        #elif(14 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 15-1) 
+#if (NUM_USB_CHAN_IN > 15-1)
     .inputChanStr_15          = ""
-    #if (15 < I2S_CHANS_ADC+1) 
-        "Analogue 15" 
-    #endif 
-    #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (15 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(15 - SPDIF_TX_INDEX == 1) 
+    #if (15 < I2S_CHANS_ADC+1)
+        "Analogue 15"
+    #endif
+    #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (15 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(15 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(15 - SPDIF_TX_INDEX == 2) 
+        #elif(15 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((15 < ADAT_RX_INDEX+8+1) && (15 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (15 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(15 - ADAT_TX_INDEX == 1) 
+    #if ((15 < ADAT_RX_INDEX+8+1) && (15 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((15 < SPDIF_RX_INDEX+2+1) && (15 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (15 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(15 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(15 - ADAT_TX_INDEX == 2) 
+        #elif(15 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(15 - ADAT_TX_INDEX == 3) 
+        #elif(15 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(15 - ADAT_TX_INDEX == 4) 
+        #elif(15 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(15 - ADAT_TX_INDEX == 5) 
+        #elif(15 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(15 - ADAT_TX_INDEX == 6) 
+        #elif(15 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(15 - ADAT_TX_INDEX == 7) 
+        #elif(15 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(15 - ADAT_TX_INDEX == 8) 
+        #elif(15 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 16-1) 
+#if (NUM_USB_CHAN_IN > 16-1)
     .inputChanStr_16          = ""
-    #if (16 < I2S_CHANS_ADC+1) 
-        "Analogue 16" 
-    #endif 
-    #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (16 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(16 - SPDIF_TX_INDEX == 1) 
+    #if (16 < I2S_CHANS_ADC+1)
+        "Analogue 16"
+    #endif
+    #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (16 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(16 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(16 - SPDIF_TX_INDEX == 2) 
+        #elif(16 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((16 < ADAT_RX_INDEX+8+1) && (16 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (16 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(16 - ADAT_TX_INDEX == 1) 
+    #if ((16 < ADAT_RX_INDEX+8+1) && (16 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((16 < SPDIF_RX_INDEX+2+1) && (16 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (16 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(16 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(16 - ADAT_TX_INDEX == 2) 
+        #elif(16 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(16 - ADAT_TX_INDEX == 3) 
+        #elif(16 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(16 - ADAT_TX_INDEX == 4) 
+        #elif(16 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(16 - ADAT_TX_INDEX == 5) 
+        #elif(16 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(16 - ADAT_TX_INDEX == 6) 
+        #elif(16 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(16 - ADAT_TX_INDEX == 7) 
+        #elif(16 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(16 - ADAT_TX_INDEX == 8) 
+        #elif(16 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 17-1) 
+#if (NUM_USB_CHAN_IN > 17-1)
     .inputChanStr_17          = ""
-    #if (17 < I2S_CHANS_ADC+1) 
-        "Analogue 17" 
-    #endif 
-    #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (17 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(17 - SPDIF_TX_INDEX == 1) 
+    #if (17 < I2S_CHANS_ADC+1)
+        "Analogue 17"
+    #endif
+    #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (17 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(17 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(17 - SPDIF_TX_INDEX == 2) 
+        #elif(17 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((17 < ADAT_RX_INDEX+8+1) && (17 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (17 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(17 - ADAT_TX_INDEX == 1) 
+    #if ((17 < ADAT_RX_INDEX+8+1) && (17 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((17 < SPDIF_RX_INDEX+2+1) && (17 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (17 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(17 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(17 - ADAT_TX_INDEX == 2) 
+        #elif(17 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(17 - ADAT_TX_INDEX == 3) 
+        #elif(17 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(17 - ADAT_TX_INDEX == 4) 
+        #elif(17 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(17 - ADAT_TX_INDEX == 5) 
+        #elif(17 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(17 - ADAT_TX_INDEX == 6) 
+        #elif(17 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(17 - ADAT_TX_INDEX == 7) 
+        #elif(17 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(17 - ADAT_TX_INDEX == 8) 
+        #elif(17 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 18-1) 
+#if (NUM_USB_CHAN_IN > 18-1)
     .inputChanStr_18          = ""
-    #if (18 < I2S_CHANS_ADC+1) 
-        "Analogue 18" 
-    #endif 
-    #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (18 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(18 - SPDIF_TX_INDEX == 1) 
+    #if (18 < I2S_CHANS_ADC+1)
+        "Analogue 18"
+    #endif
+    #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (18 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(18 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(18 - SPDIF_TX_INDEX == 2) 
+        #elif(18 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((18 < ADAT_RX_INDEX+8+1) && (18 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (18 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(18 - ADAT_TX_INDEX == 1) 
+    #if ((18 < ADAT_RX_INDEX+8+1) && (18 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((18 < SPDIF_RX_INDEX+2+1) && (18 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (18 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(18 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(18 - ADAT_TX_INDEX == 2) 
+        #elif(18 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(18 - ADAT_TX_INDEX == 3) 
+        #elif(18 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(18 - ADAT_TX_INDEX == 4) 
+        #elif(18 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(18 - ADAT_TX_INDEX == 5) 
+        #elif(18 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(18 - ADAT_TX_INDEX == 6) 
+        #elif(18 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(18 - ADAT_TX_INDEX == 7) 
+        #elif(18 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(18 - ADAT_TX_INDEX == 8) 
+        #elif(18 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 19-1) 
+#if (NUM_USB_CHAN_IN > 19-1)
     .inputChanStr_19          = ""
-    #if (19 < I2S_CHANS_ADC+1) 
-        "Analogue 19" 
-    #endif 
-    #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (19 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(19 - SPDIF_TX_INDEX == 1) 
+    #if (19 < I2S_CHANS_ADC+1)
+        "Analogue 19"
+    #endif
+    #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (19 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(19 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(19 - SPDIF_TX_INDEX == 2) 
+        #elif(19 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((19 < ADAT_RX_INDEX+8+1) && (19 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (19 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(19 - ADAT_TX_INDEX == 1) 
+    #if ((19 < ADAT_RX_INDEX+8+1) && (19 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((19 < SPDIF_RX_INDEX+2+1) && (19 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (19 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(19 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(19 - ADAT_TX_INDEX == 2) 
+        #elif(19 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(19 - ADAT_TX_INDEX == 3) 
+        #elif(19 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(19 - ADAT_TX_INDEX == 4) 
+        #elif(19 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(19 - ADAT_TX_INDEX == 5) 
+        #elif(19 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(19 - ADAT_TX_INDEX == 6) 
+        #elif(19 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(19 - ADAT_TX_INDEX == 7) 
+        #elif(19 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(19 - ADAT_TX_INDEX == 8) 
+        #elif(19 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 20-1) 
+#if (NUM_USB_CHAN_IN > 20-1)
     .inputChanStr_20          = ""
-    #if (20 < I2S_CHANS_ADC+1) 
-        "Analogue 20" 
-    #endif 
-    #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (20 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(20 - SPDIF_TX_INDEX == 1) 
+    #if (20 < I2S_CHANS_ADC+1)
+        "Analogue 20"
+    #endif
+    #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (20 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(20 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(20 - SPDIF_TX_INDEX == 2) 
+        #elif(20 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((20 < ADAT_RX_INDEX+8+1) && (20 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (20 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(20 - ADAT_TX_INDEX == 1) 
+    #if ((20 < ADAT_RX_INDEX+8+1) && (20 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((20 < SPDIF_RX_INDEX+2+1) && (20 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (20 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(20 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(20 - ADAT_TX_INDEX == 2) 
+        #elif(20 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(20 - ADAT_TX_INDEX == 3) 
+        #elif(20 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(20 - ADAT_TX_INDEX == 4) 
+        #elif(20 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(20 - ADAT_TX_INDEX == 5) 
+        #elif(20 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(20 - ADAT_TX_INDEX == 6) 
+        #elif(20 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(20 - ADAT_TX_INDEX == 7) 
+        #elif(20 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(20 - ADAT_TX_INDEX == 8) 
+        #elif(20 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 21-1) 
+#if (NUM_USB_CHAN_IN > 21-1)
     .inputChanStr_21          = ""
-    #if (21 < I2S_CHANS_ADC+1) 
-        "Analogue 21" 
-    #endif 
-    #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (21 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(21 - SPDIF_TX_INDEX == 1) 
+    #if (21 < I2S_CHANS_ADC+1)
+        "Analogue 21"
+    #endif
+    #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (21 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(21 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(21 - SPDIF_TX_INDEX == 2) 
+        #elif(21 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((21 < ADAT_RX_INDEX+8+1) && (21 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (21 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(21 - ADAT_TX_INDEX == 1) 
+    #if ((21 < ADAT_RX_INDEX+8+1) && (21 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((21 < SPDIF_RX_INDEX+2+1) && (21 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (21 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(21 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(21 - ADAT_TX_INDEX == 2) 
+        #elif(21 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(21 - ADAT_TX_INDEX == 3) 
+        #elif(21 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(21 - ADAT_TX_INDEX == 4) 
+        #elif(21 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(21 - ADAT_TX_INDEX == 5) 
+        #elif(21 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(21 - ADAT_TX_INDEX == 6) 
+        #elif(21 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(21 - ADAT_TX_INDEX == 7) 
+        #elif(21 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(21 - ADAT_TX_INDEX == 8) 
+        #elif(21 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 22-1) 
+#if (NUM_USB_CHAN_IN > 22-1)
     .inputChanStr_22          = ""
-    #if (22 < I2S_CHANS_ADC+1) 
-        "Analogue 22" 
-    #endif 
-    #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (22 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(22 - SPDIF_TX_INDEX == 1) 
+    #if (22 < I2S_CHANS_ADC+1)
+        "Analogue 22"
+    #endif
+    #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (22 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(22 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(22 - SPDIF_TX_INDEX == 2) 
+        #elif(22 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((22 < ADAT_RX_INDEX+8+1) && (22 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (22 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(22 - ADAT_TX_INDEX == 1) 
+    #if ((22 < ADAT_RX_INDEX+8+1) && (22 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((22 < SPDIF_RX_INDEX+2+1) && (22 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (22 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(22 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(22 - ADAT_TX_INDEX == 2) 
+        #elif(22 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(22 - ADAT_TX_INDEX == 3) 
+        #elif(22 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(22 - ADAT_TX_INDEX == 4) 
+        #elif(22 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(22 - ADAT_TX_INDEX == 5) 
+        #elif(22 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(22 - ADAT_TX_INDEX == 6) 
+        #elif(22 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(22 - ADAT_TX_INDEX == 7) 
+        #elif(22 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(22 - ADAT_TX_INDEX == 8) 
+        #elif(22 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 23-1) 
+#if (NUM_USB_CHAN_IN > 23-1)
     .inputChanStr_23          = ""
-    #if (23 < I2S_CHANS_ADC+1) 
-        "Analogue 23" 
-    #endif 
-    #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (23 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(23 - SPDIF_TX_INDEX == 1) 
+    #if (23 < I2S_CHANS_ADC+1)
+        "Analogue 23"
+    #endif
+    #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (23 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(23 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(23 - SPDIF_TX_INDEX == 2) 
+        #elif(23 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((23 < ADAT_RX_INDEX+8+1) && (23 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (23 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(23 - ADAT_TX_INDEX == 1) 
+    #if ((23 < ADAT_RX_INDEX+8+1) && (23 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((23 < SPDIF_RX_INDEX+2+1) && (23 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (23 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(23 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(23 - ADAT_TX_INDEX == 2) 
+        #elif(23 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(23 - ADAT_TX_INDEX == 3) 
+        #elif(23 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(23 - ADAT_TX_INDEX == 4) 
+        #elif(23 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(23 - ADAT_TX_INDEX == 5) 
+        #elif(23 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(23 - ADAT_TX_INDEX == 6) 
+        #elif(23 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(23 - ADAT_TX_INDEX == 7) 
+        #elif(23 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(23 - ADAT_TX_INDEX == 8) 
+        #elif(23 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 24-1) 
+#if (NUM_USB_CHAN_IN > 24-1)
     .inputChanStr_24          = ""
-    #if (24 < I2S_CHANS_ADC+1) 
-        "Analogue 24" 
-    #endif 
-    #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (24 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(24 - SPDIF_TX_INDEX == 1) 
+    #if (24 < I2S_CHANS_ADC+1)
+        "Analogue 24"
+    #endif
+    #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (24 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(24 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(24 - SPDIF_TX_INDEX == 2) 
+        #elif(24 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((24 < ADAT_RX_INDEX+8+1) && (24 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (24 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(24 - ADAT_TX_INDEX == 1) 
+    #if ((24 < ADAT_RX_INDEX+8+1) && (24 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((24 < SPDIF_RX_INDEX+2+1) && (24 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (24 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(24 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(24 - ADAT_TX_INDEX == 2) 
+        #elif(24 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(24 - ADAT_TX_INDEX == 3) 
+        #elif(24 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(24 - ADAT_TX_INDEX == 4) 
+        #elif(24 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(24 - ADAT_TX_INDEX == 5) 
+        #elif(24 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(24 - ADAT_TX_INDEX == 6) 
+        #elif(24 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(24 - ADAT_TX_INDEX == 7) 
+        #elif(24 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(24 - ADAT_TX_INDEX == 8) 
+        #elif(24 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 25-1) 
+#if (NUM_USB_CHAN_IN > 25-1)
     .inputChanStr_25          = ""
-    #if (25 < I2S_CHANS_ADC+1) 
-        "Analogue 25" 
-    #endif 
-    #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (25 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(25 - SPDIF_TX_INDEX == 1) 
+    #if (25 < I2S_CHANS_ADC+1)
+        "Analogue 25"
+    #endif
+    #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (25 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(25 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(25 - SPDIF_TX_INDEX == 2) 
+        #elif(25 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((25 < ADAT_RX_INDEX+8+1) && (25 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (25 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(25 - ADAT_TX_INDEX == 1) 
+    #if ((25 < ADAT_RX_INDEX+8+1) && (25 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((25 < SPDIF_RX_INDEX+2+1) && (25 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (25 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(25 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(25 - ADAT_TX_INDEX == 2) 
+        #elif(25 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(25 - ADAT_TX_INDEX == 3) 
+        #elif(25 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(25 - ADAT_TX_INDEX == 4) 
+        #elif(25 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(25 - ADAT_TX_INDEX == 5) 
+        #elif(25 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(25 - ADAT_TX_INDEX == 6) 
+        #elif(25 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(25 - ADAT_TX_INDEX == 7) 
+        #elif(25 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(25 - ADAT_TX_INDEX == 8) 
+        #elif(25 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 26-1) 
+#if (NUM_USB_CHAN_IN > 26-1)
     .inputChanStr_26          = ""
-    #if (26 < I2S_CHANS_ADC+1) 
-        "Analogue 26" 
-    #endif 
-    #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (26 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(26 - SPDIF_TX_INDEX == 1) 
+    #if (26 < I2S_CHANS_ADC+1)
+        "Analogue 26"
+    #endif
+    #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (26 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(26 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(26 - SPDIF_TX_INDEX == 2) 
+        #elif(26 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((26 < ADAT_RX_INDEX+8+1) && (26 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (26 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(26 - ADAT_TX_INDEX == 1) 
+    #if ((26 < ADAT_RX_INDEX+8+1) && (26 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((26 < SPDIF_RX_INDEX+2+1) && (26 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (26 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(26 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(26 - ADAT_TX_INDEX == 2) 
+        #elif(26 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(26 - ADAT_TX_INDEX == 3) 
+        #elif(26 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(26 - ADAT_TX_INDEX == 4) 
+        #elif(26 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(26 - ADAT_TX_INDEX == 5) 
+        #elif(26 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(26 - ADAT_TX_INDEX == 6) 
+        #elif(26 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(26 - ADAT_TX_INDEX == 7) 
+        #elif(26 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(26 - ADAT_TX_INDEX == 8) 
+        #elif(26 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 27-1) 
+#if (NUM_USB_CHAN_IN > 27-1)
     .inputChanStr_27          = ""
-    #if (27 < I2S_CHANS_ADC+1) 
-        "Analogue 27" 
-    #endif 
-    #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (27 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(27 - SPDIF_TX_INDEX == 1) 
+    #if (27 < I2S_CHANS_ADC+1)
+        "Analogue 27"
+    #endif
+    #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (27 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(27 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(27 - SPDIF_TX_INDEX == 2) 
+        #elif(27 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((27 < ADAT_RX_INDEX+8+1) && (27 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (27 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(27 - ADAT_TX_INDEX == 1) 
+    #if ((27 < ADAT_RX_INDEX+8+1) && (27 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((27 < SPDIF_RX_INDEX+2+1) && (27 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (27 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(27 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(27 - ADAT_TX_INDEX == 2) 
+        #elif(27 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(27 - ADAT_TX_INDEX == 3) 
+        #elif(27 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(27 - ADAT_TX_INDEX == 4) 
+        #elif(27 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(27 - ADAT_TX_INDEX == 5) 
+        #elif(27 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(27 - ADAT_TX_INDEX == 6) 
+        #elif(27 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(27 - ADAT_TX_INDEX == 7) 
+        #elif(27 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(27 - ADAT_TX_INDEX == 8) 
+        #elif(27 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 28-1) 
+#if (NUM_USB_CHAN_IN > 28-1)
     .inputChanStr_28          = ""
-    #if (28 < I2S_CHANS_ADC+1) 
-        "Analogue 28" 
-    #endif 
-    #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (28 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(28 - SPDIF_TX_INDEX == 1) 
+    #if (28 < I2S_CHANS_ADC+1)
+        "Analogue 28"
+    #endif
+    #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (28 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(28 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(28 - SPDIF_TX_INDEX == 2) 
+        #elif(28 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((28 < ADAT_RX_INDEX+8+1) && (28 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (28 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(28 - ADAT_TX_INDEX == 1) 
+    #if ((28 < ADAT_RX_INDEX+8+1) && (28 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((28 < SPDIF_RX_INDEX+2+1) && (28 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (28 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(28 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(28 - ADAT_TX_INDEX == 2) 
+        #elif(28 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(28 - ADAT_TX_INDEX == 3) 
+        #elif(28 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(28 - ADAT_TX_INDEX == 4) 
+        #elif(28 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(28 - ADAT_TX_INDEX == 5) 
+        #elif(28 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(28 - ADAT_TX_INDEX == 6) 
+        #elif(28 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(28 - ADAT_TX_INDEX == 7) 
+        #elif(28 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(28 - ADAT_TX_INDEX == 8) 
+        #elif(28 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 29-1) 
+#if (NUM_USB_CHAN_IN > 29-1)
     .inputChanStr_29          = ""
-    #if (29 < I2S_CHANS_ADC+1) 
-        "Analogue 29" 
-    #endif 
-    #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (29 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(29 - SPDIF_TX_INDEX == 1) 
+    #if (29 < I2S_CHANS_ADC+1)
+        "Analogue 29"
+    #endif
+    #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (29 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(29 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(29 - SPDIF_TX_INDEX == 2) 
+        #elif(29 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((29 < ADAT_RX_INDEX+8+1) && (29 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (29 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(29 - ADAT_TX_INDEX == 1) 
+    #if ((29 < ADAT_RX_INDEX+8+1) && (29 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((29 < SPDIF_RX_INDEX+2+1) && (29 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (29 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(29 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(29 - ADAT_TX_INDEX == 2) 
+        #elif(29 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(29 - ADAT_TX_INDEX == 3) 
+        #elif(29 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(29 - ADAT_TX_INDEX == 4) 
+        #elif(29 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(29 - ADAT_TX_INDEX == 5) 
+        #elif(29 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(29 - ADAT_TX_INDEX == 6) 
+        #elif(29 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(29 - ADAT_TX_INDEX == 7) 
+        #elif(29 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(29 - ADAT_TX_INDEX == 8) 
+        #elif(29 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 30-1) 
+#if (NUM_USB_CHAN_IN > 30-1)
     .inputChanStr_30          = ""
-    #if (30 < I2S_CHANS_ADC+1) 
-        "Analogue 30" 
-    #endif 
-    #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (30 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(30 - SPDIF_TX_INDEX == 1) 
+    #if (30 < I2S_CHANS_ADC+1)
+        "Analogue 30"
+    #endif
+    #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (30 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(30 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(30 - SPDIF_TX_INDEX == 2) 
+        #elif(30 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((30 < ADAT_RX_INDEX+8+1) && (30 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (30 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(30 - ADAT_TX_INDEX == 1) 
+    #if ((30 < ADAT_RX_INDEX+8+1) && (30 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((30 < SPDIF_RX_INDEX+2+1) && (30 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (30 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(30 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(30 - ADAT_TX_INDEX == 2) 
+        #elif(30 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(30 - ADAT_TX_INDEX == 3) 
+        #elif(30 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(30 - ADAT_TX_INDEX == 4) 
+        #elif(30 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(30 - ADAT_TX_INDEX == 5) 
+        #elif(30 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(30 - ADAT_TX_INDEX == 6) 
+        #elif(30 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(30 - ADAT_TX_INDEX == 7) 
+        #elif(30 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(30 - ADAT_TX_INDEX == 8) 
+        #elif(30 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
-#if (NUM_USB_CHAN_IN > 31-1) 
+#if (NUM_USB_CHAN_IN > 31-1)
     .inputChanStr_31          = ""
-    #if (31 < I2S_CHANS_ADC+1) 
-        "Analogue 31" 
-    #endif 
-    #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (31 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(31 - SPDIF_TX_INDEX == 1) 
+    #if (31 < I2S_CHANS_ADC+1)
+        "Analogue 31"
+    #endif
+    #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (31 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(31 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(31 - SPDIF_TX_INDEX == 2) 
+        #elif(31 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((31 < ADAT_RX_INDEX+8+1) && (31 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (31 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(31 - ADAT_TX_INDEX == 1) 
+    #if ((31 < ADAT_RX_INDEX+8+1) && (31 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((31 < SPDIF_RX_INDEX+2+1) && (31 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (31 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(31 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(31 - ADAT_TX_INDEX == 2) 
+        #elif(31 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(31 - ADAT_TX_INDEX == 3) 
+        #elif(31 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(31 - ADAT_TX_INDEX == 4) 
+        #elif(31 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(31 - ADAT_TX_INDEX == 5) 
+        #elif(31 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(31 - ADAT_TX_INDEX == 6) 
+        #elif(31 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(31 - ADAT_TX_INDEX == 7) 
+        #elif(31 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(31 - ADAT_TX_INDEX == 8) 
+        #elif(31 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
diff --git a/module_usb_audio/uac_hwresources.h b/module_usb_audio/uac_hwresources.h
index e8d2e8e0..a5f67f6e 100644
--- a/module_usb_audio/uac_hwresources.h
+++ b/module_usb_audio/uac_hwresources.h
@@ -4,7 +4,7 @@
 
 #include "xud.h"                 /* XMOS USB Device Layer defines and functions */
 
-#if (XUD_SERIES_SUPPORT != XUD_U_SERIES) 
+#if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
 
 /* XUD_L_SERIES and XUD_G_SERIES */
 
@@ -31,7 +31,7 @@
 /* #define CLKBLK_MCLK        XS1_CLKBLK_2 */
 #define CLKBLK_I2S_BIT     XS1_CLKBLK_3
 
-#else 
+#else
 
 /* XUD_U_SERIES */
 

From fa12263ac6248aa95abcdb11eaa5d6b09cffff7f Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:10:04 +0000
Subject: [PATCH 07/11] 'Release: 6.11.1beta0'

---
 README.rst | 2 +-
 xpd.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index b556ea6d..0017f035 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.11.0alpha2
+:Latest release: 6.11.1beta0
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/xpd.xml b/xpd.xml
index 25a5a992..d41d164a 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -81,7 +81,8 @@
     <release parenthash = "30f610d185606bd17061581debb6693369fcbb05" version = "6.10.0alpha2" githash = "517fe9667c43f2c5fe0d8e5dae06be716342a16a"></release>
     <release parenthash = "38958db165ea44a8db74abd0cf294fcb466e5172" version = "6.11.0alpha0" githash = "af925d59b69833c0ec8d970b667b4164833e5d4c"></release>
     <release parenthash = "a4af4fd0f27b117df1f6e7ff6a10299f2ea91349" version = "6.11.0alpha1" githash = "bed9f5314a0f7f2c952da24bd6efa18931b12b93"></release>
-    <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2"></release>
+    <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release>
+    <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>

From 8335ef56cdc879e7e84a338534e10091b86b1e5a Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:12:02 +0000
Subject: [PATCH 08/11] Fixed spelling error in changelog

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c75d1dea..cf2cb203 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,7 +3,7 @@ sc_usb_audio Change Log
 
 6.11.1
 ------
-    - ADDED:      ADAT transmit functionality, inclusing SMUX. See ADAT_TX and ADAT_TX_INDEX. 
+    - ADDED:      ADAT transmit functionality, including SMUX. See ADAT_TX and ADAT_TX_INDEX. 
     - RESOLVED:   Build issue with CODEC_MASTER (xCore is I2S slave) enabled
     - RESOLVED:   Channel ordering issue in when TDM and CODEC_MASTER mode enabled
     - RESOLVED:   DFU fails when SPDIF_RX enabled due to clock block being shared between SPDIF

From 3e61cee71c4aaa845908d5d9dfb9257a1000215d Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:13:00 +0000
Subject: [PATCH 09/11] 'Release: 6.11.1beta1'

---
 README.rst | 2 +-
 xpd.xml    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 0017f035..9ef27f1f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.11.1beta0
+:Latest release: 6.11.1beta1
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/xpd.xml b/xpd.xml
index d41d164a..585b6ddc 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -20,7 +20,7 @@
         </component>
         <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
             <board></board>
-            <componentDependency version = "6.11.0">module_queue</componentDependency>
+            <componentDependency version = "6.11.1">module_queue</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
             <keyword>MIDI</keyword>
         </component>
@@ -82,7 +82,8 @@
     <release parenthash = "38958db165ea44a8db74abd0cf294fcb466e5172" version = "6.11.0alpha0" githash = "af925d59b69833c0ec8d970b667b4164833e5d4c"></release>
     <release parenthash = "a4af4fd0f27b117df1f6e7ff6a10299f2ea91349" version = "6.11.0alpha1" githash = "bed9f5314a0f7f2c952da24bd6efa18931b12b93"></release>
     <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release>
-    <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0"></release>
+    <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0" githash = "fa12263ac6248aa95abcdb11eaa5d6b09cffff7f"></release>
+    <release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>

From 214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:38:26 +0000
Subject: [PATCH 10/11] Fixed build issue due to SPDIF clock block always
 delcared.

---
 module_usb_audio/main.xc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 646406e5..9991f2d8 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -151,7 +151,9 @@ on tile[AUDIO_IO_TILE] :  buffered in port:1 p_midi_rx      = PORT_MIDI_IN;
 on tile[AUDIO_IO_TILE] : clock    clk_midi                  = CLKBLK_MIDI;
 #endif
 
+#if defined(SPDIF) || defined(ADAT_TX)
 on tile[AUDIO_IO_TILE] : clock    clk_mst_spd               = CLKBLK_SPDIF_TX;
+#endif
 
 #ifdef SPDIF_RX
 on tile[XUD_TILE] : clock    clk_spd_rx                     = CLKBLK_SPDIF_RX;

From 1e963e8bc5e02fc4a03cc1b4059533a7734417e9 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Wed, 4 Mar 2015 16:38:50 +0000
Subject: [PATCH 11/11] 'Release: 6.11.1beta2'

---
 README.rst | 2 +-
 xpd.xml    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 9ef27f1f..74daa595 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.11.1beta1
+:Latest release: 6.11.1beta2
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/xpd.xml b/xpd.xml
index 585b6ddc..73bc8090 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -20,8 +20,8 @@
         </component>
         <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
             <board></board>
-            <componentDependency version = "6.11.1">module_queue</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
+            <componentDependency version = "6.11.1">module_queue</componentDependency>
             <keyword>MIDI</keyword>
         </component>
     </components>
@@ -83,7 +83,8 @@
     <release parenthash = "a4af4fd0f27b117df1f6e7ff6a10299f2ea91349" version = "6.11.0alpha1" githash = "bed9f5314a0f7f2c952da24bd6efa18931b12b93"></release>
     <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release>
     <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0" githash = "fa12263ac6248aa95abcdb11eaa5d6b09cffff7f"></release>
-    <release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1"></release>
+    <release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1" githash = "3e61cee71c4aaa845908d5d9dfb9257a1000215d"></release>
+    <release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>