Fix off by one on the capture buffer due to earlier debugging. I finally realized I was checking if an unsigned int was less than zero. Thanks Szilárd for the correct indexes in the issue comments.

Add a sketch with Sigrok support. Basically returning the capture buffer in the opposite order.
Move README to README.md and update it.
2026-05-06 14:17:28 +03:00 · 2023-10-03 23:48:07 -05:00 · 2023-10-03 23:00:05 -05:00 · 2021-12-21 13:28:29 -06:00 · 2021-12-21 12:51:32 -06:00 · 2021-12-21 12:35:18 -06:00
17 changed files with 60391 additions and 146 deletions
--- a/22
+++ b/22
@@ -0,0 +1,22 @@
+Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY ANDREW GILLHAM ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL ANDREW GILLHAM BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/37
+++ b/37
@@ -1,19 +1,24 @@
 #
-# Makefile for an Arduino based logic analyzer using the 'arduino-core'
-# package and makefiles.
+# Makefile for an Arduino based logic analyzer using the arduino-cli
 #
-#	$Id: Makefile,v 1.3 2011-03-07 02:47:26 gillham Exp $
+
+TARGET	= logic_analyzer
+FQBN	= arduino:avr:diecimila
+SERIAL	= /dev/ttyUSB*
+
+
+all:
+	@echo ""
+	@echo "---> run 'make build' to compile for Arduino Duemilanove"
+	@echo "---> run 'make upload' to upload to /dev/ttyUSB*"
+	@echo ""
+
+build:
+	arduino-cli compile --fqbn $(FQBN) $(TARGET)
+
+upload:
+	arduino-cli upload --fqbn $(FQBN) --port $(SERIAL) $(TARGET)
+
+#
+# end-of-file
 #
