Bump the metadata version to 0.15 also.

Wrong delayTime in 500KHz menu

Makefile

@@ -1,19 +1,24 @@
 #
-# Makefile for an Arduino based logic analyzer using the 'arduino-core'
-# package and makefiles.
+# Makefile for an Arduino based logic analyzer using the arduino-cli
 #
-#	$Id: Makefile,v 1.3 2011-03-07 02:47:26 gillham Exp $
+
+TARGET	= logic_analyzer
+FQBN	= arduino:avr:diecimila
+SERIAL	= /dev/ttyUSB*
+
+
+all:
+	@echo ""
+	@echo "---> run 'make build' to compile for Arduino Duemilanove"
+	@echo "---> run 'make upload' to upload to /dev/ttyUSB*"
+	@echo ""
+
+build:
+	arduino-cli compile --fqbn $(FQBN) $(TARGET)
+
+upload:
+	arduino-cli upload --fqbn $(FQBN) --port $(SERIAL) $(TARGET)
+
+#
+# end-of-file
 #
-ARDUINO_DIR  = /usr/share/arduino
-
-TARGET       = logic_analyzer
-ARDUINO_LIBS = 
-
-MCU          = atmega328p
-F_CPU        = 16000000
-ARDUINO_PORT = /dev/ttyUSB*
-AVRDUDE_ARD_BAUDRATE = 57600
-AVRDUDE_ARD_PROGRAMMER = arduino
-
-include /usr/share/arduino/Arduino.mk
-

README

@@ -7,6 +7,9 @@ SUMP client as well as the alternative client from here:
 
 The alternative client version is highly recommended.  Download version
 "ols-0.9.7" or newer for built-in device profiles.
+NOTE: The latest officially released version of ols (0.9.7.2) does not work
+      with modern Java runtimes.  You will need to build it yourself.
+      Follow the build instructions here: https://github.com/jawi/ols
 
 This SUMP protocol compatible logic analyzer for the Arduino board supports
 5 channels consisting of digital pins 8-12, which are the first 5 bits (0-4)
@@ -36,6 +39,35 @@ 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.
 
+Debugging
+=========
+
+You can uncomment the '#define DEBUG_MENU' line to add some diagnostic menu
+options for capturing or dumping the capture buffer.
+You can uncomment the '#define DEBUG' and '#define DEBUG_MENU' for a couple
+extra menu options and logging of the received commands.  The DEBUG option
+is generally only useful for development, while the DEBUG_MENU option is
+good for troubleshooting when the logic_analyzer sketch isn't working for you.
+Both are disabled by default to conserve RAM for improved stability.
+
+CLI compiling
+=============
+
+If you want to use the 'arduino-mk' package (on Debian for example ) to compile
+this using the Makefile, you'll need to make a couple of changes since the
+Makefile only supports a single .ino file.  Basically you just need to append
+the other two files to the main .ino and then remove them.
+
+$ cat logic_analyzer_inline_4mhz.ino >> logic_analyzer.ino
+$ cat logic_analyzer_inline_2mhz.ino >> logic_analyzer.ino
+$ rm logic_analyzer_inline_4mhz.ino logic_analyzer_inline_2mhz.ino
+$ make
+
+This will make GIT unhappy so if you need to revert it to run 'git pull' do
+this:
+$ git reset --hard origin/master
+
+
 Older Notes
 ===========================================================================
 NOTE: With v0.11 you can now sample at 4MHz & 2MHz rates in addition to the 
@@ -69,5 +101,5 @@ NOTE: This master branch now supports Arduino 1.0 only.
       Checkout branch logic_analyzer_v0_5 for Arduino 22 support.
 
 
-Release: v0.13 February 7, 2015.
+Release: v0.15 December 21, 2021.
 

logic_analyzer/logic_analyzer.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
  * until after the trigger fires.
  * Please try it out and report back.
  *
- * Release: v0.13 February 7, 2015.
+ * Release: v0.15 December 21, 2021.
  *
  */
 
@@ -82,7 +82,8 @@ void get_metadata(void);
 void debugprint(void);
 void debugdump(void);
 void prettydump(void);
