public/logic_analyzer_sump
1
0
Fork 0
mirror of https://github.com/gillham/logic_analyzer.git synced 2026-05-01 23:53:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Create an Ethernet shield version.

Browse Source 
This alpha version can be connected to across the network using the OLS
client and an Ethernet shield.
This commit is contained in:
Andrew Gillham
2013-06-22 22:04:05 -07:00
parent 17d2a1a15f
commit 1b9c3e7314
1 changed files with 258 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

466
logic_analyzer.ino
View File

@@ -29,6 +29,16 @@
*/ */
/* /*
* 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. * 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.
* *
@@ -82,6 +92,8 @@
* *
*/ */
#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
@@ -98,12 +110,11 @@ void get_metadata(void);
void debugprint(void); void debugprint(void);
void debugdump(void); void debugdump(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
@@ -218,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
@@ -231,16 +262,24 @@ 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);
@@ -252,160 +291,170 @@ 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()) {
if (client.available()) {
cmdByte = client.read();
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 * 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.
*/ */
break; break;
case SUMP_QUERY: case SUMP_QUERY:
/* return the expected bytes. */ /* return the expected bytes. */
Serial.write('1'); client.write('1');
Serial.write('A'); client.write('A');
Serial.write('L'); client.write('L');
Serial.write('S'); client.write('S');
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 (useMicro) {
if (trigger && (delayTime != 1)) { if (trigger && (delayTime != 1)) {
triggerMicro(); triggerMicro();
} }
else { else {
captureMicro(); captureMicro();
} }
} }
else { else {
captureMilli(); captureMilli();
} }
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 #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 #ifdef DEBUG
/* /*
* a couple of debug commands used during development. * a couple of debug commands used during development.
*/ */
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.
*/ */
blinkled(); blinkled();
debugprint(); debugprint();
break; break;
case '2': case '2':
/* /*
* This dumps the sample data to the serial port. Used for debugging. * This dumps the sample data to the serial port. Used for debugging.
*/ */
debugdump(); debugdump();
break; break;
#endif /* DEBUG */ #endif /* DEBUG */
default: default:
/* ignore any unrecognized bytes. */ /* ignore any unrecognized bytes. */
break; break;
} } /* switch */
} } /* if client.available() */
} /* while */
delay(1);
client.stop();
Serial.println("client disconnected?");
} /* if client */
} }
void blinkled() { void blinkled() {
@@ -424,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 ) {
@@ -546,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
} }
} }
@@ -621,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
} }
} }
@@ -813,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
} }
} }
@@ -852,69 +901,69 @@ 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('0'); client.write('0');
Serial.write('9'); 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 (1MHz) */ /* 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)0x0F); client.write((uint8_t)0x0F);
Serial.write((uint8_t)0x42); client.write((uint8_t)0x42);
Serial.write((uint8_t)0x40); 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);
} }
/* /*
@@ -927,36 +976,36 @@ 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...");
} }
/* /*
@@ -967,17 +1016,17 @@ 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++;
@@ -991,3 +1040,4 @@ void debugdump() {