Add support for Arduino Mega external SRAM.

Using external SRAM (like Rugged Circuits "QuadRAM" board) we can have
up to 55KB of capture buffer space.

README

@@ -12,19 +12,34 @@ crystal oscillator pins.
 Uncomment CHAN5 below if you want to use the LED pin as an input and have
 6 channels.
 
+On the Arduino Mega board 8 channels are supported and 7k of samples.
+Pins 22-29 (Port A) are used by default, you can change the 'CHANPIN' below
+if something else works better for you.
+
 NOTE:
+If you are using the original SUMP client, or using the alternative client
+without the device profiles, then you will get a "device not found" error.
 You must DISABLE the Arduino auto reset feature to use this logic analyzer
 code. There are various methods to do this, some boards have a jumper,
 others require you to cut a trace.  You may also install a *precisely*
 120 Ohm resistor between the reset & 5V piins.  Make sure it is really
-120 Ohm or you may damage your board.
+120 Ohm or you may damage your board.  It is much easier to use the
+alternative SUMP client referenced above.
+
+The device profiles should be included with this code.  Copy them to the
+'plugins' directory of the client.  The location varies depending on the
+platform, but on the mac it is here by default:
+/Applications/LogicSniffer.app/Contents/Resources/Java/plugins
 
 To use this with the original or alternative SUMP clients,
 use these settings:
 
 Sampling rate: 1MHz (or lower)
 Channel Groups: 0 (zero) only
-Recording Size: 1024 (or lower)
+Recording Size:
+   ATmega168:  532 (or lower)
+   ATmega328:  1024 (or lower)
+   ATmega2560: 7168 (or lower)
 Noise Filter: doesn't matter
 RLE: disabled (unchecked)
 
@@ -33,5 +48,8 @@ below 1MHz.  1MHz works for a basic busy wait trigger that doesn't store
 until after the trigger fires.
 Please try it out and report back.
 
-Release: v0.03 March 7, 2011.
+This master branch now supports Arduino 1.0 only.
+Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
+
+Release: v0.06 November 4, 2011.
 

logic_analyzer.ino

@@ -25,11 +25,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logic_analyzer.pde,v 1.14 2011-03-08 07:14:42 gillham Exp $
+ *	$Id: logic_analyzer.pde,v 1.17 2011-08-04 02:31:01 gillham Exp $
  *
  */
 
 /*
+ * This Arduino sketch implements a SUMP protocol compatible with the standard
+ * SUMP client as well as the alternative client from here:
+ *	http://www.lxtreme.nl/ols/
+ *
  * This SUMP protocol compatible logic analyzer for the Arduino board supports
  * 5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
  * of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
@@ -37,19 +41,35 @@
  * Uncomment CHAN5 below if you want to use the LED pin as an input and have
  * 6 channels.
  *
+ * On the Arduino Mega board 8 channels are supported and 7k of samples.
+ * Pins 22-29 (Port A) are used by default, you can change the 'CHANPIN' below
+ * if something else works better for you.
+ *
  * NOTE:
+ * If you are using the original SUMP client, or using the alternative client
+ * without the device profiles, then you will get a "device not found" error.
  * You must DISABLE the Arduino auto reset feature to use this logic analyzer
  * code. There are various methods to do this, some boards have a jumper,
  * others require you to cut a trace.  You may also install a *precisely*
  * 120 Ohm resistor between the reset & 5V piins.  Make sure it is really
  * 120 Ohm or you may damage your board.
+ * It is much easier to use the alternative SUMP client from here:
+ *      http://www.lxtreme.nl/ols/
+ *
+ * The device profiles should be included with this code.  Copy them to the
+ * 'plugins' directory of the client.  The location varies depending on the
+ * platform, but on the mac it is here by default:
+ * /Applications/LogicSniffer.app/Contents/Resources/Java/plugins
  *
  * To use this with the original or alternative SUMP clients,
  * use these settings:
  * 
  * Sampling rate: 1MHz (or lower)
  * Channel Groups: 0 (zero) only
- * Recording Size: 1024 (or lower)
+ * Recording Size:
+ *    ATmega168:  532 (or lower)
+ *    ATmega328:  1024 (or lower)
+ *    ATmega2560: 7168 (or lower)
  * Noise Filter: doesn't matter
  * RLE: disabled (unchecked)
  *
@@ -58,7 +78,7 @@
  * until after the trigger fires.
  * Please try it out and report back.
  *
- * Release: v0.02 February 28, 2011.
+ * Release: v0.06 November 4, 2011.
  *
  */
 
