public/logic_analyzer_sump
1
0
Fork 0
mirror of https://github.com/gillham/logic_analyzer.git synced 2026-05-02 08:35:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update for Arduino 1.0 support.

Browse Source 
Change file extension to .ino Change Serial.print(x, BYTE) to
Serial.write(x)
This commit is contained in:
Andrew Gillham
2011-11-04 18:19:59 -07:00
parent 6396054c16
commit bc32e9fde6
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
logic_analyzer.ino
View File

@@ -154,7 +154,7 @@ void debugdump(void);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define DEBUG_CAPTURE_SIZE 7168 #define DEBUG_CAPTURE_SIZE 7168
#define CAPTURE_SIZE 7168 #define CAPTURE_SIZE 7168
#elif defined(__AVR_ATmega328__) #elif defined(__AVR_ATmega328P__)
#define DEBUG_CAPTURE_SIZE 1024 #define DEBUG_CAPTURE_SIZE 1024
#define CAPTURE_SIZE 1024 #define CAPTURE_SIZE 1024
#else #else
@@ -239,10 +239,10 @@ void loop()
break; break;
case SUMP_QUERY: case SUMP_QUERY:
/* return the expected bytes. */ /* return the expected bytes. */
Serial.print('1', BYTE); Serial.write('1');
Serial.print('A', BYTE); Serial.write('A');
Serial.print('L', BYTE); Serial.write('L');
Serial.print('S', BYTE); Serial.write('S');
break; break;
case SUMP_ARM: case SUMP_ARM:
/* /*
@@ -513,7 +513,7 @@ void captureMicro() {
* is done for any triggers, this is effectively the 0/100 buffer split. * is done for any triggers, this is effectively the 0/100 buffer split.
*/ */
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
Serial.print(logicdata[i], BYTE); Serial.write(logicdata[i]);
} }
} }
@@ -549,7 +549,7 @@ void captureMilli() {
delay(delayTime); delay(delayTime);
} }
for (i = 0 ; i < readCount; i++) { for (i = 0 ; i < readCount; i++) {
Serial.print(logicdata[i], BYTE); Serial.write(logicdata[i]);
} }
} }
@@ -728,7 +728,7 @@ void triggerMicro() {
if (logicIndex >= readCount) { if (logicIndex >= readCount) {
logicIndex = 0; logicIndex = 0;
} }
Serial.print(logicdata[logicIndex++], BYTE); Serial.write(logicdata[logicIndex++]);
} }
} }
@@ -764,61 +764,61 @@ void setupDelay() {
*/ */
void get_metadata() { void get_metadata() {
/* device name */ /* device name */
Serial.print(0x01, BYTE); Serial.write((uint8_t)0x01);
Serial.print('A', BYTE); Serial.write('A');
Serial.print('G', BYTE); Serial.write('G');
Serial.print('L', BYTE); Serial.write('L');
Serial.print('A', BYTE); Serial.write('A');
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.print('M', BYTE); Serial.write('M');
#endif /* Mega */ #endif /* Mega */
Serial.print('v', BYTE); Serial.write('v');
Serial.print('0', BYTE); Serial.write('0');
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
/* sample memory */ /* sample memory */
Serial.print(0x21, BYTE); Serial.write((uint8_t)0x21);
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
/* 7168 bytes */ /* 7168 bytes */
Serial.print(0x1C, BYTE); Serial.write((uint8_t)0x1C);
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
#elif defined(__AVR_ATmega328__) #elif defined(__AVR_ATmega328P__)
/* 1024 bytes */ /* 1024 bytes */
Serial.print(0x04, BYTE); Serial.write((uint8_t)0x04);
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
#else #else
/* 532 bytes */ /* 532 bytes */
Serial.print(0x02, BYTE); Serial.write((uint8_t)0x02);
Serial.print(0x14, BYTE); Serial.write((uint8_t)0x14);
#endif /* Mega */ #endif /* Mega */
/* sample rate (1MHz) */ /* sample rate (1MHz) */
Serial.print(0x23, BYTE); Serial.write((uint8_t)0x23);
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
Serial.print(0x0F, BYTE); Serial.write((uint8_t)0x0F);
Serial.print(0x42, BYTE); Serial.write((uint8_t)0x42);
Serial.print(0x40, BYTE); Serial.write((uint8_t)0x40);
/* number of probes (5 by default on Arduino, 8 on Mega) */ /* number of probes (5 by default on Arduino, 8 on Mega) */
Serial.print(0x40, BYTE); Serial.write((uint8_t)0x40);
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
Serial.print(0x08, BYTE); Serial.write((uint8_t)0x08);
#else #else
#ifdef CHAN5 #ifdef CHAN5
Serial.print(0x06, BYTE); Serial.write((uint8_t)0x06);
#else #else
Serial.print(0x05, BYTE); Serial.write((uint8_t)0x05);
#endif /* CHAN5 */ #endif /* CHAN5 */
#endif /* Mega */ #endif /* Mega */
/* protocol version (2) */ /* protocol version (2) */
Serial.print(0x41, BYTE); Serial.write((uint8_t)0x41);
Serial.print(0x02, BYTE); Serial.write((uint8_t)0x02);
/* end of data */ /* end of data */
Serial.print(0x00, BYTE); Serial.write((uint8_t)0x00);
} }
/* /*
@@ -855,7 +855,7 @@ void debugprint() {
} }
else { else {
Serial.print(savebytes[i], HEX); Serial.print(savebytes[i], HEX);
Serial.print(' ', BYTE); Serial.write(' ');
} }
} }
Serial.println("done..."); Serial.println("done...");