-ARDUINO_DIR  = /usr/share/arduino
-
-TARGET       = logic_analyzer
-ARDUINO_LIBS = 
-
-MCU          = atmega328p
-F_CPU        = 16000000
-ARDUINO_PORT = /dev/ttyUSB*
-AVRDUDE_ARD_BAUDRATE = 57600
-AVRDUDE_ARD_PROGRAMMER = arduino
-
-include /usr/share/arduino/Arduino.mk
-
--- a/64
+++ b/64
@@ -1,64 +0,0 @@
-SUMP compatible logic analyzer for Arduino
-==========================================
-
-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. 
-
-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.
-
-This Arduino sketch implements a SUMP protocol compatible with the standard
-SUMP client as well as the alternative client from here:
-	http://www.lxtreme.nl/ols/
-
-This SUMP protocol compatible logic analyzer for the Arduino board supports
-5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
-of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
-crystal oscillator pins.
-Uncomment CHAN5 below if you want to use the LED pin as an input and have
-6 channels.
-
-On the Arduino Mega board 8 channels are supported and 7k of samples.
-Pins 22-29 (Port A) are used by default, you can change the 'CHANPIN' below
-if something else works better for you.
-
-NOTE:
-If you are using the original SUMP client, or using the alternative client
-without the device profiles, then you will get a "device not found" error.
-You must DISABLE the Arduino auto reset feature to use this logic analyzer
-code. There are various methods to do this, some boards have a jumper,
-others require you to cut a trace.  You may also install a *precisely*
-120 Ohm resistor between the reset & 5V piins.  Make sure it is really
-120 Ohm or you may damage your board.  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: 4MHz (or lower)
-Channel Groups: 0 (zero) only
-Recording Size:
-   ATmega168:  532 (or lower)
-   ATmega328:  1024 (or lower)
-   ATmega2560: 7168 (or lower)
-Noise Filter: doesn't matter
-RLE: disabled (unchecked)
-
-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.
-
-This master branch now supports Arduino 1.0 only.
-Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
-
-Release: v0.11 August 3, 2013.
-
--- a/README.md
+++ b/README.md
@@ -0,0 +1,131 @@
+SUMP compatible logic analyzer for Arduino
+==========================================
+
+This Arduino sketch implements a SUMP protocol compatible logic analyzer.
+This implementation is compatible with the standard SUMP client as well as
+an alternative OLS client.  More recently support has been added to Sigrok.
+
+This logic analyzer for Arduino supports 6 channels consisting of digital
+pins 8-13, which are the first 6 bits (0-5) of PORTB.
+Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the crystal
+oscillator pins. Comment out CHAN5 if you don't want to use the
+LED pin for an input.
+
+On the Arduino Mega board 8 channels are supported and 7k of samples.
+Pins 22-29 (Port A) are used by default.
+
+Client Software
+===============
+
+Sigrok support via the 'ols' device configuration has been added. This
+mostly involved returning the capture buffer in the reverse order.
+
+Use the `logic_analyzer_sigrok` sketch.  Since the OLS alternative client
+mentioned below has some issues with newer Java versions, Sigrok is currently
+the only practical way to use this logic analyzer.  If you use an older machine
+with an older operating system and older Java you can probably use the OLS client.
+
+Sigrok support seems to work fairly well so I would currently recommend it for
+anyone interested in trying this sketch.
+
+Run PulseView like this on Linux: (I'll add Windows options after more testing)
+```
+PulseView --driver=ols:conn=/dev/ttyUSB0 --dont-scan
+```
+
+It may be necessary to exit and relaunch PulseView to get it to recognize the device.
+An easy way to test the device is using the `sigrok-cli` utility. The command below
+samples channel 2 at 1MHz.  If you get a device not found error, but /dev/ttyUSB0 exists,
+run this command a couple times and usually it will start working. Due to the way opening
+the serial port resets the Arduino there are some issues/bugs to work out yet.
+```
+sigrok-cli --driver=ols:conn=/dev/ttyUSB0 --config samplerate=1Mhz --config pattern=External --samples 1024 --channels 2
+```
+
+The OLS alternative client hasn't had an official release recently so you will
+need to compile it yourself.
+
+Follow the build instructions here: https://github.com/jawi/ols
+
+
+Older details on the OLS client is available at the project page:
+https://lxtreme.nl/projects/ols/
+
+Direct link to older releases of the OLS alternative client:
+http://www.lxtreme.nl/ols/
+
+The alternative client version is highly recommended.  You can tried the older
+release ols-0.9.7.2 but most likely need to build it yourself. Use "ols-0.9.7"
+or newer for built-in device profiles.
+
+To use this with the original or alternative SUMP clients,
+use these settings:
+```
+Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
+Channel Groups: 0 (zero) only
+Recording Size:
+   ATmega168:  532 (or lower)
+   ATmega328:  1024 (or lower)
+   ATmega2560: 7168 (or lower)
+Noise Filter: doesn't matter
+RLE: disabled (unchecked)
+```
+
+Using the Logic Analyzer
+========================
+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.  Please provide a detailed bug report
+if you file an issue.
+
+Debugging
+=========
+
+You can uncomment the `#define DEBUG_MENU` line to add some diagnostic menu
+options for capturing or dumping the capture buffer.
+You can uncomment the `#define DEBUG` and `#define DEBUG_MENU` for a couple
+extra menu options and logging of the received commands.  The DEBUG option
+is generally only useful for development, while the DEBUG_MENU option is
+good for troubleshooting when the logic_analyzer sketch isn't working for you.
+Both are disabled by default to conserve RAM for improved stability.
+
+CLI compiling
+=============
+
+If you want to use the `arduino-cli` tool to compile this using the Makefile,
+you'll need to install the tool first following instructions here:
+https://arduino.github.io/arduino-cli/
+
+Once installed you can simple type `make` and you should get some simple help:
+```bash
+$ make
+---> run 'make build' to compile for Arduino Duemilanove
+---> run 'make upload' to upload to /dev/ttyUSB*
+```
+
+
+Other Notes
+===========================================================================
+```
+NOTE: Starting with v0.11 you can 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 too big for an ATmega168's flash. The code 
+      automatically skips the 2MHz code on ATmega168
+
+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: 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. ]
+```
--- a/logic_analyzer/LICENSE
+++ b/logic_analyzer/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY ANDREW GILLHAM ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL ANDREW GILLHAM BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/logic_analyzer/logic_analyzer.ino
+++ b/logic_analyzer/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,2016,2017,2018,2019,2020,2021,2022,2023 Andrew Gillham
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,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: 4MHz (or lower)
+ *
+ * Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
 * Channel Groups: 0 (zero) only
 * Recording Size:
 *    ATmega168:  532 (or lower)
@@ -78,7 +62,7 @@
 * until after the trigger fires.
 * Please try it out and report back.
 *
- * Release: v0.11 August 3, 2013.
+ * Release: v0.16 October 3, 2023.
 *
 */

@@ -97,7 +81,9 @@ void blinkled(void);
 void get_metadata(void);
 void debugprint(void);
 void debugdump(void);
-
+void prettydump(void);
+void captureInline4mhz(void);
+void captureInline2mhz(void);

 /*
 * Should we use PORTD or PORTB?  (default is PORTB)
@@ -170,6 +156,9 @@ void debugdump(void);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 #define DEBUG_CAPTURE_SIZE 7168
 #define CAPTURE_SIZE 7168
+#elif defined(__AVR_ATmega32U4__)
+#define DEBUG_CAPTURE_SIZE 2048
+#define CAPTURE_SIZE 2048
 #elif defined(__AVR_ATmega328P__)
 #define DEBUG_CAPTURE_SIZE 1024
 #define CAPTURE_SIZE 1024
@@ -186,8 +175,11 @@ void debugdump(void);
 #define DEBUG_ENABLE DDRD = DDRD | B10000000
 #define DEBUG_ON PORTD = B10000000
 #define DEBUG_OFF PORTD = B00000000
-#endif
-#define DEBUG
+#endif /* USE_PORTD */
+
+//#define DEBUG_MENU
+//#define DEBUG
+
 #ifdef DEBUG
 #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
 #else
@@ -279,10 +271,10 @@ void loop()

  if (Serial.available() > 0) {
    cmdByte = Serial.read();
-    switch(cmdByte) {
+    switch (cmdByte) {
    case SUMP_RESET:
      /*
-       * We don't do anything here as some unsupported extended commands have
+         * We don't do anything here as some unsupported extended commands have
       * 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.
       */
@@ -296,14 +288,14 @@ void loop()
      break;
    case SUMP_ARM:
      /*
-       * Zero out any previous samples before arming.
+         * Zero out any previous samples before arming.
       * Done here instead via reset due to spurious resets.
       */
      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
        logicdata[i] = 0;
      }
      /*
-       * depending on the sample rate we need to delay in microseconds
+         * depending on the sample rate we need to delay in microseconds
       * or milliseconds.  We can't do the complex trigger at 1MHz
       * so in that case (delayTime == 1 and triggers enabled) use
       * captureMicro() instead of triggerMicro().
@@ -312,26 +304,28 @@ void loop()
      if (divider == 24) {
        /* 4.0MHz */
        captureInline4mhz();
-      } 
+      }
      else if (divider == 49) {
        /* 2.0MHz */
+#if !defined(__AVR_ATmega168__)
        captureInline2mhz();
-      } 
+#endif
+      }
      else if (useMicro) {
        if (trigger && (delayTime != 1)) {
          triggerMicro();
-        } 
+        }
        else {
          captureMicro();
        }
