diff --git a/module_usb_audio/endpoint0/chanstringgen.py b/module_usb_audio/endpoint0/chanstringgen.py
index eb4167fe..2053c3c4 100644
--- a/module_usb_audio/endpoint0/chanstringgen.py
+++ b/module_usb_audio/endpoint0/chanstringgen.py
@@ -1,58 +1,56 @@
 
 
-def genstrings(outputChanCount, chanString, portString, structureString):
+def genstrings(outputChanCount, chanString, portString, structureString, adc_dac):
     
     for i in range(1,outputChanCount):
 
-        print "#if (NUM_USB_CHAN_{c} > {iteration}-1) \n\
-    #if (!defined(SPDIF_{p}) || ({i} > (SPDIF_{p}_INDEX+2)) || ({i} <= SPDIF_{p}_INDEX)) && (({i} > (ADAT_{p}_INDEX+8)) || (!defined(ADAT_{p})) || ({i} <= ADAT_{p}_INDEX))\n\
-        .{s}ChanStr_{i}          = \"Analogue {iteration}\", \n\
-    #elif defined(ADAT_{p}) && defined(SPDIF_{p}) && ((SPDIF_{p}_INDEX+2) < ADAT_{p}_INDEX)\n\
-        .{s}ChanStr_{i}          = \"Analogue {iteration}/SPDIF/ADAT\",\n\
-    #elif(SPDIF_{p}_INDEX < I2S_CHANS_DAC) && defined(SPDIF) \n\
-        .{s}ChanStr_{i}          = \"Analogue {iteration}/SPDIF\",\n\
-    #elif(ADAT_{p}_INDEX < I2S_CHANS_DAC) && defined(ADAT_{p}) && ({i} <= ADAT_{p}_INDEX+8)\n\
-        .{s}ChanStr_{i}          = \"Analogue {iteration}/ADAT\",\n \
-    #elif defined(SPDIF_{p}) && defined(ADAT_{p}) && ((SPDIF_{p}_INDEX + 2) < (ADAT_{p}_INDEX))\n\
-        .{s}ChanStr_{i}          = \"SPDIF/ADAT\",\n\
-    #elif((SPDIF_{p}_INDEX < {i}) && ({i} <= SPDIF_{p}_INDEX+2) && defined(SPDIF_{p})) \n \
-        #if({i} - SPDIF_TX_INDEX == 1) \n\
-        .{s}ChanStr_{i}          = \"SPDIF 1\", \n\
-        #elif({i} - SPDIF_TX_INDEX == 2) \n\
-        .{s}ChanStr_{i}          = \"SPDIF 2\", \n\
-        #endif\n\
-    #elif((ADAT_{p}_INDEX < {i}) && defined(ADAT_{p}))   \n\
-        #if({i} - ADAT_TX_INDEX == 1) \n\
-        .{s}ChanStr_{i}          = \"ADAT 1\", \n\
-        #elif({i} - ADAT_TX_INDEX == 2) \n\
-        .{s}ChanStr_{i}          = \"ADAT 2\", \n\
-        #elif({i} - ADAT_TX_INDEX == 3) \n\
-        .{s}ChanStr_{i}          = \"ADAT 3\", \n\
-        #elif({i} - ADAT_TX_INDEX == 4) \n\
-        .{s}ChanStr_{i}          = \"ADAT 4\", \n\
-        #elif({i} - ADAT_TX_INDEX == 5) \n\
-        .{s}ChanStr_{i}          = \"ADAT 5\", \n\
-        #elif({i} - ADAT_TX_INDEX == 6) \n\
-        .{s}ChanStr_{i}          = \"ADAT 6\", \n\
-        #elif({i} - ADAT_TX_INDEX == 7) \n\
-        .{s}ChanStr_{i}          = \"ADAT 7\", \n\
-        #elif({i} - ADAT_TX_INDEX == 8) \n\
-        .{s}ChanStr_{i}          = \"ADAT 8\", \n\
-        #else \n\
-        .{s}ChanStr_{i}          = \"ADAT \",\n\
-        #endif\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\
-#endif\n\n".format(iteration=i, i=i, c=chanString, p=portString, s=structureString)
-
+    #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\
+            \"SPDIF 1\"\n\
+        #elif({i} - SPDIF_TX_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\
+            \"ADAT 1\"\n\
+        #elif({i} - ADAT_TX_INDEX == 2) \n\
+            \"ADAT 2\"\n\
+        #elif({i} - ADAT_TX_INDEX == 3) \n\
+            \"ADAT 3\"\n\
+        #elif({i} - ADAT_TX_INDEX == 4) \n\
+            \"ADAT 4\"\n\
+        #elif({i} - ADAT_TX_INDEX == 5) \n\
+            \"ADAT 5\"\n\
+        #elif({i} - ADAT_TX_INDEX == 6) \n\
+            \"ADAT 6\"\n\
+        #elif({i} - ADAT_TX_INDEX == 7) \n\
+            \"ADAT 7\"\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);
     return;
 
-print "/* AUTOGENERATED using stringtable.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"
 
-genstrings(32, "OUT", "TX", "output");
+genstrings(32, "OUT", "TX", "output", "DAC");
 
 print "/* Input Strings */\n\n"
 
-genstrings(32, "IN", "RX", "input");
+genstrings(32, "IN", "RX", "input", "ADC");