Add additional diagnostic commands.

You can connect via the serial monitor and send ‘?’ to get a list of
commands available.  This allows some diagnostics when the board isn’t
working with the OLS client.
Sending ‘4’ does a 4MHz capture and ‘2’ dumbs the data buffer for
example.  Recommended to use this with the simulated signal via a
timer.  See the bottom of the setup() function and change the ‘#if 0’
to ‘#if 1’ to enable it.
Also, fix a long standing bug that broke 2MHz captures and the
ATmega168. (improper #if defined check)

README

@@ -1,43 +1,28 @@
 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/
 
+The alternative client version is highly recommended.  Download version
+"ols-0.9.7" or newer for built-in device profiles.
+
 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
 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
+Pins 22-29 (Port A) are used by default.
-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 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)
+Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
 Channel Groups: 0 (zero) only
 Recording Size:
    ATmega168:  532 (or lower)
@@ -51,8 +36,38 @@ 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.
 
-This master branch now supports Arduino 1.0 only.
+Older Notes
-Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
+===========================================================================
+NOTE: With v0.11 you can now sample at 4MHz & 2MHz rates in addition to the 
+      previous 1MHz and lower rates.  This is done via unrolled loops which
+      makes the source code huge and the binary takes much more of the flash.
+      v0.11 is just slightly to big for an ATmega168's flash.  You can comment
+      out either captureInline2mhz() or captureInline4mhz() and it will fit.
+      [ The code automatically skips the 2MHz code now, this isn't needed. ]
 
-Release: v0.09 June 22, 2013.
+NOTE: v0.09 switched the channels BACK to pins 8-13 for trigger reliability.
+      Please report any issues.  Uncomment USE_PORTD for pins 2-7.
+
+NOTE: 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
+      [ These are included in ols-0.9.7 or newer so do not copy them. ]
+
+NOTE: If you are using the original SUMP client, 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 referenced above.
+      [ This is not needed with ols-0.9.7 or newer. ]
+      [ DO NOT use this resistor unless absolutely necessary on old clients. ]
+
+NOTE: This master branch now supports Arduino 1.0 only.
+      Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
+
+
+Release: v0.13 February 7, 2015.
 

logic_analyzer.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,17 +29,7 @@
  */
 
 /*
- * NOTE: This is an ALPHA of support for an Ethernet attached Logic Analyzer.
+ * NOTE: v0.09 switched the channels BACK to pins 8-13 for trigger reliability.
- *       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
@@ -54,26 +44,10 @@
  * 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)
+ * Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
  * Channel Groups: 0 (zero) only
  * Recording Size:
  *    ATmega168:  532 (or lower)
@@ -88,12 +62,10 @@
  * until after the trigger fires.
  * Please try it out and report back.
  *
- * Release: v0.09 June 22, 2013.
+ * Release: v0.13 February 7, 2015.
  *
  */
 
-#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
@@ -109,12 +81,14 @@ void blinkled(void);
 void get_metadata(void);
 void debugprint(void);
 void debugdump(void);
+void prettydump(void);
+
 
 /*
  * Should we use PORTD or PORTB?  (default is PORTB)
  * PORTD support with triggers seems to work but needs more testing.
  */
-#define USE_PORTD 1
+//#define USE_PORTD 1
 
 /*
  * Arduino device profile:      ols.profile-agla.cfg
@@ -197,7 +171,7 @@ void debugdump(void);
 #define DEBUG_ENABLE DDRD = DDRD | B10000000
 #define DEBUG_ON PORTD = B10000000
 #define DEBUG_OFF PORTD = B00000000
-#endif
+#endif /* USE_PORTD */
 #define DEBUG
 #ifdef DEBUG
 #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
@@ -229,30 +203,10 @@ 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 (digital pin 8) to output right away so it settles.
    * this gets toggled during sampling as a way to measure
@@ -262,199 +216,261 @@ void setup()
   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);
-  digitalWrite(CHAN4, LOW);
 #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 /* Mega */
