From 1e3f0696af4c335845895e9e12a4203771be0e5b Mon Sep 17 00:00:00 2001 From: Andrew Gillham Date: Wed, 16 Dec 2015 11:47:31 -0800 Subject: [PATCH] Update for CLI compiling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add function declarations for the inline capture functions and add a note to the README explaining how to compile from the CLI using the ‘arduino-mk’ package. Known to work on Debian 8, but untested elsewhere. --- README | 18 ++++++++++++++++++ logic_analyzer.ino | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/README b/README index 48062fb..c3c9561 100644 --- a/README +++ b/README @@ -47,6 +47,24 @@ 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 diff --git a/logic_analyzer.ino b/logic_analyzer.ino index 1b989b4..03e523c 100644 --- a/logic_analyzer.ino +++ b/logic_analyzer.ino @@ -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)