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

@@ -1,9 +1,6 @@
 SUMP compatible logic analyzer for Arduino
 ==========================================
 
-NOTE: NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
-      Please report any issues.  Uncomment USE_PORTD for pins 2-7.
-
 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/
@@ -54,5 +51,5 @@ Please try it out and report back.
 This master branch now supports Arduino 1.0 only.
 Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
 
-Release: v0.09 June 22, 2013.
+Release: v0.06 November 4, 2011.
 

logic_analyzer.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,30 +25,21 @@
  * (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.17 2011-08-04 02:31:01 gillham Exp $
  *
  */
 
 /*
- * NOTE: This is an ALPHA of support for an Ethernet attached Logic Analyzer.
- *       Tested with an Arduino Duemilanove and W5100 based Ethernet shield.
- *       It may work with other combinations, but I haven't tested it.
- *
- *  USE: Configure the mac address (if you want) and the ip address (mandatory)
- *       for your network and upload it.  In the OLS client select network
- *       instead of serial and use your ip address and port 1234.
- *       Click capture!  You should get some data back from your Arduino.
- *
- *
- * NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
- *       Please report any issues.  Uncomment USE_PORTD for pins 2-7.
- *
  * 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
- * 6 channels consisting of digital pins 2-7, which are the last 6 bits (2-7)
+ * 5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
- * of PORTD.  Bits 0 & 1 are the UART RX/TX pins.
+ * of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
+ * 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
@@ -81,19 +72,16 @@
  *    ATmega2560: 7168 (or lower)
  * Noise Filter: doesn't matter
  * RLE: disabled (unchecked)
- *    NOTE: Preliminary RLE support for 50Hz or less exists, please test it.
  *
  * Triggering is still a work in progress, but generally works for samples
  * 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.09 June 22, 2013.
+ * Release: v0.06 November 4, 2011.
  *
  */
 
-#include <SPI.h>
-#include <Ethernet.h>
 /*
  * Function prototypes so this can compile from the cli.
  * You'll need the 'arduino-core' package and to check the paths in the
@@ -111,44 +99,41 @@ void debugprint(void);
 void debugdump(void);
 
 /*
- * Should we use PORTD or PORTB?  (default is PORTB)
+ * Uncomment CHAN5 to use it as an additional input on a normal Arduino.
- * PORTD support with triggers seems to work but needs more testing.
+ * You'll need to change the number of channels in the device profile as well.
- */
+ *
-#define USE_PORTD 1
+ * 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 CHANPIN PINA
+#define DEBUGPORT PORTH
-#define CHAN0 22
+#define DEBUGDDR DDRH
-#define CHAN1 23
+#define CHANPIN PINF
-#define CHAN2 24
+#define CHAN0 A0
-#define CHAN3 25
+#define CHAN1 A1
-#define CHAN4 26
+#define CHAN2 A2
-#define CHAN5 27
+#define CHAN3 A3
-#define CHAN6 28
+#define CHAN4 A4
-#define CHAN7 29
+#define CHAN5 A5
-#else
+#define CHAN6 A6
-#if defined(USE_PORTD)
+#define CHAN7 A7
-#define CHANPIN PIND
-#define CHAN0 2
-#define CHAN1 3
-#define CHAN2 4
-#define CHAN3 5
-#define CHAN4 6
-#define CHAN5 7
 #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
-/* Comment out CHAN5 if you don't want to use the LED pin for an input */
+//#define CHAN5 13
-#define CHAN5 13
-#endif /* USE_PORTD */
 #endif
 #define ledPin 13
 
@@ -164,40 +149,39 @@ void debugdump(void);
 #define SUMP_TRIGGER_VALUES 0xC1
 #define SUMP_TRIGGER_CONFIG 0xC2
 
-/* Most flags (except RLE) are ignored. */
+/* flags are ignored. */
 #define SUMP_SET_DIVIDER 0x80
 #define SUMP_SET_READ_DELAY_COUNT 0x81
 #define SUMP_SET_FLAGS 0x82
-#define SUMP_SET_RLE 0x0100
 
 /* extended commands -- self-test unsupported, but metadata is returned. */
 #define SUMP_SELF_TEST 0x03
 #define SUMP_GET_METADATA 0x04
 
-/* ATmega168:  532 (or lower)
+
- * ATmega328:  1024 (or lower)
+/*
- * ATmega2560: 7168 (or lower)
+ * 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(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+
-#define DEBUG_CAPTURE_SIZE 7168
+#if defined(MEGARAM)
-#define CAPTURE_SIZE 7168
+  #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 DEBUG_CAPTURE_SIZE 1024
-#define CAPTURE_SIZE 1024
+  #define CAPTURE_SIZE 1024
 #else
-#define DEBUG_CAPTURE_SIZE 532
+  #define DEBUG_CAPTURE_SIZE 532
-#define CAPTURE_SIZE 532
+  #define CAPTURE_SIZE 532
 #endif
 
-#ifdef USE_PORTD
-#define DEBUG_ENABLE DDRB = DDRB | B00000001
-#define DEBUG_ON PORTB = B00000001
-#define DEBUG_OFF PORTB = B00000000
-#else
-#define DEBUG_ENABLE DDRD = DDRD | B10000000
-#define DEBUG_ON PORTD = B10000000
-#define DEBUG_OFF PORTD = B00000000
-#endif
 #define DEBUG
 #ifdef DEBUG
 #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
@@ -217,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;
@@ -227,77 +224,55 @@ unsigned int trigger_values = 0;
 unsigned int useMicro = 0;
 unsigned int delayTime = 0;
 unsigned long divider = 0;
-boolean rleEnabled = 0;
-
-/*
- * Enter a MAC address and IP address for your Arduino.
- */
-byte mac[] = {
-  0x40, 0x00, 0x01, 0x02, 0x03, 0x04 };
-IPAddress ip(192,168,1,200);
-
-// Initialize the Ethernet server library
-// with the IP address and port you want to use
-// (port 80 is default for HTTP):
-EthernetServer server(1234);
-EthernetClient client;
-
 
 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);
 