@@ -79,15 +99,42 @@ void debugprint(void);
 void debugdump(void);
 
 /*
- * Uncomment CHAN5 to use it as an additional input.
+ * Uncomment CHAN5 to use it as an additional input on a normal Arduino.
  * You'll need to change the number of channels in the device profile as well.
+ *
+ * Uncomment MEGARAM if you have an Arduino Mega with an external SRAM board with
+ * at least 64KB on it.
+ *
+ * Arduino device profile:      ols.profile-agla.cfg
+ * Arduino Mega device profile: ols.profile-aglam.cfg
+ * Arduino Mega RAM device profile: ols.profile-aglamr.cfg
  */
+
+#define MEGARAM 1
+
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#define DEBUGPORT PORTH
+#define DEBUGDDR DDRH
+#define CHANPIN PINF
+#define CHAN0 A0
+#define CHAN1 A1
+#define CHAN2 A2
+#define CHAN3 A3
+#define CHAN4 A4
+#define CHAN5 A5
+#define CHAN6 A6
+#define CHAN7 A7
+#else
+#define DEBUGPORT PORTD
+#define DEBUGDDR DDRD
+#define CHANPIN PINB
 #define CHAN0 8
 #define CHAN1 9
 #define CHAN2 10
 #define CHAN3 11
 #define CHAN4 12
 //#define CHAN5 13
+#endif
 #define ledPin 13
 
 /* XON/XOFF are not supported. */
@@ -111,15 +158,35 @@ void debugdump(void);
 #define SUMP_SELF_TEST 0x03
 #define SUMP_GET_METADATA 0x04
 
+
 /*
- * Capture size of 1024 bytes works on the ATmega328.
+ * Default capture buffer sizes. Lower values should work, but the metadata and/or
- *
+ * device profiles will need to be adjusted to match.
+ * ATmega168:  532
+ * ATmega328:  1024 (1KB)
+ * ATmega2560: 7168 (7KB)
+ * ATmega2560+external SRAM: 56320 (55KB)
  */
+
+#if defined(MEGARAM)
+  #define DEBUG_CAPTURE_SIZE 56320
+  #define CAPTURE_SIZE 56320
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+  #define DEBUG_CAPTURE_SIZE 7168
+  #define CAPTURE_SIZE 7168
+#elif defined(__AVR_ATmega328P__)
+  #define DEBUG_CAPTURE_SIZE 1024
+  #define CAPTURE_SIZE 1024
+#else
+  #define DEBUG_CAPTURE_SIZE 532
+  #define CAPTURE_SIZE 532
+#endif
+
 #define DEBUG
 #ifdef DEBUG
-#define MAX_CAPTURE_SIZE 1024
+#define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
 #else
-#define MAX_CAPTURE_SIZE 1024
+#define MAX_CAPTURE_SIZE CAPTURE_SIZE
 #endif /* DEBUG */
 
 /*
@@ -134,7 +201,20 @@ byte savebytes[128];
 int savecount = 0;
 #endif /* DEBUG */
 
+/*
+ * External SRAM adds 56,320 (55kb) directly addressable bytes starting at 0x2200.
+ * We access it via a hard coded pointer instead of a directly allocated array like
+ * on other Arduinos.
+ *
+ * We only use bank 0 as our capture routines can't spare the cycles to switch banks.
+ *
+ */
+
+#ifdef MEGARAM
+byte *logicdata = (byte *) 0x2200U; 
+#else
 byte logicdata[MAX_CAPTURE_SIZE];
