public/logic_analyzer_sump
1
0
Fork 0
mirror of https://github.com/gillham/logic_analyzer.git synced 2026-05-06 23:20:13 +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:aglan_alpha
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 ... aglan_alph

Author SHA1 Message Date
Andrew Gillham
1b9c3e7314 Create an Ethernet shield version. 
This alpha version can be connected to across the network using the OLS
client and an Ethernet shield.
 2013-06-22 22:04:05 -07:00
6 changed files with 338 additions and 29338 deletions
Expand all files Collapse all files

74
README
View File

@@ -1,28 +1,43 @@
SUMP compatible logic analyzer for Arduino SUMP compatible logic analyzer for Arduino
========================================== ==========================================
NOTE: NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
Please report any issues. Uncomment USE_PORTD for pins 2-7.
This Arduino sketch implements a SUMP protocol compatible with the standard 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 +51,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.09 June 22, 2013.
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.

664
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,2012,2013 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
@@ -29,7 +29,17 @@
*/ */
/* /*
* NOTE: v0.09 switched the channels BACK to pins 8-13 for trigger reliability. * NOTE: This is an ALPHA of support for an Ethernet attached Logic Analyzer.
* Tested with an Arduino Duemilanove and W5100 based Ethernet shield.
* It may work with other combinations, but I haven't tested it.
*
* USE: Configure the mac address (if you want) and the ip address (mandatory)
* for your network and upload it. In the OLS client select network
* instead of serial and use your ip address and port 1234.
* Click capture! You should get some data back from your Arduino.
*
*
* NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
* Please report any issues. Uncomment USE_PORTD for pins 2-7. * 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
@@ -44,10 +54,26 @@
* 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)
@@ -62,10 +88,12 @@
* 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.09 June 22, 2013.
* *
*/ */
#include <SPI.h>
#include <Ethernet.h>
/* /*
* Function prototypes so this can compile from the cli. * Function prototypes so this can compile from the cli.
* You'll need the 'arduino-core' package and to check the paths in the * You'll need the 'arduino-core' package and to check the paths in the
@@ -81,14 +109,12 @@ 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) * Should we use PORTD or PORTB? (default is PORTB)
* PORTD support with triggers seems to work but needs more testing. * PORTD support with triggers seems to work but needs more testing.
*/ */
//#define USE_PORTD 1 #define USE_PORTD 1
/* /*
* Arduino device profile: ols.profile-agla.cfg * Arduino device profile: ols.profile-agla.cfg
@@ -171,11 +197,8 @@ void prettydump(void);
#define DEBUG_ENABLE DDRD = DDRD | B10000000 #define DEBUG_ENABLE DDRD = DDRD | B10000000
#define DEBUG_ON PORTD = B10000000 #define DEBUG_ON PORTD = B10000000
#define DEBUG_OFF PORTD = B00000000 #define DEBUG_OFF PORTD = B00000000
#endif /* USE_PORTD */ #endif
#define DEBUG
//#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
@@ -206,10 +229,30 @@ unsigned int delayTime = 0;
unsigned long divider = 0; unsigned long divider = 0;
boolean rleEnabled = 0; boolean rleEnabled = 0;
/*
* Enter a MAC address and IP address for your Arduino.
*/
byte mac[] = {
0x40, 0x00, 0x01, 0x02, 0x03, 0x04 };
IPAddress ip(192,168,1,200);
// Initialize the Ethernet server library
// with the IP address and port you want to use
// (port 80 is default for HTTP):
EthernetServer server(1234);
EthernetClient client;
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
// start the Ethernet connection and the server:
Ethernet.begin(mac, ip);
server.begin();
Serial.print("server is at ");
Serial.println(Ethernet.localIP());
/* /*
* set debug pin (digital pin 8) to output right away so it settles. * set debug pin (digital pin 8) 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
@@ -219,265 +262,199 @@ void setup()
DEBUG_ENABLE; /* debug measurement pin */ DEBUG_ENABLE; /* debug measurement pin */
pinMode(CHAN0, INPUT); pinMode(CHAN0, INPUT);
digitalWrite(CHAN0, LOW);
pinMode(CHAN1, INPUT); pinMode(CHAN1, INPUT);
digitalWrite(CHAN1, LOW);
pinMode(CHAN2, INPUT); pinMode(CHAN2, INPUT);
digitalWrite(CHAN2, LOW);
pinMode(CHAN3, INPUT); pinMode(CHAN3, INPUT);
digitalWrite(CHAN3, LOW);
pinMode(CHAN4, INPUT); pinMode(CHAN4, INPUT);
digitalWrite(CHAN4, LOW);
#ifdef CHAN5 #ifdef CHAN5
pinMode(CHAN5, INPUT); pinMode(CHAN5, INPUT);
digitalWrite(CHAN5, LOW);
#endif #endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
pinMode(CHAN6, INPUT); pinMode(CHAN6, INPUT);
digitalWrite(CHAN6, LOW);
pinMode(CHAN7, INPUT); pinMode(CHAN7, INPUT);
digitalWrite(CHAN7, LOW);
#else #else
#ifndef CHAN5 #ifndef CHAN5
pinMode(ledPin, OUTPUT); pinMode(ledPin, OUTPUT);
#endif #endif
#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; int i;
if (Serial.available() > 0) { // listen for incoming clients
cmdByte = Serial.read(); client = server.available();
switch (cmdByte) { if (client) {
case SUMP_RESET: Serial.println("new client");
/* while (client.connected()) {
* We don't do anything here as some unsupported extended commands have if (client.available()) {
* zero bytes and are mistaken as resets. This can trigger false resets cmdByte = client.read();
* so we don't erase the data or do anything for a reset. switch(cmdByte) {
*/ case SUMP_RESET:
break; /*
case SUMP_QUERY: * We don't do anything here as some unsupported extended commands have
/* return the expected bytes. */ * zero bytes and are mistaken as resets. This can trigger false resets
Serial.write('1'); * so we don't erase the data or do anything for a reset.
Serial.write('A'); */
Serial.write('L'); break;
Serial.write('S'); case SUMP_QUERY:
break; /* return the expected bytes. */
case SUMP_ARM: client.write('1');
/* client.write('A');
* Zero out any previous samples before arming. client.write('L');
* Done here instead via reset due to spurious resets. client.write('S');
*/ break;
for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) { case SUMP_ARM:
logicdata[i] = 0; /*
} * Zero out any previous samples before arming.
/* * Done here instead via reset due to spurious resets.
* depending on the sample rate we need to delay in microseconds */
* or milliseconds. We can't do the complex trigger at 1MHz for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
* so in that case (delayTime == 1 and triggers enabled) use logicdata[i] = 0;
* captureMicro() instead of triggerMicro(). }
*/ /*
* depending on the sample rate we need to delay in microseconds
if (divider == 24) { * or milliseconds. We can't do the complex trigger at 1MHz
/* 4.0MHz */ * so in that case (delayTime == 1 and triggers enabled) use
captureInline4mhz(); * captureMicro() instead of triggerMicro().
} */
else if (divider == 49) { if (useMicro) {
/* 2.0MHz */ if (trigger && (delayTime != 1)) {
#if !defined(__AVR_ATmega168__) triggerMicro();
captureInline2mhz(); }
#endif else {
} captureMicro();
else if (useMicro) { }
if (trigger && (delayTime != 1)) { }
triggerMicro(); else {
} captureMilli();
else { }
captureMicro(); break;
} case SUMP_TRIGGER_MASK:
} /*
else { * the trigger mask byte has a '1' for each enabled trigger so
captureMilli(); * we can just use it directly as our trigger mask.
} */
break; getCmd();
case SUMP_TRIGGER_MASK:
/*
* the trigger mask byte has a '1' for each enabled trigger so
* we can just use it directly as our trigger mask.
*/
getCmd();
#ifdef USE_PORTD #ifdef USE_PORTD
trigger = cmdBytes[0] << 2; trigger = cmdBytes[0] << 2;
#else #else
trigger = cmdBytes[0]; trigger = cmdBytes[0];
#endif #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 #ifdef USE_PORTD
trigger_values = cmdBytes[0] << 2; trigger_values = cmdBytes[0] << 2;
#else #else
trigger_values = cmdBytes[0]; trigger_values = cmdBytes[0];
#endif #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. */
getCmd(); getCmd();
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();
divider = cmdBytes[2]; divider = cmdBytes[2];
divider = divider << 8; divider = divider << 8;
divider += cmdBytes[1]; divider += cmdBytes[1];
divider = divider << 8; divider = divider << 8;
divider += cmdBytes[0]; divider += cmdBytes[0];
setupDelay(); setupDelay();
break; break;
case SUMP_SET_READ_DELAY_COUNT: case SUMP_SET_READ_DELAY_COUNT:
/* /*
* this just sets up how many samples there should be before * this just sets up how many samples there should be before
* and after the trigger fires. The readCount is total samples * and after the trigger fires. The readCount is total samples
* to return and delayCount number of samples after the trigger. * to return and delayCount number of samples after the trigger.
* this sets the buffer splits like 0/100, 25/75, 50/50 * this sets the buffer splits like 0/100, 25/75, 50/50
* for example if readCount == delayCount then we should * for example if readCount == delayCount then we should
* return all samples starting from the trigger point. * return all samples starting from the trigger point.
* if delayCount < readCount we return (readCount - delayCount) of * if delayCount < readCount we return (readCount - delayCount) of
* samples from before the trigger fired. * samples from before the trigger fired.
*/ */
getCmd(); getCmd();
readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1); readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
if (readCount > MAX_CAPTURE_SIZE) if (readCount > MAX_CAPTURE_SIZE)
readCount = MAX_CAPTURE_SIZE; readCount = MAX_CAPTURE_SIZE;
delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1); delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
if (delayCount > MAX_CAPTURE_SIZE) if (delayCount > MAX_CAPTURE_SIZE)
delayCount = MAX_CAPTURE_SIZE; delayCount = MAX_CAPTURE_SIZE;
break; break;
case SUMP_SET_FLAGS: case SUMP_SET_FLAGS:
/* read the rest of the command bytes and check if RLE is enabled. */ /* read the rest of the command bytes and check if RLE is enabled. */
getCmd(); getCmd();
rleEnabled = ((cmdBytes[1] & B1000000) != 0); 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();
break; break;
case SUMP_SELF_TEST: case SUMP_SELF_TEST:
/* ignored. */ /* ignored. */
break; break;
#ifdef DEBUG_MENU
/*
* a couple of debug commands used during development.
*/
case '?':
Serial.println("");
#ifdef DEBUG #ifdef DEBUG
Serial.println("0 = clear cmd buffer"); /*
Serial.println("1 = print cmd buffer"); * a couple of debug commands used during development.
*/
case '0':
/*
* 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;
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.
* you can use the Arduino serial monitor and send a '1' and get
* a debug printout. useless except for development.
*/
blinkled();
debugprint();
break;
case '2':
/*
* This dumps the sample data to the serial port. Used for debugging.
*/
debugdump();
break;
#endif /* DEBUG */ #endif /* DEBUG */
Serial.println("2 = print data buffer"); default:
Serial.println("3 = pretty print buffer"); /* ignore any unrecognized bytes. */
Serial.println("4 = capture at 4MHz"); break;
Serial.println("5 = capture at 1MHz"); } /* switch */
Serial.println("6 = capture at 500KHz"); } /* if client.available() */
break; } /* while */
#ifdef DEBUG delay(1);
case '0': client.stop();
/* Serial.println("client disconnected?");
* This resets the debug buffer pointer, effectively clearing the } /* if client */
* 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;
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.
* 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.
*/
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_MENU */
default:
/* ignore any unrecognized bytes. */
break;
}
}
} }
void blinkled() { void blinkled() {
@@ -496,10 +473,10 @@ void blinkled() {
*/ */
void getCmd() { void getCmd() {
delay(10); delay(10);
cmdBytes[0] = Serial.read(); cmdBytes[0] = client.read();
cmdBytes[1] = Serial.read(); cmdBytes[1] = client.read();
cmdBytes[2] = Serial.read(); cmdBytes[2] = client.read();
cmdBytes[3] = Serial.read(); cmdBytes[3] = client.read();
#ifdef DEBUG #ifdef DEBUG
if (savecount < 120 ) { if (savecount < 120 ) {
@@ -529,7 +506,7 @@ void getCmd() {
*/ */
void captureMicro() { 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.
@@ -554,7 +531,6 @@ void captureMicro() {
* Arduino digital pin 8 is being used here. * Arduino digital pin 8 is being used here.
*/ */
DEBUG_ENABLE; DEBUG_ENABLE;
#ifdef DEBUG
DEBUG_ON; DEBUG_ON;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUG_OFF;
@@ -563,7 +539,6 @@ void captureMicro() {
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUG_OFF;
delayMicroseconds(20); delayMicroseconds(20);
#endif
if (delayTime == 1) { if (delayTime == 1) {
/* /*
@@ -620,9 +595,9 @@ void captureMicro() {
*/ */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD #ifdef USE_PORTD
Serial.write(logicdata[i] >> 2); client.write(logicdata[i] >> 2);
#else #else
Serial.write(logicdata[i]); client.write(logicdata[i]);
#endif #endif
} }
} }
@@ -645,9 +620,9 @@ void captureMicro() {
* this basic functionality. * this basic functionality.
*/ */
void captureMilli() { void captureMilli() {
unsigned int i = 0; int i = 0;
if (rleEnabled) { if(rleEnabled) {
/* /*
* very basic trigger, just like in captureMicros() above. * very basic trigger, just like in captureMicros() above.
*/ */
@@ -658,16 +633,16 @@ void captureMilli() {
byte lastSample = 0; byte lastSample = 0;
byte sampleCount = 0; byte sampleCount = 0;
while (i < readCount) { while(i < readCount) {
/* /*
* Implementation of the RLE unlimited protocol: timings might be off a little * 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++; sampleCount++;
delay(delayTime); delay(delayTime);
continue; continue;
} }
if (sampleCount != 0) { if(sampleCount != 0) {
logicdata[i] = B10000000 | sampleCount; logicdata[i] = B10000000 | sampleCount;
sampleCount = 0; sampleCount = 0;
i++; i++;
@@ -695,9 +670,9 @@ void captureMilli() {
} }
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD #ifdef USE_PORTD
Serial.write(logicdata[i] >> 2); client.write(logicdata[i] >> 2);
#else #else
Serial.write(logicdata[i]); client.write(logicdata[i]);
#endif #endif
} }
} }
@@ -711,7 +686,7 @@ void captureMilli() {
* *
*/ */
void triggerMicro() { void triggerMicro() {
unsigned int i = 0; int i = 0;
logicIndex = 0; logicIndex = 0;
triggerIndex = 0; triggerIndex = 0;
@@ -731,7 +706,6 @@ void triggerMicro() {
* Arduino digital pin 8 is being used here. * Arduino digital pin 8 is being used here.
*/ */
DEBUG_ENABLE; DEBUG_ENABLE;
#ifdef DEBUG
DEBUG_ON; DEBUG_ON;
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUG_OFF;
@@ -740,7 +714,6 @@ void triggerMicro() {
delayMicroseconds(20); delayMicroseconds(20);
DEBUG_OFF; DEBUG_OFF;
delayMicroseconds(20); delayMicroseconds(20);
#endif
if (delayTime == 1) { if (delayTime == 1) {
/* /*
@@ -889,9 +862,9 @@ void triggerMicro() {
logicIndex = 0; logicIndex = 0;
} }
#ifdef USE_PORTD #ifdef USE_PORTD
Serial.write(logicdata[logicIndex++] >> 2); client.write(logicdata[logicIndex++] >> 2);
#else #else
Serial.write(logicdata[logicIndex++]); client.write(logicdata[logicIndex++]);
#endif #endif
} }
} }
@@ -928,73 +901,73 @@ void setupDelay() {
*/ */
void get_metadata() { void get_metadata() {
/* device name */ /* device name */
Serial.write((uint8_t)0x01); client.write((uint8_t)0x01);
Serial.write('A'); client.write('A');
Serial.write('G'); client.write('G');
Serial.write('L'); client.write('L');
Serial.write('A'); client.write('A');
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write('M'); client.write('M');
#endif /* Mega */ #endif /* Mega */
Serial.write('v'); client.write('v');
Serial.write('0'); client.write('0');
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
/* firmware version */ /* firmware version */
Serial.write((uint8_t)0x02); client.write((uint8_t)0x02);
Serial.write('0'); client.write('0');
Serial.write('.'); client.write('.');
Serial.write('1'); client.write('0');
Serial.write('3'); client.write('9');
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
/* sample memory */ /* sample memory */
Serial.write((uint8_t)0x21); client.write((uint8_t)0x21);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes */ /* 7168 bytes */
Serial.write((uint8_t)0x1C); client.write((uint8_t)0x1C);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
#elif defined(__AVR_ATmega328P__) #elif defined(__AVR_ATmega328P__)
/* 1024 bytes */ /* 1024 bytes */
Serial.write((uint8_t)0x04); client.write((uint8_t)0x04);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
#else #else
/* 532 bytes */ /* 532 bytes */
Serial.write((uint8_t)0x02); client.write((uint8_t)0x02);
Serial.write((uint8_t)0x14); client.write((uint8_t)0x14);
#endif /* Mega */ #endif /* Mega */
/* sample rate (4MHz) */ /* sample rate (1MHz) */
Serial.write((uint8_t)0x23); client.write((uint8_t)0x23);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
Serial.write((uint8_t)0x3D); client.write((uint8_t)0x0F);
Serial.write((uint8_t)0x09); client.write((uint8_t)0x42);
Serial.write((uint8_t)0x00); client.write((uint8_t)0x40);
/* number of probes (6 by default on Arduino, 8 on Mega) */ /* number of probes (6 by default on Arduino, 8 on Mega) */
Serial.write((uint8_t)0x40); client.write((uint8_t)0x40);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.write((uint8_t)0x08); client.write((uint8_t)0x08);
#else #else
#ifdef CHAN5 #ifdef CHAN5
Serial.write((uint8_t)0x06); client.write((uint8_t)0x06);
#else #else
Serial.write((uint8_t)0x05); client.write((uint8_t)0x05);
#endif /* CHAN5 */ #endif /* CHAN5 */
#endif /* Mega */ #endif /* Mega */
/* protocol version (2) */ /* protocol version (2) */
Serial.write((uint8_t)0x41); client.write((uint8_t)0x41);
Serial.write((uint8_t)0x02); client.write((uint8_t)0x02);
/* end of data */ /* end of data */
Serial.write((uint8_t)0x00); client.write((uint8_t)0x00);
} }
/* /*
* 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.
* *
*/ */
@@ -1003,40 +976,38 @@ void debugprint() {
int i; int i;
#if 0 #if 0
Serial.print("divider = "); client.print("divider = ");
Serial.println(divider, DEC); client.println(divider, DEC);
Serial.print("delayTime = "); client.print("delayTime = ");
Serial.println(delayTime, DEC); client.println(delayTime, DEC);
Serial.print("trigger_values = "); client.print("trigger_values = ");
Serial.println(trigger_values, BIN); client.println(trigger_values, BIN);
#endif #endif
Serial.print("readCount = "); client.print("readCount = ");
Serial.println(readCount, DEC); client.println(readCount, DEC);
Serial.print("delayCount = "); client.print("delayCount = ");
Serial.println(delayCount, DEC); client.println(delayCount, DEC);
Serial.print("logicIndex = "); client.print("logicIndex = ");
Serial.println(logicIndex, DEC); client.println(logicIndex, DEC);
Serial.print("triggerIndex = "); client.print("triggerIndex = ");
Serial.println(triggerIndex, DEC); client.println(triggerIndex, DEC);
Serial.print("rleEnabled = "); client.print("rleEnabled = ");
Serial.println(rleEnabled, DEC); client.println(rleEnabled, DEC);
Serial.println("Bytes:"); client.println("Bytes:");
for (i = 0 ; i < savecount; i++) { for (i = 0 ; i < savecount; i++) {
if (savebytes[i] == 0x20) { if (savebytes[i] == 0x20) {
Serial.println(); client.println();
} }
else { else {
Serial.print(savebytes[i], HEX); client.print(savebytes[i], HEX);
Serial.write(' '); client.write(' ');
} }
} }
Serial.println("done..."); client.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.
@@ -1045,56 +1016,23 @@ void debugdump() {
int i; int i;
int j = 1; int j = 1;
Serial.print("\r\n"); client.print("\r\n");
for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) { for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
#ifdef USE_PORTD #ifdef USE_PORTD
Serial.print(logicdata[i] >> 2, HEX); client.print(logicdata[i] >> 2, HEX);
#else #else
Serial.print(logicdata[i], HEX); client.print(logicdata[i], HEX);
#endif #endif
Serial.print(" "); client.print(" ");
if (j == 32) { if (j == 32) {
Serial.print("\r\n"); client.print("\r\n");
j = 0; j = 0;
} }
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

4
ols.profile-agla.cfg
View File

@@ -11,7 +11,7 @@ device.clockspeed = 16000000
# 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,7 +39,7 @@ 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 = 1500
# The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout) # The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout)
device.receive.timeout = 100 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)

2
ols.profile-aglam.cfg
View File

@@ -11,7 +11,7 @@ device.clockspeed = 16000000
# 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