-      } 
+      }
      else {
        captureMilli();
      }
      break;
    case SUMP_TRIGGER_MASK:
      /*
-       * the trigger mask byte has a '1' for each enabled trigger so
+         * the trigger mask byte has a '1' for each enabled trigger so
       * we can just use it directly as our trigger mask.
       */
      getCmd();
@@ -343,7 +337,7 @@ void loop()
      break;
    case SUMP_TRIGGER_VALUES:
      /*
-       * trigger_values can be used directly as the value of each bit
+         * trigger_values can be used directly as the value of each bit
       * defines whether we're looking for it to be high or low.
       */
      getCmd();
@@ -359,7 +353,7 @@ void loop()
      break;
    case SUMP_SET_DIVIDER:
      /*
-       * the shifting needs to be done on the 32bit unsigned long variable
+         * the shifting needs to be done on the 32bit unsigned long variable
       * so that << 16 doesn't end up as zero.
       */
      getCmd();
@@ -372,7 +366,7 @@ void loop()
      break;
    case SUMP_SET_READ_DELAY_COUNT:
      /*
-       * this just sets up how many samples there should be before
+         * this just sets up how many samples there should be before
       * and after the trigger fires.  The readCount is total samples
       * to return and delayCount number of samples after the trigger.
       * this sets the buffer splits like 0/100, 25/75, 50/50
@@ -396,7 +390,7 @@ void loop()
      break;
    case SUMP_GET_METADATA:
      /*
-       * We return a description of our capabilities.
+         * We return a description of our capabilities.
       * Check the function's comments below.
       */
      get_metadata();
