public/logic_analyzer_sump
1
0
Fork 0
mirror of https://github.com/gillham/logic_analyzer.git synced 2026-05-07 17:25:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: public:agla_v0_14
Branches Tags
public:master public:agla_v0_17 public:agla_v0_16 public:agla_v0_15 public:agla_v0_14 public:agla_v0_13 public:agla_leonardo public:agla_v0_12 public:agla_v0_11 public:agla_v0_10 public:agla_v0_9 public:aglan_alpha public:agla_v0_8 public:agla_v0_7 public:agla_v0_6 public:agla_megaram public:agla_v0_5 public:agla_v0_4 public:agla_v0_3
public:0.17.0
..
compare: public:agla_megaram
Branches Tags
public:master public:agla_v0_17 public:agla_v0_16 public:agla_v0_15 public:agla_v0_14 public:agla_v0_13 public:agla_leonardo public:agla_v0_12 public:agla_v0_11 public:agla_v0_10 public:agla_v0_9 public:aglan_alpha public:agla_v0_8 public:agla_v0_7 public:agla_v0_6 public:agla_megaram public:agla_v0_5 public:agla_v0_4 public:agla_v0_3
public:0.17.0

1 Commits
agla_v0_14 ... agla_megar

Author SHA1 Message Date
Andrew Gillham
c5a778b8b2 Add support for Arduino Mega external SRAM. 
Using external SRAM (like Rugged Circuits "QuadRAM" board) we can have
up to 55KB of capture buffer space.
 2011-12-27 16:01:42 -08:00
7 changed files with 297 additions and 29337 deletions
Expand all files Collapse all files

71
README
View File

@@ -5,24 +5,36 @@ This Arduino sketch implements a SUMP protocol compatible with the standard
SUMP client as well as the alternative client from here: SUMP client as well as the alternative client from here:
http://www.lxtreme.nl/ols/ 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 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) 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 of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
crystal oscillator pins. crystal oscillator pins.
Uncomment CHAN5 below if you want to use the LED pin as an input and have Uncomment CHAN5 below if you want to use the LED pin as an input and have
6 channels. 6 channels.
On the Arduino Mega board 8 channels are supported and 7k of samples. On the Arduino Mega board 8 channels are supported and 7k of samples.
Pins 22-29 (Port A) are used by default. 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, To use this with the original or alternative SUMP clients,
use these settings: use these settings:
Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168) Sampling rate: 1MHz (or lower)
Channel Groups: 0 (zero) only Channel Groups: 0 (zero) only
Recording Size: Recording Size:
ATmega168: 532 (or lower) ATmega168: 532 (or lower)
@@ -36,49 +48,8 @@ below 1MHz. 1MHz works for a basic busy wait trigger that doesn't store
until after the trigger fires. until after the trigger fires.
Please try it out and report back. Please try it out and report back.
Debugging This master branch now supports Arduino 1.0 only.
========= Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
You can uncomment the '#define DEBUG_MENU' line to add some diagnostic menu Release: v0.06 November 4, 2011.
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.
Older Notes
===========================================================================
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. ]
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.14 December 16, 2015.

548
logic_analyzer.ino
View File

