diff --git a/.github/workflows/aunit_tests.yml b/.github/workflows/aunit_tests.yml index 76d7b59..bd2ff57 100644 --- a/.github/workflows/aunit_tests.yml +++ b/.github/workflows/aunit_tests.yml @@ -13,7 +13,7 @@ jobs: - name: Setup run: | cd .. - git clone https://github.com/bxparks/UnixHostDuino + git clone https://github.com/bxparks/EpoxyDuino git clone https://github.com/bxparks/AUnit git clone https://github.com/bxparks/AceCommon git clone https://github.com/bxparks/AceRoutine diff --git a/CHANGELOG.md b/CHANGELOG.md index 10305e0..6d90ca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog * Unreleased +* 0.4.1 (2021-01-22) + * Convert `SHIFT_ARGC_ARGV()` macro in `src/cli/CommandHandler.h` to + an inlined static function `CommandHandler::shiftArgcArgv()` using + references. I forgot that I was programming in C++ when I created the + macro. Add `SHIFT_ARGC_ARGV()` function for backwards compatibility. + * Update UnixHostDuino 0.4 to EpoxyDuino 0.5. + * No functional change in this release. * 0.4 (2020-12-09) * update `AceUtilsCrcEeprom.h` * Replace FastCRC with AceCRC library for a reduction of 4-5 kB of flash diff --git a/README.md b/README.md index a47d7e1..97a1fe9 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ AceTime, AceRoutine, etc) or third party libraries. * Depends on: * (none) -**Version**: 0.4 (2020-12-09) +**Version**: 0.4.1 (2021-01-22) **Changelog**: [CHANGELOG.md](CHANGELOG.md) @@ -115,7 +115,7 @@ It should work with [PlatformIO](https://platformio.org/) but I have not tested it. Many utilities work on Linux or MacOS (using both g++ and clang++ compilers) -using the [UnixHostDuino](https://github.com/bxparks/UnixHostDuino) emulation +using the [EpoxyDuino](https://github.com/bxparks/EpoxyDuino) emulation layer. ### Operating System diff --git a/docs/doxygen.cfg b/docs/doxygen.cfg index 1f5c41d..cdeee53 100644 --- a/docs/doxygen.cfg +++ b/docs/doxygen.cfg @@ -38,7 +38,7 @@ PROJECT_NAME = "AceUtils" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.4 +PROJECT_NUMBER = 0.4.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/docs/html/AceUtilsCli_8h_source.html b/docs/html/AceUtilsCli_8h_source.html index bd392d3..800c14a 100644 --- a/docs/html/AceUtilsCli_8h_source.html +++ b/docs/html/AceUtilsCli_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/AceUtilsCrcEeprom_8h_source.html b/docs/html/AceUtilsCrcEeprom_8h_source.html index 75935d0..02b24cf 100644 --- a/docs/html/AceUtilsCrcEeprom_8h_source.html +++ b/docs/html/AceUtilsCrcEeprom_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/AceUtilsModeGroup_8h_source.html b/docs/html/AceUtilsModeGroup_8h_source.html index 13aa68d..c14da45 100644 --- a/docs/html/AceUtilsModeGroup_8h_source.html +++ b/docs/html/AceUtilsModeGroup_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/AceUtils_8h_source.html b/docs/html/AceUtils_8h_source.html index f6d22c3..5b67b82 100644 --- a/docs/html/AceUtils_8h_source.html +++ b/docs/html/AceUtils_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/CommandDispatcher_8cpp_source.html b/docs/html/CommandDispatcher_8cpp_source.html index 2b75575..a813eb4 100644 --- a/docs/html/CommandDispatcher_8cpp_source.html +++ b/docs/html/CommandDispatcher_8cpp_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -207,12 +207,12 @@
134 } // cli
135 } // ace_utils
-
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:68
-
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:47
+
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:59
+
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:38
ace_utils::cli::CommandDispatcher::findAndRunCommand
void findAndRunCommand(const char *cmd, int argc, const char *const *argv) const
Find and run the given command.
Definition: CommandDispatcher.cpp:122
ace_utils::cli::CommandDispatcher::runCommand
void runCommand(char *line) const
Tokenize the given line and run the command handler.
Definition: CommandDispatcher.cpp:107
ace_utils::cli::CommandDispatcher::printHelp
static void printHelp(Print &printer, const CommandHandler *command)
Print help string for the given command.
Definition: CommandDispatcher.cpp:95
-
ace_utils::cli::CommandHandler::getHelpString
ace_common::FCString getHelpString() const
Return the help string of the command.
Definition: CommandHandler.h:71
+
ace_utils::cli::CommandHandler::getHelpString
ace_common::FCString getHelpString() const
Return the help string of the command.
Definition: CommandHandler.h:62
ace_utils::cli::CommandDispatcher::helpCommandHandler
void helpCommandHandler(Print &printer, int argc, const char *const *argv) const
Handle the 'help' command.
Definition: CommandDispatcher.cpp:55
ace_utils::cli::CommandDispatcher::helpAll
void helpAll(Print &printer) const
Print help on all commands.
Definition: CommandDispatcher.cpp:77
ace_utils::cli::CommandHandler::run
virtual void run(Print &printer, int argc, const char *const *argv) const =0
Run the command.
diff --git a/docs/html/CommandDispatcher_8h_source.html b/docs/html/CommandDispatcher_8h_source.html index 5c0ddfa..2e8d926 100644 --- a/docs/html/CommandDispatcher_8h_source.html +++ b/docs/html/CommandDispatcher_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -210,8 +210,8 @@
190 #endif
ace_utils::cli::InputLine
Message sent from StreamLineReader to CommandDispatcher coroutines through Channel<InputLine> channel...
Definition: InputLine.h:36
-
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:68
-
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:47
+
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:59
+
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:38
ace_utils::cli::CommandDispatcher::findAndRunCommand
void findAndRunCommand(const char *cmd, int argc, const char *const *argv) const
Find and run the given command.
Definition: CommandDispatcher.cpp:122
ace_utils::cli::CommandDispatcher::runCommand
void runCommand(char *line) const
Tokenize the given line and run the command handler.
Definition: CommandDispatcher.cpp:107
ace_utils::cli::CommandDispatcher::printHelp
static void printHelp(Print &printer, const CommandHandler *command)
Print help string for the given command.
Definition: CommandDispatcher.cpp:95
diff --git a/docs/html/CommandHandler_8h_source.html b/docs/html/CommandHandler_8h_source.html index 05df59f..c514ea7 100644 --- a/docs/html/CommandHandler_8h_source.html +++ b/docs/html/CommandHandler_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -102,56 +102,65 @@
29 
30 class Print;
31 
-
39 #define SHIFT_ARGC_ARGV(argc, argv) do { argc--; argv++; } while (false)
-
40 
-
41 namespace ace_utils {
-
42 namespace cli {
-
43 
-
47 class CommandHandler {
-
48  public:
-
64  virtual void run(Print& printer, int argc, const char* const* argv)
-
65  const = 0;
-
66 
-
68  ace_common::FCString getName() const { return mName; }
-
69 
-
71  ace_common::FCString getHelpString() const { return mHelpString; }
-
72 
-
73  protected:
-
75  static bool isArgEqual(const char* arg, const char* token) {
-
76  return strcmp(arg, token) == 0;
-
77  }
-
78 
-
80  static bool isArgEqual(const char* arg, const __FlashStringHelper* token) {
-
81  return strcmp_P(arg, (const char*) token) == 0;
-
82  }
-
83 
-
85  CommandHandler(const char* name, const char* helpString):
-
86  mName(name),
-
87  mHelpString(helpString) {}
-
88 
-
90  CommandHandler(const __FlashStringHelper* name,
-
91  const __FlashStringHelper* helpString):
-
92  mName(name),
-
93  mHelpString(helpString) {}
-
94 
-
95  private:
-
96  ace_common::FCString const mName;
-
97  ace_common::FCString const mHelpString;
-
98 };
-
99 
-
100 } // cli
-
101 } // ace_utils
+
32 namespace ace_utils {
+
33 namespace cli {
+
34 
+
38 class CommandHandler {
+
39  public:
+
55  virtual void run(Print& printer, int argc, const char* const* argv)
+
56  const = 0;
+
57 
+
59  ace_common::FCString getName() const { return mName; }
+
60 
+
62  ace_common::FCString getHelpString() const { return mHelpString; }
+
63 
+
64  protected:
+
72  static void shiftArgcArgv(int& argc, const char* const*& argv) {
+
73  argc--;
+
74  argv++;
+
75  }
+
76 
+
78  static void SHIFT_ARGC_ARGV(int& argc, const char* const*& argv) {
+
79  shiftArgcArgv(argc, argv);
+
80  }
+
81 
+
83  static bool isArgEqual(const char* arg, const char* token) {
+
84  return strcmp(arg, token) == 0;
+
85  }
+
86 
+
88  static bool isArgEqual(const char* arg, const __FlashStringHelper* token) {
+
89  return strcmp_P(arg, (const char*) token) == 0;
+
90  }
+
91 
+
93  CommandHandler(const char* name, const char* helpString):
+
94  mName(name),
+
95  mHelpString(helpString) {}
+
96 
+
98  CommandHandler(const __FlashStringHelper* name,
+
99  const __FlashStringHelper* helpString):
+
100  mName(name),
+
101  mHelpString(helpString) {}
102 
-
103 #endif
+
103  private:
+
104  ace_common::FCString const mName;
+
105  ace_common::FCString const mHelpString;
+
106 };
+
107 
+
108 } // cli
+
109 } // ace_utils
+
110 
+
111 #endif
-
ace_utils::cli::CommandHandler::isArgEqual
static bool isArgEqual(const char *arg, const __FlashStringHelper *token)
Test for equality when token is in PROGMEM.
Definition: CommandHandler.h:80
-
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:68
-
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:47
-
ace_utils::cli::CommandHandler::CommandHandler
CommandHandler(const __FlashStringHelper *name, const __FlashStringHelper *helpString)
Constructor.
Definition: CommandHandler.h:90
-
ace_utils::cli::CommandHandler::getHelpString
ace_common::FCString getHelpString() const
Return the help string of the command.
Definition: CommandHandler.h:71
-
ace_utils::cli::CommandHandler::isArgEqual
static bool isArgEqual(const char *arg, const char *token)
Test for equality against token.
Definition: CommandHandler.h:75
-
ace_utils::cli::CommandHandler::CommandHandler
CommandHandler(const char *name, const char *helpString)
Constructor.
Definition: CommandHandler.h:85
+
ace_utils::cli::CommandHandler::isArgEqual
static bool isArgEqual(const char *arg, const __FlashStringHelper *token)
Test for equality when token is in PROGMEM.
Definition: CommandHandler.h:88
+
ace_utils::cli::CommandHandler::getName
ace_common::FCString getName() const
Return the name of the command.
Definition: CommandHandler.h:59
+
ace_utils::cli::CommandHandler::SHIFT_ARGC_ARGV
static void SHIFT_ARGC_ARGV(int &argc, const char *const *&argv)
Backwards compatibility with previous macro implementation .
Definition: CommandHandler.h:78
+
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:38
+
ace_utils::cli::CommandHandler::CommandHandler
CommandHandler(const __FlashStringHelper *name, const __FlashStringHelper *helpString)
Constructor.
Definition: CommandHandler.h:98
+
ace_utils::cli::CommandHandler::getHelpString
ace_common::FCString getHelpString() const
Return the help string of the command.
Definition: CommandHandler.h:62
+
ace_utils::cli::CommandHandler::isArgEqual
static bool isArgEqual(const char *arg, const char *token)
Test for equality against token.
Definition: CommandHandler.h:83
+
ace_utils::cli::CommandHandler::CommandHandler
CommandHandler(const char *name, const char *helpString)
Constructor.
Definition: CommandHandler.h:93
ace_utils::cli::CommandHandler::run
virtual void run(Print &printer, int argc, const char *const *argv) const =0
Run the command.
+
ace_utils::cli::CommandHandler::shiftArgcArgv
static void shiftArgcArgv(int &argc, const char *const *&argv)
Increment argv and decrement argc so that it appears as if the command line arguments are shifted to ...
Definition: CommandHandler.h:72
Generated by   diff --git a/docs/html/CommandManager_8h_source.html b/docs/html/CommandManager_8h_source.html index 26e5de6..83bd24e 100644 --- a/docs/html/CommandManager_8h_source.html +++ b/docs/html/CommandManager_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -144,7 +144,7 @@
129 
130 #endif
-
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:47
+
ace_utils::cli::CommandHandler
Signature for a command handler.
Definition: CommandHandler.h:38
ace_utils::cli::CommandManager
A convenience wrapper around a CommandDispatcher that hides complexity of creating,...
Definition: CommandManager.h:82
ace_utils::cli::StreamLineReader
An AceRoutine coroutine that reads lines (terminated by '\n' or '\r' from the Stream device,...
Definition: StreamLineReader.h:40
ace_utils::cli::CommandDispatcher
A coroutine that reads lines from the Serial port, tokenizes the line on whitespace boundaries,...
Definition: CommandDispatcher.h:52
diff --git a/docs/html/CrcEeprom_8h_source.html b/docs/html/CrcEeprom_8h_source.html index 133e0c7..99390ad 100644 --- a/docs/html/CrcEeprom_8h_source.html +++ b/docs/html/CrcEeprom_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -79,8 +79,8 @@
6 #ifndef ACE_UTILS_CRC_EEPROM_H
7 #define ACE_UTILS_CRC_EEPROM_H
8 
-
9 // Cannot compile this on UnixHostDuino
-
10 #if ! defined(UNIX_HOST_DUINO)
+
9 // Cannot compile this on EpoxyDuino
+
10 #if ! defined(EPOXY_DUINO)
11 
12 // EEPROM is supported only on certain Arduino boards. In particular, many
13 // (most?) Arduino Zero compatible boards cannot support EEPROM even on Flash
@@ -185,7 +185,7 @@
152 } // crc_eeprom
153 } // ace_utils
154 
-
155 #endif // ! defined(UNIX_HOST_DUINO)
+
155 #endif // ! defined(EPOXY_DUINO)
156 
157 #endif // defined(ACE_UTILS_CRC_EEPROM_H)
diff --git a/docs/html/InputLine_8h_source.html b/docs/html/InputLine_8h_source.html index 7f8102a..4fb5d22 100644 --- a/docs/html/InputLine_8h_source.html +++ b/docs/html/InputLine_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/ModeGroup_8h_source.html b/docs/html/ModeGroup_8h_source.html index f6b2a5c..05349a3 100644 --- a/docs/html/ModeGroup_8h_source.html +++ b/docs/html/ModeGroup_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/ModeNavigator_8h_source.html b/docs/html/ModeNavigator_8h_source.html index d084e54..527281b 100644 --- a/docs/html/ModeNavigator_8h_source.html +++ b/docs/html/ModeNavigator_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/StreamLineReader_8h_source.html b/docs/html/StreamLineReader_8h_source.html index 47004fe..69e8bde 100644 --- a/docs/html/StreamLineReader_8h_source.html +++ b/docs/html/StreamLineReader_8h_source.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 4a1e5d5..f355098 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/classace__utils_1_1cli_1_1CommandDispatcher-members.html b/docs/html/classace__utils_1_1cli_1_1CommandDispatcher-members.html index 287775e..6c2bfd7 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandDispatcher-members.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandDispatcher-members.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/classace__utils_1_1cli_1_1CommandDispatcher.html b/docs/html/classace__utils_1_1cli_1_1CommandDispatcher.html index 3f86776..dd69149 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandDispatcher.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandDispatcher.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
diff --git a/docs/html/classace__utils_1_1cli_1_1CommandHandler-members.html b/docs/html/classace__utils_1_1cli_1_1CommandHandler-members.html index 2a11b32..04d4f41 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandHandler-members.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandHandler-members.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -81,6 +81,8 @@ isArgEqual(const char *arg, const char *token)ace_utils::cli::CommandHandlerinlineprotectedstatic isArgEqual(const char *arg, const __FlashStringHelper *token)ace_utils::cli::CommandHandlerinlineprotectedstatic run(Print &printer, int argc, const char *const *argv) const =0ace_utils::cli::CommandHandlerpure virtual + SHIFT_ARGC_ARGV(int &argc, const char *const *&argv)ace_utils::cli::CommandHandlerinlineprotectedstatic + shiftArgcArgv(int &argc, const char *const *&argv)ace_utils::cli::CommandHandlerinlineprotectedstatic
diff --git a/docs/html/classace__utils_1_1cli_1_1CommandHandler.html b/docs/html/classace__utils_1_1cli_1_1CommandHandler.html index 093098e..92e7c53 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandHandler.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandHandler.html @@ -22,7 +22,7 @@
AceUtils -  0.4 +  0.4.1
Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
@@ -107,6 +107,13 @@ + + + + + + @@ -119,7 +126,7 @@

