Improve Leonardo support.

Shift port by 1 bit on the Leonardo since PB0 is the RXLED and not
available for use via a pin.
Use a more generic method of shifting the bits since the Leonardo needs
1 bit shift and the Mega needs 2.

logic_analyzer.ino

@@ -88,6 +88,11 @@ void debugdump(void);
  * PORTD support with triggers seems to work but needs more testing.
  */
 //#define USE_PORTD 1
+#if defined(USE_PORTD)
+#define SHIFTBITS 2
+#elif defined(__AVR_ATmega32U4__)
+#define SHIFTBITS 1
+#endif
 
 /*
  * Arduino device profile:      ols.profile-agla.cfg
@@ -114,6 +119,15 @@ void debugdump(void);
 #define CHAN5 7
 #else
 #define CHANPIN PINB
+#if defined(__AVR_ATmega32U4__)
+#define CHAN0 SCK
+#define CHAN1 MOSI
+#define CHAN2 MISO
+#define CHAN3 8
+#define CHAN4 9
+#define CHAN5 10
+#define CHAN6 11
+#else
 #define CHAN0 8
 #define CHAN1 9
 #define CHAN2 10
@@ -121,8 +135,9 @@ void debugdump(void);
 #define CHAN4 12
 /* Comment out CHAN5 if you don't want to use the LED pin for an input */
 #define CHAN5 13
+#endif /* AVR_ATmega32U4 */
 #endif /* USE_PORTD */
-#endif
+#endif /* Mega1280 or Mega2560 */
 #define ledPin 13
 
 /* XON/XOFF are not supported. */
@@ -154,6 +169,9 @@ void debugdump(void);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 #define DEBUG_CAPTURE_SIZE 7168
 #define CAPTURE_SIZE 7168
+#elif defined(__AVR_ATmega32U4__)
+#define DEBUG_CAPTURE_SIZE 1536
+#define CAPTURE_SIZE 1536
 #elif defined(__AVR_ATmega328P__)
 #define DEBUG_CAPTURE_SIZE 1024
 #define CAPTURE_SIZE 1024
@@ -205,6 +223,10 @@ boolean rleEnabled = 0;
 void setup()
 {
   Serial.begin(115200);
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
+
 
   /*
    * set debug pin (digital pin 8) to output right away so it settles.
@@ -222,14 +244,15 @@ void setup()
 #ifdef CHAN5
   pinMode(CHAN5, INPUT);
 #endif
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#ifdef CHAN6
   pinMode(CHAN6, INPUT);
+#endif
+#ifdef CHAN7
   pinMode(CHAN7, INPUT);
-#else
+#endif
 #ifndef CHAN5
   pinMode(ledPin, OUTPUT);
 #endif
-#endif /* Mega */
 
 #if 0
 
@@ -321,8 +344,8 @@ void loop()
        * we can just use it directly as our trigger mask.
        */
       getCmd();
-#ifdef USE_PORTD
-      trigger = cmdBytes[0] << 2;
+#ifdef SHIFTBITS
+      trigger = cmdBytes[0] << SHIFTBITS;
 #else
       trigger = cmdBytes[0];
 #endif
@@ -333,8 +356,8 @@ void loop()
        * defines whether we're looking for it to be high or low.
        */
       getCmd();
-#ifdef USE_PORTD
-      trigger_values = cmdBytes[0] << 2;
+#ifdef SHIFTBITS
+      trigger_values = cmdBytes[0] << SHIFTBITS;
 #else
       trigger_values = cmdBytes[0];
 #endif
@@ -567,8 +590,8 @@ void captureMicro() {
    * is done for any triggers, this is effectively the 0/100 buffer split.
    */
   for (i = 0 ; i < readCount; i++) {
-#ifdef USE_PORTD
-    Serial.write(logicdata[i] >> 2);
+#ifdef SHIFTBITS
+    Serial.write(logicdata[i] >> SHIFTBITS);
 #else
     Serial.write(logicdata[i]);
 #endif
@@ -642,8 +665,8 @@ void captureMilli() {
     }
   }
   for (i = 0 ; i < readCount; i++) {
-#ifdef USE_PORTD
-    Serial.write(logicdata[i] >> 2);
+#ifdef SHIFTBITS
+    Serial.write(logicdata[i] >> SHIFTBITS);
 #else
     Serial.write(logicdata[i]);
 #endif
@@ -836,8 +859,8 @@ void triggerMicro() {
     if (logicIndex >= readCount) {
       logicIndex = 0;
     }
-#ifdef USE_PORTD
-    Serial.write(logicdata[logicIndex++] >> 2);
+#ifdef SHIFTBITS
+    Serial.write(logicdata[logicIndex++] >> SHIFTBITS);
 #else
     Serial.write(logicdata[logicIndex++]);
 #endif
@@ -883,6 +906,8 @@ void get_metadata() {
   Serial.write('A');
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   Serial.write('M');
+#elif defined(__AVR_ATmega32U4__)
+  Serial.write('L');
 #endif /* Mega */
   Serial.write('v');
   Serial.write('0');
@@ -904,6 +929,10 @@ void get_metadata() {
   /* 7168 bytes */
   Serial.write((uint8_t)0x1C);
   Serial.write((uint8_t)0x00);
+#elif defined(__AVR_ATmega32U4__)
+  /* 1024 bytes */
+  Serial.write((uint8_t)0x04);
+  Serial.write((uint8_t)0x00);
 #elif defined(__AVR_ATmega328P__)
   /* 1024 bytes */
   Serial.write((uint8_t)0x04);
@@ -923,15 +952,15 @@ void get_metadata() {
 
   /* number of probes (6 by default on Arduino, 8 on Mega) */
   Serial.write((uint8_t)0x40);
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#ifdef CHAN7
   Serial.write((uint8_t)0x08);
-#else
-#ifdef CHAN5
+#elif CHAN6
+  Serial.write((uint8_t)0x07);
+#elif CHAN5
   Serial.write((uint8_t)0x06);
 #else
   Serial.write((uint8_t)0x05);
-#endif /* CHAN5 */
-#endif /* Mega */
+#endif
 
   /* protocol version (2) */
   Serial.write((uint8_t)0x41);
@@ -994,8 +1023,8 @@ void debugdump() {
   Serial.print("\r\n");
 
   for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-#ifdef USE_PORTD
-    Serial.print(logicdata[i] >> 2, HEX);
+#ifdef SHIFTBITS
+    Serial.print(logicdata[i] >> SHIFTBITS, HEX);
 #else
     Serial.print(logicdata[i], HEX);
 #endif
@@ -1019,3 +1048,5 @@ void debugdump() {
 
 
 
+
+

logic_analyzer_inline_2mhz.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

logic_analyzer_inline_4mhz.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without