@@ -2,7 +2,7 @@
* *
* SUMP Protocol Implementation for Arduino boards. * SUMP Protocol Implementation for Arduino boards.
* *
* Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham * Copyright (c) 2011 Andrew Gillham
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -25,29 +25,46 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: logic_analyzer.pde,v 1.17 2011-08-04 02:31:01 gillham Exp $
* *
*/ */
/* /*
* NOTE: 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 * This Arduino sketch implements a SUMP protocol compatible with the standard
* SUMP client as well as the alternative client from here: * SUMP client as well as the alternative client from here:
* http://www.lxtreme.nl/ols/ * http://www.lxtreme.nl/ols/
* *
* This SUMP protocol compatible logic analyzer for the Arduino board supports * This SUMP protocol compatible logic analyzer for the Arduino board supports
* 6 channels consisting of digital pins 2-7, which are the last 6 bits (2-7) * 5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
* of PORTD. Bits 0 & 1 are the UART RX/TX pins. * of PORTB. Arduino pin 13 / bit 5 is the Arduino LED, bits 6 & 7 are the
* crystal oscillator pins.
* Uncomment CHAN5 below if you want to use the LED pin as an input and have
* 6 channels.
* *
* On the Arduino Mega board 8 channels are supported and 7k of samples. * 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, you can change the 'CHANPIN' below
* if something else works better for you. * 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, * To use this with the original or alternative SUMP clients,
* use these settings: * use these settings:
* *
* Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168) * Sampling rate: 1MHz (or lower)
* Channel Groups: 0 (zero) only * Channel Groups: 0 (zero) only
* Recording Size: * Recording Size:
* ATmega168: 532 (or lower) * ATmega168: 532 (or lower)
@@ -55,14 +72,13 @@
* ATmega2560: 7168 (or lower) * ATmega2560: 7168 (or lower)
* Noise Filter: doesn't matter * Noise Filter: doesn't matter
* RLE: disabled (unchecked) * 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 * 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 * below 1MHz. 1MHz works for a basic busy wait trigger that doesn't store
* until after the trigger fires. * until after the trigger fires.
* Please try it out and report back. * Please try it out and report back.
* *
* Release: v0.14 December 16, 2015. * Release: v0.06 November 4, 2011.
* *
*/ */
@@ -81,48 +97,43 @@ void blinkled(void);
void get_metadata(void); void get_metadata(void);
void debugprint(void); void debugprint(void);
void debugdump(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
/* /*
* Uncomment CHAN5 to use it as an additional input on a normal Arduino.
* You'll need to change the number of channels in the device profile as well.
*
* Uncomment MEGARAM if you have an Arduino Mega with an external SRAM board with
* at least 64KB on it.
*
* Arduino device profile: ols.profile-agla.cfg * Arduino device profile: ols.profile-agla.cfg
* Arduino Mega device profile: ols.profile-aglam.cfg * Arduino Mega device profile: ols.profile-aglam.cfg
* Arduino Mega RAM device profile: ols.profile-aglamr.cfg
*/ */
#define MEGARAM 1
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define CHANPIN PINA #define DEBUGPORT PORTH
#define CHAN0 22 #define DEBUGDDR DDRH
#define CHAN1 23 #define CHANPIN PINF
#define CHAN2 24 #define CHAN0 A0
#define CHAN3 25 #define CHAN1 A1
#define CHAN4 26 #define CHAN2 A2
#define CHAN5 27 #define CHAN3 A3
#define CHAN6 28 #define CHAN4 A4
#define CHAN7 29 #define CHAN5 A5
#else #define CHAN6 A6
#if defined(USE_PORTD) #define CHAN7 A7
#define CHANPIN PIND
#define CHAN0 2
#define CHAN1 3
#define CHAN2 4
#define CHAN3 5
#define CHAN4 6
#define CHAN5 7
#else #else
#define DEBUGPORT PORTD
#define DEBUGDDR DDRD
#define CHANPIN PINB #define CHANPIN PINB
#define CHAN0 8 #define CHAN0 8
#define CHAN1 9 #define CHAN1 9
#define CHAN2 10 #define CHAN2 10
#define CHAN3 11 #define CHAN3 11
#define CHAN4 12 #define CHAN4 12
/* Comment out CHAN5 if you don't want to use the LED pin for an input */ //#define CHAN5 13
#define CHAN5 13
#endif /* USE_PORTD */
#endif #endif
#define ledPin 13 #define ledPin 13
@@ -138,44 +149,40 @@ void prettydump(void);
#define SUMP_TRIGGER_VALUES 0xC1 #define SUMP_TRIGGER_VALUES 0xC1
#define SUMP_TRIGGER_CONFIG 0xC2 #define SUMP_TRIGGER_CONFIG 0xC2
/* Most flags (except RLE) are ignored. */ /* flags are ignored. */
#define SUMP_SET_DIVIDER 0x80 #define SUMP_SET_DIVIDER 0x80
#define SUMP_SET_READ_DELAY_COUNT 0x81 #define SUMP_SET_READ_DELAY_COUNT 0x81
#define SUMP_SET_FLAGS 0x82 #define SUMP_SET_FLAGS 0x82
#define SUMP_SET_RLE 0x0100
/* extended commands -- self-test unsupported, but metadata is returned. */ /* extended commands -- self-test unsupported, but metadata is returned. */
#define SUMP_SELF_TEST 0x03 #define SUMP_SELF_TEST 0x03
#define SUMP_GET_METADATA 0x04 #define SUMP_GET_METADATA 0x04
/* ATmega168: 532 (or lower)
* ATmega328: 1024 (or lower) /*
* ATmega2560: 7168 (or lower) * Default capture buffer sizes. Lower values should work, but the metadata and/or
* device profiles will need to be adjusted to match.
* ATmega168: 532
* ATmega328: 1024 (1KB)
* ATmega2560: 7168 (7KB)
* ATmega2560+external SRAM: 56320 (55KB)
*/ */
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define DEBUG_CAPTURE_SIZE 7168 #if defined(MEGARAM)
#define CAPTURE_SIZE 7168 #define DEBUG_CAPTURE_SIZE 56320
#define CAPTURE_SIZE 56320
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define DEBUG_CAPTURE_SIZE 7168
#define CAPTURE_SIZE 7168
#elif defined(__AVR_ATmega328P__) #elif defined(__AVR_ATmega328P__)
#define DEBUG_CAPTURE_SIZE 1024 #define DEBUG_CAPTURE_SIZE 1024
#define CAPTURE_SIZE 1024 #define CAPTURE_SIZE 1024
#else #else
#define DEBUG_CAPTURE_SIZE 532 #define DEBUG_CAPTURE_SIZE 532
#define CAPTURE_SIZE 532 #define CAPTURE_SIZE 532
#endif #endif
#ifdef USE_PORTD #define DEBUG
#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 /* USE_PORTD */
//#define DEBUG_MENU
//#define DEBUG
#ifdef DEBUG #ifdef DEBUG
#define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
#else #else
@@ -194,7 +201,20 @@ byte savebytes[128];
int savecount = 0; int savecount = 0;
#endif /* DEBUG */ #endif /* DEBUG */
/*
* External SRAM adds 56,320 (55kb) directly addressable bytes starting at 0x2200.
* We access it via a hard coded pointer instead of a directly allocated array like
* on other Arduinos.
*
* We only use bank 0 as our capture routines can't spare the cycles to switch banks.
*
*/
#ifdef MEGARAM
byte *logicdata = (byte *) 0x2200U;
#else
byte logicdata[MAX_CAPTURE_SIZE]; byte logicdata[MAX_CAPTURE_SIZE];
#endif
unsigned int logicIndex = 0; unsigned int logicIndex = 0;
unsigned int triggerIndex = 0; unsigned int triggerIndex = 0;
unsigned int readCount = MAX_CAPTURE_SIZE; unsigned int readCount = MAX_CAPTURE_SIZE;
@@ -204,73 +224,59 @@ unsigned int trigger_values = 0;
unsigned int useMicro = 0; unsigned int useMicro = 0;
unsigned int delayTime = 0; unsigned int delayTime = 0;
unsigned long divider = 0; unsigned long divider = 0;
boolean rleEnabled = 0;
void setup() void setup()
{ {
#ifdef MEGARAM
XMCRA = _BV(SRE); // Enable external memory interface
pinMode(38, OUTPUT); digitalWrite(38, LOW); // Enable RAM device
pinMode(42, OUTPUT); // Make the bank selection bits output pins
pinMode(43, OUTPUT); // Make the bank selection bits output pins
pinMode(44, OUTPUT); // Make the bank selection bits output pins
digitalWrite(42, LOW); // Select bank 0 (see below for discussion)
digitalWrite(43, LOW); // Select bank 0 (see below for discussion)
digitalWrite(44, LOW); // Select bank 0 (see below for discussion)
#endif // MEGARAM
Serial.begin(115200); Serial.begin(115200);
/* /*
* set debug pin (digital pin 8) to output right away so it settles. * set debug pin to output right away so it settles.
* this gets toggled during sampling as a way to measure * this gets toggled during sampling as a way to measure
* the sample time. this is used during development to * the sample time. this is used during development to
* properly pad out the sampling routines. * properly pad out the sampling routines.
*/ */
DEBUG_ENABLE; /* debug measurement pin */ DEBUGDDR = DEBUGDDR | B10000000; /* debug measurement pin */
pinMode(CHAN0, INPUT); pinMode(CHAN0, INPUT);
pinMode(CHAN1, INPUT); pinMode(CHAN1, INPUT);
pinMode(CHAN2, INPUT); pinMode(CHAN2, INPUT);
pinMode(CHAN3, INPUT); pinMode(CHAN3, INPUT);
pinMode(CHAN4, INPUT); pinMode(CHAN4, INPUT);
#ifdef CHAN5
pinMode(CHAN5, INPUT);
#endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
pinMode(CHAN5, INPUT);
pinMode(CHAN6, INPUT); pinMode(CHAN6, INPUT);
pinMode(CHAN7, INPUT); pinMode(CHAN7, INPUT);
#else
#ifndef CHAN5
pinMode(ledPin, OUTPUT); pinMode(ledPin, OUTPUT);
#endif #else
#ifdef CHAN5
pinMode(CHAN5, INPUT);
#else
pinMode(ledPin, OUTPUT);
#endif /* CHAN5 */
#endif /* Mega */ #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() void loop()
{ {
int i; unsigned int i;
if (Serial.available() > 0) { if (Serial.available() > 0) {
cmdByte = Serial.read(); cmdByte = Serial.read();
switch (cmdByte) { switch(cmdByte) {
case SUMP_RESET: 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 * 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.
*/ */
@@ -284,30 +290,19 @@ void loop()
break; break;
case SUMP_ARM: 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. * 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 * 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 (divider == 24) {
/* 4.0MHz */
captureInline4mhz();
}
else if (divider == 49) {
/* 2.0MHz */
#if !defined(__AVR_ATmega168__)
captureInline2mhz();
#endif
}
else if (useMicro) {
if (trigger && (delayTime != 1)) { if (trigger && (delayTime != 1)) {
triggerMicro(); triggerMicro();
} }
@@ -321,27 +316,19 @@ void loop()
break; break;
case SUMP_TRIGGER_MASK: 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. * we can just use it directly as our trigger mask.
*/ */
getCmd(); getCmd();
#ifdef USE_PORTD
trigger = cmdBytes[0] << 2;
#else
trigger = cmdBytes[0]; trigger = cmdBytes[0];
#endif
break; break;
case SUMP_TRIGGER_VALUES: 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. * defines whether we're looking for it to be high or low.
*/ */
getCmd(); getCmd();
#ifdef USE_PORTD
trigger_values = cmdBytes[0] << 2;
#else
trigger_values = cmdBytes[0]; trigger_values = cmdBytes[0];
#endif
break; break;
case SUMP_TRIGGER_CONFIG: case SUMP_TRIGGER_CONFIG:
/* read the rest of the command bytes, but ignore them. */ /* read the rest of the command bytes, but ignore them. */
@@ -349,7 +336,7 @@ void loop()
break; break;
case SUMP_SET_DIVIDER: 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. * so that << 16 doesn't end up as zero.
*/ */
getCmd(); getCmd();
@@ -362,7 +349,7 @@ void loop()
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 * 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
@@ -380,13 +367,12 @@ void loop()
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 and check if RLE is enabled. */ /* read the rest of the command bytes, but ignore them. */
getCmd(); getCmd();
rleEnabled = ((cmdBytes[1] & B1000000) != 0);
break; break;
case SUMP_GET_METADATA: case SUMP_GET_METADATA:
/* /*
* We return a description of our capabilities. * We return a description of our capabilities.
* Check the function's comments below. * Check the function's comments below.
*/ */
get_metadata(); get_metadata();
@@ -394,85 +380,45 @@ void loop()
case SUMP_SELF_TEST: case SUMP_SELF_TEST:
/* ignored. */ /* ignored. */
break; break;
#ifdef DEBUG_MENU #ifdef DEBUG
/* /*
* 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': 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. * 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. * 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();
#endif /* !CHAN5 */
debugprint(); debugprint();
break; break;
#endif /* DEBUG */
case '2': case '2':
/* /*
* This dumps the sample data to the serial port. * This dumps the sample data to the serial port. Used for debugging.
*/ */
debugdump(); debugdump();
break; break;
case '3': case '3':
/* /*
* Prints a visual representation of the data buffer. * This samples the channel pin and writes to the serial port. Used for debugging.
*/ */
prettydump(); Serial.print(CHANPIN, HEX);
break; break;
case '4': #endif /* DEBUG */
/*
* 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_MENU */
default: default:
/* ignore any unrecognized bytes. */ /* ignore any unrecognized bytes. */
break; break;
@@ -532,7 +478,7 @@ void captureMicro() {
unsigned int i; unsigned int i;
/* /*
* basic trigger, wait until all trigger conditions are met on port. * basic trigger, wait until all trigger conditions are met on port B.
* this needs further testing, but basic tests work as expected. * this needs further testing, but basic tests work as expected.
*/ */
if (trigger) { if (trigger) {
@@ -551,49 +497,51 @@ void captureMicro() {
* this is used during development to measure the sample intervals. * 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 * it is best to just leave the toggling in place so we don't alter
* any timing unexpectedly. * any timing unexpectedly.
* Arduino digital pin 8 is being used here. * Arduino pin 7 is being used here.
*/ */
DEBUG_ENABLE; DEBUGDDR = DEBUGDDR | B10000000;
#ifdef DEBUG DEBUGPORT = B10000000;
DEBUG_ON;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUGPORT = B00000000;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_ON; DEBUGPORT = B10000000;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUGPORT = B00000000;
delayMicroseconds(20); delayMicroseconds(20);
#endif
if (delayTime == 1) { if (delayTime == 1) {
/* /*
* 1MHz sample rate = 1 uS delay so we can't use delayMicroseconds * 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. * since our loop takes some time. The delay is padded out by hand.
*/ */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN; logicdata[i] = CHANPIN;
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
#endif /* MEGARAM */
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
} }
else if (delayTime == 2) { else if (delayTime == 2) {
/* /*
* 500KHz sample rate = 2 uS delay, still pretty fast so we pad this * 500KHz sample rate = 2 uS delay, still pretty fast so we pad this
* one by hand too. * one by hand too.
*/ */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN; logicdata[i] = CHANPIN;
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
#endif /* MEGARAM */
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
} }
else { else {
/* /*
@@ -602,13 +550,15 @@ void captureMicro() {
* a better logic analyzer) * a better logic analyzer)
* start of real measurement * start of real measurement
*/ */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN; logicdata[i] = CHANPIN;
delayMicroseconds(delayTime - 1); delayMicroseconds(delayTime - 1);
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t");
#endif /* MEGARAM */
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
} }
/* re-enable interrupts now that we're done sampling. */ /* re-enable interrupts now that we're done sampling. */
@@ -619,11 +569,7 @@ void captureMicro() {
* is done for any triggers, this is effectively the 0/100 buffer split. * is done for any triggers, this is effectively the 0/100 buffer split.
*/ */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD
Serial.write(logicdata[i] >> 2);
#else
Serial.write(logicdata[i]); Serial.write(logicdata[i]);
#endif
} }
} }
@@ -645,60 +591,21 @@ void captureMicro() {
* this basic functionality. * this basic functionality.
*/ */
void captureMilli() { void captureMilli() {
unsigned int i = 0; unsigned int i;
if (rleEnabled) { /*
/* * very basic trigger, just like in captureMicros() above.
* very basic trigger, just like in captureMicros() above. */
*/ if (trigger) {
if (trigger) { while ((trigger_values ^ CHANPIN) & trigger);
while ((trigger_values ^ (CHANPIN & B01111111)) & trigger);
}
byte lastSample = 0;
byte sampleCount = 0;
while (i < readCount) {
/*
* Implementation of the RLE unlimited protocol: timings might be off a little
*/
if (lastSample == (CHANPIN & B01111111) && sampleCount < 127) {
sampleCount++;
delay(delayTime);
continue;
}
if (sampleCount != 0) {
logicdata[i] = B10000000 | sampleCount;
sampleCount = 0;
i++;
continue;
}
logicdata[i] = (CHANPIN & B01111111);
lastSample = (CHANPIN & B01111111);
delay(delayTime);
i++;
}
} }
else {
/*
* very basic trigger, just like in captureMicros() above.
*/
if (trigger) {
while ((trigger_values ^ CHANPIN) & trigger);
}
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN; logicdata[i] = CHANPIN;
delay(delayTime); delay(delayTime);
}
} }
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD
Serial.write(logicdata[i] >> 2);
#else
Serial.write(logicdata[i]); Serial.write(logicdata[i]);
#endif
} }
} }
@@ -728,19 +635,17 @@ void triggerMicro() {
* this is used during development to measure the sample intervals. * 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 * it is best to just leave the toggling in place so we don't alter
* any timing unexpectedly. * any timing unexpectedly.
* Arduino digital pin 8 is being used here. * Arduino pin 7 is being used here.
*/ */
DEBUG_ENABLE; DEBUGDDR = DEBUGDDR | B10000000;
#ifdef DEBUG DEBUGPORT = B10000000;
DEBUG_ON;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUGPORT = B00000000;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_ON; DEBUGPORT = B10000000;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUGPORT = B00000000;
delayMicroseconds(20); delayMicroseconds(20);
#endif
if (delayTime == 1) { if (delayTime == 1) {
/* /*
@@ -764,9 +669,9 @@ void triggerMicro() {
* we always start capturing at the start of the buffer * we always start capturing at the start of the buffer
* and use it as a circular buffer * and use it as a circular buffer
*/ */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) { while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
/* DEBUG_OFF; */ /* DEBUGPORT = B00000000; */
/* increment index. */ /* increment index. */
logicIndex++; logicIndex++;
if (logicIndex >= readCount) { if (logicIndex >= readCount) {
@@ -777,12 +682,16 @@ void triggerMicro() {
* without pin toggles, will try 1 nop. * without pin toggles, will try 1 nop.
* __asm__("nop\n\t""nop\n\t""nop\n\t"); * __asm__("nop\n\t""nop\n\t""nop\n\t");
*/ */
#ifndef MEGARAM
__asm__("nop\n\t"); __asm__("nop\n\t");
/* DEBUG_ON; */ #endif /* MEGARAM */
/* DEBUGPORT = B10000000; */
} }
/* this pads the immediate trigger case to 2.0 uS, just as an example. */ /* this pads the immediate trigger case to 2.0 uS, just as an example. */
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
DEBUG_OFF; /* debug timing measurement */ #endif /* MEGARAM */
DEBUGPORT = B00000000; /* debug timing measurement */
/* /*
* One sample size delay. ends up being 2 uS combined with assignment * One sample size delay. ends up being 2 uS combined with assignment
@@ -790,14 +699,16 @@ void triggerMicro() {
* between the trigger point and the subsequent samples. * between the trigger point and the subsequent samples.
*/ */
delayMicroseconds(1); delayMicroseconds(1);
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
#endif /* MEGARAM */
/* 'logicIndex' now points to trigger sample, keep track of it */ /* 'logicIndex' now points to trigger sample, keep track of it */
triggerIndex = logicIndex; triggerIndex = logicIndex;
/* keep sampling for delayCount after trigger */ /* keep sampling for delayCount after trigger */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
/* /*
* this is currently taking: * this is currently taking:
* 1025.5 uS for 512 samples. (512 samples, 0/100 split) * 1025.5 uS for 512 samples. (512 samples, 0/100 split)
@@ -808,11 +719,13 @@ void triggerMicro() {
logicIndex = 0; logicIndex = 0;
} }
logicdata[logicIndex++] = CHANPIN; logicdata[logicIndex++] = CHANPIN;
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
#endif /* MEGARAM */
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
delayMicroseconds(100); delayMicroseconds(100);
} }
else { else {
@@ -825,23 +738,17 @@ void triggerMicro() {
* and use it as a circular buffer * and use it as a circular buffer
* *
*/ */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) { while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
/* DEBUG_OFF; */ /* DEBUGPORT = B00000000; */
/* increment index. */ /* increment index. */
logicIndex++; logicIndex++;
if (logicIndex >= readCount) { if (logicIndex >= readCount) {
logicIndex = 0; logicIndex = 0;
} }
else { /* DEBUGPORT = B10000000; */
/* pad the same number of cycles as the above assignment (needs verification) */
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
}
delayMicroseconds(delayTime - 3);
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
/* DEBUG_ON; */
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
/* 'logicIndex' now points to trigger sample, keep track of it */ /* 'logicIndex' now points to trigger sample, keep track of it */
triggerIndex = logicIndex; triggerIndex = logicIndex;
@@ -850,24 +757,23 @@ void triggerMicro() {
* This needs adjustment so that we have the right spacing between the * This needs adjustment so that we have the right spacing between the
* before trigger samples and the after trigger samples. * before trigger samples and the after trigger samples.
*/ */
delayMicroseconds(delayTime - 2); delayMicroseconds(delayTime);
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t");
/* keep sampling for delayCount after trigger */ /* keep sampling for delayCount after trigger */
DEBUG_ON; /* debug timing measurement */ DEBUGPORT = B10000000; /* debug timing measurement */
for (i = 0 ; i < delayCount; i++) { for (i = 0 ; i < delayCount; i++) {
if (logicIndex >= readCount) { if (logicIndex >= readCount) {
logicIndex = 0; logicIndex = 0;
} }
logicdata[logicIndex++] = CHANPIN; logicdata[logicIndex++] = CHANPIN;
delayMicroseconds(delayTime - 3); delayMicroseconds(delayTime - 3);
#ifndef MEGARAM
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
#endif /* MEGARAM */
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t"); __asm__("nop\n\t""nop\n\t""nop\n\t");
} }
DEBUG_OFF; /* debug timing measurement */ DEBUGPORT = B00000000; /* debug timing measurement */
delayMicroseconds(100); delayMicroseconds(100);
} }
@@ -888,11 +794,7 @@ void triggerMicro() {
if (logicIndex >= readCount) { if (logicIndex >= readCount) {
logicIndex = 0; logicIndex = 0;
} }
#ifdef USE_PORTD
Serial.write(logicdata[logicIndex++] >> 2);
#else
Serial.write(logicdata[logicIndex++]); Serial.write(logicdata[logicIndex++]);
#endif
} }
} }
@@ -936,28 +838,27 @@ void get_metadata() {
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write('M'); Serial.write('M');
#endif /* Mega */ #endif /* Mega */
#if defined(MEGARAM)
Serial.write('R');
#endif /* MEGARAM */
Serial.write('v'); Serial.write('v');
Serial.write('0'); Serial.write('0');
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
/* firmware version */
Serial.write((uint8_t)0x02);
Serial.write('0');
Serial.write('.');
Serial.write('1');
Serial.write('3');
Serial.write((uint8_t)0x00);
/* sample memory */ /* sample memory */
Serial.write((uint8_t)0x21); Serial.write((uint8_t)0x21);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(MEGARAM)
/* 7168 bytes */ /* 56320 bytes (55KB) */
Serial.write((uint8_t)0xDC);
Serial.write((uint8_t)0x00);
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes (7KB) */
Serial.write((uint8_t)0x1C); Serial.write((uint8_t)0x1C);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#elif defined(__AVR_ATmega328P__) #elif defined(__AVR_ATmega328P__)
/* 1024 bytes */ /* 1024 bytes (1KB) */
Serial.write((uint8_t)0x04); Serial.write((uint8_t)0x04);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#else #else
@@ -966,14 +867,14 @@ void get_metadata() {
Serial.write((uint8_t)0x14); Serial.write((uint8_t)0x14);
#endif /* Mega */ #endif /* Mega */
/* sample rate (4MHz) */ /* sample rate (1MHz) */
Serial.write((uint8_t)0x23); Serial.write((uint8_t)0x23);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
Serial.write((uint8_t)0x3D); Serial.write((uint8_t)0x0F);
Serial.write((uint8_t)0x09); Serial.write((uint8_t)0x42);
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x40);
/* number of probes (6 by default on Arduino, 8 on Mega) */ /* number of probes (5 by default on Arduino, 8 on Mega) */
Serial.write((uint8_t)0x40); Serial.write((uint8_t)0x40);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write((uint8_t)0x08); Serial.write((uint8_t)0x08);
@@ -994,7 +895,7 @@ void get_metadata() {
} }
/* /*
* This is used by the '1' debug command to dump the contents of some * This is used by the '0' debug command to dump the contents of some
* interesting variables and the debug buffer. * interesting variables and the debug buffer.
* *
*/ */
@@ -1018,8 +919,6 @@ void debugprint() {
Serial.println(logicIndex, DEC); Serial.println(logicIndex, DEC);
Serial.print("triggerIndex = "); Serial.print("triggerIndex = ");
Serial.println(triggerIndex, DEC); Serial.println(triggerIndex, DEC);
Serial.print("rleEnabled = ");
Serial.println(rleEnabled, DEC);
Serial.println("Bytes:"); Serial.println("Bytes:");
@@ -1035,24 +934,18 @@ void debugprint() {
Serial.println("done..."); Serial.println("done...");
} }
#endif /* DEBUG */
#ifdef DEBUG_MENU
/* /*
* This is used by the '2' debug command to dump the contents * This is used by the '2' debug command to dump the contents
* of the sample buffer. * of the sample buffer.
*/ */
void debugdump() { void debugdump() {
int i; unsigned int i;
int j = 1; int j = 1;
Serial.print("\r\n"); Serial.print("\r\n");
for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) { for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
#ifdef USE_PORTD
Serial.print(logicdata[i] >> 2, HEX);
#else
Serial.print(logicdata[i], HEX); Serial.print(logicdata[i], HEX);
#endif
Serial.print(" "); Serial.print(" ");
if (j == 32) { if (j == 32) {
Serial.print("\r\n"); Serial.print("\r\n");
@@ -1061,45 +954,6 @@ void debugdump() {
j++; 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 */

14456
logic_analyzer_inline_2mhz.ino
View File

File diff suppressed because it is too large Load Diff

14456
logic_analyzer_inline_4mhz.ino
View File

File diff suppressed because it is too large Load Diff

16
ols.profile-agla.cfg
View File

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

12
ols.profile-aglam.cfg
View File

@@ -7,11 +7,11 @@ device.description = Arduino Mega Logic Analyzer
# The device interface, SERIAL only # The device interface, SERIAL only
device.interface = SERIAL device.interface = SERIAL
# The device's native clockspeed, in Hertz. # The device's native clockspeed, in Hertz.
device.clockspeed = 16000000 device.clockspeed = 100000000
# Whether or not double-data-rate is supported by the device (also known as the "demux"-mode). # Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
device.supports_ddr = false device.supports_ddr = false
# Supported sample rates in Hertz, separated by comma's # 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, 2000000, 4000000 device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
# What capture clocks are supported # What capture clocks are supported
device.captureclock = INTERNAL device.captureclock = INTERNAL
# The supported capture sizes, in bytes # The supported capture sizes, in bytes
@@ -39,15 +39,13 @@ device.capturesize.bound = false
device.channel.numberingschemes = DEFAULT device.channel.numberingschemes = DEFAULT
# Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds) # Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds)
device.open.portdelay = 2000 device.open.portdelay = 1000
# The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout)
device.receive.timeout = 100
# Does the device need a high or low DTR-line to operate correctly? (high = true, low = false) # Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
device.open.portdtr = true device.open.portdtr = true
# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names... # Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
device.metadata.keys = "AGLAMv0" device.metadata.keys = "AGLAMv0"
# In which order are samples sent back from the device? false = last sample first, true = first sample first # In which order are samples sent back from the device? true = last sample first, false = first sample first
device.samples.reverseOrder = true device.samples.reverseOrder = false
###EOF### ###EOF###

51
ols.profile-aglamr.cfg Normal file
View File

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