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_3
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

30 Commits
agla_v0_3 ... 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
Andrew Gillham
17d2a1a15f Bump metadata for version 0.09 2013-06-22 19:22:35 -07:00
Andrew Gillham
0a40fdb2ac Update comment to reflect that PORTD seems to work, but needs testing. 
I'm still working on PORTD triggers.  I'm not yet satisfied they are
working 100% correctly.
 2013-06-22 11:33:29 -07:00
Andrew Gillham
1f7eb0aecd Add missing shift for PORTD trigger. 2013-06-22 11:30:39 -07:00
Andrew Gillham
dc3d85abf7 Revert to PORTB (Arduino pins 8-13) and make PORTD a configuration option. 
Triggers are more reliable on PORTB.  I am working on fixing triggers
on PORTD, but I'm setting this back to original behavior (with a
#define USE_PORTD available) so this isn't broken for triggering.
 2013-06-22 11:17:06 -07:00
Andrew Gillham
240ebc134c Update to v0.08 and add note about channels changes. 2013-02-08 17:06:23 -08:00
Andrew Gillham
396a3ccfa5 Switch to 6 channels on PORTD. 
Switch from PORTB to PORTD so that a full 6 channels can be used
without messing with the LED.  Per suggestion in issue #7.  I was
unable to find any issues with using PORTB.  During initial development
I ran into some noise & stability issues but I believe those were
solved later via allowing the ports to settle prior to beginning
sampling.
This allows for 6 channels, starting with digital pin 2 (next to the
UART TX pin) and ending at digital pin 7.
The debug pin is now digital pin 8.
 2013-02-08 17:02:18 -08:00
