Create an Ethernet shield version.

This alpha version can be connected to across the network using the OLS
client and an Ethernet shield.

README

@@ -1,6 +1,9 @@
 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/
@@ -51,5 +54,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.06 November 4, 2011.
+Release: v0.09 June 22, 2013.
 

logic_analyzer.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011 Andrew Gillham
+ * Copyright (c) 2011,2012,2013 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,21 +25,30 @@
  * (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.ino,v 1.21 2012/02/27 20:19:44 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
- * 5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
+ * 6 channels consisting of digital pins 2-7, which are the last 6 bits (2-7)
- * of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
+ * of PORTD.  Bits 0 & 1 are the UART RX/TX pins.
- * 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
@@ -72,16 +81,19 @@
  *    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.06 November 4, 2011.
+ * Release: v0.09 June 22, 2013.
  *
  */
 
+#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
@@ -99,9 +111,12 @@ void debugprint(void);
 void debugdump(void);
 
 /*
- * Uncomment CHAN5 to use it as an additional input on a normal Arduino.
+ * Should we use PORTD or PORTB?  (default is PORTB)
- * You'll need to change the number of channels in the device profile as well.
+ * PORTD support with triggers seems to work but needs more testing.
- *
+ */
+#define USE_PORTD 1
+
+/*
  * Arduino device profile:      ols.profile-agla.cfg
  * Arduino Mega device profile: ols.profile-aglam.cfg
  */
@@ -116,13 +131,24 @@ void debugdump(void);
 #define CHAN6 28
 #define CHAN7 29
 #else
+#if defined(USE_PORTD)
+#define CHANPIN PIND
+#define CHAN0 2
+#define CHAN1 3
+#define CHAN2 4
+#define CHAN3 5
+#define CHAN4 6
+#define CHAN5 7
+#else
 #define CHANPIN PINB
 #define CHAN0 8
 #define CHAN1 9
 #define CHAN2 10
 #define CHAN3 11
 #define CHAN4 12
-//#define CHAN5 13
+/* Comment out CHAN5 if you don't want to use the LED pin for an input */
+#define CHAN5 13
+#endif /* USE_PORTD */
 #endif
 #define ledPin 13
 
@@ -138,10 +164,11 @@ void debugdump(void);
 #define SUMP_TRIGGER_VALUES 0xC1
 #define SUMP_TRIGGER_CONFIG 0xC2
 
-/* flags are ignored. */
+/* Most flags (except RLE) 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
@@ -162,6 +189,15 @@ void debugdump(void);
 #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
@@ -191,35 +227,63 @@ 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()
 {
   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 to output right away so it settles.
+   * set debug pin (digital pin 8) 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.
    */
-  DDRD = DDRD | B10000000; /* debug measurement pin */
+  DEBUG_ENABLE; /* 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);
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+  digitalWrite(CHAN4, LOW);
-  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 /* CHAN5 */
+#endif
 #endif /* Mega */
 }
 