Detailed Description

Signature for a command handler.

-

Definition at line 47 of file CommandHandler.h.

+

Definition at line 38 of file CommandHandler.h.

Constructor & Destructor Documentation

◆ CommandHandler() [1/2]

@@ -158,7 +165,7 @@

Definition at line 85 of file CommandHandler.h.

+

Definition at line 93 of file CommandHandler.h.

@@ -199,7 +206,7 @@

Definition at line 90 of file CommandHandler.h.

+

Definition at line 98 of file CommandHandler.h.

@@ -254,6 +261,47 @@

+

◆ shiftArgcArgv()

+ +
+
+

Static Protected Member Functions

static void shiftArgcArgv (int &argc, const char *const *&argv)
 Increment argv and decrement argc so that it appears as if the command line arguments are shifted to the left by one position. More...
 
+static void SHIFT_ARGC_ARGV (int &argc, const char *const *&argv)
 Backwards compatibility with previous macro implementation .
 
static bool isArgEqual (const char *arg, const char *token)
 Test for equality against token.
+ + + + +
+ + + + + + + + + + + + + + + + + + +
static void ace_utils::cli::CommandHandler::shiftArgcArgv (int & argc,
const char *const *& argv 
)
+ 		+inlinestaticprotected
+
+ +

Increment argv and decrement argc so that it appears as if the command line arguments are shifted to the left by one position.