-  // start the Ethernet connection and the server:
-  Ethernet.begin(mac, ip);
-  server.begin();
-  Serial.print("server is at ");
-  Serial.println(Ethernet.localIP());
-
   /*
-   * set debug pin (digital pin 8) to output right away so it settles.
+   * set debug pin to output right away so it settles.
    * this gets toggled during sampling as a way to measure
    * the sample time.  this is used during development to
    * properly pad out the sampling routines.
    */
-  DEBUG_ENABLE; /* debug measurement pin */
+  DEBUGDDR = DEBUGDDR | B10000000; /* debug measurement pin */
 
   pinMode(CHAN0, INPUT);
-  digitalWrite(CHAN0, LOW);
   pinMode(CHAN1, INPUT);
-  digitalWrite(CHAN1, LOW);
   pinMode(CHAN2, INPUT);
-  digitalWrite(CHAN2, LOW);
   pinMode(CHAN3, INPUT);
-  digitalWrite(CHAN3, LOW);
   pinMode(CHAN4, INPUT);
-  digitalWrite(CHAN4, LOW);
+#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);
-  digitalWrite(CHAN5, LOW);
-#endif
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  pinMode(CHAN6, INPUT);
-  digitalWrite(CHAN6, LOW);
-  pinMode(CHAN7, INPUT);
-  digitalWrite(CHAN7, LOW);
 #else
-#ifndef CHAN5
   pinMode(ledPin, OUTPUT);
