diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b7f0c38b..4ee82d74 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,8 @@ sc_usb_audio Change Log
     - RESOLVED:   (Minor) BCD_DEVICE define in devicedefines.h now guarded by ifndef (caused issues
                   with DFU test build configs.
     - RESOLVED:   (Minor) String descriptor for Clock Selector unit incorrectly reported
+    - RESOLVED:   (Minor) BCD_DEVICE in devicedefines.h now guarded by #ifndef (Caused issues with 
+                  default DFU test build configs.
     - CHANGE:     HID report descriptor defines added to shared user_hid.h
     - CHANGE:     Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed)
 
diff --git a/README.rst b/README.rst
index 74daa595..638ad8b2 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.11.1beta2
+:Latest release: 6.11.2rc2
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/module_dfu/.cproject b/module_dfu/.cproject
index bb778c83..1ab30e26 100644
--- a/module_dfu/.cproject
+++ b/module_dfu/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.56671338" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.87205741" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.87205741" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/module_queue/.cproject b/module_queue/.cproject
index c7c68158..9bed8103 100644
--- a/module_queue/.cproject
+++ b/module_queue/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.7708331" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.60520286" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.60520286" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/module_usb_audio/.cproject b/module_usb_audio/.cproject
index 3426382e..5b0ab598 100644
--- a/module_usb_audio/.cproject
+++ b/module_usb_audio/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.55196333" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.36159420" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.36159420" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 675921cc..55cf5a6e 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -469,7 +469,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             1
+#define BCD_DEVICE_N             2
 #endif
 
 /**
diff --git a/module_usb_audio/endpoint0/chanstringgen.py b/module_usb_audio/endpoint0/chanstringgen.py
index 5bafd989..f6716bfc 100644
--- a/module_usb_audio/endpoint0/chanstringgen.py
+++ b/module_usb_audio/endpoint0/chanstringgen.py
@@ -4,47 +4,47 @@ def genstrings(outputChanCount, chanString, portString, structureString, adc_dac
     
     for i in range(1,outputChanCount):
 
-        print "#if (NUM_USB_CHAN_{c} > {i}-1) \n\
+        print "#if (NUM_USB_CHAN_{c} > {i}-1)\n\
     .{s}ChanStr_{i}          = \"\"\n\
-    #if ({i} < I2S_CHANS_{adcdac}+1) \n\
-        \"Analogue {i}\" \n\
-    #endif \n\
-    #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) \n\
-        #if ({i} < I2S_CHANS_{adcdac}+1) \n\
-        \"/\" \n\
-        #endif \n\
-        #if({i} - SPDIF_TX_INDEX == 1) \n\
+    #if ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"Analogue {i}\"\n\
+    #endif\n\
+    #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p})\n\
+        #if ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"/\"\n\
+        #endif\n\
+        #if({i} - SPDIF_{p}_INDEX == 1)\n\
             \"SPDIF 1\"\n\
-        #elif({i} - SPDIF_TX_INDEX == 2) \n\
+        #elif({i} - SPDIF_{p}_INDEX == 2)\n\
             \"SPDIF 2\"\n\
         #endif\n\
     #endif\n\
-    #if (({i} < ADAT_{p}_INDEX+8+1) && ({i} > ADAT_{p}_INDEX)) && defined(ADAT_{p}) \n\
-        #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) || ({i} < I2S_CHANS_{adcdac}+1) \n\
-        \"/\" \n\
-        #endif \n\
-        #if({i} - ADAT_TX_INDEX == 1) \n\
+    #if (({i} < ADAT_{p}_INDEX+8+1) && ({i} > ADAT_{p}_INDEX)) && defined(ADAT_{p})\n\
+        #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) || ({i} < I2S_CHANS_{adcdac}+1)\n\
+        \"/\"\n\
+        #endif\n\
+        #if({i} - ADAT_TX_INDEX == 1)\n\
             \"ADAT 1\"\n\
-        #elif({i} - ADAT_TX_INDEX == 2) \n\
+        #elif({i} - ADAT_TX_INDEX == 2)\n\
             \"ADAT 2\"\n\
-        #elif({i} - ADAT_TX_INDEX == 3) \n\
+        #elif({i} - ADAT_TX_INDEX == 3)\n\
             \"ADAT 3\"\n\
-        #elif({i} - ADAT_TX_INDEX == 4) \n\
+        #elif({i} - ADAT_TX_INDEX == 4)\n\
             \"ADAT 4\"\n\
-        #elif({i} - ADAT_TX_INDEX == 5) \n\
+        #elif({i} - ADAT_TX_INDEX == 5)\n\
             \"ADAT 5\"\n\
-        #elif({i} - ADAT_TX_INDEX == 6) \n\
+        #elif({i} - ADAT_TX_INDEX == 6)\n\
             \"ADAT 6\"\n\
-        #elif({i} - ADAT_TX_INDEX == 7) \n\
+        #elif({i} - ADAT_TX_INDEX == 7)\n\
             \"ADAT 7\"\n\
-        #elif({i} - ADAT_TX_INDEX == 8) \n\
+        #elif({i} - ADAT_TX_INDEX == 8)\n\
             \"ADAT 8\"\n\
-        #endif\n \
-    #endif\n\
-        , \n#endif \n".format(i=i, c=chanString, p=portString, s=structureString, adcdac=adc_dac);
+        #endif\n\
+     #endif\n\
+        ,\n#endif\n".format(i=i, c=chanString, p=portString, s=structureString, adcdac=adc_dac);
     return;
 
-print "/* AUTOGENERATED using chanstringgen.py */ \n"
+print "/* AUTOGENERATED using chanstringgen.py */\n"
 print "/* Not very nice looking but the standard preprocessor is not very powerful\n and we save some memory over doing this all at runtime */"
 
 print "/* Output Strings */\n\n"
