Broken the source in to manageable chunks - 2KLOC files are not fun to debug!

Utterly failed to reduce the MARK_?? functions back down to MACROs - every time I try, the decoders start failing ...However, I have found a considerable number of bugs in the toolchain, so I'm starting to wonder if the fault is not mine.

ir_Dish.cpp

@@ -0,0 +1,55 @@
+#include "IRremote.h"
+#include "IRremoteInt.h"
+
+//==============================================================================
+//                       DDDD   IIIII   SSSS  H   H
+//                        D  D    I    S      H   H
+//                        D  D    I     SSS   HHHHH
+//                        D  D    I        S  H   H
+//                       DDDD   IIIII  SSSS   H   H
+//==============================================================================
+
+// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand )
+//
+// The sned function needs to be repeated 4 times
+//
+// Only send the last for characters of the hex.
+// I.E.  Use 0x1C10 instead of 0x0000000000001C10 as listed in the LIRC file.
+//
+// Here is the LIRC file I found that seems to match the remote codes from the
+// oscilloscope:
+//   DISH NETWORK (echostar 301):
+//   http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx
+
+#define DISH_BITS 16
+
+#define DISH_HDR_MARK 400
+#define DISH_HDR_SPACE 6100
+#define DISH_BIT_MARK 400
+#define DISH_ONE_SPACE 1700
+#define DISH_ZERO_SPACE 2800
+#define DISH_RPT_SPACE 6200
+#define DISH_TOP_BIT 0x8000
+
+//+=============================================================================
+#ifdef SEND_DISH
+void  IRsend::sendDISH (unsigned long data,  int nbits)
+{
+  // Set IR carrier frequency
+  enableIROut(56);
+
+  mark(DISH_HDR_MARK);
+  space(DISH_HDR_SPACE);
+
+  for (unsigned long  mask = 1 << (nbits - 1);  mask;  mask >>= 1) {
+    if (data & mask) {
+      mark(DISH_BIT_MARK);
+      space(DISH_ONE_SPACE);
+    } else {
+      mark(DISH_BIT_MARK);
+      space(DISH_ZERO_SPACE);
+    }
+  }
+}
+#endif
+