@@ -227,153 +291,170 @@ void loop()
 {
   int i;
 
-  if (Serial.available() > 0) {
+  // listen for incoming clients
-    cmdByte = Serial.read();
+  client = server.available();
-    switch(cmdByte) {
+  if (client) {
-    case SUMP_RESET:
+    Serial.println("new client");
-      /*
+    while (client.connected()) {
+      if (client.available()) {
+        cmdByte = client.read();
+        switch(cmdByte) {
+        case SUMP_RESET:
+          /*
        * We don't do anything here as some unsupported extended commands have
-       * zero bytes and are mistaken as resets.  This can trigger false resets
+           * zero bytes and are mistaken as resets.  This can trigger false resets
-       * so we don't erase the data or do anything for a reset.
+           * so we don't erase the data or do anything for a reset.
-       */
+           */
-      break;
+          break;
-    case SUMP_QUERY:
+        case SUMP_QUERY:
-      /* return the expected bytes. */
+          /* return the expected bytes. */
-      Serial.write('1');
+          client.write('1');
-      Serial.write('A');
+          client.write('A');
-      Serial.write('L');
+          client.write('L');
-      Serial.write('S');
+          client.write('S');
-      break;
+          break;
-    case SUMP_ARM:
+        case SUMP_ARM:
-      /*
+          /*
        * Zero out any previous samples before arming.
-       * Done here instead via reset due to spurious resets.
+           * Done here instead via reset due to spurious resets.
-       */
+           */
-      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
+          for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-        logicdata[i] = 0;
+            logicdata[i] = 0;
-      }
+          }
-      /*
+          /*
        * depending on the sample rate we need to delay in microseconds
-       * or milliseconds.  We can't do the complex trigger at 1MHz
+           * or milliseconds.  We can't do the complex trigger at 1MHz
-       * so in that case (delayTime == 1 and triggers enabled) use
+           * so in that case (delayTime == 1 and triggers enabled) use
-       * captureMicro() instead of triggerMicro().
+           * captureMicro() instead of triggerMicro().
-       */
+           */
-      if (useMicro) {
+          if (useMicro) {
-        if (trigger && (delayTime != 1)) {
+            if (trigger && (delayTime != 1)) {
-          triggerMicro();
+              triggerMicro();
-        } 
+            } 
-        else {
+            else {
-          captureMicro();
+              captureMicro();
-        }
+            }
-      } 
+          } 
-      else {
+          else {
-        captureMilli();
+            captureMilli();
-      }
+          }
-      break;
+          break;
-    case SUMP_TRIGGER_MASK:
+        case SUMP_TRIGGER_MASK:
-      /*
+          /*
        * the trigger mask byte has a '1' for each enabled trigger so
-       * we can just use it directly as our trigger mask.
+           * we can just use it directly as our trigger mask.
-       */
+           */
-      getCmd();
+          getCmd();
-      trigger = cmdBytes[0];
+#ifdef USE_PORTD
-      break;
+          trigger = cmdBytes[0] << 2;
-    case SUMP_TRIGGER_VALUES:
+#else
-      /*
+          trigger = cmdBytes[0];
+#endif
+          break;
+        case SUMP_TRIGGER_VALUES:
+          /*
        * trigger_values can be used directly as the value of each bit
-       * defines whether we're looking for it to be high or low.
+           * defines whether we're looking for it to be high or low.
-       */
+           */
-      getCmd();
+          getCmd();
-      trigger_values = cmdBytes[0];
+#ifdef USE_PORTD
-      break;
+          trigger_values = cmdBytes[0] << 2;
-    case SUMP_TRIGGER_CONFIG:
+#else
-      /* read the rest of the command bytes, but ignore them. */
+          trigger_values = cmdBytes[0];
-      getCmd();
+#endif
-      break;
+          break;
-    case SUMP_SET_DIVIDER:
+        case SUMP_TRIGGER_CONFIG:
-      /*
+          /* read the rest of the command bytes, but ignore them. */
+          getCmd();
+          break;
+        case SUMP_SET_DIVIDER:
+          /*
        * the shifting needs to be done on the 32bit unsigned long variable
-       * so that << 16 doesn't end up as zero.
+           * so that << 16 doesn't end up as zero.
-       */
+           */
-      getCmd();
+          getCmd();
-      divider = cmdBytes[2];
+          divider = cmdBytes[2];
-      divider = divider << 8;
+          divider = divider << 8;
-      divider += cmdBytes[1];
+          divider += cmdBytes[1];
-      divider = divider << 8;
+          divider = divider << 8;
-      divider += cmdBytes[0];
+          divider += cmdBytes[0];
-      setupDelay();
+          setupDelay();
-      break;
+          break;
-    case SUMP_SET_READ_DELAY_COUNT:
+        case SUMP_SET_READ_DELAY_COUNT:
-      /*
+          /*
        * this just sets up how many samples there should be before
-       * and after the trigger fires.  The readCount is total samples
+           * and after the trigger fires.  The readCount is total samples
-       * to return and delayCount number of samples after the trigger.
+           * to return and delayCount number of samples after the trigger.
-       * this sets the buffer splits like 0/100, 25/75, 50/50
+           * this sets the buffer splits like 0/100, 25/75, 50/50
-       * for example if readCount == delayCount then we should
+           * for example if readCount == delayCount then we should
-       * return all samples starting from the trigger point.
+           * return all samples starting from the trigger point.
-       * if delayCount < readCount we return (readCount - delayCount) of
+           * if delayCount < readCount we return (readCount - delayCount) of
-       * samples from before the trigger fired.
+           * samples from before the trigger fired.
-       */
+           */
-      getCmd();
+          getCmd();
-      readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
+          readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
-      if (readCount > MAX_CAPTURE_SIZE)
+          if (readCount > MAX_CAPTURE_SIZE)
-        readCount = MAX_CAPTURE_SIZE;
+            readCount = MAX_CAPTURE_SIZE;
-      delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
+          delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
-      if (delayCount > MAX_CAPTURE_SIZE)
+          if (delayCount > MAX_CAPTURE_SIZE)
-        delayCount = MAX_CAPTURE_SIZE;
+            delayCount = MAX_CAPTURE_SIZE;
-      break;
+          break;
-    case SUMP_SET_FLAGS:
+        case SUMP_SET_FLAGS:
-      /* read the rest of the command bytes, but ignore them. */
+          /* read the rest of the command bytes and check if RLE is enabled. */
-      getCmd();
+          getCmd();
-      break;
+          rleEnabled = ((cmdBytes[1] & B1000000) != 0);
-    case SUMP_GET_METADATA:
+          break;
-      /*
+        case SUMP_GET_METADATA:
+          /*
        * We return a description of our capabilities.
-       * Check the function's comments below.
+           * Check the function's comments below.
-       */
+           */
-      get_metadata();
+          get_metadata();
-      break;
+          break;
-    case SUMP_SELF_TEST:
+        case SUMP_SELF_TEST:
-      /* ignored. */
+          /* ignored. */
-      break;
+          break;
 #ifdef DEBUG
-      /*
+          /*
        * a couple of debug commands used during development.
-       */
+           */
-    case '0':
+        case '0':
-      /*
+          /*
        * This resets the debug buffer pointer, effectively clearing the
-       * previous commands out of the buffer. Clear the sample data as well.
+           * previous commands out of the buffer. Clear the sample data as well.
-       * Just send a '0' from the Arduino IDE's Serial Monitor.
+           * Just send a '0' from the Arduino IDE's Serial Monitor.
-       */
+           */
-      savecount=0;
+          savecount=0;
-      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
+          for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-        logicdata[i] = 0;
+            logicdata[i] = 0;
-      }
+          }
-      break;
+          break;
-    case '1':
+        case '1':
-      /*
+          /*
        * This is used to see what commands were sent to the device.
-       * you can use the Arduino serial monitor and send a '1' and get
+           * you can use the Arduino serial monitor and send a '1' and get
-       * a debug printout.  useless except for development.
+           * a debug printout.  useless except for development.
-       */
+           */
-#ifndef CHAN5
+          blinkled();
-      blinkled();
+          debugprint();
-#endif /* !CHAN5 */
+          break;
-      debugprint();
+        case '2':
-      break;
+          /*
-    case '2':
-      /*
        * This dumps the sample data to the serial port.  Used for debugging.
-       */
+           */
-      debugdump();
+          debugdump();
-      break;
+          break;
 #endif /* DEBUG */