diff --git a/module_usb_audio/endpoint0/chanstrings.h b/module_usb_audio/endpoint0/chanstrings.h
index ddeca0fa..90534998 100644
--- a/module_usb_audio/endpoint0/chanstrings.h
+++ b/module_usb_audio/endpoint0/chanstrings.h
@@ -1,2570 +1,2570 @@
-/* AUTOGENERATED using chanstringgen.py */ 
+/* AUTOGENERATED using chanstringgen.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
 
-#if (NUM_USB_CHAN_OUT > 32-1) 
+#if (NUM_USB_CHAN_OUT > 32-1)
     .outputChanStr_32          = ""
-    #if (32 < I2S_CHANS_DAC+1) 
-        "Analogue 32" 
-    #endif 
-    #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) 
-        #if (32 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(32 - SPDIF_TX_INDEX == 1) 
+    #if (32 < I2S_CHANS_DAC+1)
+        "Analogue 32"
+    #endif
+    #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
+        #if (32 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(32 - SPDIF_TX_INDEX == 1)
             "SPDIF 1"
-        #elif(32 - SPDIF_TX_INDEX == 2) 
+        #elif(32 - SPDIF_TX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((32 < ADAT_TX_INDEX+8+1) && (32 > ADAT_TX_INDEX)) && defined(ADAT_TX) 
-        #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (32 < I2S_CHANS_DAC+1) 
-        "/" 
-        #endif 
-        #if(32 - ADAT_TX_INDEX == 1) 
+    #if ((32 < ADAT_TX_INDEX+8+1) && (32 > ADAT_TX_INDEX)) && defined(ADAT_TX)
+        #if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (32 < I2S_CHANS_DAC+1)
+        "/"
+        #endif
+        #if(32 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(32 - ADAT_TX_INDEX == 2) 
+        #elif(32 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(32 - ADAT_TX_INDEX == 3) 
+        #elif(32 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(32 - ADAT_TX_INDEX == 4) 
+        #elif(32 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(32 - ADAT_TX_INDEX == 5) 
+        #elif(32 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(32 - ADAT_TX_INDEX == 6) 
+        #elif(32 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(32 - ADAT_TX_INDEX == 7) 
+        #elif(32 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(32 - ADAT_TX_INDEX == 8) 
+        #elif(32 - 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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(1 - SPDIF_TX_INDEX == 2) 
+        #elif(1 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(2 - SPDIF_TX_INDEX == 2) 
+        #elif(2 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(3 - SPDIF_TX_INDEX == 2) 
+        #elif(3 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(4 - SPDIF_TX_INDEX == 2) 
+        #elif(4 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(5 - SPDIF_TX_INDEX == 2) 
+        #elif(5 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(6 - SPDIF_TX_INDEX == 2) 
+        #elif(6 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(7 - SPDIF_TX_INDEX == 2) 
+        #elif(7 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(8 - SPDIF_TX_INDEX == 2) 
+        #elif(8 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(9 - SPDIF_TX_INDEX == 2) 
+        #elif(9 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(10 - SPDIF_TX_INDEX == 2) 
+        #elif(10 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(11 - SPDIF_TX_INDEX == 2) 
+        #elif(11 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(12 - SPDIF_TX_INDEX == 2) 
+        #elif(12 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(13 - SPDIF_TX_INDEX == 2) 
+        #elif(13 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(14 - SPDIF_TX_INDEX == 2) 
+        #elif(14 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(15 - SPDIF_TX_INDEX == 2) 
+        #elif(15 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(16 - SPDIF_TX_INDEX == 2) 
+        #elif(16 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(17 - SPDIF_TX_INDEX == 2) 
+        #elif(17 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(18 - SPDIF_TX_INDEX == 2) 
+        #elif(18 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(19 - SPDIF_TX_INDEX == 2) 
+        #elif(19 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(20 - SPDIF_TX_INDEX == 2) 
+        #elif(20 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(21 - SPDIF_TX_INDEX == 2) 
+        #elif(21 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(22 - SPDIF_TX_INDEX == 2) 
+        #elif(22 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(23 - SPDIF_TX_INDEX == 2) 
+        #elif(23 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(24 - SPDIF_TX_INDEX == 2) 
+        #elif(24 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(25 - SPDIF_TX_INDEX == 2) 
+        #elif(25 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(26 - SPDIF_TX_INDEX == 2) 
+        #elif(26 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(27 - SPDIF_TX_INDEX == 2) 
+        #elif(27 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(28 - SPDIF_TX_INDEX == 2) 
+        #elif(28 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(29 - SPDIF_TX_INDEX == 2) 
+        #elif(29 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(30 - SPDIF_TX_INDEX == 2) 
+        #elif(30 - SPDIF_RX_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_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(31 - SPDIF_TX_INDEX == 2) 
+        #elif(31 - SPDIF_RX_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
 
-#if (NUM_USB_CHAN_IN > 32-1) 
+#if (NUM_USB_CHAN_IN > 32-1)
     .inputChanStr_32          = ""
-    #if (32 < I2S_CHANS_ADC+1) 
-        "Analogue 32" 
-    #endif 
-    #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) 
-        #if (32 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(32 - SPDIF_TX_INDEX == 1) 
+    #if (32 < I2S_CHANS_ADC+1)
+        "Analogue 32"
+    #endif
+    #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
+        #if (32 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(32 - SPDIF_RX_INDEX == 1)
             "SPDIF 1"
-        #elif(32 - SPDIF_TX_INDEX == 2) 
+        #elif(32 - SPDIF_RX_INDEX == 2)
             "SPDIF 2"
         #endif
     #endif
-    #if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && defined(ADAT_RX) 
-        #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (32 < I2S_CHANS_ADC+1) 
-        "/" 
-        #endif 
-        #if(32 - ADAT_TX_INDEX == 1) 
+    #if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && defined(ADAT_RX)
+        #if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (32 < I2S_CHANS_ADC+1)
+        "/"
+        #endif
+        #if(32 - ADAT_TX_INDEX == 1)
             "ADAT 1"
-        #elif(32 - ADAT_TX_INDEX == 2) 
+        #elif(32 - ADAT_TX_INDEX == 2)
             "ADAT 2"
-        #elif(32 - ADAT_TX_INDEX == 3) 
+        #elif(32 - ADAT_TX_INDEX == 3)
             "ADAT 3"
-        #elif(32 - ADAT_TX_INDEX == 4) 
+        #elif(32 - ADAT_TX_INDEX == 4)
             "ADAT 4"
-        #elif(32 - ADAT_TX_INDEX == 5) 
+        #elif(32 - ADAT_TX_INDEX == 5)
             "ADAT 5"
-        #elif(32 - ADAT_TX_INDEX == 6) 
+        #elif(32 - ADAT_TX_INDEX == 6)
             "ADAT 6"
-        #elif(32 - ADAT_TX_INDEX == 7) 
+        #elif(32 - ADAT_TX_INDEX == 7)
             "ADAT 7"
-        #elif(32 - ADAT_TX_INDEX == 8) 
+        #elif(32 - ADAT_TX_INDEX == 8)
             "ADAT 8"
         #endif
      #endif
-        , 
-#endif 
+        ,
+#endif
 
diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index adab684f..b7dc54ce 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -120,7 +120,7 @@ on tile[SPDIF_TX_TILE] : buffered out port:32 p_spdif_tx    = PORT_SPDIF_OUT;
 #endif
 
 #ifdef ADAT_TX
-on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx        = PORT_ADAT_OUT;
+on stdcore[AUDIO_IO_TILE] : buffered out port:32 p_adat_tx  = PORT_ADAT_OUT;
 #endif
 
 #ifdef ADAT_RX
diff --git a/module_usb_audio/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc
index 9d637344..bc38ccb2 100644
--- a/module_usb_audio/mixer/mixer.xc
+++ b/module_usb_audio/mixer/mixer.xc
@@ -620,7 +620,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
     {
 #pragma xta endpoint "mixer2_req"
         request = inuint(c_audio);
-        
+
         /* Forward the request on */
         outuint(c_mixer1, request);
 
