From cedcd4b685ee061eb5ecb63ca474c64ccb61efac Mon Sep 17 00:00:00 2001 From: Andrew Gillham Date: Fri, 4 Nov 2011 17:34:44 -0700 Subject: [PATCH] Revert c923ff1a0c8f512be1012a3c3925869505dbc53b^..HEAD --- README | 2 +- logic_analyzer.pde | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README b/README index 26c6d36..0e6e299 100644 --- a/README +++ b/README @@ -48,5 +48,5 @@ 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. -Release: v0.05 November 4, 2011. +Release: v0.04 August 3, 2011. diff --git a/logic_analyzer.pde b/logic_analyzer.pde index a7dde73..562d054 100644 --- a/logic_analyzer.pde +++ b/logic_analyzer.pde @@ -67,7 +67,7 @@ * Sampling rate: 1MHz (or lower) * Channel Groups: 0 (zero) only * Recording Size: - * ATmega168: 532 (or lower) + * ATmega186: 532 (or lower) * ATmega328: 1024 (or lower) * ATmega2560: 7168 (or lower) * Noise Filter: doesn't matter @@ -78,7 +78,7 @@ * until after the trigger fires. * Please try it out and report back. * - * Release: v0.05 November 4, 2011. + * Release: v0.04 August 3, 2011. * */ @@ -147,7 +147,7 @@ void debugdump(void); #define SUMP_SELF_TEST 0x03 #define SUMP_GET_METADATA 0x04 -/* ATmega168: 532 (or lower) +/* ATmega186: 532 (or lower) * ATmega328: 1024 (or lower) * ATmega2560: 7168 (or lower) */ @@ -776,23 +776,16 @@ void get_metadata() { Serial.print('0', BYTE); Serial.print(0x00, BYTE); - /* sample memory */ + /* sample memory (1024) */ Serial.print(0x21, BYTE); Serial.print(0x00, BYTE); Serial.print(0x00, BYTE); #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) - /* 7168 bytes */ Serial.print(0x1C, BYTE); - Serial.print(0x00, BYTE); -#elif defined(__AVR_ATmega328__) - /* 1024 bytes */ - Serial.print(0x04, BYTE); - Serial.print(0x00, BYTE); #else - /* 532 bytes */ - Serial.print(0x02, BYTE); - Serial.print(0x14, BYTE); + Serial.print(0x04, BYTE); #endif /* Mega */ + Serial.print(0x00, BYTE); /* sample rate (1MHz) */ Serial.print(0x23, BYTE);