+

This is useful for processing the command line tokens one at a time. Use CommandHandler::isArgEqual() method to test for match against an expected token.

+ +

Definition at line 72 of file CommandHandler.h.

+
The documentation for this class was generated from the following file:
    diff --git a/docs/html/classace__utils_1_1cli_1_1CommandManager-members.html b/docs/html/classace__utils_1_1cli_1_1CommandManager-members.html index f14ffd9..470c7e5 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandManager-members.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandManager-members.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1cli_1_1CommandManager.html b/docs/html/classace__utils_1_1cli_1_1CommandManager.html index d1d13df..eec4274 100644 --- a/docs/html/classace__utils_1_1cli_1_1CommandManager.html +++ b/docs/html/classace__utils_1_1cli_1_1CommandManager.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1cli_1_1StreamLineReader-members.html b/docs/html/classace__utils_1_1cli_1_1StreamLineReader-members.html index 1760622..11f0f3e 100644 --- a/docs/html/classace__utils_1_1cli_1_1StreamLineReader-members.html +++ b/docs/html/classace__utils_1_1cli_1_1StreamLineReader-members.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1cli_1_1StreamLineReader.html b/docs/html/classace__utils_1_1cli_1_1StreamLineReader.html index e5f85be..f93780f 100644 --- a/docs/html/classace__utils_1_1cli_1_1StreamLineReader.html +++ b/docs/html/classace__utils_1_1cli_1_1StreamLineReader.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom-members.html b/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom-members.html index 5706646..414942e 100644 --- a/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom-members.html +++ b/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom-members.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom.html b/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom.html index b88fb7a..e1a90d9 100644 --- a/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom.html +++ b/docs/html/classace__utils_1_1crc__eeprom_1_1CrcEeprom.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator-members.html b/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator-members.html index bf69dc6..571effe 100644 --- a/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator-members.html +++ b/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator-members.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator.html b/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator.html index f38d319..dfe2821 100644 --- a/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator.html +++ b/docs/html/classace__utils_1_1mode__group_1_1ModeNavigator.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/classes.html b/docs/html/classes.html index a1595f0..62b3846 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/dir_2bfeb371046d82fb856795cb229a687c.html b/docs/html/dir_2bfeb371046d82fb856795cb229a687c.html index ebeaea1..46c1371 100644 --- a/docs/html/dir_2bfeb371046d82fb856795cb229a687c.html +++ b/docs/html/dir_2bfeb371046d82fb856795cb229a687c.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 96e27c5..296458c 100644 --- a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/dir_b78fdfbbb632ce54d070469d6a721373.html b/docs/html/dir_b78fdfbbb632ce54d070469d6a721373.html index 065e624..21efbcd 100644 --- a/docs/html/dir_b78fdfbbb632ce54d070469d6a721373.html +++ b/docs/html/dir_b78fdfbbb632ce54d070469d6a721373.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/dir_db35cd7a1e6ee27d29dae5dbac1c12c5.html b/docs/html/dir_db35cd7a1e6ee27d29dae5dbac1c12c5.html index 302cd8f..9164b20 100644 --- a/docs/html/dir_db35cd7a1e6ee27d29dae5dbac1c12c5.html +++ b/docs/html/dir_db35cd7a1e6ee27d29dae5dbac1c12c5.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/files.html b/docs/html/files.html index eb097b7..ac56291 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    diff --git a/docs/html/functions.html b/docs/html/functions.html index 6b18343..82ea757 100644 --- a/docs/html/functions.html +++ b/docs/html/functions.html @@ -22,7 +22,7 @@
    AceUtils -  0.4 +  0.4.1
    Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
    @@ -200,6 +200,12 @@

    - s -

    • setup() : ace_utils::mode_group::ModeNavigator
      • +
    • SHIFT_ARGC_ARGV() +: ace_utils::cli::CommandHandler +
      • +
    • shiftArgcArgv() +: ace_utils::cli::CommandHandler +
    • StreamLineReader() : ace_utils::cli::StreamLineReader
      • diff --git a/docs/html/functions_func.html b/docs/html/functions_func.html index bbd0564..62c1f44 100644 --- a/docs/html/functions_func.html +++ b/docs/html/functions_func.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      @@ -63,10 +63,16 @@
      - 
        +  + +

        - b -

        + + +

        - c -

        + + +

        - f -

        + + +

        - g -

        + + +

        - h -

        + + +

        - i -

        + + +

        - m -

        + + +

        - p -

        + + +

        - r -

        + + +

        - s -

        + + +

        - t -

        + + +

        - w -

        + + +

        - ~ -

        • ~CommandDispatcher() : ace_utils::cli::CommandDispatcher
          • diff --git a/docs/html/functions_type.html b/docs/html/functions_type.html index ed972b1..50f1e1f 100644 --- a/docs/html/functions_type.html +++ b/docs/html/functions_type.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/functions_vars.html b/docs/html/functions_vars.html index 78bbbef..3d9e37c 100644 --- a/docs/html/functions_vars.html +++ b/docs/html/functions_vars.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/graph_legend.html b/docs/html/graph_legend.html index 1ffa324..d107bd9 100644 --- a/docs/html/graph_legend.html +++ b/docs/html/graph_legend.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html index 3e71670..690f4ac 100644 --- a/docs/html/hierarchy.html +++ b/docs/html/hierarchy.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/index.html b/docs/html/index.html index 7985821..0f1ccb0 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/inherits.html b/docs/html/inherits.html index ecc56a1..57ee1d1 100644 --- a/docs/html/inherits.html +++ b/docs/html/inherits.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          diff --git a/docs/html/md__home_brian_src_AceUtils_src_cli_README.html b/docs/html/md__home_brian_src_AceUtils_src_cli_README.html index ca2ad62..9b206f0 100644 --- a/docs/html/md__home_brian_src_AceUtils_src_cli_README.html +++ b/docs/html/md__home_brian_src_AceUtils_src_cli_README.html @@ -22,7 +22,7 @@
          AceUtils -  0.4 +  0.4.1
          Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
          @@ -159,7 +159,7 @@

          CommandHandler Definitions and Setup

      Argc and Argv Parsing

      Within the CommandHandler, there are several helper routines which are useful for processing the argc and argv arguments:

        -
      • SHIFT_ARGC_ARGV(argc, argv) macro shifts the input tokens by 1, incrementing argv and decrementing argc
        • +
      • shiftArgcArgv(argc, argv) shifts the input tokens by 1 token to the left, by incrementing argv and decrementing argc
      • bool isArgEqual(const char*, const char*);
      • bool isArgEqual(const char*, const __FlashHelperString*);
      @@ -181,7 +181,7 @@

      CommandHandler Definitions and Setup

      return;
      }
      -
      SHIFT_ARGC_ARGV(argc, argv);
      +
      shiftArgcArgv(argc, argv);
      if (isArgEqual(argv[0], "on")) {
      int delay = atoi(argv[1]));
      printer.print(F("Executing: delay on "));
      diff --git a/docs/html/md__home_brian_src_AceUtils_src_mode_group_README.html b/docs/html/md__home_brian_src_AceUtils_src_mode_group_README.html index 76944be..964a312 100644 --- a/docs/html/md__home_brian_src_AceUtils_src_mode_group_README.html +++ b/docs/html/md__home_brian_src_AceUtils_src_mode_group_README.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/docs/html/menudata.js b/docs/html/menudata.js index 300a15e..43fefeb 100644 --- a/docs/html/menudata.js +++ b/docs/html/menudata.js @@ -44,7 +44,20 @@ var menudata={children:[ {text:"t",url:"functions.html#index_t"}, {text:"w",url:"functions.html#index_w"}, {text:"~",url:"functions.html#index__7E"}]}, -{text:"Functions",url:"functions_func.html"}, +{text:"Functions",url:"functions_func.html",children:[ +{text:"b",url:"functions_func.html#index_b"}, +{text:"c",url:"functions_func.html#index_c"}, +{text:"f",url:"functions_func.html#index_f"}, +{text:"g",url:"functions_func.html#index_g"}, +{text:"h",url:"functions_func.html#index_h"}, +{text:"i",url:"functions_func.html#index_i"}, +{text:"m",url:"functions_func.html#index_m"}, +{text:"p",url:"functions_func.html#index_p"}, +{text:"r",url:"functions_func.html#index_r"}, +{text:"s",url:"functions_func.html#index_s"}, +{text:"t",url:"functions_func.html#index_t"}, +{text:"w",url:"functions_func.html#index_w"}, +{text:"~",url:"functions_func.html#index__7E"}]}, {text:"Variables",url:"functions_vars.html"}, {text:"Typedefs",url:"functions_type.html"}]}]}, {text:"Files",url:"files.html",children:[ diff --git a/docs/html/pages.html b/docs/html/pages.html index 95ef1b5..28cbaa7 100644 --- a/docs/html/pages.html +++ b/docs/html/pages.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/docs/html/search/all_c.js b/docs/html/search/all_c.js index 5eba193..a2de2d8 100644 --- a/docs/html/search/all_c.js +++ b/docs/html/search/all_c.js @@ -1,5 +1,7 @@ var searchData= [ ['setup_34',['setup',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a8fcc09eaa24f32eed4d3bb9bcef48f0c',1,'ace_utils::mode_group::ModeNavigator']]], - ['streamlinereader_35',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html',1,'ace_utils::cli::StreamLineReader'],['../classace__utils_1_1cli_1_1StreamLineReader.html#ad16d26a6e4286dc4fc2015fe9c68fee1',1,'ace_utils::cli::StreamLineReader::StreamLineReader()']]] + ['shift_5fargc_5fargv_35',['SHIFT_ARGC_ARGV',['../classace__utils_1_1cli_1_1CommandHandler.html#a6399717e176c5bb95ae49b930f6ecb9a',1,'ace_utils::cli::CommandHandler']]], + ['shiftargcargv_36',['shiftArgcArgv',['../classace__utils_1_1cli_1_1CommandHandler.html#a61cb84a2e3179d1647565e21b3a9c14f',1,'ace_utils::cli::CommandHandler']]], + ['streamlinereader_37',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html',1,'ace_utils::cli::StreamLineReader'],['../classace__utils_1_1cli_1_1StreamLineReader.html#ad16d26a6e4286dc4fc2015fe9c68fee1',1,'ace_utils::cli::StreamLineReader::StreamLineReader()']]] ]; diff --git a/docs/html/search/all_d.js b/docs/html/search/all_d.js index a6b27a3..29481fc 100644 --- a/docs/html/search/all_d.js +++ b/docs/html/search/all_d.js @@ -1,4 +1,4 @@ var searchData= [ - ['tokenize_36',['tokenize',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a535d819984ddd20524a00837d14bfa1a',1,'ace_utils::cli::CommandDispatcher']]] + ['tokenize_38',['tokenize',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a535d819984ddd20524a00837d14bfa1a',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/all_e.js b/docs/html/search/all_e.js index 4208da3..1aa5c68 100644 --- a/docs/html/search/all_e.js +++ b/docs/html/search/all_e.js @@ -1,4 +1,4 @@ var searchData= [ - ['writewithcrc_37',['writeWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#adb4a02090c1bfc668cf86cbb12e713c0',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['writewithcrc_39',['writeWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#adb4a02090c1bfc668cf86cbb12e713c0',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/all_f.js b/docs/html/search/all_f.js index 7fe46b8..9f56d82 100644 --- a/docs/html/search/all_f.js +++ b/docs/html/search/all_f.js @@ -1,4 +1,4 @@ var searchData= [ - ['_7ecommanddispatcher_38',['~CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a787df24c1781164b5d926032071a6e4e',1,'ace_utils::cli::CommandDispatcher']]] + ['_7ecommanddispatcher_40',['~CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a787df24c1781164b5d926032071a6e4e',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/classes_0.js b/docs/html/search/classes_0.js index 7af69db..fa7d581 100644 --- a/docs/html/search/classes_0.js +++ b/docs/html/search/classes_0.js @@ -1,7 +1,7 @@ var searchData= [ - ['commanddispatcher_39',['CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html',1,'ace_utils::cli']]], - ['commandhandler_40',['CommandHandler',['../classace__utils_1_1cli_1_1CommandHandler.html',1,'ace_utils::cli']]], - ['commandmanager_41',['CommandManager',['../classace__utils_1_1cli_1_1CommandManager.html',1,'ace_utils::cli']]], - ['crceeprom_42',['CrcEeprom',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html',1,'ace_utils::crc_eeprom']]] + ['commanddispatcher_41',['CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html',1,'ace_utils::cli']]], + ['commandhandler_42',['CommandHandler',['../classace__utils_1_1cli_1_1CommandHandler.html',1,'ace_utils::cli']]], + ['commandmanager_43',['CommandManager',['../classace__utils_1_1cli_1_1CommandManager.html',1,'ace_utils::cli']]], + ['crceeprom_44',['CrcEeprom',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html',1,'ace_utils::crc_eeprom']]] ]; diff --git a/docs/html/search/classes_1.js b/docs/html/search/classes_1.js index b40a99c..c2beb43 100644 --- a/docs/html/search/classes_1.js +++ b/docs/html/search/classes_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['inputline_43',['InputLine',['../structace__utils_1_1cli_1_1InputLine.html',1,'ace_utils::cli']]] + ['inputline_45',['InputLine',['../structace__utils_1_1cli_1_1InputLine.html',1,'ace_utils::cli']]] ]; diff --git a/docs/html/search/classes_2.js b/docs/html/search/classes_2.js index 8a97657..b3a9d7c 100644 --- a/docs/html/search/classes_2.js +++ b/docs/html/search/classes_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['modegroup_44',['ModeGroup',['../structace__utils_1_1mode__group_1_1ModeGroup.html',1,'ace_utils::mode_group']]], - ['modenavigator_45',['ModeNavigator',['../classace__utils_1_1mode__group_1_1ModeNavigator.html',1,'ace_utils::mode_group']]] + ['modegroup_46',['ModeGroup',['../structace__utils_1_1mode__group_1_1ModeGroup.html',1,'ace_utils::mode_group']]], + ['modenavigator_47',['ModeNavigator',['../classace__utils_1_1mode__group_1_1ModeNavigator.html',1,'ace_utils::mode_group']]] ]; diff --git a/docs/html/search/classes_3.js b/docs/html/search/classes_3.js index 2eb9071..a9d2f82 100644 --- a/docs/html/search/classes_3.js +++ b/docs/html/search/classes_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['streamlinereader_46',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html',1,'ace_utils::cli']]] + ['streamlinereader_48',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html',1,'ace_utils::cli']]] ]; diff --git a/docs/html/search/functions_0.js b/docs/html/search/functions_0.js index 0883351..c8c1d46 100644 --- a/docs/html/search/functions_0.js +++ b/docs/html/search/functions_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['begin_47',['begin',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#afa98dd019e95fad991a77296eec0e728',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['begin_49',['begin',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#afa98dd019e95fad991a77296eec0e728',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/functions_1.js b/docs/html/search/functions_1.js index 0ea43d2..78e1a2b 100644 --- a/docs/html/search/functions_1.js +++ b/docs/html/search/functions_1.js @@ -1,9 +1,9 @@ var searchData= [ - ['changegroup_48',['changeGroup',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#adaae7dc240a20a8dc623a5168fee4981',1,'ace_utils::mode_group::ModeNavigator']]], - ['changemode_49',['changeMode',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a20914625815dbedaa60d12d407e7bf89',1,'ace_utils::mode_group::ModeNavigator']]], - ['commanddispatcher_50',['CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ad1ab7be3d70937bf978c6ab2d2ceaf9b',1,'ace_utils::cli::CommandDispatcher']]], - ['commandhandler_51',['CommandHandler',['../classace__utils_1_1cli_1_1CommandHandler.html#a50a4af8c63b7bcafe0ed7e8269d3da50',1,'ace_utils::cli::CommandHandler::CommandHandler(const char *name, const char *helpString)'],['../classace__utils_1_1cli_1_1CommandHandler.html#a846e22124c7239103bc75bc0baf0e598',1,'ace_utils::cli::CommandHandler::CommandHandler(const __FlashStringHelper *name, const __FlashStringHelper *helpString)']]], - ['commandmanager_52',['CommandManager',['../classace__utils_1_1cli_1_1CommandManager.html#a367a2cbd734cac13b875a7fa44224ff5',1,'ace_utils::cli::CommandManager']]], - ['crceeprom_53',['CrcEeprom',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#ad6f0e26adae30c2397313dc1547d0cfb',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['changegroup_50',['changeGroup',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#adaae7dc240a20a8dc623a5168fee4981',1,'ace_utils::mode_group::ModeNavigator']]], + ['changemode_51',['changeMode',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a20914625815dbedaa60d12d407e7bf89',1,'ace_utils::mode_group::ModeNavigator']]], + ['commanddispatcher_52',['CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ad1ab7be3d70937bf978c6ab2d2ceaf9b',1,'ace_utils::cli::CommandDispatcher']]], + ['commandhandler_53',['CommandHandler',['../classace__utils_1_1cli_1_1CommandHandler.html#a50a4af8c63b7bcafe0ed7e8269d3da50',1,'ace_utils::cli::CommandHandler::CommandHandler(const char *name, const char *helpString)'],['../classace__utils_1_1cli_1_1CommandHandler.html#a846e22124c7239103bc75bc0baf0e598',1,'ace_utils::cli::CommandHandler::CommandHandler(const __FlashStringHelper *name, const __FlashStringHelper *helpString)']]], + ['commandmanager_54',['CommandManager',['../classace__utils_1_1cli_1_1CommandManager.html#a367a2cbd734cac13b875a7fa44224ff5',1,'ace_utils::cli::CommandManager']]], + ['crceeprom_55',['CrcEeprom',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#ad6f0e26adae30c2397313dc1547d0cfb',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/functions_2.js b/docs/html/search/functions_2.js index f7b2d4c..cf1a2b1 100644 --- a/docs/html/search/functions_2.js +++ b/docs/html/search/functions_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['findandruncommand_54',['findAndRunCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a97631715e21c262544a228377688d593',1,'ace_utils::cli::CommandDispatcher']]], - ['findcommand_55',['findCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ad59ab4795f6834ccf252dce8b0682c52',1,'ace_utils::cli::CommandDispatcher']]] + ['findandruncommand_56',['findAndRunCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a97631715e21c262544a228377688d593',1,'ace_utils::cli::CommandDispatcher']]], + ['findcommand_57',['findCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ad59ab4795f6834ccf252dce8b0682c52',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/functions_3.js b/docs/html/search/functions_3.js index bc70e53..eb0fe01 100644 --- a/docs/html/search/functions_3.js +++ b/docs/html/search/functions_3.js @@ -1,6 +1,6 @@ var searchData= [ - ['getdispatcher_56',['getDispatcher',['../classace__utils_1_1cli_1_1CommandManager.html#af767cc67f79958fdf7d260d2737af7c9',1,'ace_utils::cli::CommandManager']]], - ['gethelpstring_57',['getHelpString',['../classace__utils_1_1cli_1_1CommandHandler.html#a44b81af723307175744e02a0517b52b3',1,'ace_utils::cli::CommandHandler']]], - ['getname_58',['getName',['../classace__utils_1_1cli_1_1CommandHandler.html#a4a2832aa6b28f490661214a1cf9ab4b6',1,'ace_utils::cli::CommandHandler']]] + ['getdispatcher_58',['getDispatcher',['../classace__utils_1_1cli_1_1CommandManager.html#af767cc67f79958fdf7d260d2737af7c9',1,'ace_utils::cli::CommandManager']]], + ['gethelpstring_59',['getHelpString',['../classace__utils_1_1cli_1_1CommandHandler.html#a44b81af723307175744e02a0517b52b3',1,'ace_utils::cli::CommandHandler']]], + ['getname_60',['getName',['../classace__utils_1_1cli_1_1CommandHandler.html#a4a2832aa6b28f490661214a1cf9ab4b6',1,'ace_utils::cli::CommandHandler']]] ]; diff --git a/docs/html/search/functions_4.js b/docs/html/search/functions_4.js index 979375b..013927f 100644 --- a/docs/html/search/functions_4.js +++ b/docs/html/search/functions_4.js @@ -1,6 +1,6 @@ var searchData= [ - ['helpall_59',['helpAll',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a517055113aecc022baed1fa53742ee7c',1,'ace_utils::cli::CommandDispatcher']]], - ['helpcommandhandler_60',['helpCommandHandler',['../classace__utils_1_1cli_1_1CommandDispatcher.html#af91ec1340b0b62e43dab869316cf9b22',1,'ace_utils::cli::CommandDispatcher']]], - ['helpspecific_61',['helpSpecific',['../classace__utils_1_1cli_1_1CommandDispatcher.html#aaba7e9cf696e4a84e0611cf9c9d40607',1,'ace_utils::cli::CommandDispatcher']]] + ['helpall_61',['helpAll',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a517055113aecc022baed1fa53742ee7c',1,'ace_utils::cli::CommandDispatcher']]], + ['helpcommandhandler_62',['helpCommandHandler',['../classace__utils_1_1cli_1_1CommandDispatcher.html#af91ec1340b0b62e43dab869316cf9b22',1,'ace_utils::cli::CommandDispatcher']]], + ['helpspecific_63',['helpSpecific',['../classace__utils_1_1cli_1_1CommandDispatcher.html#aaba7e9cf696e4a84e0611cf9c9d40607',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/functions_5.js b/docs/html/search/functions_5.js index 2d9fb38..89668c4 100644 --- a/docs/html/search/functions_5.js +++ b/docs/html/search/functions_5.js @@ -1,4 +1,4 @@ var searchData= [ - ['isargequal_62',['isArgEqual',['../classace__utils_1_1cli_1_1CommandHandler.html#ab664de864c17a35e0bbb6c75176684cb',1,'ace_utils::cli::CommandHandler::isArgEqual(const char *arg, const char *token)'],['../classace__utils_1_1cli_1_1CommandHandler.html#aecf6a79d06930a7d91c8862274af698a',1,'ace_utils::cli::CommandHandler::isArgEqual(const char *arg, const __FlashStringHelper *token)']]] + ['isargequal_64',['isArgEqual',['../classace__utils_1_1cli_1_1CommandHandler.html#ab664de864c17a35e0bbb6c75176684cb',1,'ace_utils::cli::CommandHandler::isArgEqual(const char *arg, const char *token)'],['../classace__utils_1_1cli_1_1CommandHandler.html#aecf6a79d06930a7d91c8862274af698a',1,'ace_utils::cli::CommandHandler::isArgEqual(const char *arg, const __FlashStringHelper *token)']]] ]; diff --git a/docs/html/search/functions_6.js b/docs/html/search/functions_6.js index 3020084..ec0b84e 100644 --- a/docs/html/search/functions_6.js +++ b/docs/html/search/functions_6.js @@ -1,5 +1,5 @@ var searchData= [ - ['mode_63',['mode',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a9e8dd63c1d9aaf46400e4d8a2f04f8fe',1,'ace_utils::mode_group::ModeNavigator']]], - ['modenavigator_64',['ModeNavigator',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#aab97f3a22f4e9212356880285f6bfbb3',1,'ace_utils::mode_group::ModeNavigator']]] + ['mode_65',['mode',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a9e8dd63c1d9aaf46400e4d8a2f04f8fe',1,'ace_utils::mode_group::ModeNavigator']]], + ['modenavigator_66',['ModeNavigator',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#aab97f3a22f4e9212356880285f6bfbb3',1,'ace_utils::mode_group::ModeNavigator']]] ]; diff --git a/docs/html/search/functions_7.js b/docs/html/search/functions_7.js index ed3bfcf..8af2fcc 100644 --- a/docs/html/search/functions_7.js +++ b/docs/html/search/functions_7.js @@ -1,5 +1,5 @@ var searchData= [ - ['printhelp_65',['printHelp',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ac9a7dea42f2dc74729e524e71c5b9d54',1,'ace_utils::cli::CommandDispatcher']]], - ['printlineerror_66',['printLineError',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a0db9822394faea14916353985c9ff7b0',1,'ace_utils::cli::CommandDispatcher']]] + ['printhelp_67',['printHelp',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ac9a7dea42f2dc74729e524e71c5b9d54',1,'ace_utils::cli::CommandDispatcher']]], + ['printlineerror_68',['printLineError',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a0db9822394faea14916353985c9ff7b0',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/functions_8.js b/docs/html/search/functions_8.js index 76c12da..0be1a07 100644 --- a/docs/html/search/functions_8.js +++ b/docs/html/search/functions_8.js @@ -1,6 +1,6 @@ var searchData= [ - ['readwithcrc_67',['readWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a82c85ef76e886c832438a71d5d4e7e9b',1,'ace_utils::crc_eeprom::CrcEeprom']]], - ['run_68',['run',['../classace__utils_1_1cli_1_1CommandHandler.html#a82e846fdd080bfb36b13a1f903cb7def',1,'ace_utils::cli::CommandHandler']]], - ['runcommand_69',['runCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ae20ae336f3740b1faceecdf0babfa55e',1,'ace_utils::cli::CommandDispatcher']]] + ['readwithcrc_69',['readWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a82c85ef76e886c832438a71d5d4e7e9b',1,'ace_utils::crc_eeprom::CrcEeprom']]], + ['run_70',['run',['../classace__utils_1_1cli_1_1CommandHandler.html#a82e846fdd080bfb36b13a1f903cb7def',1,'ace_utils::cli::CommandHandler']]], + ['runcommand_71',['runCommand',['../classace__utils_1_1cli_1_1CommandDispatcher.html#ae20ae336f3740b1faceecdf0babfa55e',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/functions_9.js b/docs/html/search/functions_9.js index 0f2079e..3e90bdf 100644 --- a/docs/html/search/functions_9.js +++ b/docs/html/search/functions_9.js @@ -1,5 +1,7 @@ var searchData= [ - ['setup_70',['setup',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a8fcc09eaa24f32eed4d3bb9bcef48f0c',1,'ace_utils::mode_group::ModeNavigator']]], - ['streamlinereader_71',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html#ad16d26a6e4286dc4fc2015fe9c68fee1',1,'ace_utils::cli::StreamLineReader']]] + ['setup_72',['setup',['../classace__utils_1_1mode__group_1_1ModeNavigator.html#a8fcc09eaa24f32eed4d3bb9bcef48f0c',1,'ace_utils::mode_group::ModeNavigator']]], + ['shift_5fargc_5fargv_73',['SHIFT_ARGC_ARGV',['../classace__utils_1_1cli_1_1CommandHandler.html#a6399717e176c5bb95ae49b930f6ecb9a',1,'ace_utils::cli::CommandHandler']]], + ['shiftargcargv_74',['shiftArgcArgv',['../classace__utils_1_1cli_1_1CommandHandler.html#a61cb84a2e3179d1647565e21b3a9c14f',1,'ace_utils::cli::CommandHandler']]], + ['streamlinereader_75',['StreamLineReader',['../classace__utils_1_1cli_1_1StreamLineReader.html#ad16d26a6e4286dc4fc2015fe9c68fee1',1,'ace_utils::cli::StreamLineReader']]] ]; diff --git a/docs/html/search/functions_a.js b/docs/html/search/functions_a.js index a02ab1e..e7c865e 100644 --- a/docs/html/search/functions_a.js +++ b/docs/html/search/functions_a.js @@ -1,4 +1,4 @@ var searchData= [ - ['tokenize_72',['tokenize',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a535d819984ddd20524a00837d14bfa1a',1,'ace_utils::cli::CommandDispatcher']]] + ['tokenize_76',['tokenize',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a535d819984ddd20524a00837d14bfa1a',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/functions_b.js b/docs/html/search/functions_b.js index e335bd5..4eb06e1 100644 --- a/docs/html/search/functions_b.js +++ b/docs/html/search/functions_b.js @@ -1,4 +1,4 @@ var searchData= [ - ['writewithcrc_73',['writeWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#adb4a02090c1bfc668cf86cbb12e713c0',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['writewithcrc_77',['writeWithCrc',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#adb4a02090c1bfc668cf86cbb12e713c0',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/functions_c.js b/docs/html/search/functions_c.js index 17229e2..02c9e35 100644 --- a/docs/html/search/functions_c.js +++ b/docs/html/search/functions_c.js @@ -1,4 +1,4 @@ var searchData= [ - ['_7ecommanddispatcher_74',['~CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a787df24c1781164b5d926032071a6e4e',1,'ace_utils::cli::CommandDispatcher']]] + ['_7ecommanddispatcher_78',['~CommandDispatcher',['../classace__utils_1_1cli_1_1CommandDispatcher.html#a787df24c1781164b5d926032071a6e4e',1,'ace_utils::cli::CommandDispatcher']]] ]; diff --git a/docs/html/search/pages_0.js b/docs/html/search/pages_0.js index 5df7057..a67e012 100644 --- a/docs/html/search/pages_0.js +++ b/docs/html/search/pages_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['aceutils_20library_81',['AceUtils Library',['../index.html',1,'']]] + ['aceutils_20library_85',['AceUtils Library',['../index.html',1,'']]] ]; diff --git a/docs/html/search/pages_1.js b/docs/html/search/pages_1.js index 59cf0d5..5d5a870 100644 --- a/docs/html/search/pages_1.js +++ b/docs/html/search/pages_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['command_20line_20interface_20_28cli_29_82',['Command Line Interface (CLI)',['../md__home_brian_src_AceUtils_src_cli_README.html',1,'']]] + ['command_20line_20interface_20_28cli_29_86',['Command Line Interface (CLI)',['../md__home_brian_src_AceUtils_src_cli_README.html',1,'']]] ]; diff --git a/docs/html/search/pages_2.js b/docs/html/search/pages_2.js index b5bf0d4..f117d5d 100644 --- a/docs/html/search/pages_2.js +++ b/docs/html/search/pages_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['mode_20group_83',['Mode Group',['../md__home_brian_src_AceUtils_src_mode_group_README.html',1,'']]] + ['mode_20group_87',['Mode Group',['../md__home_brian_src_AceUtils_src_mode_group_README.html',1,'']]] ]; diff --git a/docs/html/search/typedefs_0.js b/docs/html/search/typedefs_0.js index a25a6e4..e4ad84e 100644 --- a/docs/html/search/typedefs_0.js +++ b/docs/html/search/typedefs_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['crc32calculator_80',['Crc32Calculator',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a94b1fd4a63022713b355d45bc68de767',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['crc32calculator_84',['Crc32Calculator',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a94b1fd4a63022713b355d45bc68de767',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/variables_0.js b/docs/html/search/variables_0.js index fb30597..f7a1105 100644 --- a/docs/html/search/variables_0.js +++ b/docs/html/search/variables_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['childgroups_75',['childGroups',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a1dffe67e3bd9c12e6a7bce78b882d80f',1,'ace_utils::mode_group::ModeGroup']]] + ['childgroups_79',['childGroups',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a1dffe67e3bd9c12e6a7bce78b882d80f',1,'ace_utils::mode_group::ModeGroup']]] ]; diff --git a/docs/html/search/variables_1.js b/docs/html/search/variables_1.js index 3405bd5..129d7ba 100644 --- a/docs/html/search/variables_1.js +++ b/docs/html/search/variables_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['kcrcsize_76',['kCrcSize',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a2f2fcf3066d500a77cfbbf1e03437a8e',1,'ace_utils::crc_eeprom::CrcEeprom']]] + ['kcrcsize_80',['kCrcSize',['../classace__utils_1_1crc__eeprom_1_1CrcEeprom.html#a2f2fcf3066d500a77cfbbf1e03437a8e',1,'ace_utils::crc_eeprom::CrcEeprom']]] ]; diff --git a/docs/html/search/variables_2.js b/docs/html/search/variables_2.js index 069491a..d55bdf9 100644 --- a/docs/html/search/variables_2.js +++ b/docs/html/search/variables_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['modes_77',['modes',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a1957bb0d8c4cc3fa53fa12a078d45558',1,'ace_utils::mode_group::ModeGroup']]] + ['modes_81',['modes',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a1957bb0d8c4cc3fa53fa12a078d45558',1,'ace_utils::mode_group::ModeGroup']]] ]; diff --git a/docs/html/search/variables_3.js b/docs/html/search/variables_3.js index cf2eb9c..35e9e63 100644 --- a/docs/html/search/variables_3.js +++ b/docs/html/search/variables_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['nummodes_78',['numModes',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a43fc6a7df3927f0d3d16f0c33901b0e5',1,'ace_utils::mode_group::ModeGroup']]] + ['nummodes_82',['numModes',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a43fc6a7df3927f0d3d16f0c33901b0e5',1,'ace_utils::mode_group::ModeGroup']]] ]; diff --git a/docs/html/search/variables_4.js b/docs/html/search/variables_4.js index 2cf0b08..06a61bb 100644 --- a/docs/html/search/variables_4.js +++ b/docs/html/search/variables_4.js @@ -1,4 +1,4 @@ var searchData= [ - ['parentgroup_79',['parentGroup',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a8e8e2d3b47f11a516d70d2664db9bcde',1,'ace_utils::mode_group::ModeGroup']]] + ['parentgroup_83',['parentGroup',['../structace__utils_1_1mode__group_1_1ModeGroup.html#a8e8e2d3b47f11a516d70d2664db9bcde',1,'ace_utils::mode_group::ModeGroup']]] ]; diff --git a/docs/html/structace__utils_1_1cli_1_1InputLine-members.html b/docs/html/structace__utils_1_1cli_1_1InputLine-members.html index 81cc60b..f90e69a 100644 --- a/docs/html/structace__utils_1_1cli_1_1InputLine-members.html +++ b/docs/html/structace__utils_1_1cli_1_1InputLine-members.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/docs/html/structace__utils_1_1cli_1_1InputLine.html b/docs/html/structace__utils_1_1cli_1_1InputLine.html index 358a94b..66dbcc2 100644 --- a/docs/html/structace__utils_1_1cli_1_1InputLine.html +++ b/docs/html/structace__utils_1_1cli_1_1InputLine.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/docs/html/structace__utils_1_1mode__group_1_1ModeGroup-members.html b/docs/html/structace__utils_1_1mode__group_1_1ModeGroup-members.html index 0ecde07..edbeac4 100644 --- a/docs/html/structace__utils_1_1mode__group_1_1ModeGroup-members.html +++ b/docs/html/structace__utils_1_1mode__group_1_1ModeGroup-members.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/docs/html/structace__utils_1_1mode__group_1_1ModeGroup.html b/docs/html/structace__utils_1_1mode__group_1_1ModeGroup.html index 120728b..3b97ee3 100644 --- a/docs/html/structace__utils_1_1mode__group_1_1ModeGroup.html +++ b/docs/html/structace__utils_1_1mode__group_1_1ModeGroup.html @@ -22,7 +22,7 @@
      AceUtils -  0.4 +  0.4.1
      Useful Arduino utilties which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries.
      diff --git a/examples/CommandLineShell/CommandLineShell.ino b/examples/CommandLineShell/CommandLineShell.ino index 8940d99..4146eb8 100644 --- a/examples/CommandLineShell/CommandLineShell.ino +++ b/examples/CommandLineShell/CommandLineShell.ino @@ -16,7 +16,7 @@ #include #include -#if defined(UNIX_HOST_DUINO) +#if defined(EPOXY_DUINO) #include #endif @@ -103,7 +103,7 @@ unsigned long freeMemory() { return system_get_free_heap_size(); #elif defined(ESP32) return ESP.getFreeHeap(); -#elif defined(UNIX_HOST_DUINO) +#elif defined(EPOXY_DUINO) long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); return pages * page_size; @@ -157,8 +157,8 @@ class FreeCommand: public CommandHandler { /** * Change the blinking LED on and off delay parameters. If no argument given, - * simply print out the current values. Demonstrates the use of - * SHIFT_ARGC_ARGV() macro and the isArgEqual() helper method. + * simply print out the current values. Demonstrates the use of shiftArgcArgv() + * and the isArgEqual() helper method. */ class DelayCommand: public CommandHandler { public: @@ -180,12 +180,12 @@ class DelayCommand: public CommandHandler { return; } - SHIFT_ARGC_ARGV(argc, argv); + shiftArgcArgv(argc, argv); if (isArgEqual(argv[0], F("on"))) { - SHIFT_ARGC_ARGV(argc, argv); + shiftArgcArgv(argc, argv); ledOnDelay = atoi(argv[0]); } else if (isArgEqual(argv[0], F("off"))) { - SHIFT_ARGC_ARGV(argc, argv); + shiftArgcArgv(argc, argv); ledOffDelay = atoi(argv[0]); } else { printer.print(F("Unknown argument: ")); @@ -216,7 +216,7 @@ CommandManager commandManager( //--------------------------------------------------------------------------- void setup() { -#if ! defined(UNIX_HOST_DUINO) +#if ! defined(EPOXY_DUINO) delay(1000); #endif SERIAL_PORT_MONITOR.begin(115200); diff --git a/examples/CommandLineShell/Makefile b/examples/CommandLineShell/Makefile index d8cb7ea..27dea7c 100644 --- a/examples/CommandLineShell/Makefile +++ b/examples/CommandLineShell/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := CommandLineShell ARDUINO_LIBS := AceCommon AceRoutine AceUtils -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk diff --git a/library.properties b/library.properties index 8c93792..b8aa780 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ name=AceUtils -version=0.4 +version=0.4.1 author=Brian T. Park maintainer=Brian T. Park sentence=Useful Arduino utilities which are too small as separate libraries, but complex enough to be shared among multiple projects, and often have external dependencies to other libraries. -paragraph=Since they have external dependencies, they cannot be added to the AceCommon library. Utilities include: AceUtilCrcEeprom, AceUtilModeGroup, AceUtilCli. +paragraph=Since they have external dependencies, they cannot be added to the AceCommon library. Utilities include: AceUtilsCrcEeprom, AceUtilsModeGroup, AceUtilsCli. category=Other url=https://github.com/bxparks/AceUtils architectures=* diff --git a/src/cli/CommandHandler.h b/src/cli/CommandHandler.h index 83d9853..13c6299 100644 --- a/src/cli/CommandHandler.h +++ b/src/cli/CommandHandler.h @@ -29,15 +29,6 @@ SOFTWARE. class Print; -/** - * Increment argv and decrement argc so that it appears as if the command line - * arguments are shifted to the *left* by one position. This is useful for - * processing the command line tokens one at a time. Use - * CommandHandler::isArgEqual() method to test for match against an expected - * token. - */ -#define SHIFT_ARGC_ARGV(argc, argv) do { argc--; argv++; } while (false) - namespace ace_utils { namespace cli { @@ -71,6 +62,23 @@ class CommandHandler { ace_common::FCString getHelpString() const { return mHelpString; } protected: + /** + * Increment argv and decrement argc so that it appears as if the command + * line arguments are shifted to the *left* by one position. This is useful + * for processing the command line tokens one at a time. Use + * CommandHandler::isArgEqual() method to test for match against an expected + * token. + */ + static void shiftArgcArgv(int& argc, const char* const*& argv) { + argc--; + argv++; + } + + /** Backwards compatibility with previous macro implementation . */ + static void SHIFT_ARGC_ARGV(int& argc, const char* const*& argv) { + shiftArgcArgv(argc, argv); + } + /** Test for equality against token. */ static bool isArgEqual(const char* arg, const char* token) { return strcmp(arg, token) == 0; diff --git a/src/cli/README.md b/src/cli/README.md index 8cb1878..d91e9db 100644 --- a/src/cli/README.md +++ b/src/cli/README.md @@ -118,8 +118,8 @@ void loop() { Within the `CommandHandler`, there are several helper routines which are useful for processing the `argc` and `argv` arguments: -* `SHIFT_ARGC_ARGV(argc, argv)` macro shifts the input tokens by 1, incrementing - `argv` and decrementing `argc` +* `shiftArgcArgv(argc, argv)` shifts the input tokens by 1 token to the left, + by incrementing `argv` and decrementing `argc` * `bool isArgEqual(const char*, const char*);` * `bool isArgEqual(const char*, const __FlashHelperString*);` @@ -144,7 +144,7 @@ class DelayCommand: public CommandHandler { return; } - SHIFT_ARGC_ARGV(argc, argv); + shiftArgcArgv(argc, argv); if (isArgEqual(argv[0], "on")) { int delay = atoi(argv[1])); printer.print(F("Executing: delay on ")); diff --git a/src/crc_eeprom/CrcEeprom.h b/src/crc_eeprom/CrcEeprom.h index b752ec7..88c4c94 100644 --- a/src/crc_eeprom/CrcEeprom.h +++ b/src/crc_eeprom/CrcEeprom.h @@ -6,8 +6,8 @@ #ifndef ACE_UTILS_CRC_EEPROM_H #define ACE_UTILS_CRC_EEPROM_H -// Cannot compile this on UnixHostDuino -#if ! defined(UNIX_HOST_DUINO) +// Cannot compile this on EpoxyDuino +#if ! defined(EPOXY_DUINO) // EEPROM is supported only on certain Arduino boards. In particular, many // (most?) Arduino Zero compatible boards cannot support EEPROM even on Flash @@ -152,6 +152,6 @@ class CrcEeprom { } // crc_eeprom } // ace_utils -#endif // ! defined(UNIX_HOST_DUINO) +#endif // ! defined(EPOXY_DUINO) #endif // defined(ACE_UTILS_CRC_EEPROM_H) diff --git a/tests/CliTest/Makefile b/tests/CliTest/Makefile index 5ee84ca..b5b51c9 100644 --- a/tests/CliTest/Makefile +++ b/tests/CliTest/Makefile @@ -1,6 +1,6 @@ -# See https://github.com/bxparks/UnixHostDuino for documentation about this +# See https://github.com/bxparks/EpoxyDuino for documentation about this # Makefile to compile and run Arduino programs natively on Linux or MacOS. APP_NAME := CliTest ARDUINO_LIBS := AUnit AceCommon AceRoutine AceUtils -include ../../../UnixHostDuino/UnixHostDuino.mk +include ../../../EpoxyDuino/EpoxyDuino.mk