diff --git a/module_usb_audio/uac_hwresources.h b/module_usb_audio/uac_hwresources.h
index d3ce99cf..89f4a628 100644
--- a/module_usb_audio/uac_hwresources.h
+++ b/module_usb_audio/uac_hwresources.h
@@ -42,7 +42,6 @@
 /* use REF for ADAT_RX on U-series */
 /* #define CLKBLK_ADAT_RX     XS1_CLKBLK_3 */
 /* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */
-
 #define CLKBLK_I2S_BIT     XS1_CLKBLK_3
 #endif
 
diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
index 8dd20c01..c28d00db 100644
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -130,7 +130,7 @@ void handle_audio_request(chanend c_mix_out)
 
     /* Input word that triggered interrupt and handshake back */
     unsigned underflowSample = inuint(c_mix_out);
-    
+
     outuint(c_mix_out, 0);
 
     /* If in overflow condition then receive samples and throw away */
diff --git a/module_usb_midi/.cproject b/module_usb_midi/.cproject
index 6e8bf901..fac2e099 100644
--- a/module_usb_midi/.cproject
+++ b/module_usb_midi/.cproject
@@ -43,7 +43,7 @@
                                 </outputEntries>
                             </builder>
                             <tool id = "com.xmos.cdt.xc.compiler.79700694" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
