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

Correct preprocessor logic to avoid data gap on the Mega.

Browse Source 
Fixes issue #14 where I copied the preprocessor logic from a different
Mega related check and didn't fix up the elif.  So samples from 512 -
1023 were always zero on the Mega.
Update to v0.12
This commit is contained in:
Andrew Gillham
2013-09-06 09:54:41 -07:00
parent 2a549be57a
commit 9c83897b9b
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -60,5 +60,5 @@ Please try it out and report back.
This master branch now supports Arduino 1.0 only. This master branch now supports Arduino 1.0 only.
Checkout branch logic_analyzer_v0_5 for Arduino 22 support. Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
Release: v0.11 August 3, 2013. Release: v0.12 September 6, 2013.

4
logic_analyzer.ino
View File

@@ -78,7 +78,7 @@
* 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.11 August 3, 2013. * Release: v0.12 September 6, 2013.
* *
*/ */
@@ -907,7 +907,7 @@ void get_metadata() {
Serial.write('0'); Serial.write('0');
Serial.write('.'); Serial.write('.');
Serial.write('1'); Serial.write('1');
Serial.write('1'); Serial.write('2');
Serial.write((uint8_t)0x00); Serial.write((uint8_t)0x00);
/* sample memory */ /* sample memory */

5
logic_analyzer_inline_2mhz.ino
View File

@@ -1154,7 +1154,7 @@ void captureInline2mhz() {
INLINE_NOP; INLINE_NOP;
logicdata[531] = CHANPIN; logicdata[531] = CHANPIN;
INLINE_NOP; INLINE_NOP;
#if defined(__AVR_ATmega328P__) #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
logicdata[532] = CHANPIN; logicdata[532] = CHANPIN;
INLINE_NOP; INLINE_NOP;
logicdata[533] = CHANPIN; logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline2mhz() {
INLINE_NOP; INLINE_NOP;
logicdata[1023] = CHANPIN; logicdata[1023] = CHANPIN;
INLINE_NOP; INLINE_NOP;
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
logicdata[1024] = CHANPIN; logicdata[1024] = CHANPIN;
INLINE_NOP; INLINE_NOP;
logicdata[1025] = CHANPIN; logicdata[1025] = CHANPIN;

5
logic_analyzer_inline_4mhz.ino
View File

@@ -1154,7 +1154,7 @@ void captureInline4mhz() {
INLINE_NOP; INLINE_NOP;
logicdata[531] = CHANPIN; logicdata[531] = CHANPIN;
INLINE_NOP; INLINE_NOP;
#if defined(__AVR_ATmega328P__) #if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
logicdata[532] = CHANPIN; logicdata[532] = CHANPIN;
INLINE_NOP; INLINE_NOP;
logicdata[533] = CHANPIN; logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline4mhz() {
INLINE_NOP; INLINE_NOP;
logicdata[1023] = CHANPIN; logicdata[1023] = CHANPIN;
INLINE_NOP; INLINE_NOP;
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
logicdata[1024] = CHANPIN; logicdata[1024] = CHANPIN;
INLINE_NOP; INLINE_NOP;
logicdata[1025] = CHANPIN; logicdata[1025] = CHANPIN;