From 9c83897b9bedf8fbad0d54ce8043a99eb08c140b Mon Sep 17 00:00:00 2001
From: Andrew Gillham <gillham@roadsign.com>
Date: Fri, 6 Sep 2013 09:54:41 -0700
Subject: [PATCH] Correct preprocessor logic to avoid data gap on the Mega.

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
---
 README                         | 2 +-
 logic_analyzer.ino             | 4 ++--
 logic_analyzer_inline_2mhz.ino | 5 +++--
 logic_analyzer_inline_4mhz.ino | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README b/README
index a34bd23..8bdbc57 100644
--- a/README
+++ b/README
@@ -60,5 +60,5 @@ Please try it out and report back.
 This master branch now supports Arduino 1.0 only.
 Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
 
-Release: v0.11 August 3, 2013.
+Release: v0.12 September 6, 2013.
 
diff --git a/logic_analyzer.ino b/logic_analyzer.ino
index f08cdf3..a4bf467 100644
--- a/logic_analyzer.ino
+++ b/logic_analyzer.ino
@@ -78,7 +78,7 @@
  * until after the trigger fires.
  * 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('.');
   Serial.write('1');
-  Serial.write('1');
+  Serial.write('2');
   Serial.write((uint8_t)0x00);
 
   /* sample memory */
diff --git a/logic_analyzer_inline_2mhz.ino b/logic_analyzer_inline_2mhz.ino
index 1a6e201..4226828 100644
--- a/logic_analyzer_inline_2mhz.ino
+++ b/logic_analyzer_inline_2mhz.ino
@@ -1154,7 +1154,7 @@ void captureInline2mhz() {
   INLINE_NOP;
   logicdata[531] = CHANPIN;
   INLINE_NOP;
-#if defined(__AVR_ATmega328P__)
+#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   logicdata[532] = CHANPIN;
   INLINE_NOP;
   logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline2mhz() {
   INLINE_NOP;
   logicdata[1023] = CHANPIN;
   INLINE_NOP;
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
+#endif
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
   logicdata[1024] = CHANPIN;
   INLINE_NOP;
   logicdata[1025] = CHANPIN;
diff --git a/logic_analyzer_inline_4mhz.ino b/logic_analyzer_inline_4mhz.ino
index 245aca2..c67b71e 100644
--- a/logic_analyzer_inline_4mhz.ino
+++ b/logic_analyzer_inline_4mhz.ino
@@ -1154,7 +1154,7 @@ void captureInline4mhz() {
   INLINE_NOP;
   logicdata[531] = CHANPIN;
   INLINE_NOP;
-#if defined(__AVR_ATmega328P__)
+#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   logicdata[532] = CHANPIN;
   INLINE_NOP;
   logicdata[533] = CHANPIN;
@@ -2139,7 +2139,8 @@ void captureInline4mhz() {
   INLINE_NOP;
   logicdata[1023] = CHANPIN;
   INLINE_NOP;
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
+#endif
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) 
   logicdata[1024] = CHANPIN;
   INLINE_NOP;
   logicdata[1025] = CHANPIN;