-    default:
+        default:
-      /* ignore any unrecognized bytes. */
+          /* ignore any unrecognized bytes. */
-      break;
+          break;
-    }
+        } /* switch */
-  }
+      } /* if client.available() */
+    } /* while */
+    delay(1);
+    client.stop();
+    Serial.println("client disconnected?");
+  } /* if client */
 }
 
 void blinkled() {
@@ -392,10 +473,10 @@ void blinkled() {
  */
 void getCmd() {
   delay(10);
-  cmdBytes[0] = Serial.read();
+  cmdBytes[0] = client.read();
-  cmdBytes[1] = Serial.read();
+  cmdBytes[1] = client.read();
-  cmdBytes[2] = Serial.read();
+  cmdBytes[2] = client.read();
-  cmdBytes[3] = Serial.read();
+  cmdBytes[3] = client.read();
 
 #ifdef DEBUG
   if (savecount < 120 ) {
@@ -428,7 +509,7 @@ void captureMicro() {
   int i;
 
   /*
-   * basic trigger, wait until all trigger conditions are met on port B.
+   * basic trigger, wait until all trigger conditions are met on port.
    * this needs further testing, but basic tests work as expected.
    */
   if (trigger) {
@@ -447,16 +528,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 pin 7 is being used here.
+   * Arduino digital pin 8 is being used here.
    */
-  DDRD = DDRD | B10000000;
+  DEBUG_ENABLE;
-  PORTD = B10000000;
+  DEBUG_ON;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUG_OFF;
   delayMicroseconds(20);
-  PORTD = B10000000;
+  DEBUG_ON;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUG_OFF;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -464,20 +545,20 @@ 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 */
+    DEBUG_ON; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       logicdata[i] = CHANPIN;
       __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");
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUG_OFF; /* 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 */
+    DEBUG_ON; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       logicdata[i] = CHANPIN;
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
@@ -487,7 +568,7 @@ void captureMicro() {
       __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 */
+    DEBUG_OFF; /* debug timing measurement */
   } 
   else {
     /*
@@ -496,13 +577,13 @@ void captureMicro() {
      * a better logic analyzer)
      * start of real measurement
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUG_ON; /* debug timing measurement */
     for (i = 0 ; i < readCount; i++) {
       logicdata[i] = CHANPIN;
       delayMicroseconds(delayTime - 1);
       __asm__("nop\n\t""nop\n\t");
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUG_OFF; /* debug timing measurement */
   }
 
   /* re-enable interrupts now that we're done sampling. */
@@ -513,7 +594,11 @@ void captureMicro() {
    * is done for any triggers, this is effectively the 0/100 buffer split.
    */
   for (i = 0 ; i < readCount; i++) {
-    Serial.write(logicdata[i]);
+#ifdef USE_PORTD
+    client.write(logicdata[i] >> 2);
+#else
+    client.write(logicdata[i]);
+#endif
   }
 }
 
@@ -535,21 +620,60 @@ void captureMicro() {
  * this basic functionality.
  */
 void captureMilli() {
-  int i;
+  int i = 0;
 
-  /*
+  if(rleEnabled) {
-   * very basic trigger, just like in captureMicros() above.
+    /*
-   */
+     * very basic trigger, just like in captureMicros() above.
-  if (trigger) {
+     */
-    while ((trigger_values ^ CHANPIN) & trigger);
+    if (trigger) {
-  }
+      while ((trigger_values ^ (CHANPIN & B01111111)) & trigger);
+    }
 
-  for (i = 0 ; i < readCount; i++) {
+    byte lastSample = 0;
-    logicdata[i] = CHANPIN;
+    byte sampleCount = 0;
-    delay(delayTime);
+
+    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.
+     */
+    if (trigger) {
+      while ((trigger_values ^ CHANPIN) & trigger);
+    }
+
+    for (i = 0 ; i < readCount; i++) {
+      logicdata[i] = CHANPIN;
+      delay(delayTime);
+    }
   }
   for (i = 0 ; i < readCount; i++) {
-    Serial.write(logicdata[i]);
+#ifdef USE_PORTD
+    client.write(logicdata[i] >> 2);
+#else
+    client.write(logicdata[i]);
+#endif
   }
 }
 
@@ -579,16 +703,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 pin 7 is being used here.
+   * Arduino digital pin 8 is being used here.
    */
-  DDRD = DDRD | B10000000;
+  DEBUG_ENABLE;
-  PORTD = B10000000;
+  DEBUG_ON;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUG_OFF;
   delayMicroseconds(20);
-  PORTD = B10000000;
+  DEBUG_ON;
   delayMicroseconds(20);
-  PORTD = B00000000;
+  DEBUG_OFF;
   delayMicroseconds(20);
 
   if (delayTime == 1) {
@@ -613,9 +737,9 @@ void triggerMicro() {
      * we always start capturing at the start of the buffer
      * and use it as a circular buffer
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUG_ON; /* debug timing measurement */
     while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* PORTD = B00000000; */
+      /* DEBUG_OFF; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
@@ -627,11 +751,11 @@ void triggerMicro() {
        * __asm__("nop\n\t""nop\n\t""nop\n\t");
        */
       __asm__("nop\n\t");
-      /* PORTD = B10000000; */
+      /* DEBUG_ON; */
     }
     /* this pads the immediate trigger case to 2.0 uS, just as an example. */
     __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUG_OFF; /* debug timing measurement */
 
     /* 
      * One sample size delay. ends up being 2 uS combined with assignment
@@ -646,7 +770,7 @@ void triggerMicro() {
     triggerIndex = logicIndex;
 
     /* keep sampling for delayCount after trigger */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUG_ON; /* debug timing measurement */
     /*
      * this is currently taking:
      * 1025.5 uS for 512 samples. (512 samples, 0/100 split)
@@ -661,7 +785,7 @@ void triggerMicro() {
       __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");
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUG_OFF; /* debug timing measurement */
     delayMicroseconds(100);
   } 
   else {
@@ -674,9 +798,9 @@ void triggerMicro() {
      * and use it as a circular buffer
      *
      */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUG_ON; /* debug timing measurement */
     while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
-      /* PORTD = B00000000; */
+      /* DEBUG_OFF; */
       /* increment index. */
       logicIndex++;
       if (logicIndex >= readCount) {
@@ -688,9 +812,9 @@ void triggerMicro() {
       }
       delayMicroseconds(delayTime - 3);
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
-      /* PORTD = B10000000; */
+      /* DEBUG_ON; */
     }
-    PORTD = B00000000; /* debug timing measurement */
+    DEBUG_OFF; /* debug timing measurement */
 
     /* 'logicIndex' now points to trigger sample, keep track of it */
     triggerIndex = logicIndex;
@@ -705,7 +829,7 @@ void triggerMicro() {
     __asm__("nop\n\t""nop\n\t""nop\n\t");
 
     /* keep sampling for delayCount after trigger */
-    PORTD = B10000000; /* debug timing measurement */
+    DEBUG_ON; /* debug timing measurement */
     for (i = 0 ; i < delayCount; i++) {
       if (logicIndex >= readCount) {
         logicIndex = 0;
@@ -716,7 +840,7 @@ void triggerMicro() {
       __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 */
+    DEBUG_OFF; /* debug timing measurement */
     delayMicroseconds(100);
   }
 
@@ -737,7 +861,11 @@ void triggerMicro() {
     if (logicIndex >= readCount) {
       logicIndex = 0;
     }
-    Serial.write(logicdata[logicIndex++]);
+#ifdef USE_PORTD
+    client.write(logicdata[logicIndex++] >> 2);
+#else
+    client.write(logicdata[logicIndex++]);
+#endif
   }
 }
 
@@ -773,61 +901,69 @@ void setupDelay() {
  */
 void get_metadata() {
   /* device name */
-  Serial.write((uint8_t)0x01);
+  client.write((uint8_t)0x01);
-  Serial.write('A');
+  client.write('A');
-  Serial.write('G');
+  client.write('G');
-  Serial.write('L');
+  client.write('L');
-  Serial.write('A');
+  client.write('A');
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.write('M');
+  client.write('M');
 #endif /* Mega */
-  Serial.write('v');
+  client.write('v');
-  Serial.write('0');
+  client.write('0');
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
+
+  /* firmware version */
+  client.write((uint8_t)0x02);
+  client.write('0');
+  client.write('.');
+  client.write('0');
+  client.write('9');
+  client.write((uint8_t)0x00);
 
   /* sample memory */
-  Serial.write((uint8_t)0x21);
+  client.write((uint8_t)0x21);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   /* 7168 bytes */
-  Serial.write((uint8_t)0x1C);
+  client.write((uint8_t)0x1C);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #elif defined(__AVR_ATmega328P__)
   /* 1024 bytes */
-  Serial.write((uint8_t)0x04);
+  client.write((uint8_t)0x04);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #else
   /* 532 bytes */
-  Serial.write((uint8_t)0x02);
+  client.write((uint8_t)0x02);
-  Serial.write((uint8_t)0x14);
+  client.write((uint8_t)0x14);
 #endif /* Mega */
 
   /* sample rate (1MHz) */
-  Serial.write((uint8_t)0x23);
+  client.write((uint8_t)0x23);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
-  Serial.write((uint8_t)0x0F);
+  client.write((uint8_t)0x0F);
-  Serial.write((uint8_t)0x42);
+  client.write((uint8_t)0x42);
-  Serial.write((uint8_t)0x40);
+  client.write((uint8_t)0x40);
 
-  /* number of probes (5 by default on Arduino, 8 on Mega) */
+  /* number of probes (6 by default on Arduino, 8 on Mega) */
-  Serial.write((uint8_t)0x40);
+  client.write((uint8_t)0x40);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.write((uint8_t)0x08);
+  client.write((uint8_t)0x08);
 #else
 #ifdef CHAN5
-  Serial.write((uint8_t)0x06);
+  client.write((uint8_t)0x06);
 #else
-  Serial.write((uint8_t)0x05);
+  client.write((uint8_t)0x05);
 #endif /* CHAN5 */
 #endif /* Mega */
 
   /* protocol version (2) */
-  Serial.write((uint8_t)0x41);
+  client.write((uint8_t)0x41);
-  Serial.write((uint8_t)0x02);
+  client.write((uint8_t)0x02);
 
   /* end of data */
-  Serial.write((uint8_t)0x00);  
+  client.write((uint8_t)0x00);  
 }
 
 /*
@@ -840,34 +976,36 @@ void debugprint() {
   int i;
 
 #if 0
-  Serial.print("divider = ");
+  client.print("divider = ");
-  Serial.println(divider, DEC);
+  client.println(divider, DEC);
-  Serial.print("delayTime = ");
+  client.print("delayTime = ");
-  Serial.println(delayTime, DEC);
+  client.println(delayTime, DEC);
-  Serial.print("trigger_values = ");
+  client.print("trigger_values = ");
-  Serial.println(trigger_values, BIN);
+  client.println(trigger_values, BIN);
 #endif
-  Serial.print("readCount = ");
+  client.print("readCount = ");
-  Serial.println(readCount, DEC);
+  client.println(readCount, DEC);
-  Serial.print("delayCount = ");
+  client.print("delayCount = ");
-  Serial.println(delayCount, DEC);
+  client.println(delayCount, DEC);
-  Serial.print("logicIndex = ");
+  client.print("logicIndex = ");
-  Serial.println(logicIndex, DEC);
+  client.println(logicIndex, DEC);
-  Serial.print("triggerIndex = ");
+  client.print("triggerIndex = ");
-  Serial.println(triggerIndex, DEC);
+  client.println(triggerIndex, DEC);
+  client.print("rleEnabled = ");
+  client.println(rleEnabled, DEC);
 
-  Serial.println("Bytes:");
+  client.println("Bytes:");
 
   for (i = 0 ; i < savecount; i++) {
     if (savebytes[i] == 0x20) {
-      Serial.println();
+      client.println();
     } 
     else {
-      Serial.print(savebytes[i], HEX);
+      client.print(savebytes[i], HEX);
-      Serial.write(' ');
+      client.write(' ');
     }
   }
-  Serial.println("done...");
+  client.println("done...");
 }
 
 /*
@@ -878,13 +1016,17 @@ void debugdump() {
   int i;
   int j = 1;
 
-  Serial.print("\r\n");
+  client.print("\r\n");
 
   for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-    Serial.print(logicdata[i], HEX);
+#ifdef USE_PORTD
-    Serial.print(" ");
+    client.print(logicdata[i] >> 2, HEX);
+#else
+    client.print(logicdata[i], HEX);
+#endif
+    client.print(" ");
     if (j == 32) {
-      Serial.print("\r\n");
+      client.print("\r\n");
       j = 0;
     }
     j++;
@@ -896,3 +1038,6 @@ void debugdump() {
 
 
 
+
+
+

ols.profile-agla.cfg

@@ -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 = false
+device.feature.rle = true
 # 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 = 5
+device.channel.count = 6
 # 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