@@ -404,37 +398,85 @@ void loop()
    case SUMP_SELF_TEST:
      /* ignored. */
      break;
-#ifdef DEBUG
+#ifdef DEBUG_MENU
      /*
-       * a couple of debug commands used during development.
+         * a couple of debug commands used during development.
       */
+    case '?':
+      Serial.println("");
+#ifdef DEBUG
+      Serial.println("0 = clear cmd buffer");
+      Serial.println("1 = print cmd buffer");
+#endif /* DEBUG */
+      Serial.println("2 = print data buffer");
+      Serial.println("3 = pretty print buffer");
+      Serial.println("4 = capture at 4MHz");
+      Serial.println("5 = capture at 1MHz");
+      Serial.println("6 = capture at 500KHz");
+      break;
+#ifdef DEBUG
    case '0':
      /*
-       * This resets the debug buffer pointer, effectively clearing the
+         * This resets the debug buffer pointer, effectively clearing the
       * previous commands out of the buffer. Clear the sample data as well.
       * Just send a '0' from the Arduino IDE's Serial Monitor.
       */
-      savecount=0;
+      savecount = 0;
      for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
        logicdata[i] = 0;
      }
      break;
    case '1':
      /*
-       * This is used to see what commands were sent to the device.
+         * 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
       * a debug printout.  useless except for development.
       */
      blinkled();
      debugprint();
      break;
+#endif /* DEBUG */
    case '2':
      /*
-       * This dumps the sample data to the serial port.  Used for debugging.
+         * This dumps the sample data to the serial port.
       */
      debugdump();
      break;
-#endif /* DEBUG */
+    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 = 2;
+      captureMicro();
+      Serial.println("");
+      Serial.println("500KHz capture done.");
+      break;
+#endif /* DEBUG_MENU */
    default:
      /* ignore any unrecognized bytes. */
      break;