+
+#if 0
+
+  /*
+   * This sets up timer2 at 100KHz to toggle a pin.  This is useful
+   * for debugging as it gives an internally precise signal source.
+   * This doesn't work on the Arduino Mega.  Use on the Uno or older.
+   * We're using the same clock source for the timer & our sampling.
+   */
+
+  /* Set OC2A (digital pin 11) to output so we can toggle it. */
+  pinMode(11, OUTPUT);
+
+  /* reset timer to zero */
+  TCNT2 = 0;
+  TCCR2A = 0;
+  TCCR2B = 0;
+  OCR2A = 0;
+
+  /* Set CTC mode and toggle on compare. */
+  TCCR2A = _BV (COM2A0) | _BV (WGM21);
+  /* 79 = 100KHz, 15 = 500KHz, 7 = 1MHz */
+  OCR2A = 79;
+  TCCR2B = _BV (CS20);
+#endif
 }
 
 void loop()
 {
   int i;
 
-  // listen for incoming clients
+  if (Serial.available() > 0) {
-  client = server.available();
+    cmdByte = Serial.read();
-  if (client) {
+    switch (cmdByte) {
-    Serial.println("new client");
+    case SUMP_RESET:
-    while (client.connected()) {
+      /*
-      if (client.available()) {
+         * We don't do anything here as some unsupported extended commands have
-        cmdByte = client.read();
+       * zero bytes and are mistaken as resets.  This can trigger false resets
-        switch(cmdByte) {
+       * so we don't erase the data or do anything for a reset.
-        case SUMP_RESET:
+       */
-          /*
+      break;
-       * We don't do anything here as some unsupported extended commands have
+    case SUMP_QUERY:
-           * zero bytes and are mistaken as resets.  This can trigger false resets
+      /* return the expected bytes. */
-           * so we don't erase the data or do anything for a reset.
+      Serial.write('1');
-           */
+      Serial.write('A');
-          break;
+      Serial.write('L');
-        case SUMP_QUERY:
+      Serial.write('S');
-          /* return the expected bytes. */
+      break;
-          client.write('1');
+    case SUMP_ARM:
-          client.write('A');
+      /*
-          client.write('L');
+         * Zero out any previous samples before arming.
-          client.write('S');
+       * Done here instead via reset due to spurious resets.
-          break;
+       */
-        case SUMP_ARM:
+      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-          /*
+        logicdata[i] = 0;
-       * Zero out any previous samples before arming.
+      }
-           * Done here instead via reset due to spurious resets.
+      /*
-           */
+         * depending on the sample rate we need to delay in microseconds
-          for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
+       * or milliseconds.  We can't do the complex trigger at 1MHz
-            logicdata[i] = 0;
+       * so in that case (delayTime == 1 and triggers enabled) use
-          }
+       * captureMicro() instead of triggerMicro().
-          /*
+       */
-       * depending on the sample rate we need to delay in microseconds
+
-           * or milliseconds.  We can't do the complex trigger at 1MHz
+      if (divider == 24) {
-           * so in that case (delayTime == 1 and triggers enabled) use
+        /* 4.0MHz */
-           * captureMicro() instead of triggerMicro().
+        captureInline4mhz();
-           */
+      }
-          if (useMicro) {
+      else if (divider == 49) {
-            if (trigger && (delayTime != 1)) {
+        /* 2.0MHz */
-              triggerMicro();
+#if !defined(__AVR_ATmega168__)
-            } 
+        captureInline2mhz();
-            else {
-              captureMicro();
-            }
-          } 
-          else {
-            captureMilli();
-          }
-          break;
-        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.
-           */
-          getCmd();
-#ifdef USE_PORTD
-          trigger = cmdBytes[0] << 2;
-#else
-          trigger = cmdBytes[0];
 #endif
-          break;
+      }
-        case SUMP_TRIGGER_VALUES:
+      else if (useMicro) {
-          /*
+        if (trigger && (delayTime != 1)) {
-       * trigger_values can be used directly as the value of each bit
+          triggerMicro();
-           * defines whether we're looking for it to be high or low.
+        }
-           */
+        else {
-          getCmd();
+          captureMicro();
+        }
+      }
+      else {
+        captureMilli();
+      }
+      break;
+    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.
+       */
+      getCmd();
 #ifdef USE_PORTD
-          trigger_values = cmdBytes[0] << 2;
+      trigger = cmdBytes[0] << 2;
 #else
-          trigger_values = cmdBytes[0];
+      trigger = cmdBytes[0];
 #endif
-          break;
+      break;
-        case SUMP_TRIGGER_CONFIG:
+    case SUMP_TRIGGER_VALUES:
-          /* read the rest of the command bytes, but ignore them. */
+      /*
-          getCmd();
+         * trigger_values can be used directly as the value of each bit
-          break;
+       * defines whether we're looking for it to be high or low.
-        case SUMP_SET_DIVIDER:
+       */
-          /*
+      getCmd();
-       * the shifting needs to be done on the 32bit unsigned long variable
+#ifdef USE_PORTD
-           * so that << 16 doesn't end up as zero.
+      trigger_values = cmdBytes[0] << 2;
-           */
+#else
-          getCmd();
+      trigger_values = cmdBytes[0];
-          divider = cmdBytes[2];
+#endif
-          divider = divider << 8;
+      break;
-          divider += cmdBytes[1];
+    case SUMP_TRIGGER_CONFIG:
-          divider = divider << 8;
+      /* read the rest of the command bytes, but ignore them. */
-          divider += cmdBytes[0];
+      getCmd();
-          setupDelay();
+      break;
-          break;
+    case SUMP_SET_DIVIDER:
-        case SUMP_SET_READ_DELAY_COUNT:
+      /*
-          /*
+         * the shifting needs to be done on the 32bit unsigned long variable
-       * this just sets up how many samples there should be before
+       * so that << 16 doesn't end up as zero.
-           * and after the trigger fires.  The readCount is total samples
+       */
-           * to return and delayCount number of samples after the trigger.
+      getCmd();
-           * this sets the buffer splits like 0/100, 25/75, 50/50
+      divider = cmdBytes[2];
-           * for example if readCount == delayCount then we should
+      divider = divider << 8;
-           * return all samples starting from the trigger point.
+      divider += cmdBytes[1];
-           * if delayCount < readCount we return (readCount - delayCount) of
+      divider = divider << 8;
-           * samples from before the trigger fired.
+      divider += cmdBytes[0];
-           */
+      setupDelay();
-          getCmd();
+      break;
-          readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
+    case SUMP_SET_READ_DELAY_COUNT:
-          if (readCount > MAX_CAPTURE_SIZE)
+      /*
-            readCount = MAX_CAPTURE_SIZE;
+         * this just sets up how many samples there should be before
-          delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
+       * and after the trigger fires.  The readCount is total samples
-          if (delayCount > MAX_CAPTURE_SIZE)
+       * to return and delayCount number of samples after the trigger.
-            delayCount = MAX_CAPTURE_SIZE;
+       * this sets the buffer splits like 0/100, 25/75, 50/50
-          break;
+       * for example if readCount == delayCount then we should
-        case SUMP_SET_FLAGS:
+       * return all samples starting from the trigger point.
-          /* read the rest of the command bytes and check if RLE is enabled. */
+       * if delayCount < readCount we return (readCount - delayCount) of
-          getCmd();
+       * samples from before the trigger fired.
-          rleEnabled = ((cmdBytes[1] & B1000000) != 0);
+       */
-          break;
+      getCmd();
-        case SUMP_GET_METADATA:
+      readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
-          /*
+      if (readCount > MAX_CAPTURE_SIZE)
-       * We return a description of our capabilities.
+        readCount = MAX_CAPTURE_SIZE;
-           * Check the function's comments below.
+      delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
-           */
+      if (delayCount > MAX_CAPTURE_SIZE)
-          get_metadata();
+        delayCount = MAX_CAPTURE_SIZE;
-          break;
+      break;
-        case SUMP_SELF_TEST:
+    case SUMP_SET_FLAGS:
-          /* ignored. */
+      /* read the rest of the command bytes and check if RLE is enabled. */
-          break;
+      getCmd();
+      rleEnabled = ((cmdBytes[1] & B1000000) != 0);
+      break;
+    case SUMP_GET_METADATA:
+      /*
+         * We return a description of our capabilities.
+       * Check the function's comments below.
+       */
+      get_metadata();
+      break;
+    case SUMP_SELF_TEST:
+      /* ignored. */
+      break;
 #ifdef DEBUG
-          /*
+      /*
-       * a couple of debug commands used during development.
+         * a couple of debug commands used during development.
-           */
+       */
-        case '0':
+    case '?':
-          /*
+      Serial.println("");
-       * This resets the debug buffer pointer, effectively clearing the
+      Serial.println("0 = clear cmd buffer");
-           * previous commands out of the buffer. Clear the sample data as well.
+      Serial.println("1 = print cmd buffer");
-           * Just send a '0' from the Arduino IDE's Serial Monitor.
+      Serial.println("2 = print data buffer");
-           */
+      Serial.println("3 = pretty print buffer");
-          savecount=0;
+      Serial.println("4 = capture at 4MHz");
-          for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
+      Serial.println("5 = capture at 1MHz");
-            logicdata[i] = 0;
+      Serial.println("6 = capture at 500KHz");
-          }
+      break;
-          break;
+    case '0':
-        case '1':
+      /*
-          /*
+         * This resets the debug buffer pointer, effectively clearing the
-       * This is used to see what commands were sent to the device.
+       * previous commands out of the buffer. Clear the sample data as well.
-           * you can use the Arduino serial monitor and send a '1' and get
+       * Just send a '0' from the Arduino IDE's Serial Monitor.
-           * a debug printout.  useless except for development.
+       */
-           */
+      savecount = 0;
-          blinkled();
+      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-          debugprint();
+        logicdata[i] = 0;
-          break;
+      }
-        case '2':
+      break;
-          /*
+    case '1':
-       * This dumps the sample data to the serial port.  Used for debugging.
+      /*
-           */
+         * This is used to see what commands were sent to the device.
-          debugdump();
+       * you can use the Arduino serial monitor and send a '1' and get
-          break;
+       * a debug printout.  useless except for development.
+       */
+      blinkled();
+      debugprint();
+      break;
+    case '2':
+      /*
+         * This dumps the sample data to the serial port.
+       */
+      debugdump();
+      break;
+    case '3':
+      /*
+         * Prints a visual representation of the data buffer.
+       */
+      prettydump();
+      break;
+    case '4':
+      /*
+         * This runs a sample capture at 4MHz.
+       */
+      captureInline4mhz();
+      Serial.println("");
+      Serial.println("4MHz capture done.");
+      break;
+    case '5':
+      /*
+         * This runs a sample capture at 1MHz.
+       * delayTime = 1ms for 1MHz sampling.
+       */
+      delayTime = 1;
+      captureMicro();
+      Serial.println("");
+      Serial.println("1MHz capture done.");
+      break;
+    case '6':
+      /*
+         * This runs a sample capture at 500KHz.
+       * delayTime = 2ms for 500KHz.
+       */
+      delayTime = 1;
+      captureMicro();
+      Serial.println("");
+      Serial.println("500KHz capture done.");
+      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() {
@@ -473,10 +489,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,7 +522,7 @@ void getCmd() {
  */
 
 void captureMicro() {
-  int i;
+  unsigned int i;
 
   /*
    * basic trigger, wait until all trigger conditions are met on port.
@@ -531,6 +547,7 @@ void captureMicro() {
    * Arduino digital pin 8 is being used here.
    */
   DEBUG_ENABLE;
+#ifdef DEBUG
   DEBUG_ON;
   delayMicroseconds(20);
   DEBUG_OFF;
@@ -539,6 +556,7 @@ void captureMicro() {
   delayMicroseconds(20);
   DEBUG_OFF;
   delayMicroseconds(20);
+#endif
 
   if (delayTime == 1) {
     /*
@@ -552,7 +570,7 @@ void captureMicro() {
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     }
     DEBUG_OFF; /* debug timing measurement */
-  } 
+  }
   else if (delayTime == 2) {
     /*
      * 500KHz sample rate = 2 uS delay, still pretty fast so we pad this
@@ -569,7 +587,7 @@ void captureMicro() {
       __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     }
     DEBUG_OFF; /* debug timing measurement */
-  } 
+  }
   else {
     /*
      * not 1MHz or 500KHz; delayMicroseconds(delay - 1) works fine here
@@ -595,9 +613,9 @@ void captureMicro() {
    */
   for (i = 0 ; i < readCount; i++) {
 #ifdef USE_PORTD
-    client.write(logicdata[i] >> 2);
+    Serial.write(logicdata[i] >> 2);
 #else
-    client.write(logicdata[i]);
+    Serial.write(logicdata[i]);
 #endif
   }
 }
@@ -620,9 +638,9 @@ void captureMicro() {
  * this basic functionality.
  */
 void captureMilli() {
-  int i = 0;
+  unsigned int i = 0;
 
-  if(rleEnabled) {
+  if (rleEnabled) {
     /*
      * very basic trigger, just like in captureMicros() above.
      */
@@ -633,16 +651,16 @@ void captureMilli() {
     byte lastSample = 0;
     byte sampleCount = 0;
 
-    while(i < readCount) {
+    while (i < readCount) {
       /*
        * Implementation of the RLE unlimited protocol: timings might be off a little
        */
-      if(lastSample == (CHANPIN & B01111111) && sampleCount < 127) {
+      if (lastSample == (CHANPIN & B01111111) && sampleCount < 127) {
         sampleCount++;
         delay(delayTime);
         continue;
       }
-      if(sampleCount != 0) {
+      if (sampleCount != 0) {
         logicdata[i] = B10000000 | sampleCount;
         sampleCount = 0;
         i++;
@@ -654,7 +672,7 @@ void captureMilli() {
 
       i++;
     }
-  } 
+  }
   else {
     /*
      * very basic trigger, just like in captureMicros() above.
@@ -670,9 +688,9 @@ void captureMilli() {
   }
   for (i = 0 ; i < readCount; i++) {
 #ifdef USE_PORTD
-    client.write(logicdata[i] >> 2);
+    Serial.write(logicdata[i] >> 2);
 #else
-    client.write(logicdata[i]);
+    Serial.write(logicdata[i]);
 #endif
   }
 }
@@ -683,10 +701,10 @@ void captureMilli() {
  * This works ok at 500KHz and lower sample rates.  We don't have enough time
  * with a 16MHz clock to sample at 1MHz into the circular buffer.  A 20MHz
  * clock might be ok but all of the timings would have to be redone.
- * 
+ *
  */
 void triggerMicro() {
-  int i = 0;
+  unsigned int i = 0;
 
   logicIndex = 0;
   triggerIndex = 0;
@@ -706,6 +724,7 @@ void triggerMicro() {
    * Arduino digital pin 8 is being used here.
    */
   DEBUG_ENABLE;
+#ifdef DEBUG
   DEBUG_ON;
   delayMicroseconds(20);
   DEBUG_OFF;
@@ -714,6 +733,7 @@ void triggerMicro() {
   delayMicroseconds(20);
   DEBUG_OFF;
   delayMicroseconds(20);
+#endif
 
   if (delayTime == 1) {
     /*
@@ -728,7 +748,7 @@ void triggerMicro() {
      * click stop.
      */
     return;
-  } 
+  }
   else if (delayTime == 2) {
     /*
      * 500KHz case.  We should be able to manage this in time.
@@ -757,7 +777,7 @@ void triggerMicro() {
     __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
     DEBUG_OFF; /* debug timing measurement */
 
-    /* 
+    /*
      * One sample size delay. ends up being 2 uS combined with assignment
      * below.  This padding is so we have a consistent timing interval
      * between the trigger point and the subsequent samples.
@@ -787,7 +807,7 @@ void triggerMicro() {
     }
     DEBUG_OFF; /* debug timing measurement */
     delayMicroseconds(100);
-  } 
+  }
   else {
     /*
      * Less than 500KHz case.  This uses delayMicroseconds() and some padding
@@ -862,9 +882,9 @@ void triggerMicro() {
       logicIndex = 0;
     }
 #ifdef USE_PORTD
-    client.write(logicdata[logicIndex++] >> 2);
+    Serial.write(logicdata[logicIndex++] >> 2);
 #else
-    client.write(logicdata[logicIndex++]);
+    Serial.write(logicdata[logicIndex++]);
 #endif
   }
 }
@@ -887,7 +907,7 @@ void setupDelay() {
   if (divider >= 1500000) {
     useMicro = 0;
     delayTime = (divider + 1) / 100000;
-  } 
+  }
   else {
     useMicro = 1;
     delayTime = (divider + 1) / 100;
@@ -901,73 +921,73 @@ 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');
+  Serial.write('v');
-  client.write('0');
+  Serial.write('0');
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
 
   /* firmware version */
-  client.write((uint8_t)0x02);
+  Serial.write((uint8_t)0x02);
-  client.write('0');
+  Serial.write('0');
-  client.write('.');
+  Serial.write('.');
-  client.write('0');
+  Serial.write('1');
-  client.write('9');
+  Serial.write('3');
-  client.write((uint8_t)0x00);
+  Serial.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__)
   /* 7168 bytes */
-  client.write((uint8_t)0x1C);
+  Serial.write((uint8_t)0x1C);
-  client.write((uint8_t)0x00);
+  Serial.write((uint8_t)0x00);
 #elif defined(__AVR_ATmega328P__)
   /* 1024 bytes */
-  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) */
+  /* sample rate (4MHz) */
-  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)0x3D);
-  client.write((uint8_t)0x42);
+  Serial.write((uint8_t)0x09);
-  client.write((uint8_t)0x40);
+  Serial.write((uint8_t)0x00);
 
   /* number of probes (6 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);
 }
 
 /*
- * This is used by the '0' debug command to dump the contents of some
+ * This is used by the '1' debug command to dump the contents of some
  * interesting variables and the debug buffer.
  *
  */
@@ -976,36 +996,36 @@ 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 = ");
+  Serial.print("rleEnabled = ");
-  client.println(rleEnabled, DEC);
+  Serial.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...");
 }
 
 /*
@@ -1016,22 +1036,51 @@ void debugdump() {
   int i;
   int j = 1;
 
-  client.print("\r\n");
+  Serial.print("\r\n");
 
   for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
 #ifdef USE_PORTD
-    client.print(logicdata[i] >> 2, HEX);
+    Serial.print(logicdata[i] >> 2, HEX);
 #else
-    client.print(logicdata[i], HEX);
+    Serial.print(logicdata[i], HEX);
 #endif
-    client.print(" ");
+    Serial.print(" ");
     if (j == 32) {
-      client.print("\r\n");
+      Serial.print("\r\n");
       j = 0;
     }
     j++;
   }
 }
+
+/*
+ * This is used by the '3' debugs command to dump the first 64 bytes
+ * of the sample buffer.
+ * It prints the data in a graphical representation.
+ */
+void prettydump() {
+  int i;
+  byte j;
+  byte k;
+
+  Serial.print("\r\n");
+
+  for (i = 0 ; i < 64; i++) {
+#ifdef USE_PORTD
+    k = logicdata[i] >> 2;
+#else
+    k = logicdata[i];
+#endif
+    for (j = 0; j < 8; j++) {
+      if (k & 0x01)
+        Serial.print("| ");
+      else
+        Serial.print(" |");
+      k = k >> 1;
+    }
+    Serial.print("\r\n");
+  }
+}
 #endif /* DEBUG */
 
 
@@ -1041,3 +1090,7 @@ void debugdump() {
 
 
 
+
+
+
+

ols.profile-agla.cfg

@@ -11,7 +11,7 @@ device.clockspeed = 16000000
 # 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
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000, 4000000
 # What capture clocks are supported
 device.captureclock = INTERNAL
 # The supported capture sizes, in bytes
@@ -39,7 +39,7 @@ 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 = 2000
 # 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)

ols.profile-aglam.cfg

@@ -11,7 +11,7 @@ device.clockspeed = 16000000
 # 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
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000, 4000000
 # What capture clocks are supported
 device.captureclock = INTERNAL
 # The supported capture sizes, in bytes