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

Compare commits

base: 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
..
compare: public:agla_v0_9
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
aglan_alph ... agla_v0_9

Author SHA1 Message Date
Andrew Gillham
8c7db04e3c Increase portdelay so that Arduino Uno R3 works. 
For some reason the Arduino Uno R3 (but not my earlier / original Uno)
needs a longer delay after reset.  I haven't investigated the cause
yet, but increasing device.open.portdelay to > 1700ms seems to fix it.
Bump to 2000 just to be safe in all cases.  This should fix the Uno R3
issues that have been reported a couple of times now.
 2013-07-22 22:11:20 -07:00
2 changed files with 209 additions and 259 deletions
Expand all files Collapse all files

214
logic_analyzer.ino
View File

@@ -29,16 +29,6 @@
*/ */
/* /*
* 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.
* *
@@ -92,8 +82,6 @@
* *
*/ */
#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
@@ -110,11 +98,12 @@ 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
@@ -229,30 +218,10 @@ 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
@@ -262,24 +231,16 @@ 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);
@@ -291,13 +252,8 @@ void loop()
{ {
int i; int i;
// listen for incoming clients if (Serial.available() > 0) {
client = server.available(); cmdByte = Serial.read();
if (client) {
Serial.println("new client");
while (client.connected()) {
if (client.available()) {
cmdByte = client.read();
switch(cmdByte) { switch(cmdByte) {
case SUMP_RESET: case SUMP_RESET:
/* /*
@@ -308,10 +264,10 @@ void loop()
break; break;
case SUMP_QUERY: case SUMP_QUERY:
/* return the expected bytes. */ /* return the expected bytes. */
client.write('1'); Serial.write('1');
client.write('A'); Serial.write('A');
client.write('L'); Serial.write('L');
client.write('S'); Serial.write('S');
break; break;
case SUMP_ARM: case SUMP_ARM:
/* /*
@@ -448,13 +404,8 @@ void loop()
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() {
@@ -473,10 +424,10 @@ void blinkled() {
*/ */
void getCmd() { void getCmd() {
delay(10); delay(10);
cmdBytes[0] = client.read(); cmdBytes[0] = Serial.read();
cmdBytes[1] = client.read(); cmdBytes[1] = Serial.read();
cmdBytes[2] = client.read(); cmdBytes[2] = Serial.read();
cmdBytes[3] = client.read(); cmdBytes[3] = Serial.read();
#ifdef DEBUG #ifdef DEBUG
if (savecount < 120 ) { if (savecount < 120 ) {
@@ -595,9 +546,9 @@ void captureMicro() {
*/ */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD #ifdef USE_PORTD
client.write(logicdata[i] >> 2); Serial.write(logicdata[i] >> 2);
#else #else
client.write(logicdata[i]); Serial.write(logicdata[i]);
#endif #endif
} }
} }
@@ -670,9 +621,9 @@ void captureMilli() {
} }
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
#ifdef USE_PORTD #ifdef USE_PORTD
client.write(logicdata[i] >> 2); Serial.write(logicdata[i] >> 2);
#else #else
client.write(logicdata[i]); Serial.write(logicdata[i]);
#endif #endif
} }
} }
@@ -862,9 +813,9 @@ void triggerMicro() {
logicIndex = 0; logicIndex = 0;
} }
#ifdef USE_PORTD #ifdef USE_PORTD
client.write(logicdata[logicIndex++] >> 2); Serial.write(logicdata[logicIndex++] >> 2);
#else #else
client.write(logicdata[logicIndex++]); Serial.write(logicdata[logicIndex++]);
#endif #endif
} }
} }
@@ -901,69 +852,69 @@ void setupDelay() {
*/ */
void get_metadata() { void get_metadata() {
/* device name */ /* device name */
client.write((uint8_t)0x01); Serial.write((uint8_t)0x01);
client.write('A'); Serial.write('A');
client.write('G'); Serial.write('G');
client.write('L'); Serial.write('L');
client.write('A'); Serial.write('A');
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
client.write('M'); Serial.write('M');
#endif /* Mega */ #endif /* Mega */
client.write('v'); Serial.write('v');
client.write('0'); Serial.write('0');
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
/* firmware version */ /* firmware version */
client.write((uint8_t)0x02); Serial.write((uint8_t)0x02);
client.write('0'); Serial.write('0');
client.write('.'); Serial.write('.');
client.write('0'); Serial.write('0');
client.write('9'); Serial.write('9');
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
/* sample memory */ /* sample memory */
client.write((uint8_t)0x21); Serial.write((uint8_t)0x21);
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes */ /* 7168 bytes */
client.write((uint8_t)0x1C); Serial.write((uint8_t)0x1C);
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#elif defined(__AVR_ATmega328P__) #elif defined(__AVR_ATmega328P__)
/* 1024 bytes */ /* 1024 bytes */
client.write((uint8_t)0x04); Serial.write((uint8_t)0x04);
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
#else #else
/* 532 bytes */ /* 532 bytes */
client.write((uint8_t)0x02); Serial.write((uint8_t)0x02);
client.write((uint8_t)0x14); Serial.write((uint8_t)0x14);
#endif /* Mega */ #endif /* Mega */
/* sample rate (1MHz) */ /* sample rate (1MHz) */
client.write((uint8_t)0x23); Serial.write((uint8_t)0x23);
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
client.write((uint8_t)0x0F); Serial.write((uint8_t)0x0F);
client.write((uint8_t)0x42); Serial.write((uint8_t)0x42);
client.write((uint8_t)0x40); Serial.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) */
client.write((uint8_t)0x40); Serial.write((uint8_t)0x40);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
client.write((uint8_t)0x08); Serial.write((uint8_t)0x08);
#else #else
#ifdef CHAN5 #ifdef CHAN5
client.write((uint8_t)0x06); Serial.write((uint8_t)0x06);
#else #else
client.write((uint8_t)0x05); Serial.write((uint8_t)0x05);
#endif /* CHAN5 */ #endif /* CHAN5 */
#endif /* Mega */ #endif /* Mega */
/* protocol version (2) */ /* protocol version (2) */
client.write((uint8_t)0x41); Serial.write((uint8_t)0x41);
client.write((uint8_t)0x02); Serial.write((uint8_t)0x02);
/* end of data */ /* end of data */
client.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
} }
/* /*
@@ -976,36 +927,36 @@ void debugprint() {
int i; int i;
#if 0 #if 0
client.print("divider = "); Serial.print("divider = ");
client.println(divider, DEC); Serial.println(divider, DEC);
client.print("delayTime = "); Serial.print("delayTime = ");
client.println(delayTime, DEC); Serial.println(delayTime, DEC);
client.print("trigger_values = "); Serial.print("trigger_values = ");
client.println(trigger_values, BIN); Serial.println(trigger_values, BIN);
#endif #endif
client.print("readCount = "); Serial.print("readCount = ");
client.println(readCount, DEC); Serial.println(readCount, DEC);
client.print("delayCount = "); Serial.print("delayCount = ");
client.println(delayCount, DEC); Serial.println(delayCount, DEC);
client.print("logicIndex = "); Serial.print("logicIndex = ");
client.println(logicIndex, DEC); Serial.println(logicIndex, DEC);
client.print("triggerIndex = "); Serial.print("triggerIndex = ");
client.println(triggerIndex, DEC); Serial.println(triggerIndex, DEC);
client.print("rleEnabled = "); Serial.print("rleEnabled = ");
client.println(rleEnabled, DEC); Serial.println(rleEnabled, DEC);
client.println("Bytes:"); Serial.println("Bytes:");
for (i = 0 ; i < savecount; i++) { for (i = 0 ; i < savecount; i++) {
if (savebytes[i] == 0x20) { if (savebytes[i] == 0x20) {
client.println(); Serial.println();
} }
else { else {
client.print(savebytes[i], HEX); Serial.print(savebytes[i], HEX);
client.write(' '); Serial.write(' ');
} }
} }
client.println("done..."); Serial.println("done...");
} }
/* /*
@@ -1016,17 +967,17 @@ void debugdump() {
int i; int i;
int j = 1; int j = 1;
client.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 #ifdef USE_PORTD
client.print(logicdata[i] >> 2, HEX); Serial.print(logicdata[i] >> 2, HEX);
#else #else
client.print(logicdata[i], HEX); Serial.print(logicdata[i], HEX);
#endif #endif
client.print(" "); Serial.print(" ");
if (j == 32) { if (j == 32) {
client.print("\r\n"); Serial.print("\r\n");
j = 0; j = 0;
} }
j++; j++;
@@ -1040,4 +991,3 @@ void debugdump() {

2
ols.profile-agla.cfg
View File

@@ -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 = 1500 device.open.portdelay = 2000
# 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)