1 Commits

Author SHA1 Message Date
Andrew Gillham
d31d662ede Add device profile for Arduino logic analyzer
Use this device profile with the alternative SUMP client.  It goes in
the plugins directory with the other similarly named files.
2011-08-03 19:43:09 -07:00
6 changed files with 164 additions and 29447 deletions

54
README
View File

@@ -5,29 +5,26 @@ 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.
NOTE:
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.
To use this with the original or alternative SUMP clients,
use these settings:
Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
Sampling rate: 1MHz (or lower)
Channel Groups: 0 (zero) only
Recording Size:
ATmega168: 532 (or lower)
ATmega328: 1024 (or lower)
ATmega2560: 7168 (or lower)
Recording Size: 1024 (or lower)
Noise Filter: doesn't matter
RLE: disabled (unchecked)
@@ -36,38 +33,5 @@ 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.
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.13 February 7, 2015.
Release: v0.03 March 7, 2011.

View File

@@ -2,7 +2,7 @@
*
* SUMP Protocol Implementation for Arduino boards.
*
* Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham
* Copyright (c) 2011 Andrew Gillham
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,44 +25,40 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: logic_analyzer.pde,v 1.14 2011-03-08 07:14:42 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
* SUMP client as well as the alternative client from here:
* http://www.lxtreme.nl/ols/
*
* This SUMP protocol compatible logic analyzer for the Arduino board supports
* 6 channels consisting of digital pins 2-7, which are the last 6 bits (2-7)
* of PORTD. Bits 0 & 1 are the UART RX/TX pins.
* 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:
* 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.
*
* To use this with the original or alternative SUMP clients,
* use these settings:
*
* Sampling rate: 4MHz (or lower) (no 2MHz on ATmega168)
*
* Sampling rate: 1MHz (or lower)
* Channel Groups: 0 (zero) only
* Recording Size:
* ATmega168: 532 (or lower)
* ATmega328: 1024 (or lower)
* ATmega2560: 7168 (or lower)
* Recording Size: 1024 (or lower)
* Noise Filter: doesn't matter
* RLE: disabled (unchecked)
* NOTE: Preliminary RLE support for 50Hz or less exists, please test it.
*
* Triggering is still a work in progress, but generally works for samples
* below 1MHz. 1MHz works for a basic busy wait trigger that doesn't store
* until after the trigger fires.
* Please try it out and report back.
*
* Release: v0.13 February 7, 2015.
* Release: v0.02 February 28, 2011.
*
*/
@@ -81,49 +77,17 @@ 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.
* Uncomment CHAN5 to use it as an additional input.
* You'll need to change the number of channels in the device profile as well.
*/
//#define USE_PORTD 1
/*
* Arduino device profile: ols.profile-agla.cfg
* Arduino Mega device profile: ols.profile-aglam.cfg
*/
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define CHANPIN PINA
#define CHAN0 22
#define CHAN1 23
#define CHAN2 24
#define CHAN3 25
#define CHAN4 26
#define CHAN5 27
#define CHAN6 28
#define CHAN7 29
#else
#if defined(USE_PORTD)
#define CHANPIN PIND
#define CHAN0 2
#define CHAN1 3
#define CHAN2 4
#define CHAN3 5
#define CHAN4 6
#define CHAN5 7
#else
#define CHANPIN PINB
#define CHAN0 8
#define CHAN1 9
#define CHAN2 10
#define CHAN3 11
#define CHAN4 12
/* Comment out CHAN5 if you don't want to use the LED pin for an input */
#define CHAN5 13
#endif /* USE_PORTD */
#endif
//#define CHAN5 13
#define ledPin 13
/* XON/XOFF are not supported. */
@@ -138,45 +102,24 @@ void prettydump(void);
#define SUMP_TRIGGER_VALUES 0xC1
#define SUMP_TRIGGER_CONFIG 0xC2
/* Most flags (except RLE) are ignored. */
/* flags are ignored. */
#define SUMP_SET_DIVIDER 0x80
#define SUMP_SET_READ_DELAY_COUNT 0x81
#define SUMP_SET_FLAGS 0x82
#define SUMP_SET_RLE 0x0100
/* extended commands -- self-test unsupported, but metadata is returned. */
#define SUMP_SELF_TEST 0x03
#define SUMP_GET_METADATA 0x04
/* ATmega168: 532 (or lower)
* ATmega328: 1024 (or lower)
* ATmega2560: 7168 (or lower)
/*
* Capture size of 1024 bytes works on the ATmega328.
*
*/
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define DEBUG_CAPTURE_SIZE 7168
#define CAPTURE_SIZE 7168
#elif defined(__AVR_ATmega328P__)
#define DEBUG_CAPTURE_SIZE 1024
#define CAPTURE_SIZE 1024
#else
#define DEBUG_CAPTURE_SIZE 532
#define CAPTURE_SIZE 532
#endif
#ifdef USE_PORTD
#define DEBUG_ENABLE DDRB = DDRB | B00000001
#define DEBUG_ON PORTB = B00000001
#define DEBUG_OFF PORTB = B00000000
#else
#define DEBUG_ENABLE DDRD = DDRD | B10000000
#define DEBUG_ON PORTD = B10000000
#define DEBUG_OFF PORTD = B00000000
#endif /* USE_PORTD */
#define DEBUG
#ifdef DEBUG
#define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
#define MAX_CAPTURE_SIZE 1024
#else
#define MAX_CAPTURE_SIZE CAPTURE_SIZE
#define MAX_CAPTURE_SIZE 1024
#endif /* DEBUG */
/*
@@ -201,19 +144,18 @@ unsigned int trigger_values = 0;
unsigned int useMicro = 0;
unsigned int delayTime = 0;
unsigned long divider = 0;
boolean rleEnabled = 0;
void setup()
{
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
* the sample time. this is used during development to
* properly pad out the sampling routines.
*/
DEBUG_ENABLE; /* debug measurement pin */
DDRD = DDRD | B10000000; /* debug measurement pin */
pinMode(CHAN0, INPUT);
pinMode(CHAN1, INPUT);
@@ -222,40 +164,9 @@ void setup()
pinMode(CHAN4, INPUT);
#ifdef CHAN5
pinMode(CHAN5, INPUT);
#endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
pinMode(CHAN6, INPUT);
pinMode(CHAN7, INPUT);
#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
#endif /* CHAN5 */
}
void loop()
@@ -264,81 +175,62 @@ 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.
*/
break;
case SUMP_QUERY:
/* return the expected bytes. */
Serial.write('1');
Serial.write('A');
Serial.write('L');
Serial.write('S');
Serial.print('1', BYTE);
Serial.print('A', BYTE);
Serial.print('L', BYTE);
Serial.print('S', BYTE);
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().
*/
if (divider == 24) {
/* 4.0MHz */
captureInline4mhz();
}
else if (divider == 49) {
/* 2.0MHz */
#if !defined(__AVR_ATmega168__)
captureInline2mhz();
#endif
}
else if (useMicro) {
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();
#ifdef USE_PORTD
trigger = cmdBytes[0] << 2;
#else
trigger = cmdBytes[0];
#endif
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();
#ifdef USE_PORTD
trigger_values = cmdBytes[0] << 2;
#else
trigger_values = cmdBytes[0];
#endif
break;
case SUMP_TRIGGER_CONFIG:
/* read the rest of the command bytes, but ignore them. */
@@ -346,7 +238,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();
@@ -359,7 +251,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
@@ -377,13 +269,12 @@ void loop()
delayCount = MAX_CAPTURE_SIZE;
break;
case SUMP_SET_FLAGS:
/* read the rest of the command bytes and check if RLE is enabled. */
/* read the rest of the command bytes, but ignore them. */
getCmd();
rleEnabled = ((cmdBytes[1] & B1000000) != 0);
break;
case SUMP_GET_METADATA:
/*
* We return a description of our capabilities.
* We return a description of our capabilities.
* Check the function's comments below.
*/
get_metadata();
@@ -393,78 +284,36 @@ void loop()
break;
#ifdef DEBUG
/*
* a couple of debug commands used during development.
* a couple of debug commands used during development.
*/
case '?':
Serial.println("");
Serial.println("0 = clear cmd buffer");
Serial.println("1 = print cmd buffer");
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;
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.
*/
#ifndef CHAN5
blinkled();
#endif /* !CHAN5 */
debugprint();
break;
case '2':
/*
* This dumps the sample data to the serial port.
* This dumps the sample data to the serial port. Used for debugging.
*/
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:
/* ignore any unrecognized bytes. */
@@ -473,12 +322,14 @@ void loop()
}
}
#ifndef CHAN5
void blinkled() {
digitalWrite(ledPin, HIGH);
delay(200);
digitalWrite(ledPin, LOW);
delay(200);
}
#endif /* !CHAN5 */
/*
* Extended SUMP commands are 5 bytes. A command byte followed by 4 bytes
@@ -522,14 +373,14 @@ void getCmd() {
*/
void captureMicro() {
unsigned int i;
int i;
/*
* basic trigger, wait until all trigger conditions are met on port.
* basic trigger, wait until all trigger conditions are met on port B.
* this needs further testing, but basic tests work as expected.
*/
if (trigger) {
while ((trigger_values ^ CHANPIN) & trigger);
while ((trigger_values ^ PINB) & trigger);
}
/*
@@ -544,41 +395,39 @@ void captureMicro() {
* this is used during development to measure the sample intervals.
* it is best to just leave the toggling in place so we don't alter
* any timing unexpectedly.
* Arduino digital pin 8 is being used here.
* Arduino pin 7 is being used here.
*/
DEBUG_ENABLE;
#ifdef DEBUG
DEBUG_ON;
DDRD = DDRD | B10000000;
PORTD = B10000000;
delayMicroseconds(20);
DEBUG_OFF;
PORTD = B00000000;
delayMicroseconds(20);
DEBUG_ON;
PORTD = B10000000;
delayMicroseconds(20);
DEBUG_OFF;
PORTD = B00000000;
delayMicroseconds(20);
#endif
if (delayTime == 1) {
/*
* 1MHz sample rate = 1 uS delay so we can't use delayMicroseconds
* since our loop takes some time. The delay is padded out by hand.
*/
DEBUG_ON; /* debug timing measurement */
PORTD = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN;
logicdata[i] = PINB;
__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");
}
DEBUG_OFF; /* debug timing measurement */
}
PORTD = B00000000; /* debug timing measurement */
}
else if (delayTime == 2) {
/*
* 500KHz sample rate = 2 uS delay, still pretty fast so we pad this
* one by hand too.
*/
DEBUG_ON; /* debug timing measurement */
PORTD = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN;
logicdata[i] = PINB;
__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");
@@ -586,8 +435,8 @@ void captureMicro() {
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
}
DEBUG_OFF; /* debug timing measurement */
}
PORTD = B00000000; /* debug timing measurement */
}
else {
/*
* not 1MHz or 500KHz; delayMicroseconds(delay - 1) works fine here
@@ -595,13 +444,13 @@ void captureMicro() {
* a better logic analyzer)
* start of real measurement
*/
DEBUG_ON; /* debug timing measurement */
PORTD = B10000000; /* debug timing measurement */
for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN;
logicdata[i] = PINB;
delayMicroseconds(delayTime - 1);
__asm__("nop\n\t""nop\n\t");
}
DEBUG_OFF; /* debug timing measurement */
PORTD = B00000000; /* debug timing measurement */
}
/* re-enable interrupts now that we're done sampling. */
@@ -612,11 +461,7 @@ void captureMicro() {
* is done for any triggers, this is effectively the 0/100 buffer split.
*/
for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD
Serial.write(logicdata[i] >> 2);
#else
Serial.write(logicdata[i]);
#endif
Serial.print(logicdata[i], BYTE);
}
}
@@ -638,60 +483,21 @@ void captureMicro() {
* this basic functionality.
*/
void captureMilli() {
unsigned int i = 0;
int i;
if (rleEnabled) {
/*
* very basic trigger, just like in captureMicros() above.
*/
if (trigger) {
while ((trigger_values ^ (CHANPIN & B01111111)) & trigger);
}
byte lastSample = 0;
byte sampleCount = 0;
while (i < readCount) {
/*
* Implementation of the RLE unlimited protocol: timings might be off a little
*/
if (lastSample == (CHANPIN & B01111111) && sampleCount < 127) {
sampleCount++;
delay(delayTime);
continue;
}
if (sampleCount != 0) {
logicdata[i] = B10000000 | sampleCount;
sampleCount = 0;
i++;
continue;
}
logicdata[i] = (CHANPIN & B01111111);
lastSample = (CHANPIN & B01111111);
delay(delayTime);
i++;
}
/*
* very basic trigger, just like in captureMicros() above.
*/
if (trigger) {
while ((trigger_values ^ PINB) & trigger);
}
else {
/*
* very basic trigger, just like in captureMicros() above.
*/
if (trigger) {
while ((trigger_values ^ CHANPIN) & trigger);
}
for (i = 0 ; i < readCount; i++) {
logicdata[i] = CHANPIN;
delay(delayTime);
}
for (i = 0 ; i < readCount; i++) {
logicdata[i] = PINB;
delay(delayTime);
}
for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD
Serial.write(logicdata[i] >> 2);
#else
Serial.write(logicdata[i]);
#endif
Serial.print(logicdata[i], BYTE);
}
}
@@ -701,10 +507,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() {
unsigned int i = 0;
int i = 0;
logicIndex = 0;
triggerIndex = 0;
@@ -721,19 +527,17 @@ void triggerMicro() {
* this is used during development to measure the sample intervals.
* it is best to just leave the toggling in place so we don't alter
* any timing unexpectedly.
* Arduino digital pin 8 is being used here.
* Arduino pin 7 is being used here.
*/
DEBUG_ENABLE;
#ifdef DEBUG
DEBUG_ON;
DDRD = DDRD | B10000000;
PORTD = B10000000;
delayMicroseconds(20);
DEBUG_OFF;
PORTD = B00000000;
delayMicroseconds(20);
DEBUG_ON;
PORTD = B10000000;
delayMicroseconds(20);
DEBUG_OFF;
PORTD = B00000000;
delayMicroseconds(20);
#endif
if (delayTime == 1) {
/*
@@ -748,18 +552,18 @@ void triggerMicro() {
* click stop.
*/
return;
}
}
else if (delayTime == 2) {
/*
* 500KHz case. We should be able to manage this in time.
*
* busy loop reading CHANPIN until we trigger.
* busy loop reading PINB until we trigger.
* we always start capturing at the start of the buffer
* and use it as a circular buffer
*/
DEBUG_ON; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
/* DEBUG_OFF; */
PORTD = B10000000; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = PINB)) & trigger) {
/* PORTD = B00000000; */
/* increment index. */
logicIndex++;
if (logicIndex >= readCount) {
@@ -771,13 +575,13 @@ void triggerMicro() {
* __asm__("nop\n\t""nop\n\t""nop\n\t");
*/
__asm__("nop\n\t");
/* DEBUG_ON; */
/* PORTD = B10000000; */
}
/* this pads the immediate trigger case to 2.0 uS, just as an example. */
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t");
DEBUG_OFF; /* debug timing measurement */
PORTD = B00000000; /* 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.
@@ -790,7 +594,7 @@ void triggerMicro() {
triggerIndex = logicIndex;
/* keep sampling for delayCount after trigger */
DEBUG_ON; /* debug timing measurement */
PORTD = B10000000; /* debug timing measurement */
/*
* this is currently taking:
* 1025.5 uS for 512 samples. (512 samples, 0/100 split)
@@ -800,41 +604,35 @@ void triggerMicro() {
if (logicIndex >= readCount) {
logicIndex = 0;
}
logicdata[logicIndex++] = CHANPIN;
logicdata[logicIndex++] = PINB;
__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");
}
DEBUG_OFF; /* debug timing measurement */
PORTD = B00000000; /* debug timing measurement */
delayMicroseconds(100);
}
}
else {
/*
* Less than 500KHz case. This uses delayMicroseconds() and some padding
* to get precise timing, at least for the after trigger samples.
*
* busy loop reading CHANPIN until we trigger.
* busy loop reading PINB until we trigger.
* we always start capturing at the start of the buffer
* and use it as a circular buffer
*
*/
DEBUG_ON; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = CHANPIN)) & trigger) {
/* DEBUG_OFF; */
PORTD = B10000000; /* debug timing measurement */
while ((trigger_values ^ (logicdata[logicIndex] = PINB)) & trigger) {
/* PORTD = B00000000; */
/* increment index. */
logicIndex++;
if (logicIndex >= readCount) {
logicIndex = 0;
}
else {
/* 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; */
/* PORTD = B10000000; */
}
DEBUG_OFF; /* debug timing measurement */
PORTD = B00000000; /* debug timing measurement */
/* 'logicIndex' now points to trigger sample, keep track of it */
triggerIndex = logicIndex;
@@ -843,24 +641,21 @@ void triggerMicro() {
* This needs adjustment so that we have the right spacing between the
* before trigger samples and the after trigger samples.
*/
delayMicroseconds(delayTime - 2);
__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");
delayMicroseconds(delayTime);
/* keep sampling for delayCount after trigger */
DEBUG_ON; /* debug timing measurement */
PORTD = B10000000; /* debug timing measurement */
for (i = 0 ; i < delayCount; i++) {
if (logicIndex >= readCount) {
logicIndex = 0;
}
logicdata[logicIndex++] = CHANPIN;
logicdata[logicIndex++] = PINB;
delayMicroseconds(delayTime - 3);
__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");
}
DEBUG_OFF; /* debug timing measurement */
PORTD = B00000000; /* debug timing measurement */
delayMicroseconds(100);
}
@@ -881,11 +676,7 @@ void triggerMicro() {
if (logicIndex >= readCount) {
logicIndex = 0;
}
#ifdef USE_PORTD
Serial.write(logicdata[logicIndex++] >> 2);
#else
Serial.write(logicdata[logicIndex++]);
#endif
Serial.print(logicdata[logicIndex++], BYTE);
}
}
@@ -907,7 +698,7 @@ void setupDelay() {
if (divider >= 1500000) {
useMicro = 0;
delayTime = (divider + 1) / 100000;
}
}
else {
useMicro = 1;
delayTime = (divider + 1) / 100;
@@ -921,73 +712,47 @@ void setupDelay() {
*/
void get_metadata() {
/* device name */
Serial.write((uint8_t)0x01);
Serial.write('A');
Serial.write('G');
Serial.write('L');
Serial.write('A');
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write('M');
#endif /* Mega */
Serial.write('v');
Serial.write('0');
Serial.write((uint8_t)0x00);
Serial.print(0x01, BYTE);
Serial.print('A', BYTE);
Serial.print('G', BYTE);
Serial.print('L', BYTE);
Serial.print('A', BYTE);
Serial.print('v', BYTE);
Serial.print('0', BYTE);
Serial.print(0x00, BYTE);
/* 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 (1024) */
Serial.print(0x21, BYTE);
Serial.print(0x00, BYTE);
Serial.print(0x00, BYTE);
Serial.print(0x04, BYTE);
Serial.print(0x00, BYTE);
/* sample memory */
Serial.write((uint8_t)0x21);
Serial.write((uint8_t)0x00);
Serial.write((uint8_t)0x00);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes */
Serial.write((uint8_t)0x1C);
Serial.write((uint8_t)0x00);
#elif defined(__AVR_ATmega328P__)
/* 1024 bytes */
Serial.write((uint8_t)0x04);
Serial.write((uint8_t)0x00);
#else
/* 532 bytes */
Serial.write((uint8_t)0x02);
Serial.write((uint8_t)0x14);
#endif /* Mega */
/* sample rate (1MHz) */
Serial.print(0x23, BYTE);
Serial.print(0x00, BYTE);
Serial.print(0x0F, BYTE);
Serial.print(0x42, BYTE);
Serial.print(0x40, BYTE);
/* sample rate (4MHz) */
Serial.write((uint8_t)0x23);
Serial.write((uint8_t)0x00);
Serial.write((uint8_t)0x3D);
Serial.write((uint8_t)0x09);
Serial.write((uint8_t)0x00);
/* number of probes (6 by default on Arduino, 8 on Mega) */
Serial.write((uint8_t)0x40);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write((uint8_t)0x08);
#else
/* number of probes (5 by default) */
Serial.print(0x40, BYTE);
#ifdef CHAN5
Serial.write((uint8_t)0x06);
Serial.print(0x06, BYTE);
#else
Serial.write((uint8_t)0x05);
Serial.print(0x05, BYTE);
#endif /* CHAN5 */
#endif /* Mega */
/* protocol version (2) */
Serial.write((uint8_t)0x41);
Serial.write((uint8_t)0x02);
Serial.print(0x41, BYTE);
Serial.print(0x02, BYTE);
/* end of data */
Serial.write((uint8_t)0x00);
Serial.print(0x00, BYTE);
}
/*
* 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.
*
*/
@@ -1011,18 +776,16 @@ void debugprint() {
Serial.println(logicIndex, DEC);
Serial.print("triggerIndex = ");
Serial.println(triggerIndex, DEC);
Serial.print("rleEnabled = ");
Serial.println(rleEnabled, DEC);
Serial.println("Bytes:");
for (i = 0 ; i < savecount; i++) {
if (savebytes[i] == 0x20) {
Serial.println();
}
}
else {
Serial.print(savebytes[i], HEX);
Serial.write(' ');
Serial.print(' ', BYTE);
}
}
Serial.println("done...");
@@ -1039,11 +802,7 @@ void debugdump() {
Serial.print("\r\n");
for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
#ifdef USE_PORTD
Serial.print(logicdata[i] >> 2, HEX);
#else
Serial.print(logicdata[i], HEX);
#endif
Serial.print(" ");
if (j == 32) {
Serial.print("\r\n");
@@ -1052,45 +811,6 @@ void debugdump() {
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 */

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -1,53 +0,0 @@
# Configuration for Arduino Mega Logic Analyzer profile
# The short (single word) type of the device described in this profile
device.type = AGLAM
# A longer description of the device
device.description = Arduino Mega Logic Analyzer
# The device interface, SERIAL only
device.interface = SERIAL
# The device's native clockspeed, in Hertz.
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, 2000000, 4000000
# What capture clocks are supported
device.captureclock = INTERNAL
# The supported capture sizes, in bytes
device.capturesizes = 64, 128, 256, 512, 1024, 2048, 4096, 7168
# 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 = 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)
device.open.portdtr = true
# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
device.metadata.keys = "AGLAMv0"
# In which order are samples sent back from the device? false = last sample first, true = first sample first
device.samples.reverseOrder = true
###EOF###