-#endif
+#endif /* CHAN5 */
 #endif /* Mega */
 }
 
 void loop()
 {
-  int i;
+  unsigned int i;
 
-  // listen for incoming clients
+  if (Serial.available() > 0) {
-  client = server.available();
+    cmdByte = Serial.read();
-  if (client) {
-    Serial.println("new client");
-    while (client.connected()) {
-      if (client.available()) {
-        cmdByte = client.read();
     switch(cmdByte) {
     case SUMP_RESET:
       /*
@@ -308,10 +283,10 @@ void loop()
       break;
     case SUMP_QUERY:
       /* return the expected bytes. */
-          client.write('1');
+      Serial.write('1');
-          client.write('A');
+      Serial.write('A');
-          client.write('L');
+      Serial.write('L');
-          client.write('S');
+      Serial.write('S');
       break;
     case SUMP_ARM:
       /*
@@ -345,11 +320,7 @@ void loop()
        * we can just use it directly as our trigger mask.
        */
       getCmd();
-#ifdef USE_PORTD
-          trigger = cmdBytes[0] << 2;
-#else
       trigger = cmdBytes[0];
-#endif
       break;
     case SUMP_TRIGGER_VALUES:
       /*
@@ -357,11 +328,7 @@ void loop()
        * defines whether we're looking for it to be high or low.
        */
       getCmd();
-#ifdef USE_PORTD
-          trigger_values = cmdBytes[0] << 2;
-#else
       trigger_values = cmdBytes[0];
-#endif
       break;
     case SUMP_TRIGGER_CONFIG:
       /* read the rest of the command bytes, but ignore them. */
@@ -400,9 +367,8 @@ void loop()
         delayCount = MAX_CAPTURE_SIZE;
       break;
     case SUMP_SET_FLAGS:
-          /* read the rest of the command bytes and check if RLE is enabled. */
+      /* read the rest of the command bytes, but ignore them. */
       getCmd();
-          rleEnabled = ((cmdBytes[1] & B1000000) != 0);
       break;
     case SUMP_GET_METADATA:
       /*
@@ -435,7 +401,9 @@ void loop()
        * you can use the Arduino serial monitor and send a '1' and get
        * a debug printout.  useless except for development.
        */
+#ifndef CHAN5
       blinkled();
+#endif /* !CHAN5 */
       debugprint();
       break;
     case '2':
@@ -444,17 +412,18 @@ 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. */
       break;
-        } /* switch */
+    }
-      } /* if client.available() */
+  }
-    } /* while */
-    delay(1);
-    client.stop();
-    Serial.println("client disconnected?");
-  } /* if client */
 }
 
 void blinkled() {
@@ -473,10 +442,10 @@ void blinkled() {
  */
 void getCmd() {
   delay(10);
-  cmdBytes[0] = client.read();
+  cmdBytes[0] = Serial.read();
-  cmdBytes[1] = client.read();
+  cmdBytes[1] = Serial.read();
-  cmdBytes[2] = client.read();
+  cmdBytes[2] = Serial.read();
-  cmdBytes[3] = client.read();
+  cmdBytes[3] = Serial.read();
 
 #ifdef DEBUG
   if (savecount < 120 ) {
@@ -506,10 +475,10 @@ void getCmd() {
  */
 
 void captureMicro() {
-  int i;
+  unsigned int i;
 
   /*
-   * basic trigger, wait until all trigger conditions are met on port.
+   * basic trigger, wait until all trigger conditions are met on port B.
    * this needs further testing, but basic tests work as expected.
    */
   if (trigger) {
@@ -528,16 +497,16 @@ void captureMicro() {
    * this is used during development to measure the sample intervals.
    * it is best to just leave the toggling in place so we don't alter
    * any timing unexpectedly.
-   * Arduino digital pin 8 is being used here.
+   * Arduino pin 7 is being used here.
    */
-  DEBUG_ENABLE;
+  DEBUGDDR = DEBUGDDR | B10000000;
-  DEBUG_ON;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  DEBUG_OFF;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
-  DEBUG_ON;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  DEBUG_OFF;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -545,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.
      */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       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 */
     }
-    DEBUG_OFF; /* 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.
      */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       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");
     }
-    DEBUG_OFF; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
   } 
   else {
     /*
@@ -577,13 +550,15 @@ void captureMicro() {
      * a better logic analyzer)
      * start of real measurement
      */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       logicdata[i] = CHANPIN;
       delayMicroseconds(delayTime - 1);
+#ifndef MEGARAM
       __asm__("nop\n\t""nop\n\t");
+#endif /* MEGARAM */
     }
-    DEBUG_OFF; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
   }
 
   /* re-enable interrupts now that we're done sampling. */
@@ -594,11 +569,7 @@ 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]);
-    client.write(logicdata[i] >> 2);
-#else
-    client.write(logicdata[i]);
-#endif
   }
 }
 
