mirror of
https://github.com/gillham/logic_analyzer.git
synced 2026-05-07 08:22:55 +03:00
Compare commits
1 Commits
agla_leona
...
aglan_alph
| Author | SHA1 | Date | |
|---|---|---|---|
|
1b9c3e7314 |
63
README
63
README
@@ -1,28 +1,43 @@
|
||||
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
|
||||
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.
|
||||
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,
|
||||
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)
|
||||
@@ -36,38 +51,8 @@ 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. ]
|
||||
This master branch now supports Arduino 1.0 only.
|
||||
Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
|
||||
|
||||
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.12 September 6, 2013.
|
||||
Release: v0.09 June 22, 2013.
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*
|
||||
* SUMP Protocol Implementation for Arduino boards.
|
||||
*
|
||||
* Copyright (c) 2011,2012,2013,2014 Andrew Gillham
|
||||
* Copyright (c) 2011,2012,2013 Andrew Gillham
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* 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
|
||||
* 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,
|
||||
* 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)
|
||||
@@ -62,10 +88,12 @@
|
||||
* until after the trigger fires.
|
||||
* Please try it out and report back.
|
||||
*
|
||||
* Release: v0.12 September 6, 2013.
|
||||
* Release: v0.09 June 22, 2013.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <SPI.h>
|
||||
#include <Ethernet.h>
|
||||
/*
|
||||
* Function prototypes so this can compile from the cli.
|
||||
* You'll need the 'arduino-core' package and to check the paths in the
|
||||
@@ -82,17 +110,11 @@ void get_metadata(void);
|
||||
void debugprint(void);
|
||||
void debugdump(void);
|
||||
|
||||
|
||||
/*
|
||||
* Should we use PORTD or PORTB? (default is PORTB)
|
||||
* PORTD support with triggers seems to work but needs more testing.
|
||||
*/
|
||||
//#define USE_PORTD 1
|
||||
#if defined(USE_PORTD)
|
||||
#define SHIFTBITS 2
|
||||
#elif defined(__AVR_ATmega32U4__)
|
||||
#define SHIFTBITS 1
|
||||
#endif
|
||||
#define USE_PORTD 1
|
||||
|
||||
/*
|
||||
* Arduino device profile: ols.profile-agla.cfg
|
||||
@@ -119,15 +141,6 @@ void debugdump(void);
|
||||
#define CHAN5 7
|
||||
#else
|
||||
#define CHANPIN PINB
|
||||
#if defined(__AVR_ATmega32U4__)
|
||||
#define CHAN0 SCK
|
||||
#define CHAN1 MOSI
|
||||
#define CHAN2 MISO
|
||||
#define CHAN3 8
|
||||
#define CHAN4 9
|
||||
#define CHAN5 10
|
||||
#define CHAN6 11
|
||||
#else
|
||||
#define CHAN0 8
|
||||
#define CHAN1 9
|
||||
#define CHAN2 10
|
||||
@@ -135,9 +148,8 @@ void debugdump(void);
|
||||
#define CHAN4 12
|
||||
/* Comment out CHAN5 if you don't want to use the LED pin for an input */
|
||||
#define CHAN5 13
|
||||
#endif /* AVR_ATmega32U4 */
|
||||
#endif /* USE_PORTD */
|
||||
#endif /* Mega1280 or Mega2560 */
|
||||
#endif
|
||||
#define ledPin 13
|
||||
|
||||
/* XON/XOFF are not supported. */
|
||||
@@ -169,9 +181,6 @@ void debugdump(void);
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
#define DEBUG_CAPTURE_SIZE 7168
|
||||
#define CAPTURE_SIZE 7168
|
||||
#elif defined(__AVR_ATmega32U4__)
|
||||
#define DEBUG_CAPTURE_SIZE 1536
|
||||
#define CAPTURE_SIZE 1536
|
||||
#elif defined(__AVR_ATmega328P__)
|
||||
#define DEBUG_CAPTURE_SIZE 1024
|
||||
#define CAPTURE_SIZE 1024
|
||||
@@ -220,13 +229,29 @@ unsigned int delayTime = 0;
|
||||
unsigned long divider = 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()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
while (!Serial) {
|
||||
; // wait for serial port to connect. Needed for Leonardo only
|
||||
}
|
||||
|
||||
// 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.
|
||||
@@ -237,218 +262,199 @@ void setup()
|
||||
DEBUG_ENABLE; /* debug measurement pin */
|
||||
|
||||
pinMode(CHAN0, INPUT);
|
||||
digitalWrite(CHAN0, LOW);
|
||||
pinMode(CHAN1, INPUT);
|
||||
digitalWrite(CHAN1, LOW);
|
||||
pinMode(CHAN2, INPUT);
|
||||
digitalWrite(CHAN2, LOW);
|
||||
pinMode(CHAN3, INPUT);
|
||||
digitalWrite(CHAN3, LOW);
|
||||
pinMode(CHAN4, INPUT);
|
||||
digitalWrite(CHAN4, LOW);
|
||||
#ifdef CHAN5
|
||||
pinMode(CHAN5, INPUT);
|
||||
digitalWrite(CHAN5, LOW);
|
||||
#endif
|
||||
#ifdef CHAN6
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
pinMode(CHAN6, INPUT);
|
||||
#endif
|
||||
#ifdef CHAN7
|
||||
digitalWrite(CHAN6, LOW);
|
||||
pinMode(CHAN7, INPUT);
|
||||
#endif
|
||||
digitalWrite(CHAN7, LOW);
|
||||
#else
|
||||
#ifndef CHAN5
|
||||
pinMode(ledPin, OUTPUT);
|
||||
#endif
|
||||
|
||||
#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 /* Mega */
|
||||
}
|
||||
|
||||
void loop()
|
||||
{
|
||||
int i;
|
||||
|
||||
if (Serial.available() > 0) {
|
||||
cmdByte = Serial.read();
|
||||
switch(cmdByte) {
|
||||
case SUMP_RESET:
|
||||
/*
|
||||
// listen for incoming clients
|
||||
client = server.available();
|
||||
if (client) {
|
||||
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
|
||||
* 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');
|
||||
break;
|
||||
case SUMP_ARM:
|
||||
/*
|
||||
* 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. */
|
||||
client.write('1');
|
||||
client.write('A');
|
||||
client.write('L');
|
||||
client.write('S');
|
||||
break;
|
||||
case SUMP_ARM:
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
/*
|
||||
* 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
|
||||
* 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_ATmega168P__)
|
||||
captureInline2mhz();
|
||||
#endif
|
||||
}
|
||||
else if (useMicro) {
|
||||
if (trigger && (delayTime != 1)) {
|
||||
triggerMicro();
|
||||
}
|
||||
else {
|
||||
captureMicro();
|
||||
}
|
||||
}
|
||||
else {
|
||||
captureMilli();
|
||||
}
|
||||
break;
|
||||
case SUMP_TRIGGER_MASK:
|
||||
/*
|
||||
* 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 (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
|
||||
* we can just use it directly as our trigger mask.
|
||||
*/
|
||||
getCmd();
|
||||
#ifdef SHIFTBITS
|
||||
trigger = cmdBytes[0] << SHIFTBITS;
|
||||
* we can just use it directly as our trigger mask.
|
||||
*/
|
||||
getCmd();
|
||||
#ifdef USE_PORTD
|
||||
trigger = cmdBytes[0] << 2;
|
||||
#else
|
||||
trigger = cmdBytes[0];
|
||||
trigger = cmdBytes[0];
|
||||
#endif
|
||||
break;
|
||||
case SUMP_TRIGGER_VALUES:
|
||||
/*
|
||||
break;
|
||||
case SUMP_TRIGGER_VALUES:
|
||||
/*
|
||||
* 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 SHIFTBITS
|
||||
trigger_values = cmdBytes[0] << SHIFTBITS;
|
||||
* 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];
|
||||
trigger_values = cmdBytes[0];
|
||||
#endif
|
||||
break;
|
||||
case SUMP_TRIGGER_CONFIG:
|
||||
/* read the rest of the command bytes, but ignore them. */
|
||||
getCmd();
|
||||
break;
|
||||
case SUMP_SET_DIVIDER:
|
||||
/*
|
||||
break;
|
||||
case SUMP_TRIGGER_CONFIG:
|
||||
/* read the rest of the command bytes, but ignore them. */
|
||||
getCmd();
|
||||
break;
|
||||
case SUMP_SET_DIVIDER:
|
||||
/*
|
||||
* the shifting needs to be done on the 32bit unsigned long variable
|
||||
* so that << 16 doesn't end up as zero.
|
||||
*/
|
||||
getCmd();
|
||||
divider = cmdBytes[2];
|
||||
divider = divider << 8;
|
||||
divider += cmdBytes[1];
|
||||
divider = divider << 8;
|
||||
divider += cmdBytes[0];
|
||||
setupDelay();
|
||||
break;
|
||||
case SUMP_SET_READ_DELAY_COUNT:
|
||||
/*
|
||||
* so that << 16 doesn't end up as zero.
|
||||
*/
|
||||
getCmd();
|
||||
divider = cmdBytes[2];
|
||||
divider = divider << 8;
|
||||
divider += cmdBytes[1];
|
||||
divider = divider << 8;
|
||||
divider += cmdBytes[0];
|
||||
setupDelay();
|
||||
break;
|
||||
case SUMP_SET_READ_DELAY_COUNT:
|
||||
/*
|
||||
* 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
|
||||
* for example if readCount == delayCount then we should
|
||||
* return all samples starting from the trigger point.
|
||||
* if delayCount < readCount we return (readCount - delayCount) of
|
||||
* samples from before the trigger fired.
|
||||
*/
|
||||
getCmd();
|
||||
readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
|
||||
if (readCount > MAX_CAPTURE_SIZE)
|
||||
readCount = MAX_CAPTURE_SIZE;
|
||||
delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
|
||||
if (delayCount > MAX_CAPTURE_SIZE)
|
||||
delayCount = MAX_CAPTURE_SIZE;
|
||||
break;
|
||||
case SUMP_SET_FLAGS:
|
||||
/* read the rest of the command bytes and check if RLE is enabled. */
|
||||
getCmd();
|
||||
rleEnabled = ((cmdBytes[1] & B1000000) != 0);
|
||||
break;
|
||||
case SUMP_GET_METADATA:
|
||||
/*
|
||||
* 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
|
||||
* for example if readCount == delayCount then we should
|
||||
* return all samples starting from the trigger point.
|
||||
* if delayCount < readCount we return (readCount - delayCount) of
|
||||
* samples from before the trigger fired.
|
||||
*/
|
||||
getCmd();
|
||||
readCount = 4 * (((cmdBytes[1] << 8) | cmdBytes[0]) + 1);
|
||||
if (readCount > MAX_CAPTURE_SIZE)
|
||||
readCount = MAX_CAPTURE_SIZE;
|
||||
delayCount = 4 * (((cmdBytes[3] << 8) | cmdBytes[2]) + 1);
|
||||
if (delayCount > MAX_CAPTURE_SIZE)
|
||||
delayCount = MAX_CAPTURE_SIZE;
|
||||
break;
|
||||
case SUMP_SET_FLAGS:
|
||||
/* read the rest of the command bytes and check if RLE is enabled. */
|
||||
getCmd();
|
||||
rleEnabled = ((cmdBytes[1] & B1000000) != 0);
|
||||
break;
|
||||
case SUMP_GET_METADATA:
|
||||
/*
|
||||
* We return a description of our capabilities.
|
||||
* Check the function's comments below.
|
||||
*/
|
||||
get_metadata();
|
||||
break;
|
||||
case SUMP_SELF_TEST:
|
||||
/* ignored. */
|
||||
break;
|
||||
* Check the function's comments below.
|
||||
*/
|
||||
get_metadata();
|
||||
break;
|
||||
case SUMP_SELF_TEST:
|
||||
/* ignored. */
|
||||
break;
|
||||
#ifdef DEBUG
|
||||
/*
|
||||
/*
|
||||
* a couple of debug commands used during development.
|
||||
*/
|
||||
case '0':
|
||||
/*
|
||||
*/
|
||||
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':
|
||||
/*
|
||||
* 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':
|
||||
/*
|
||||
* 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;
|
||||
*/
|
||||
debugdump();
|
||||
break;
|
||||
#endif /* DEBUG */
|
||||
default:
|
||||
/* ignore any unrecognized bytes. */
|
||||
break;
|
||||
}
|
||||
}
|
||||
default:
|
||||
/* ignore any unrecognized bytes. */
|
||||
break;
|
||||
} /* switch */
|
||||
} /* if client.available() */
|
||||
} /* while */
|
||||
delay(1);
|
||||
client.stop();
|
||||
Serial.println("client disconnected?");
|
||||
} /* if client */
|
||||
}
|
||||
|
||||
void blinkled() {
|
||||
@@ -467,10 +473,10 @@ void blinkled() {
|
||||
*/
|
||||
void getCmd() {
|
||||
delay(10);
|
||||
cmdBytes[0] = Serial.read();
|
||||
cmdBytes[1] = Serial.read();
|
||||
cmdBytes[2] = Serial.read();
|
||||
cmdBytes[3] = Serial.read();
|
||||
cmdBytes[0] = client.read();
|
||||
cmdBytes[1] = client.read();
|
||||
cmdBytes[2] = client.read();
|
||||
cmdBytes[3] = client.read();
|
||||
|
||||
#ifdef DEBUG
|
||||
if (savecount < 120 ) {
|
||||
@@ -500,7 +506,7 @@ void getCmd() {
|
||||
*/
|
||||
|
||||
void captureMicro() {
|
||||
unsigned int i;
|
||||
int i;
|
||||
|
||||
/*
|
||||
* basic trigger, wait until all trigger conditions are met on port.
|
||||
@@ -525,7 +531,6 @@ void captureMicro() {
|
||||
* Arduino digital pin 8 is being used here.
|
||||
*/
|
||||
DEBUG_ENABLE;
|
||||
#ifdef DEBUG
|
||||
DEBUG_ON;
|
||||
delayMicroseconds(20);
|
||||
DEBUG_OFF;
|
||||
@@ -534,7 +539,6 @@ void captureMicro() {
|
||||
delayMicroseconds(20);
|
||||
DEBUG_OFF;
|
||||
delayMicroseconds(20);
|
||||
#endif
|
||||
|
||||
if (delayTime == 1) {
|
||||
/*
|
||||
@@ -590,10 +594,10 @@ void captureMicro() {
|
||||
* is done for any triggers, this is effectively the 0/100 buffer split.
|
||||
*/
|
||||
for (i = 0 ; i < readCount; i++) {
|
||||
#ifdef SHIFTBITS
|
||||
Serial.write(logicdata[i] >> SHIFTBITS);
|
||||
#ifdef USE_PORTD
|
||||
client.write(logicdata[i] >> 2);
|
||||
#else
|
||||
Serial.write(logicdata[i]);
|
||||
client.write(logicdata[i]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -616,7 +620,7 @@ void captureMicro() {
|
||||
* this basic functionality.
|
||||
*/
|
||||
void captureMilli() {
|
||||
unsigned int i = 0;
|
||||
int i = 0;
|
||||
|
||||
if(rleEnabled) {
|
||||
/*
|
||||
@@ -665,10 +669,10 @@ void captureMilli() {
|
||||
}
|
||||
}
|
||||
for (i = 0 ; i < readCount; i++) {
|
||||
#ifdef SHIFTBITS
|
||||
Serial.write(logicdata[i] >> SHIFTBITS);
|
||||
#ifdef USE_PORTD
|
||||
client.write(logicdata[i] >> 2);
|
||||
#else
|
||||
Serial.write(logicdata[i]);
|
||||
client.write(logicdata[i]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -682,7 +686,7 @@ void captureMilli() {
|
||||
*
|
||||
*/
|
||||
void triggerMicro() {
|
||||
unsigned int i = 0;
|
||||
int i = 0;
|
||||
|
||||
logicIndex = 0;
|
||||
triggerIndex = 0;
|
||||
@@ -702,7 +706,6 @@ void triggerMicro() {
|
||||
* Arduino digital pin 8 is being used here.
|
||||
*/
|
||||
DEBUG_ENABLE;
|
||||
#ifdef DEBUG
|
||||
DEBUG_ON;
|
||||
delayMicroseconds(20);
|
||||
DEBUG_OFF;
|
||||
@@ -711,7 +714,6 @@ void triggerMicro() {
|
||||
delayMicroseconds(20);
|
||||
DEBUG_OFF;
|
||||
delayMicroseconds(20);
|
||||
#endif
|
||||
|
||||
if (delayTime == 1) {
|
||||
/*
|
||||
@@ -859,10 +861,10 @@ void triggerMicro() {
|
||||
if (logicIndex >= readCount) {
|
||||
logicIndex = 0;
|
||||
}
|
||||
#ifdef SHIFTBITS
|
||||
Serial.write(logicdata[logicIndex++] >> SHIFTBITS);
|
||||
#ifdef USE_PORTD
|
||||
client.write(logicdata[logicIndex++] >> 2);
|
||||
#else
|
||||
Serial.write(logicdata[logicIndex++]);
|
||||
client.write(logicdata[logicIndex++]);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -899,75 +901,69 @@ void setupDelay() {
|
||||
*/
|
||||
void get_metadata() {
|
||||
/* device name */
|
||||
Serial.write((uint8_t)0x01);
|
||||
Serial.write('A');
|
||||
Serial.write('G');
|
||||
Serial.write('L');
|
||||
Serial.write('A');
|
||||
client.write((uint8_t)0x01);
|
||||
client.write('A');
|
||||
client.write('G');
|
||||
client.write('L');
|
||||
client.write('A');
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
Serial.write('M');
|
||||
#elif defined(__AVR_ATmega32U4__)
|
||||
Serial.write('L');
|
||||
client.write('M');
|
||||
#endif /* Mega */
|
||||
Serial.write('v');
|
||||
Serial.write('0');
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write('v');
|
||||
client.write('0');
|
||||
client.write((uint8_t)0x00);
|
||||
|
||||
/* firmware version */
|
||||
Serial.write((uint8_t)0x02);
|
||||
Serial.write('0');
|
||||
Serial.write('.');
|
||||
Serial.write('1');
|
||||
Serial.write('2');
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x02);
|
||||
client.write('0');
|
||||
client.write('.');
|
||||
client.write('0');
|
||||
client.write('9');
|
||||
client.write((uint8_t)0x00);
|
||||
|
||||
/* sample memory */
|
||||
Serial.write((uint8_t)0x21);
|
||||
Serial.write((uint8_t)0x00);
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x21);
|
||||
client.write((uint8_t)0x00);
|
||||
client.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_ATmega32U4__)
|
||||
/* 1024 bytes */
|
||||
Serial.write((uint8_t)0x04);
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x1C);
|
||||
client.write((uint8_t)0x00);
|
||||
#elif defined(__AVR_ATmega328P__)
|
||||
/* 1024 bytes */
|
||||
Serial.write((uint8_t)0x04);
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x04);
|
||||
client.write((uint8_t)0x00);
|
||||
#else
|
||||
/* 532 bytes */
|
||||
Serial.write((uint8_t)0x02);
|
||||
Serial.write((uint8_t)0x14);
|
||||
client.write((uint8_t)0x02);
|
||||
client.write((uint8_t)0x14);
|
||||
#endif /* Mega */
|
||||
|
||||
/* 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);
|
||||
/* sample rate (1MHz) */
|
||||
client.write((uint8_t)0x23);
|
||||
client.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x0F);
|
||||
client.write((uint8_t)0x42);
|
||||
client.write((uint8_t)0x40);
|
||||
|
||||
/* number of probes (6 by default on Arduino, 8 on Mega) */
|
||||
Serial.write((uint8_t)0x40);
|
||||
#ifdef CHAN7
|
||||
Serial.write((uint8_t)0x08);
|
||||
#elif CHAN6
|
||||
Serial.write((uint8_t)0x07);
|
||||
#elif CHAN5
|
||||
Serial.write((uint8_t)0x06);
|
||||
client.write((uint8_t)0x40);
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
client.write((uint8_t)0x08);
|
||||
#else
|
||||
Serial.write((uint8_t)0x05);
|
||||
#endif
|
||||
#ifdef CHAN5
|
||||
client.write((uint8_t)0x06);
|
||||
#else
|
||||
client.write((uint8_t)0x05);
|
||||
#endif /* CHAN5 */
|
||||
#endif /* Mega */
|
||||
|
||||
/* protocol version (2) */
|
||||
Serial.write((uint8_t)0x41);
|
||||
Serial.write((uint8_t)0x02);
|
||||
client.write((uint8_t)0x41);
|
||||
client.write((uint8_t)0x02);
|
||||
|
||||
/* end of data */
|
||||
Serial.write((uint8_t)0x00);
|
||||
client.write((uint8_t)0x00);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -980,36 +976,36 @@ void debugprint() {
|
||||
int i;
|
||||
|
||||
#if 0
|
||||
Serial.print("divider = ");
|
||||
Serial.println(divider, DEC);
|
||||
Serial.print("delayTime = ");
|
||||
Serial.println(delayTime, DEC);
|
||||
Serial.print("trigger_values = ");
|
||||
Serial.println(trigger_values, BIN);
|
||||
client.print("divider = ");
|
||||
client.println(divider, DEC);
|
||||
client.print("delayTime = ");
|
||||
client.println(delayTime, DEC);
|
||||
client.print("trigger_values = ");
|
||||
client.println(trigger_values, BIN);
|
||||
#endif
|
||||
Serial.print("readCount = ");
|
||||
Serial.println(readCount, DEC);
|
||||
Serial.print("delayCount = ");
|
||||
Serial.println(delayCount, DEC);
|
||||
Serial.print("logicIndex = ");
|
||||
Serial.println(logicIndex, DEC);
|
||||
Serial.print("triggerIndex = ");
|
||||
Serial.println(triggerIndex, DEC);
|
||||
Serial.print("rleEnabled = ");
|
||||
Serial.println(rleEnabled, DEC);
|
||||
client.print("readCount = ");
|
||||
client.println(readCount, DEC);
|
||||
client.print("delayCount = ");
|
||||
client.println(delayCount, DEC);
|
||||
client.print("logicIndex = ");
|
||||
client.println(logicIndex, DEC);
|
||||
client.print("triggerIndex = ");
|
||||
client.println(triggerIndex, DEC);
|
||||
client.print("rleEnabled = ");
|
||||
client.println(rleEnabled, DEC);
|
||||
|
||||
Serial.println("Bytes:");
|
||||
client.println("Bytes:");
|
||||
|
||||
for (i = 0 ; i < savecount; i++) {
|
||||
if (savebytes[i] == 0x20) {
|
||||
Serial.println();
|
||||
client.println();
|
||||
}
|
||||
else {
|
||||
Serial.print(savebytes[i], HEX);
|
||||
Serial.write(' ');
|
||||
client.print(savebytes[i], HEX);
|
||||
client.write(' ');
|
||||
}
|
||||
}
|
||||
Serial.println("done...");
|
||||
client.println("done...");
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1020,17 +1016,17 @@ void debugdump() {
|
||||
int i;
|
||||
int j = 1;
|
||||
|
||||
Serial.print("\r\n");
|
||||
client.print("\r\n");
|
||||
|
||||
for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
|
||||
#ifdef SHIFTBITS
|
||||
Serial.print(logicdata[i] >> SHIFTBITS, HEX);
|
||||
#ifdef USE_PORTD
|
||||
client.print(logicdata[i] >> 2, HEX);
|
||||
#else
|
||||
Serial.print(logicdata[i], HEX);
|
||||
client.print(logicdata[i], HEX);
|
||||
#endif
|
||||
Serial.print(" ");
|
||||
client.print(" ");
|
||||
if (j == 32) {
|
||||
Serial.print("\r\n");
|
||||
client.print("\r\n");
|
||||
j = 0;
|
||||
}
|
||||
j++;
|
||||
@@ -1045,8 +1041,3 @@ void debugdump() {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -11,7 +11,7 @@ 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
|
||||
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
|
||||
@@ -39,7 +39,7 @@ 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
|
||||
device.open.portdelay = 1500
|
||||
# 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)
|
||||
|
||||
@@ -11,7 +11,7 @@ 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
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user