-                                <option id = "com.xmos.c.compiler.option.defined.symbols.78264953" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols">
+                                <option id = "com.xmos.xc.compiler.option.defined.symbols.78264953" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
                                     <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
                                     <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>
diff --git a/xpd.xml b/xpd.xml
index 73bc8090..9403df2a 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -14,14 +14,10 @@
             <board>XR-USB-AUDIO-20-MC</board>
             <keyword>USB Audio UAC2</keyword>
         </component>
-        <component description = "ADAT" type = "demoCode" scope = "General Use" path = "module_usb_audio_adat" local = "false" id = "module_usb_audio_adat" name = "ADAT Module for UAC2 MC Reference Design">
-            <board>XR-USB-AUDIO-20-MC</board>
-            <keyword>ADAT</keyword>
-        </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.2">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>
@@ -84,7 +80,10 @@
     <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" githash = "3e61cee71c4aaa845908d5d9dfb9257a1000215d"></release>
-    <release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2"></release>
+    <release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2" githash = "1e963e8bc5e02fc4a03cc1b4059533a7734417e9"></release>
+    <release parenthash = "575ee95714761eef35b2b59db4d09fe0bb311827" version = "6.11.2rc0" githash = "5bf4f147b1442ab7c682bb39cf9a159fe3770bf2"></release>
+    <release parenthash = "67b217f48f3e37fc9c185f126d0ce78e1892203d" version = "6.11.2rc1" githash = "46faa608ccdc0b44eb00425d2eb381cc8920504b"></release>
+    <release parenthash = "5eec2dd557d7d6c7e76643ad083879a24791e832" version = "6.11.2rc2"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>