@@ -620,42 +591,8 @@ void captureMicro() {
  * this basic functionality.
  */
 void captureMilli() {
-  int i = 0;
+  unsigned int i;
 
-  if(rleEnabled) {
-    /*
-     * very basic trigger, just like in captureMicros() above.
-     */
-    if (trigger) {
-      while ((trigger_values ^ (CHANPIN & B01111111)) & trigger);
-    }
-
-    byte lastSample = 0;
-    byte sampleCount = 0;
-
-    while(i < readCount) {
-      /*
-       * Implementation of the RLE unlimited protocol: timings might be off a little
-       */
-      if(lastSample == (CHANPIN & B01111111) && sampleCount < 127) {
-        sampleCount++;
-        delay(delayTime);
-        continue;
-      }
-      if(sampleCount != 0) {
-        logicdata[i] = B10000000 | sampleCount;
-        sampleCount = 0;
-        i++;
-        continue;
-      }
-      logicdata[i] = (CHANPIN & B01111111);
-      lastSample = (CHANPIN & B01111111);
-      delay(delayTime);
-
-      i++;
-    }
-  } 
-  else {
   /*
    * very basic trigger, just like in captureMicros() above.
    */
@@ -667,13 +604,8 @@ void captureMilli() {
     logicdata[i] = CHANPIN;
     delay(delayTime);
   }
-  }
   for (i = 0 ; i < readCount; i++) {
-#ifdef USE_PORTD
+    Serial.write(logicdata[i]);
-    client.write(logicdata[i] >> 2);
-#else
-    client.write(logicdata[i]);
-#endif
   }
 }
 
@@ -686,7 +618,7 @@ void captureMilli() {
  * 
  */
 void triggerMicro() {
-  int i = 0;
+  unsigned int i = 0;
 
   logicIndex = 0;
   triggerIndex = 0;
@@ -703,16 +635,16 @@ void triggerMicro() {
    * this is used during development to measure the sample intervals.
    * it is best to just leave the toggling in place so we don't alter
    * any timing unexpectedly.
-   * Arduino digital pin 8 is being used here.
+   * Arduino pin 7 is being used here.
    */
-  DEBUG_ENABLE;
+  DEBUGDDR = DEBUGDDR | B10000000;
-  DEBUG_ON;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  DEBUG_OFF;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
-  DEBUG_ON;
+  DEBUGPORT = B10000000;
   delayMicroseconds(20);
-  DEBUG_OFF;
+  DEBUGPORT = B00000000;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -737,9 +669,9 @@ void triggerMicro() {
      * we always start capturing at the start of the buffer
      * and use it as a circular buffer
      */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* DEBUG_OFF; */
+      /* DEBUGPORT = B00000000; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
@@ -750,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");
-      /* DEBUG_ON; */
+#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");
-    DEBUG_OFF; /* debug timing measurement */
+#endif /* MEGARAM */
+    DEBUGPORT = B00000000; /* debug timing measurement */
 
     /* 
      * One sample size delay. ends up being 2 uS combined with assignment
@@ -763,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 */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     /*
      * this is currently taking:
      * 1025.5 uS for 512 samples. (512 samples, 0/100 split)
@@ -781,11 +719,13 @@ void triggerMicro() {
         logicIndex = 0;
       }
       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 */
     }
-    DEBUG_OFF; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
     delayMicroseconds(100);
   } 
   else {
@@ -798,23 +738,17 @@ void triggerMicro() {
      * and use it as a circular buffer
      *
      */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* DEBUG_OFF; */
+      /* DEBUGPORT = B00000000; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
         logicIndex = 0;
       }
-      else {
+      /* DEBUGPORT = B10000000; */
-        /* pad the same number of cycles as the above assignment (needs verification) */
-        __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     }
-      delayMicroseconds(delayTime - 3);
+    DEBUGPORT = B00000000; /* debug timing measurement */
-      __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
-      /* DEBUG_ON; */
-    }
-    DEBUG_OFF; /* debug timing measurement */
 
     /* 'logicIndex' now points to trigger sample, keep track of it */
     triggerIndex = logicIndex;
@@ -823,24 +757,23 @@ void triggerMicro() {
      * This needs adjustment so that we have the right spacing between the
      * before trigger samples and the after trigger samples.
      */
-    delayMicroseconds(delayTime - 2);
+    delayMicroseconds(delayTime);
-    __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");
 
     /* keep sampling for delayCount after trigger */
-    DEBUG_ON; /* debug timing measurement */
+    DEBUGPORT = B10000000; /* debug timing measurement */
     for (i = 0 ; i < delayCount; i++) {
       if (logicIndex >= readCount) {
         logicIndex = 0;
       }
       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");
     }
-    DEBUG_OFF; /* debug timing measurement */
+    DEBUGPORT = B00000000; /* debug timing measurement */
     delayMicroseconds(100);
   }
 
@@ -861,11 +794,7 @@ void triggerMicro() {
     if (logicIndex >= readCount) {
       logicIndex = 0;
     }
-#ifdef USE_PORTD
+    Serial.write(logicdata[logicIndex++]);
-    client.write(logicdata[logicIndex++] >> 2);
-#else
-    client.write(logicdata[logicIndex++]);
-#endif
   }
 }
 
@@ -901,69 +830,68 @@ void setupDelay() {
  */
 void get_metadata() {
   /* device name */
-  client.write((uint8_t)0x01);
+  Serial.write((uint8_t)0x01);
-  client.write('A');
+  Serial.write('A');
-  client.write('G');
+  Serial.write('G');
-  client.write('L');
+  Serial.write('L');
-  client.write('A');
+  Serial.write('A');
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  client.write('M');
+  Serial.write('M');
 #endif /* Mega */
-  client.write('v');
+#if defined(MEGARAM)
-  client.write('0');
+  Serial.write('R');
-  client.write((uint8_t)0x00);
+#endif /* MEGARAM */
-
+  Serial.write('v');
-  /* firmware version */
+  Serial.write('0');
-  client.write((uint8_t)0x02);
+  Serial.write((uint8_t)0x00);
-  client.write('0');
-  client.write('.');
-  client.write('0');
-  client.write('9');
-  client.write((uint8_t)0x00);
 
   /* sample memory */
-  client.write((uint8_t)0x21);
+  Serial.write((uint8_t)0x21);
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#if defined(MEGARAM)
-  /* 7168 bytes */
+  /* 56320 bytes (55KB) */
-  client.write((uint8_t)0x1C);
+  Serial.write((uint8_t)0xDC);
-  client.write((uint8_t)0x00);
+  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 */
+  /* 1024 bytes (1KB) */
-  client.write((uint8_t)0x04);
+  Serial.write((uint8_t)0x04);
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
 #else
   /* 532 bytes */
-  client.write((uint8_t)0x02);
+  Serial.write((uint8_t)0x02);
-  client.write((uint8_t)0x14);
+  Serial.write((uint8_t)0x14);
 #endif /* Mega */
 
   /* sample rate (1MHz) */
-  client.write((uint8_t)0x23);
+  Serial.write((uint8_t)0x23);
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
-  client.write((uint8_t)0x0F);
+  Serial.write((uint8_t)0x0F);
-  client.write((uint8_t)0x42);
+  Serial.write((uint8_t)0x42);
-  client.write((uint8_t)0x40);
+  Serial.write((uint8_t)0x40);
 
-  /* number of probes (6 by default on Arduino, 8 on Mega) */
+  /* number of probes (5 by default on Arduino, 8 on Mega) */
-  client.write((uint8_t)0x40);
+  Serial.write((uint8_t)0x40);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  client.write((uint8_t)0x08);
+  Serial.write((uint8_t)0x08);
 #else
 #ifdef CHAN5
-  client.write((uint8_t)0x06);
+  Serial.write((uint8_t)0x06);
 #else
-  client.write((uint8_t)0x05);
+  Serial.write((uint8_t)0x05);
 #endif /* CHAN5 */
 #endif /* Mega */
 
   /* protocol version (2) */
-  client.write((uint8_t)0x41);
+  Serial.write((uint8_t)0x41);
-  client.write((uint8_t)0x02);
+  Serial.write((uint8_t)0x02);
 
   /* end of data */
-  client.write((uint8_t)0x00);  
+  Serial.write((uint8_t)0x00);  
 }
 
 /*
@@ -976,36 +904,34 @@ void debugprint() {
   int i;
 
 #if 0
-  client.print("divider = ");
+  Serial.print("divider = ");
-  client.println(divider, DEC);
+  Serial.println(divider, DEC);
-  client.print("delayTime = ");
+  Serial.print("delayTime = ");
-  client.println(delayTime, DEC);
+  Serial.println(delayTime, DEC);
-  client.print("trigger_values = ");
+  Serial.print("trigger_values = ");
-  client.println(trigger_values, BIN);
+  Serial.println(trigger_values, BIN);
 #endif
-  client.print("readCount = ");
+  Serial.print("readCount = ");
-  client.println(readCount, DEC);
+  Serial.println(readCount, DEC);
-  client.print("delayCount = ");
+  Serial.print("delayCount = ");
-  client.println(delayCount, DEC);
+  Serial.println(delayCount, DEC);
-  client.print("logicIndex = ");
+  Serial.print("logicIndex = ");
-  client.println(logicIndex, DEC);
+  Serial.println(logicIndex, DEC);
-  client.print("triggerIndex = ");
+  Serial.print("triggerIndex = ");
-  client.println(triggerIndex, DEC);
+  Serial.println(triggerIndex, DEC);
-  client.print("rleEnabled = ");
-  client.println(rleEnabled, DEC);
 
-  client.println("Bytes:");
+  Serial.println("Bytes:");
 
   for (i = 0 ; i < savecount; i++) {
     if (savebytes[i] == 0x20) {
-      client.println();
+      Serial.println();
     } 
     else {
-      client.print(savebytes[i], HEX);
+      Serial.print(savebytes[i], HEX);
-      client.write(' ');
+      Serial.write(' ');
     }
   }
-  client.println("done...");
+  Serial.println("done...");
 }
 
 /*
@@ -1013,20 +939,16 @@ void debugprint() {
  * of the sample buffer.
  */
 void debugdump() {
-  int i;
+  unsigned int i;
   int j = 1;
 
-  client.print("\r\n");
+  Serial.print("\r\n");
 
   for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-#ifdef USE_PORTD
+    Serial.print(logicdata[i], HEX);
-    client.print(logicdata[i] >> 2, HEX);
+    Serial.print(" ");
-#else
-    client.print(logicdata[i], HEX);
-#endif
-    client.print(" ");
     if (j == 32) {
-      client.print("\r\n");
+      Serial.print("\r\n");
       j = 0;
     }
     j++;
@@ -1035,9 +957,3 @@ void debugdump() {
 #endif /* DEBUG */
 
 
-
-
-
-
-
-

ols.profile-agla.cfg

@@ -7,7 +7,7 @@ device.description = Arduino Generic Logic Analyzer
 # The device interface, SERIAL only
 device.interface = SERIAL
 # The device's native clockspeed, in Hertz.
-device.clockspeed = 16000000
+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
@@ -19,7 +19,7 @@ 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 = true
+device.feature.rle = false
 # Whether or not a testing mode is supported
 device.feature.testmode = false
 # Whether or not triggers are supported
@@ -30,7 +30,7 @@ device.trigger.stages = 1
 device.trigger.complex = false
 
 # The total number of channels usable for capturing
-device.channel.count = 6
+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
@@ -39,15 +39,13 @@ device.capturesize.bound = false
 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 = 1500
+device.open.portdelay = 500
-# The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout)
-device.receive.timeout = 100
 # 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? false = last sample first, true = first sample first
+# In which order are samples sent back from the device? true = last sample first, false = first sample first
-device.samples.reverseOrder = true
+device.samples.reverseOrder = false
 
 ###EOF###

ols.profile-aglam.cfg

@@ -7,7 +7,7 @@ device.description = Arduino Mega Logic Analyzer
 # The device interface, SERIAL only
 device.interface = SERIAL
 # The device's native clockspeed, in Hertz.
-device.clockspeed = 16000000
+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
@@ -39,15 +39,13 @@ device.capturesize.bound = false
 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 = 2000
+device.open.portdelay = 1000
-# The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout)
-device.receive.timeout = 100
 # 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? false = last sample first, true = first sample first
+# In which order are samples sent back from the device? true = last sample first, false = first sample first
-device.samples.reverseOrder = true
+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###