Create an Ethernet shield version.

This alpha version can be connected to across the network using the OLS
client and an Ethernet shield.

README

@@ -1,8 +1,8 @@
 SUMP compatible logic analyzer for Arduino
 ==========================================
 
-NOTE: v0.08 switches the channels to pins 2-7 NOT 8-13 any longer.
+NOTE: NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
-      Please report any issues.  For old behavior use v0.07.
+      Please report any issues.  Uncomment USE_PORTD for pins 2-7.
 
 This Arduino sketch implements a SUMP protocol compatible with the standard
 SUMP client as well as the alternative client from here:
@@ -54,5 +54,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.08 February 8, 2013.
+Release: v0.09 June 22, 2013.
 

logic_analyzer.ino

@@ -25,13 +25,22 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logic_analyzer.ino,v 1.21 2012/02/27 20:19:44 gillham Exp $
  *
  */
 
 /*
- * NOTE: v0.08 switches the channels to pins 2-7 NOT 8-13 any longer.
+ * NOTE: This is an ALPHA of support for an Ethernet attached Logic Analyzer.
- *       Please report any issues.  For old behavior use v0.07.
+ *       Tested with an Arduino Duemilanove and W5100 based Ethernet shield.
+ *       It may work with other combinations, but I haven't tested it.
+ *
+ *  USE: Configure the mac address (if you want) and the ip address (mandatory)
+ *       for your network and upload it.  In the OLS client select network
+ *       instead of serial and use your ip address and port 1234.
+ *       Click capture!  You should get some data back from your Arduino.
+ *
+ *
+ * NOTE: v0.09 switches the channels BACK to pins 8-13 for trigger reliability.
+ *       Please report any issues.  Uncomment USE_PORTD for pins 2-7.
  *
  * This Arduino sketch implements a SUMP protocol compatible with the standard
  * SUMP client as well as the alternative client from here:
@@ -79,10 +88,12 @@
  * until after the trigger fires.
  * Please try it out and report back.
  *
- * Release: v0.08 February 8, 2013.
+ * Release: v0.09 June 22, 2013.
  *
  */
 
+#include <SPI.h>
+#include <Ethernet.h>
 /*
  * Function prototypes so this can compile from the cli.
  * You'll need the 'arduino-core' package and to check the paths in the
@@ -99,6 +110,12 @@ void get_metadata(void);
 void debugprint(void);
 void debugdump(void);
 
+/*
+ * Should we use PORTD or PORTB?  (default is PORTB)
+ * PORTD support with triggers seems to work but needs more testing.
+ */
+#define USE_PORTD 1
+
 /*
  * Arduino device profile:      ols.profile-agla.cfg
  * Arduino Mega device profile: ols.profile-aglam.cfg
@@ -114,6 +131,7 @@ void debugdump(void);
 #define CHAN6 28
 #define CHAN7 29
 #else
+#if defined(USE_PORTD)
 #define CHANPIN PIND
 #define CHAN0 2
 #define CHAN1 3
@@ -121,6 +139,16 @@ void debugdump(void);
 #define CHAN3 5
 #define CHAN4 6
 #define CHAN5 7
+#else
+#define CHANPIN PINB
+#define CHAN0 8
+#define CHAN1 9
+#define CHAN2 10
+#define CHAN3 11
+#define CHAN4 12
+/* Comment out CHAN5 if you don't want to use the LED pin for an input */
+#define CHAN5 13
+#endif /* USE_PORTD */
 #endif
 #define ledPin 13
 
@@ -161,9 +189,15 @@ void debugdump(void);
 #define CAPTURE_SIZE 532
 #endif
 
+#ifdef USE_PORTD
 #define DEBUG_ENABLE DDRB = DDRB | B00000001
 #define DEBUG_ON PORTB = B00000001
 #define DEBUG_OFF PORTB = B00000000
+#else
+#define DEBUG_ENABLE DDRD = DDRD | B10000000
+#define DEBUG_ON PORTD = B10000000
+#define DEBUG_OFF PORTD = B00000000
+#endif
 #define DEBUG
 #ifdef DEBUG
 #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
@@ -195,10 +229,30 @@ unsigned int delayTime = 0;
 unsigned long divider = 0;
 boolean rleEnabled = 0;
 