@@ -539,7 +581,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
@@ -556,7 +598,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
@@ -609,7 +651,7 @@ void captureMicro() {
 void captureMilli() {
  unsigned int i = 0;

-  if(rleEnabled) {
+  if (rleEnabled) {
    /*
     * very basic trigger, just like in captureMicros() above.
     */
@@ -620,16 +662,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++;
@@ -641,7 +683,7 @@ void captureMilli() {

      i++;
    }
-  } 
+  }
  else {
    /*
     * very basic trigger, just like in captureMicros() above.
@@ -670,7 +712,7 @@ 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() {
  unsigned int i = 0;
@@ -717,7 +759,7 @@ void triggerMicro() {
     * click stop.
     */
    return;
-  } 
+  }
  else if (delayTime == 2) {
    /*
     * 500KHz case.  We should be able to manage this in time.
@@ -746,7 +788,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.
@@ -776,7 +818,7 @@ void triggerMicro() {
    }
    DEBUG_OFF; /* debug timing measurement */
    delayMicroseconds(100);
-  } 
+  }
  else {
    /*
     * Less than 500KHz case.  This uses delayMicroseconds() and some padding
@@ -876,7 +918,7 @@ void setupDelay() {
  if (divider >= 1500000) {
    useMicro = 0;
    delayTime = (divider + 1) / 100000;
-  } 
+  }
  else {
    useMicro = 1;
    delayTime = (divider + 1) / 100;
@@ -907,7 +949,7 @@ void get_metadata() {
  Serial.write('0');
  Serial.write('.');
  Serial.write('1');
-  Serial.write('1');
+  Serial.write('6');
  Serial.write((uint8_t)0x00);

  /* sample memory */
@@ -952,11 +994,11 @@ void get_metadata() {
  Serial.write((uint8_t)0x02);

  /* end of data */
-  Serial.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.
 *
 */
@@ -988,7 +1030,7 @@ void debugprint() {
  for (i = 0 ; i < savecount; i++) {
    if (savebytes[i] == 0x20) {
      Serial.println();
-    } 
+    }
    else {
      Serial.print(savebytes[i], HEX);
      Serial.write(' ');
@@ -997,6 +1039,8 @@ void debugprint() {
  Serial.println("done...");
 }

+#endif /* DEBUG */
+#ifdef DEBUG_MENU
 /*
 * This is used by the '2' debug command to dump the contents
 * of the sample buffer.
@@ -1021,7 +1065,37 @@ void debugdump() {
    j++;
  }
 }
-#endif /* DEBUG */
+
+/*
+ * 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_MENU */
+



--- a/logic_analyzer/logic_analyzer_inline_2mhz.ino
+++ b/logic_analyzer/logic_analyzer_inline_2mhz.ino
@@ -2,7 +2,7 @@
 *
 * SUMP Protocol Implementation for Arduino boards.
 *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1154,7 +1154,7 @@ void captureInline2mhz() {
  INLINE_NOP;
  logicdata[531] = CHANPIN;
  INLINE_NOP;
-#if defined(__AVR_ATmega328P__)
+#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
  logicdata[532] = CHANPIN;
  INLINE_NOP;
  logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline2mhz() {
  INLINE_NOP;
  logicdata[1023] = CHANPIN;
  INLINE_NOP;
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
+#endif
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
  logicdata[1024] = CHANPIN;
  INLINE_NOP;
  logicdata[1025] = CHANPIN;
--- a/logic_analyzer/logic_analyzer_inline_4mhz.ino
+++ b/logic_analyzer/logic_analyzer_inline_4mhz.ino
@@ -2,7 +2,7 @@
 *
 * SUMP Protocol Implementation for Arduino boards.
 *
- * Copyright (c) 2011,2012,2013 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1154,7 +1154,7 @@ void captureInline4mhz() {
  INLINE_NOP;
  logicdata[531] = CHANPIN;
  INLINE_NOP;
-#if defined(__AVR_ATmega328P__)
+#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
  logicdata[532] = CHANPIN;
  INLINE_NOP;
  logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline4mhz() {
  INLINE_NOP;
  logicdata[1023] = CHANPIN;
  INLINE_NOP;
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
+#endif
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
  logicdata[1024] = CHANPIN;
  INLINE_NOP;
  logicdata[1025] = CHANPIN;
--- a/logic_analyzer_leonardo/LICENSE
+++ b/logic_analyzer_leonardo/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY ANDREW GILLHAM ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL ANDREW GILLHAM BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/logic_analyzer_leonardo/Makefile
+++ b/logic_analyzer_leonardo/Makefile
@@ -0,0 +1,24 @@
+#
+# Makefile for an Arduino based logic analyzer using the arduino-cli
+#
+
+TARGET	= logic_analyzer_leonardo
+FQBN	= arduino:avr:leonardo
+SERIAL	= /dev/ttyUSB*
+
+
+all:
+	@echo ""
+	@echo "---> run 'make build' to compile for Arduino Leonardo"
+	@echo "---> run 'make upload' to upload to /dev/ttyUSB*"
+	@echo ""
+
+build:
+	arduino-cli compile --fqbn $(FQBN) $(TARGET)
+
+upload:
+	arduino-cli upload --fqbn $(FQBN) --port $(SERIAL) $(TARGET)
+
+#
+# end-of-file
+#
--- a/logic_analyzer_leonardo/logic_analyzer_inline_2mhz.ino
+++ b/logic_analyzer_leonardo/logic_analyzer_inline_2mhz.ino
--- a/logic_analyzer_leonardo/logic_analyzer_inline_4mhz.ino
+++ b/logic_analyzer_leonardo/logic_analyzer_inline_4mhz.ino
--- a/logic_analyzer_leonardo/logic_analyzer_leonardo.ino
+++ b/logic_analyzer_leonardo/logic_analyzer_leonardo.ino
--- a/logic_analyzer_sigrok/LICENSE
+++ b/logic_analyzer_sigrok/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY ANDREW GILLHAM ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL ANDREW GILLHAM BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/logic_analyzer_sigrok/logic_analyzer_inline_2mhz.ino
+++ b/logic_analyzer_sigrok/logic_analyzer_inline_2mhz.ino
--- a/logic_analyzer_sigrok/logic_analyzer_inline_4mhz.ino
+++ b/logic_analyzer_sigrok/logic_analyzer_inline_4mhz.ino
--- a/logic_analyzer_sigrok/logic_analyzer_sigrok.ino
+++ b/logic_analyzer_sigrok/logic_analyzer_sigrok.ino
Author	SHA1	Message	Date
Andrew Gillham	739144d57e	Fix off by one on the capture buffer due to earlier debugging. I finally realized I was checking if an unsigned int was less than zero. Thanks Szilárd for the correct indexes in the issue comments.	2023-10-03 23:48:07 -05:00
Andrew Gillham	0b2651864e	Add a sketch with Sigrok support. Basically returning the capture buffer in the opposite order.	2023-10-03 23:00:05 -05:00
Andrew Gillham	71b7c4790d	Move README to README.md and update it.	2021-12-21 13:28:29 -06:00
Andrew Gillham	016eabdc12	Add a LICENSE file.	2021-12-21 12:51:32 -06:00
Andrew Gillham	1cdc52febc	Add a LICENSE file.	2021-12-21 12:35:18 -06:00
Andrew Gillham	a426e85f0d	Bump the metadata version to 0.15 also.	2021-12-21 12:01:55 -06:00
Andrew Gillham	b919640c7e	Add a note about needing to compile the OLS client yourself.	2021-12-21 11:43:55 -06:00
Andrew Gillham	636df223a4	Bump release to 0.15 now that we have re-organized.	2021-12-21 11:36:21 -06:00
Andrew Gillham	57b1f18900	Move the main ATMega328P sketch into a sub-directory and add the Leonardo sketch to a sub-directory from the branch. Helps folks that download the repository via ZIP file and will allow different board support that is not easily done via ifdef checks.	2021-12-21 11:27:31 -06:00
Andrew Gillham	4f7f86f6d4	Convert Makefile to use arduino-cli since that replaces arduino-core and arduino-builder.	2021-12-21 11:11:38 -06:00
gillham	bd1fbe504e	Merge pull request #51 from qaxi/master Wrong delayTime in 500KHz menu	2021-12-20 15:14:22 -06:00
Petr Klíma	cfacce1758	500KMz 500KHz line was mistakenly 1MHz	2019-12-15 19:08:39 +01:00
gillham	11b8b5bbda	Merge pull request #27 from dhiltonp/master Give Leonardo-type Arduinos 2k sample size.	2016-02-02 10:03:21 -08:00
David P Hilton	4233770315	Give Leonardo-type arduinos 2048 storage	2016-02-02 11:14:06 -05:00
Andrew Gillham	1e3f0696af	Update for CLI compiling. Add function declarations for the inline capture functions and add a note to the README explaining how to compile from the CLI using the ‘arduino-mk’ package. Known to work on Debian 8, but untested elsewhere.	2015-12-16 11:47:31 -08:00
Andrew Gillham	5fb67c666d	v0.14. Rearrange DEBUG functionality, disable by default. v0.14. Add ‘DEBUG_MENU’ which can be uncommented to enable the basic debug menu with the ability to run a capture / dump the data etc. DEBUG and DEBUG_MENU are commented out by default to save RAM.	2015-12-16 11:15:10 -08:00
Andrew Gillham	9a065516e2	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)	2015-02-07 12:17:24 -08:00
Andrew Gillham	d0afee13d2	Update README formatting. Reduce lines to less than 80 columns to avoid wrapping.	2014-06-22 16:04:20 -07:00
Andrew Gillham	23fb253929	Fix sketch size for ATmega168 Automatically skip the inline2MHz sample rate on an ATmega168 based Arduino. 4MHz will still work fine and the sketch will fit (10kB instead of 16kB+)	2014-06-22 15:40:05 -07:00
Andrew Gillham	3128dc35f0	Cleanup README Cleanup older notes from the README. Move the part about disabling auto-reset to towards the end under ‘older notes’ and add a comment about how it shouldn’t be necessary. Almost move the part about the device profiles as they are builtin to ols-0.9.7 or newer.	2014-06-22 15:30:55 -07:00
Andrew Gillham	9c83897b9b	Correct preprocessor logic to avoid data gap on the Mega. Fixes issue #14 where I copied the preprocessor logic from a different Mega related check and didn't fix up the elif. So samples from 512 - 1023 were always zero on the Mega. Update to v0.12	2013-09-06 09:54:41 -07:00
Andrew Gillham	2a549be57a	Tweak README	2013-08-03 13:25:54 -07:00
Andrew Gillham	2d31a93687	Add notes about 2MHz/4MHz mode and binary size. Also move a couple more things under #ifdef DEBUG in an attempt to reduce the code size for ATmega168. It current doesn't fit in the '168 but maybe after some more tweaks.	2013-08-03 13:23:02 -07:00