+#endif
 unsigned int logicIndex = 0;
 unsigned int triggerIndex = 0;
 unsigned int readCount = MAX_CAPTURE_SIZE;
@@ -147,6 +227,17 @@ unsigned long divider = 0;
 
 void setup()
 {
+#ifdef MEGARAM
+  XMCRA = _BV(SRE); // Enable external memory interface
+  pinMode(38, OUTPUT); digitalWrite(38, LOW); // Enable RAM device
+  pinMode(42, OUTPUT);   // Make the bank selection bits output pins
+  pinMode(43, OUTPUT);   // Make the bank selection bits output pins
+  pinMode(44, OUTPUT);   // Make the bank selection bits output pins
+  digitalWrite(42, LOW); // Select bank 0 (see below for discussion)
+  digitalWrite(43, LOW); // Select bank 0 (see below for discussion)
+  digitalWrite(44, LOW); // Select bank 0 (see below for discussion)
+#endif // MEGARAM
+
   Serial.begin(115200);
 
   /*
@@ -155,23 +246,30 @@ void setup()
    * the sample time.  this is used during development to
    * properly pad out the sampling routines.
    */
-  DDRD = DDRD | B10000000; /* debug measurement pin */
+  DEBUGDDR = DEBUGDDR | B10000000; /* debug measurement pin */
 
   pinMode(CHAN0, INPUT);
   pinMode(CHAN1, INPUT);
   pinMode(CHAN2, INPUT);
   pinMode(CHAN3, INPUT);
   pinMode(CHAN4, INPUT);
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+  pinMode(CHAN5, INPUT);
+  pinMode(CHAN6, INPUT);
+  pinMode(CHAN7, INPUT);
+  pinMode(ledPin, OUTPUT);
+#else
 #ifdef CHAN5
   pinMode(CHAN5, INPUT);
 #else
   pinMode(ledPin, OUTPUT);
 #endif /* CHAN5 */
+#endif /* Mega */
 }
 
 void loop()
 {
-  int i;
+  unsigned int i;
 
   if (Serial.available() > 0) {
     cmdByte = Serial.read();
@@ -185,10 +283,10 @@ void loop()
       break;
     case SUMP_QUERY:
       /* return the expected bytes. */
-      Serial.print('1', BYTE);
+      Serial.write('1');
-      Serial.print('A', BYTE);
+      Serial.write('A');
-      Serial.print('L', BYTE);
+      Serial.write('L');
-      Serial.print('S', BYTE);
+      Serial.write('S');
       break;
     case SUMP_ARM:
       /*
@@ -314,6 +412,12 @@ void loop()
        */
       debugdump();
       break;
+    case '3':
+      /*
+       * This samples the channel pin and writes to the serial port.  Used for debugging.
+       */
+      Serial.print(CHANPIN, HEX);
+      break;
 #endif /* DEBUG */
     default:
       /* ignore any unrecognized bytes. */
@@ -322,14 +426,12 @@ void loop()
   }
 }
 
-#ifndef CHAN5
 void blinkled() {
   digitalWrite(ledPin, HIGH);
   delay(200);
   digitalWrite(ledPin, LOW);
   delay(200);
 }
