Revert "Revert c923ff1a0c8f512be1012a3c3925869505dbc53b^..HEAD"

This reverts commit cedcd4b685.
This commit is contained in:
Andrew Gillham
2011-11-04 17:38:28 -07:00
parent cedcd4b685
commit d8cd29d86a
2 changed files with 15 additions and 8 deletions

2
README
View File

@@ -48,5 +48,5 @@ 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.04 August 3, 2011. Release: v0.05 November 4, 2011.

View File

@@ -67,7 +67,7 @@
* Sampling rate: 1MHz (or lower) * Sampling rate: 1MHz (or lower)
* Channel Groups: 0 (zero) only * Channel Groups: 0 (zero) only
* Recording Size: * Recording Size:
* ATmega186: 532 (or lower) * ATmega168: 532 (or lower)
* ATmega328: 1024 (or lower) * ATmega328: 1024 (or lower)
* ATmega2560: 7168 (or lower) * ATmega2560: 7168 (or lower)
* Noise Filter: doesn't matter * Noise Filter: doesn't matter
@@ -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.04 August 3, 2011. * Release: v0.05 November 4, 2011.
* *
*/ */
@@ -147,7 +147,7 @@ void debugdump(void);
#define SUMP_SELF_TEST 0x03 #define SUMP_SELF_TEST 0x03
#define SUMP_GET_METADATA 0x04 #define SUMP_GET_METADATA 0x04
/* ATmega186: 532 (or lower) /* ATmega168: 532 (or lower)
* ATmega328: 1024 (or lower) * ATmega328: 1024 (or lower)
* ATmega2560: 7168 (or lower) * ATmega2560: 7168 (or lower)
*/ */
@@ -776,16 +776,23 @@ void get_metadata() {
Serial.print('0', BYTE); Serial.print('0', BYTE);
Serial.print(0x00, BYTE); Serial.print(0x00, BYTE);
/* sample memory (1024) */ /* sample memory */
Serial.print(0x21, BYTE); Serial.print(0x21, BYTE);
Serial.print(0x00, BYTE); Serial.print(0x00, BYTE);
Serial.print(0x00, BYTE); Serial.print(0x00, BYTE);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes */
Serial.print(0x1C, BYTE); Serial.print(0x1C, BYTE);
#else
Serial.print(0x04, BYTE);
#endif /* Mega */
Serial.print(0x00, 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);
#endif /* Mega */
/* sample rate (1MHz) */ /* sample rate (1MHz) */
Serial.print(0x23, BYTE); Serial.print(0x23, BYTE);