+/*
+ * Enter a MAC address and IP address for your Arduino.
+ */
+byte mac[] = {
+  0x40, 0x00, 0x01, 0x02, 0x03, 0x04 };
+IPAddress ip(192,168,1,200);
+
+// Initialize the Ethernet server library
+// with the IP address and port you want to use
+// (port 80 is default for HTTP):
+EthernetServer server(1234);
+EthernetClient client;
+
+
 void setup()
 {
   Serial.begin(115200);
 
+  // start the Ethernet connection and the server:
+  Ethernet.begin(mac, ip);
+  server.begin();
+  Serial.print("server is at ");
+  Serial.println(Ethernet.localIP());
+
   /*
    * set debug pin (digital pin 8) to output right away so it settles.
    * this gets toggled during sampling as a way to measure
@@ -208,24 +262,42 @@ void setup()
   DEBUG_ENABLE; /* debug measurement pin */
 
   pinMode(CHAN0, INPUT);
+  digitalWrite(CHAN0, LOW);
   pinMode(CHAN1, INPUT);
+  digitalWrite(CHAN1, LOW);
   pinMode(CHAN2, INPUT);
+  digitalWrite(CHAN2, LOW);
   pinMode(CHAN3, INPUT);
+  digitalWrite(CHAN3, LOW);
   pinMode(CHAN4, INPUT);
+  digitalWrite(CHAN4, LOW);
+#ifdef CHAN5
   pinMode(CHAN5, INPUT);
+  digitalWrite(CHAN5, LOW);
+#endif
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   pinMode(CHAN6, INPUT);
+  digitalWrite(CHAN6, LOW);
   pinMode(CHAN7, INPUT);
-#endif /* Mega */
+  digitalWrite(CHAN7, LOW);
+#else
+#ifndef CHAN5
   pinMode(ledPin, OUTPUT);
+#endif
+#endif /* Mega */
 }
 
 void loop()
 {
   int i;
 
-  if (Serial.available() > 0) {
+  // listen for incoming clients
-    cmdByte = Serial.read();
+  client = server.available();
+  if (client) {
+    Serial.println("new client");
+    while (client.connected()) {
+      if (client.available()) {
+        cmdByte = client.read();
         switch(cmdByte) {
         case SUMP_RESET:
           /*
@@ -236,10 +308,10 @@ void loop()
           break;
         case SUMP_QUERY:
           /* return the expected bytes. */
-      Serial.write('1');
+          client.write('1');
-      Serial.write('A');
+          client.write('A');
-      Serial.write('L');
+          client.write('L');
-      Serial.write('S');
+          client.write('S');
           break;
         case SUMP_ARM:
           /*
@@ -273,7 +345,11 @@ void loop()
            * we can just use it directly as our trigger mask.
            */
           getCmd();
+#ifdef USE_PORTD
+          trigger = cmdBytes[0] << 2;
+#else
           trigger = cmdBytes[0];
+#endif
           break;
         case SUMP_TRIGGER_VALUES:
           /*
@@ -281,7 +357,11 @@ void loop()
            * defines whether we're looking for it to be high or low.
            */
           getCmd();
+#ifdef USE_PORTD
+          trigger_values = cmdBytes[0] << 2;
+#else
           trigger_values = cmdBytes[0];
+#endif
           break;
         case SUMP_TRIGGER_CONFIG:
           /* read the rest of the command bytes, but ignore them. */
@@ -368,8 +448,13 @@ void loop()
         default:
           /* ignore any unrecognized bytes. */
           break;
-    }
+        } /* switch */
-  }
+      } /* if client.available() */
+    } /* while */
+    delay(1);
+    client.stop();
+    Serial.println("client disconnected?");
+  } /* if client */
 }
 
 void blinkled() {
@@ -388,10 +473,10 @@ void blinkled() {
  */
 void getCmd() {
   delay(10);
-  cmdBytes[0] = Serial.read();
+  cmdBytes[0] = client.read();
-  cmdBytes[1] = Serial.read();
+  cmdBytes[1] = client.read();
-  cmdBytes[2] = Serial.read();
+  cmdBytes[2] = client.read();
-  cmdBytes[3] = Serial.read();
+  cmdBytes[3] = client.read();
 
 #ifdef DEBUG
   if (savecount < 120 ) {
@@ -509,7 +594,11 @@ void captureMicro() {
    * is done for any triggers, this is effectively the 0/100 buffer split.
    */
   for (i = 0 ; i < readCount; i++) {
-    Serial.write(logicdata[i] >> 2);
+#ifdef USE_PORTD
+    client.write(logicdata[i] >> 2);
+#else
+    client.write(logicdata[i]);
+#endif
   }
 }
 
@@ -580,7 +669,11 @@ void captureMilli() {
     }
   }
   for (i = 0 ; i < readCount; i++) {
-    Serial.write(logicdata[i] >> 2);
+#ifdef USE_PORTD
+    client.write(logicdata[i] >> 2);
+#else
+    client.write(logicdata[i]);
+#endif
   }
 }
 
@@ -768,7 +861,11 @@ void triggerMicro() {
     if (logicIndex >= readCount) {
       logicIndex = 0;
     }
-    Serial.write(logicdata[logicIndex++] >> 2);
+#ifdef USE_PORTD
+    client.write(logicdata[logicIndex++] >> 2);
+#else
+    client.write(logicdata[logicIndex++]);
+#endif
   }
 }
 
@@ -804,65 +901,69 @@ void setupDelay() {
  */
 void get_metadata() {
   /* device name */
-  Serial.write((uint8_t)0x01);
+  client.write((uint8_t)0x01);
-  Serial.write('A');
+  client.write('A');
-  Serial.write('G');
+  client.write('G');
-  Serial.write('L');
+  client.write('L');
-  Serial.write('A');
+  client.write('A');
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.write('M');
+  client.write('M');
 #endif /* Mega */
-  Serial.write('v');
+  client.write('v');
-  Serial.write('0');
+  client.write('0');
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 
   /* firmware version */
-  Serial.write((uint8_t)0x02);
+  client.write((uint8_t)0x02);
-  Serial.write('0');
+  client.write('0');
-  Serial.write('.');
+  client.write('.');
-  Serial.write('0');
+  client.write('0');
-  Serial.write('8');
+  client.write('9');
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 
   /* sample memory */
-  Serial.write((uint8_t)0x21);
+  client.write((uint8_t)0x21);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
   /* 7168 bytes */
-  Serial.write((uint8_t)0x1C);
+  client.write((uint8_t)0x1C);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #elif defined(__AVR_ATmega328P__)
   /* 1024 bytes */
-  Serial.write((uint8_t)0x04);
+  client.write((uint8_t)0x04);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
 #else
   /* 532 bytes */
-  Serial.write((uint8_t)0x02);
+  client.write((uint8_t)0x02);
-  Serial.write((uint8_t)0x14);
+  client.write((uint8_t)0x14);
 #endif /* Mega */
 
   /* sample rate (1MHz) */
-  Serial.write((uint8_t)0x23);
+  client.write((uint8_t)0x23);
-  Serial.write((uint8_t)0x00);
+  client.write((uint8_t)0x00);
-  Serial.write((uint8_t)0x0F);
+  client.write((uint8_t)0x0F);
-  Serial.write((uint8_t)0x42);
+  client.write((uint8_t)0x42);
-  Serial.write((uint8_t)0x40);
+  client.write((uint8_t)0x40);
 
   /* number of probes (6 by default on Arduino, 8 on Mega) */
-  Serial.write((uint8_t)0x40);
+  client.write((uint8_t)0x40);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  Serial.write((uint8_t)0x08);
+  client.write((uint8_t)0x08);
 #else
-  Serial.write((uint8_t)0x06);
+#ifdef CHAN5
+  client.write((uint8_t)0x06);
+#else
+  client.write((uint8_t)0x05);
+#endif /* CHAN5 */
 #endif /* Mega */
 
   /* protocol version (2) */
-  Serial.write((uint8_t)0x41);
+  client.write((uint8_t)0x41);
-  Serial.write((uint8_t)0x02);
+  client.write((uint8_t)0x02);
 
   /* end of data */
-  Serial.write((uint8_t)0x00);  
+  client.write((uint8_t)0x00);  
 }
 
 /*
@@ -875,36 +976,36 @@ void debugprint() {
   int i;
 
 #if 0
-  Serial.print("divider = ");
+  client.print("divider = ");
-  Serial.println(divider, DEC);
+  client.println(divider, DEC);
-  Serial.print("delayTime = ");
+  client.print("delayTime = ");
-  Serial.println(delayTime, DEC);
+  client.println(delayTime, DEC);
-  Serial.print("trigger_values = ");
+  client.print("trigger_values = ");
-  Serial.println(trigger_values, BIN);
+  client.println(trigger_values, BIN);
 #endif
-  Serial.print("readCount = ");
+  client.print("readCount = ");
-  Serial.println(readCount, DEC);
+  client.println(readCount, DEC);
-  Serial.print("delayCount = ");
+  client.print("delayCount = ");
-  Serial.println(delayCount, DEC);
+  client.println(delayCount, DEC);
-  Serial.print("logicIndex = ");
+  client.print("logicIndex = ");
-  Serial.println(logicIndex, DEC);
+  client.println(logicIndex, DEC);
-  Serial.print("triggerIndex = ");
+  client.print("triggerIndex = ");
-  Serial.println(triggerIndex, DEC);
+  client.println(triggerIndex, DEC);
-  Serial.print("rleEnabled = ");
+  client.print("rleEnabled = ");
-  Serial.println(rleEnabled, DEC);
+  client.println(rleEnabled, DEC);
 
-  Serial.println("Bytes:");
+  client.println("Bytes:");
 
   for (i = 0 ; i < savecount; i++) {
     if (savebytes[i] == 0x20) {
-      Serial.println();
+      client.println();
     } 
     else {
-      Serial.print(savebytes[i], HEX);
+      client.print(savebytes[i], HEX);
-      Serial.write(' ');
+      client.write(' ');
     }
   }
-  Serial.println("done...");
+  client.println("done...");
 }
 
 /*
@@ -915,13 +1016,17 @@ void debugdump() {
   int i;
   int j = 1;
 
-  Serial.print("\r\n");
+  client.print("\r\n");
 
   for (i = 0 ; i < MAX_CAPTURE_SIZE; i++) {
-    Serial.print(logicdata[i] >> 2, HEX);
+#ifdef USE_PORTD
-    Serial.print(" ");
+    client.print(logicdata[i] >> 2, HEX);
+#else
+    client.print(logicdata[i], HEX);
+#endif
+    client.print(" ");
     if (j == 32) {
-      Serial.print("\r\n");
+      client.print("\r\n");
       j = 0;
     }
     j++;
@@ -929,3 +1034,10 @@ void debugdump() {
 }
 #endif /* DEBUG */
 
+
+
+
+
+
+
+