-#endif /* !CHAN5 */
 
 /*
  * Extended SUMP commands are 5 bytes.  A command byte followed by 4 bytes
@@ -373,14 +475,14 @@ void getCmd() {
  */
 
 void captureMicro() {
-  int i;
+  unsigned int i;
 
   /*
    * basic trigger, wait until all trigger conditions are met on port B.
    * this needs further testing, but basic tests work as expected.
    */
   if (trigger) {
-    while ((trigger_values ^ PINB) & trigger);
+    while ((trigger_values ^ CHANPIN) & trigger);
   }
 
   /*
@@ -397,14 +499,14 @@ void captureMicro() {
    * any timing unexpectedly.
    * Arduino pin 7 is being used here.
    */
-  DDRD = DDRD | B10000000;
+  DEBUGDDR = DEBUGDDR | B10000000;
-  PORTD = B10000000;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
-  PORTD = B10000000;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -412,30 +514,34 @@ void captureMicro() {
      * 1MHz sample rate = 1 uS delay so we can't use delayMicroseconds
      * since our loop takes some time.  The delay is padded out by hand.
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
-      logicdata[i] = PINB;
+      logicdata[i] = CHANPIN;
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+#endif /* MEGARAM */
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
   } 
   else if (delayTime == 2) {
     /*
      * 500KHz sample rate = 2 uS delay, still pretty fast so we pad this
      * one by hand too.
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
-      logicdata[i] = PINB;
+      logicdata[i] = CHANPIN;
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+#endif /* MEGARAM */
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
   } 
   else {
     /*
@@ -444,13 +550,15 @@ void captureMicro() {
      * a better logic analyzer)
      * start of real measurement
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
-      logicdata[i] = PINB;
+      logicdata[i] = CHANPIN;
       delayMicroseconds(delayTime - 1);
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t");
+#endif /* MEGARAM */
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
   }
 
   /* re-enable interrupts now that we're done sampling. */
@@ -461,7 +569,7 @@ void captureMicro() {
    * is done for any triggers, this is effectively the 0/100 buffer split.
    */
   for (i = 0 ; i < readCount; i++) {
-    Serial.print(logicdata[i], BYTE);
+    Serial.write(logicdata[i]);
   }
 }
 
@@ -483,21 +591,21 @@ void captureMicro() {
  * this basic functionality.
  */
 void captureMilli() {
-  int i;
+  unsigned int i;
 
   /*
    * very basic trigger, just like in captureMicros() above.
    */
   if (trigger) {
-    while ((trigger_values ^ PINB) & trigger);
+    while ((trigger_values ^ CHANPIN) & trigger);
   }
 
   for (i = 0 ; i < readCount; i++) {
-    logicdata[i] = PINB;
+    logicdata[i] = CHANPIN;
     delay(delayTime);
   }
   for (i = 0 ; i < readCount; i++) {
-    Serial.print(logicdata[i], BYTE);
+    Serial.write(logicdata[i]);
   }
 }
 
@@ -510,7 +618,7 @@ void captureMilli() {
  * 
  */
 void triggerMicro() {
-  int i = 0;
+  unsigned int i = 0;
 
   logicIndex = 0;
   triggerIndex = 0;
@@ -529,14 +637,14 @@ void triggerMicro() {
    * any timing unexpectedly.
    * Arduino pin 7 is being used here.
    */
-  DDRD = DDRD | B10000000;
+  DEBUGDDR = DEBUGDDR | B10000000;
-  PORTD = B10000000;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
-  PORTD = B10000000;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -557,13 +665,13 @@ void triggerMicro() {
     /*
      * 500KHz case.  We should be able to manage this in time.
      *
-     * busy loop reading PINB until we trigger.
+     * busy loop reading CHANPIN until we trigger.
      * we always start capturing at the start of the buffer
      * and use it as a circular buffer
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
-    while ((trigger_values ^ (logicdata[logicIndex] = PINB)) & trigger) {
+    while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* PORTD = B00000000; */
+      /* DEBUGPORT = B00000000; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
@@ -574,12 +682,16 @@ void triggerMicro() {
        * without pin toggles, will try 1 nop.
        * __asm__("nop\n\t""nop\n\t""nop\n\t");
        */
+#ifndef MEGARAM
       __asm__("nop\n\t");
-      /* PORTD = B10000000; */
+#endif /* MEGARAM */
+      /* DEBUGPORT = B10000000; */
     }
     /* this pads the immediate trigger case to 2.0 uS, just as an example. */
+#ifndef MEGARAM
     __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
-    PORTD = B00000000; /* debug timing measurement */
+#endif /* MEGARAM */
+    DEBUGPORT = B00000000; /* debug timing measurement */
 
     /* 
      * One sample size delay. ends up being 2 uS combined with assignment
@@ -587,14 +699,16 @@ void triggerMicro() {
      * between the trigger point and the subsequent samples.
      */
     delayMicroseconds(1);
+#ifndef MEGARAM
     __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+#endif /* MEGARAM */
 
     /* 'logicIndex' now points to trigger sample, keep track of it */
     triggerIndex = logicIndex;
 
     /* keep sampling for delayCount after trigger */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     /*
      * this is currently taking:
      * 1025.5 uS for 512 samples. (512 samples, 0/100 split)
@@ -604,12 +718,14 @@ void triggerMicro() {
       if (logicIndex >= readCount) {
         logicIndex = 0;
       }
-      logicdata[logicIndex++] = PINB;
+      logicdata[logicIndex++] = CHANPIN;
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+#endif /* MEGARAM */
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
     delayMicroseconds(100);
   } 
   else {
@@ -617,22 +733,22 @@ void triggerMicro() {
      * Less than 500KHz case.  This uses delayMicroseconds() and some padding
      * to get precise timing, at least for the after trigger samples.
      *
-     * busy loop reading PINB until we trigger.
+     * busy loop reading CHANPIN until we trigger.
      * we always start capturing at the start of the buffer
      * and use it as a circular buffer
      *
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
-    while ((trigger_values ^ (logicdata[logicIndex] = PINB)) & trigger) {
+    while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* PORTD = B00000000; */
+      /* DEBUGPORT = B00000000; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
         logicIndex = 0;
       }
-      /* PORTD = B10000000; */
+      /* DEBUGPORT = B10000000; */
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
 
     /* 'logicIndex' now points to trigger sample, keep track of it */
     triggerIndex = logicIndex;
@@ -644,18 +760,20 @@ void triggerMicro() {
     delayMicroseconds(delayTime);
 
     /* keep sampling for delayCount after trigger */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < delayCount; i++) {
       if (logicIndex >= readCount) {
         logicIndex = 0;
       }
-      logicdata[logicIndex++] = PINB;
+      logicdata[logicIndex++] = CHANPIN;
       delayMicroseconds(delayTime - 3);
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
+#endif /* MEGARAM */
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
       __asm__("nop\n\t""nop\n\t""nop\n\t");
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
     delayMicroseconds(100);
   }
 
@@ -676,7 +794,7 @@ void triggerMicro() {
     if (logicIndex >= readCount) {
       logicIndex = 0;
     }
-    Serial.print(logicdata[logicIndex++], BYTE);
+    Serial.write(logicdata[logicIndex++]);
   }
 }
 
@@ -712,43 +830,68 @@ void setupDelay() {
  */
 void get_metadata() {
   /* device name */
-  Serial.print(0x01, BYTE);
+  Serial.write((uint8_t)0x01);
-  Serial.print('A', BYTE);
+  Serial.write('A');
-  Serial.print('G', BYTE);
+  Serial.write('G');
-  Serial.print('L', BYTE);
+  Serial.write('L');
-  Serial.print('A', BYTE);
+  Serial.write('A');
-  Serial.print('v', BYTE);
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.print('0', BYTE);
+  Serial.write('M');
-  Serial.print(0x00, BYTE);
+#endif /* Mega */
+#if defined(MEGARAM)
+  Serial.write('R');
+#endif /* MEGARAM */
+  Serial.write('v');
+  Serial.write('0');
+  Serial.write((uint8_t)0x00);
 
-  /* sample memory (1024) */
+  /* sample memory */
-  Serial.print(0x21, BYTE);
+  Serial.write((uint8_t)0x21);
-  Serial.print(0x00, BYTE);
+  Serial.write((uint8_t)0x00);
-  Serial.print(0x00, BYTE);
+  Serial.write((uint8_t)0x00);
-  Serial.print(0x04, BYTE);
+#if defined(MEGARAM)
-  Serial.print(0x00, BYTE);
+  /* 56320 bytes (55KB) */
+  Serial.write((uint8_t)0xDC);
+  Serial.write((uint8_t)0x00);
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+  /* 7168 bytes (7KB) */
+  Serial.write((uint8_t)0x1C);
+  Serial.write((uint8_t)0x00);
+#elif defined(__AVR_ATmega328P__)
+  /* 1024 bytes (1KB) */
+  Serial.write((uint8_t)0x04);
+  Serial.write((uint8_t)0x00);
+#else
+  /* 532 bytes */
+  Serial.write((uint8_t)0x02);
+  Serial.write((uint8_t)0x14);
+#endif /* Mega */
 
   /* sample rate (1MHz) */
-  Serial.print(0x23, BYTE);
+  Serial.write((uint8_t)0x23);
-  Serial.print(0x00, BYTE);
+  Serial.write((uint8_t)0x00);
-  Serial.print(0x0F, BYTE);
+  Serial.write((uint8_t)0x0F);
-  Serial.print(0x42, BYTE);
+  Serial.write((uint8_t)0x42);
-  Serial.print(0x40, BYTE);
+  Serial.write((uint8_t)0x40);
 
-  /* number of probes (5 by default) */
+  /* number of probes (5 by default on Arduino, 8 on Mega) */
-  Serial.print(0x40, BYTE);
+  Serial.write((uint8_t)0x40);
-#ifdef CHAN5
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.print(0x06, BYTE);
+  Serial.write((uint8_t)0x08);
 #else
-  Serial.print(0x05, BYTE);
+#ifdef CHAN5
+  Serial.write((uint8_t)0x06);
+#else
+  Serial.write((uint8_t)0x05);
 #endif /* CHAN5 */
+#endif /* Mega */
 
   /* protocol version (2) */
-  Serial.print(0x41, BYTE);
+  Serial.write((uint8_t)0x41);
-  Serial.print(0x02, BYTE);
+  Serial.write((uint8_t)0x02);
 
   /* end of data */
-  Serial.print(0x00, BYTE);  
+  Serial.write((uint8_t)0x00);  
 }
 
 /*
@@ -785,7 +928,7 @@ void debugprint() {
     } 
     else {
       Serial.print(savebytes[i], HEX);
-      Serial.print(' ', BYTE);
+      Serial.write(' ');
     }
   }
   Serial.println("done...");
@@ -796,7 +939,7 @@ void debugprint() {
  * of the sample buffer.
  */
 void debugdump() {
-  int i;
+  unsigned int i;
   int j = 1;
 
   Serial.print("\r\n");

ols.profile-agla.cfg

@@ -0,0 +1,51 @@
+# Configuration for Arduino Generic Logic Analyzer profile
+
+# The short (single word) type of the device described in this profile
+device.type = AGLA
+# A longer description of the device
+device.description = Arduino Generic Logic Analyzer
+# The device interface, SERIAL only
+device.interface = SERIAL
+# The device's native clockspeed, in Hertz.
+device.clockspeed = 100000000
+# Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
+device.supports_ddr = false
+# Supported sample rates in Hertz, separated by comma's
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
+# What capture clocks are supported
+device.captureclock = INTERNAL
+# The supported capture sizes, in bytes
+device.capturesizes = 64, 128, 256, 512, 1024
+# Whether or not the noise filter is supported
+device.feature.noisefilter = false
+# Whether or not Run-Length encoding is supported
+device.feature.rle = false
+# Whether or not a testing mode is supported
+device.feature.testmode = false
+# Whether or not triggers are supported
+device.feature.triggers = true
+# The number of trigger stages
+device.trigger.stages = 1
+# Whether or not "complex" triggers are supported
+device.trigger.complex = false
+
+# The total number of channels usable for capturing
+device.channel.count = 5
+# The number of channels groups, together with the channel count determines the channels per group
+device.channel.groups = 1
+# Whether the capture size is limited by the enabled channel groups
+device.capturesize.bound = false
+# Which numbering does the device support
+device.channel.numberingschemes = DEFAULT
+
+# Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds)
+device.open.portdelay = 500
+# Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
+device.open.portdtr = true
+# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
+device.metadata.keys = "AGLAv0"
+
+# In which order are samples sent back from the device? true = last sample first, false = first sample first
+device.samples.reverseOrder = false
+
+###EOF###

ols.profile-aglam.cfg

@@ -0,0 +1,51 @@
+# Configuration for Arduino Mega Logic Analyzer profile
+
+# The short (single word) type of the device described in this profile
+device.type = AGLAM
+# A longer description of the device
+device.description = Arduino Mega Logic Analyzer
+# The device interface, SERIAL only
+device.interface = SERIAL
+# The device's native clockspeed, in Hertz.
+device.clockspeed = 100000000
+# Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
+device.supports_ddr = false
+# Supported sample rates in Hertz, separated by comma's
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
+# What capture clocks are supported
+device.captureclock = INTERNAL
+# The supported capture sizes, in bytes
+device.capturesizes = 64, 128, 256, 512, 1024, 2048, 4096, 7168
+# Whether or not the noise filter is supported
+device.feature.noisefilter = false
+# Whether or not Run-Length encoding is supported
+device.feature.rle = false
+# Whether or not a testing mode is supported
+device.feature.testmode = false
+# Whether or not triggers are supported
+device.feature.triggers = true
+# The number of trigger stages
+device.trigger.stages = 1
+# Whether or not "complex" triggers are supported
+device.trigger.complex = false
+
+# The total number of channels usable for capturing
+device.channel.count = 8
+# The number of channels groups, together with the channel count determines the channels per group
+device.channel.groups = 1
+# Whether the capture size is limited by the enabled channel groups
+device.capturesize.bound = false
+# Which numbering does the device support
+device.channel.numberingschemes = DEFAULT
+
+# Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds)
+device.open.portdelay = 1000
+# Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
+device.open.portdtr = true
+# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
+device.metadata.keys = "AGLAMv0"
+
+# In which order are samples sent back from the device? true = last sample first, false = first sample first
+device.samples.reverseOrder = false
+
+###EOF###

ols.profile-aglamr.cfg

@@ -0,0 +1,51 @@
+# Configuration for Arduino MegaRAM Logic Analyzer profile
+
+# The short (single word) type of the device described in this profile
+device.type = AGLAMR
+# A longer description of the device
+device.description = Arduino MegaRAM Logic Analyzer
+# The device interface, SERIAL only
+device.interface = SERIAL
+# The device's native clockspeed, in Hertz.
+device.clockspeed = 100000000
+# Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
+device.supports_ddr = false
+# Supported sample rates in Hertz, separated by comma's
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
+# What capture clocks are supported
+device.captureclock = INTERNAL
+# The supported capture sizes, in bytes
+device.capturesizes = 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 56320
+# Whether or not the noise filter is supported
+device.feature.noisefilter = false
+# Whether or not Run-Length encoding is supported
+device.feature.rle = false
+# Whether or not a testing mode is supported
+device.feature.testmode = false
+# Whether or not triggers are supported
+device.feature.triggers = true
+# The number of trigger stages
+device.trigger.stages = 1
+# Whether or not "complex" triggers are supported
+device.trigger.complex = false
+
+# The total number of channels usable for capturing
+device.channel.count = 8
+# The number of channels groups, together with the channel count determines the channels per group
+device.channel.groups = 1
+# Whether the capture size is limited by the enabled channel groups
+device.capturesize.bound = false
+# Which numbering does the device support
+device.channel.numberingschemes = DEFAULT
+
+# Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds)
+device.open.portdelay = 1000
+# Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
+device.open.portdtr = true
+# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
+device.metadata.keys = "AGLAMRv0"
+
+# In which order are samples sent back from the device? true = last sample first, false = first sample first
+device.samples.reverseOrder = false
+
+###EOF###