Andrew Gillham
864ae2c826 Implement RLE mode for 50Hz or lower sample rates. (via hhermsen in issue #9) 
Support RLE mode for samples rates of 50Hz or less.  Code from hhermsen
in issue #9.
This is a work in progress.  Hopefully RLE can be added for higher
sample rates in the future.
 2013-02-08 14:31:05 -08:00
Andrew Gillham
445dac179c Update copyright year. 2013-02-08 13:16:39 -08:00
Andrew Gillham
0f81002bde Update firmware version to v0.07 in metadata. 2013-02-08 12:43:28 -08:00
Andrew Gillham
fb3aca55a0 Bump to v0.07 2013-02-08 12:42:29 -08:00
Andrew Gillham
851b7e0735 Add firmware version to metadata 
Return the firmware version to the Logic Sniffer extended SUMP protocol
metadata request.  Now you can see what version is loaded on your
device.
 2013-02-08 12:41:26 -08:00
Andrew Gillham
b1a43e57c7 Update device profile clockspeed. 
The Mega also runs as 16MHz so update device.clockspeed to match.
 2013-01-28 11:15:16 -08:00
Andrew Gillham
1f418098b2 Update device profile clockspeed & portdelay. 
Set clock speed to 16MHz.  Hopefully this value works fine with the
client since the previous 100MHz was not the actual clockspeed anyway.
Also, adjust the device.open.portdelay to 1500ms.  People can test
their own device for the fastest value, but this should be a safer
default for most people and hopefully eliminates som frustration for
first time users.
 2013-01-28 11:12:07 -08:00
Andrew Gillham
34aea7435d Update device profiles. 
Add the 'device.receive.timeout' values required by the latest
LogicSniffer client application.
 2013-01-28 10:58:23 -08:00
Andrew Gillham
f51d0bbb96 Improve pre-trigger sampling on below 500kHz sample rates. 
The sample loop was not padded properly in the loop waiting for the
trigger to fire. As a result it was sampling at a much higher rate than
the post trigger sample rate.  I've added some delays and padded it out
a bit, it needs further measurement, but is usable now.
 2012-02-27 14:36:17 -08:00
gillham
3a6329775c Merge pull request #3 from scottp/master 
Correct long standing bug in the device profiles on github where the data was being reversed by the client due to the reverseOrder setting.  The sketch returns the data in the sampled order, but the client appears to expect it reversed, so the sense of the setting is backwards. Data is in the correct order based on a simple test program, even though the setting is "wrong".  Invert the comment as well.  Also increase the delay on the Mega as it doesn't always respond fast enough. Patches from scottp.
 2012-02-27 12:27:45 -08:00
Scott Penrose
3c69ec10a1 ols.profile-*: Reverse IO order received in config 
Fixed reverseOrder and comments

As per this post:
http://dangerousprototypes.com/forum/viewtopic.php?f=57&t=2432

The comment talking about device.samples.reverseOrder is reversed. I have
fixed the order and the comment and tested.
 2012-02-03 15:57:04 +11:00
Scott Penrose
7173e83e14 ols.profile-aglam.cfg: Increased delay time 
On testing a number of Arduino Mega boards, I found the device missing error.
Now it seems to be always working if you set it to 2000.
 2012-02-03 15:55:24 +11:00
Andrew Gillham
5ec7aa1b51 Fix ATmega168 comment. 2011-11-04 18:30:31 -07:00
Andrew Gillham
ebbc1fb945 Update to v0.06 supporting Arduino 1.0 only. 2011-11-04 18:22:35 -07:00
Andrew Gillham
bc32e9fde6 Update for Arduino 1.0 support. 
Change file extension to .ino Change Serial.print(x, BYTE) to
Serial.write(x)
 2011-11-04 18:19:59 -07:00
Andrew Gillham
6396054c16 Update for Arduino 1.0 support. 
Change file extension to .ino Change Serial.print(x, BYTE) to
Serial.write(x)
 2011-11-04 18:18:35 -07:00
Andrew Gillham
d8cd29d86a Revert "Revert c923ff1a0c8f512be1012a3c3925869505dbc53b^..HEAD" 
This reverts commit cedcd4b685.
 2011-11-04 17:38:28 -07:00
Andrew Gillham
cedcd4b685 Revert c923ff1a0c8f512be1012a3c3925869505dbc53b^..HEAD 2011-11-04 17:34:44 -07:00
Andrew Gillham
6ebd1c5b06 Update for release v0.05 2011-11-04 17:32:56 -07:00
Andrew Gillham
9f688ff112 Update for ATmega168 support. 
Correct previous '186' typo and adjust metadata to reflect 532 byte
buffer on the ATmega168.
 2011-11-04 17:30:07 -07:00
gillham
035873cc81 Merge pull request #2 from aaronmueller/master 
Support for ATmega186
 2011-11-04 17:12:57 -07:00
Aaron Mueller
6a05cd22ea Add support for the Arduino Duemilanove (ATmega186) 
The maximum recording size is 532 for this ATmega186-20PU.
 2011-10-11 19:41:22 +02:00
Andrew Gillham
c923ff1a0c Initial Arduino Mega support. 
The Arduino Mega 2560 is now supported in addition to the regular
Arduino.  The Mega supports 8 channels and 7k samples. The ols.profile-*
files are device profiles for the alternative SUMP client. 'AGLA' =
Arduino 'AGLAM' = Arduino Mega
 2011-08-03 19:35:40 -07:00
4 changed files with 577 additions and 274 deletions
Expand all files Collapse all files

27
README
View File

@@ -1,6 +1,9 @@
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/
@@ -12,19 +15,34 @@ 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.
Pins 22-29 (Port A) are used by default, you can change the 'CHANPIN' below
if something else works better for you.
NOTE: 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 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, 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* 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 resistor between the reset & 5V piins. Make sure it is really
120 Ohm or you may damage your board. 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: 1MHz (or lower) Sampling rate: 1MHz (or lower)
Channel Groups: 0 (zero) only Channel Groups: 0 (zero) only
Recording Size: 1024 (or lower) Recording Size:
ATmega168: 532 (or lower)
ATmega328: 1024 (or lower)
ATmega2560: 7168 (or lower)
Noise Filter: doesn't matter Noise Filter: doesn't matter
RLE: disabled (unchecked) RLE: disabled (unchecked)
@@ -33,5 +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.
Release: v0.03 March 7, 2011. This master branch now supports Arduino 1.0 only.
Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
Release: v0.09 June 22, 2013.

757
logic_analyzer.pde → logic_analyzer.ino
View File

File diff suppressed because it is too large Load Diff

14
ols.profile-agla.cfg
View File

@@ -7,7 +7,7 @@ device.description = Arduino Generic Logic Analyzer
# The device interface, SERIAL only # The device interface, SERIAL only
device.interface = SERIAL device.interface = SERIAL
# The device's native clockspeed, in Hertz. # The device's native clockspeed, in Hertz.
device.clockspeed = 100000000 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
@@ -19,7 +19,7 @@ device.capturesizes = 64, 128, 256, 512, 1024
# Whether or not the noise filter is supported # Whether or not the noise filter is supported
device.feature.noisefilter = false device.feature.noisefilter = false
# Whether or not Run-Length encoding is supported # Whether or not Run-Length encoding is supported
device.feature.rle = false device.feature.rle = true
# Whether or not a testing mode is supported # Whether or not a testing mode is supported
device.feature.testmode = false device.feature.testmode = false
# Whether or not triggers are supported # Whether or not triggers are supported
@@ -30,7 +30,7 @@ device.trigger.stages = 1
device.trigger.complex = false device.trigger.complex = false
# The total number of channels usable for capturing # The total number of channels usable for capturing
device.channel.count = 5 device.channel.count = 6
# The number of channels groups, together with the channel count determines the channels per group # The number of channels groups, together with the channel count determines the channels per group
device.channel.groups = 1 device.channel.groups = 1
# Whether the capture size is limited by the enabled channel groups # Whether the capture size is limited by the enabled channel groups
@@ -39,13 +39,15 @@ 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 = 500 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) # Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
device.open.portdtr = true device.open.portdtr = true
# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names... # Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
device.metadata.keys = "AGLAv0" device.metadata.keys = "AGLAv0"
# In which order are samples sent back from the device? true = last sample first, false = first sample first # In which order are samples sent back from the device? false = last sample first, true = first sample first
device.samples.reverseOrder = false device.samples.reverseOrder = true
###EOF### ###EOF###