-
+void captureInline4mhz(void);
+void captureInline2mhz(void);
 
 /*
  * Should we use PORTD or PORTB?  (default is PORTB)
@@ -155,6 +156,9 @@ void prettydump(void);
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 #define DEBUG_CAPTURE_SIZE 7168
 #define CAPTURE_SIZE 7168
+#elif defined(__AVR_ATmega32U4__)
+#define DEBUG_CAPTURE_SIZE 2048
+#define CAPTURE_SIZE 2048
 #elif defined(__AVR_ATmega328P__)
 #define DEBUG_CAPTURE_SIZE 1024
 #define CAPTURE_SIZE 1024
@@ -172,7 +176,10 @@ void prettydump(void);
 #define DEBUG_ON PORTD = B10000000
 #define DEBUG_OFF PORTD = B00000000
 #endif /* USE_PORTD */
-#define DEBUG
+
+//#define DEBUG_MENU
+//#define DEBUG
+
 #ifdef DEBUG
 #define MAX_CAPTURE_SIZE DEBUG_CAPTURE_SIZE
 #else
@@ -391,20 +398,23 @@ void loop()
     case SUMP_SELF_TEST:
       /* ignored. */
       break;
-#ifdef DEBUG
+#ifdef DEBUG_MENU
       /*
          * a couple of debug commands used during development.
        */
     case '?':
       Serial.println("");
+#ifdef DEBUG
       Serial.println("0 = clear cmd buffer");
       Serial.println("1 = print cmd buffer");
+#endif /* DEBUG */
       Serial.println("2 = print data buffer");
       Serial.println("3 = pretty print buffer");
       Serial.println("4 = capture at 4MHz");
       Serial.println("5 = capture at 1MHz");
       Serial.println("6 = capture at 500KHz");
       break;
+#ifdef DEBUG
     case '0':
       /*
          * This resets the debug buffer pointer, effectively clearing the
@@ -425,6 +435,7 @@ void loop()
       blinkled();
       debugprint();
       break;
+#endif /* DEBUG */
     case '2':
       /*
          * This dumps the sample data to the serial port.
@@ -460,12 +471,12 @@ void loop()
          * This runs a sample capture at 500KHz.
        * delayTime = 2ms for 500KHz.
        */
-      delayTime = 1;
+      delayTime = 2;
       captureMicro();
       Serial.println("");
       Serial.println("500KHz capture done.");
       break;
-#endif /* DEBUG */
+#endif /* DEBUG_MENU */
     default:
       /* ignore any unrecognized bytes. */
       break;
@@ -938,7 +949,7 @@ void get_metadata() {
   Serial.write('0');
   Serial.write('.');
   Serial.write('1');
-  Serial.write('3');
+  Serial.write('5');
   Serial.write((uint8_t)0x00);
 
   /* sample memory */
@@ -1028,6 +1039,8 @@ void debugprint() {
   Serial.println("done...");
 }
 
+#endif /* DEBUG */
+#ifdef DEBUG_MENU
 /*
  * This is used by the '2' debug command to dump the contents
  * of the sample buffer.
@@ -1081,7 +1094,7 @@ void prettydump() {
     Serial.print("\r\n");
   }
 }
-#endif /* DEBUG */
+#endif /* DEBUG_MENU */
 
 
 

logic_analyzer/logic_analyzer_inline_2mhz.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

logic_analyzer/logic_analyzer_inline_4mhz.ino

@@ -2,7 +2,7 @@
  *
  * SUMP Protocol Implementation for Arduino boards.
  *
- * Copyright (c) 2011,2012,2013,2014,2015 Andrew Gillham
+ * Copyright (c) 2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021 Andrew Gillham
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

logic_analyzer_leonardo/Makefile

@@ -0,0 +1,24 @@
+#
+# Makefile for an Arduino based logic analyzer using the arduino-cli
+#
+
+TARGET	= logic_analyzer_leonardo
+FQBN	= arduino:avr:leonardo
+SERIAL	= /dev/ttyUSB*
+
+
+all:
+	@echo ""
+	@echo "---> run 'make build' to compile for Arduino Leonardo"
+	@echo "---> run 'make upload' to upload to /dev/ttyUSB*"
+	@echo ""
+
+build:
+	arduino-cli compile --fqbn $(FQBN) $(TARGET)
+
+upload:
+	arduino-cli upload --fqbn $(FQBN) --port $(SERIAL) $(TARGET)
+
+#
+# end-of-file
+#