53
ols.profile-aglam.cfg Normal file
View File

@@ -0,0 +1,53 @@
# Configuration for Arduino Mega Logic Analyzer profile
# The short (single word) type of the device described in this profile
device.type = AGLAM
# A longer description of the device
device.description = Arduino Mega Logic Analyzer
# The device interface, SERIAL only
device.interface = SERIAL
# The device's native clockspeed, in Hertz.
device.clockspeed = 16000000
# Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
device.supports_ddr = false
# Supported sample rates in Hertz, separated by comma's
device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
# What capture clocks are supported
device.captureclock = INTERNAL
# The supported capture sizes, in bytes
device.capturesizes = 64, 128, 256, 512, 1024, 2048, 4096, 7168
# Whether or not the noise filter is supported
device.feature.noisefilter = false
# Whether or not Run-Length encoding is supported
device.feature.rle = false
# Whether or not a testing mode is supported
device.feature.testmode = false
# Whether or not triggers are supported
device.feature.triggers = true
# The number of trigger stages
device.trigger.stages = 1
# Whether or not "complex" triggers are supported
device.trigger.complex = false
# The total number of channels usable for capturing
device.channel.count = 8
# The number of channels groups, together with the channel count determines the channels per group
device.channel.groups = 1
# Whether the capture size is limited by the enabled channel groups
device.capturesize.bound = false
# Which numbering does the device support
device.channel.numberingschemes = DEFAULT
# Is a delay after opening the port and device detection needed? (0 = no delay, >0 = delay in milliseconds)
device.open.portdelay = 2000
# The receive timeout for the device (in milliseconds, 100 = default, <=0 = no timeout)
device.receive.timeout = 100
# Does the device need a high or low DTR-line to operate correctly? (high = true, low = false)
device.open.portdtr = true
# Which metadata keys correspond to this device profile? Value is a comma-separated list of (double quoted) names...
device.metadata.keys = "AGLAMv0"
# In which order are samples sent back from the device? false = last sample first, true = first sample first
device.samples.reverseOrder = true
###EOF###