Update to 4.1.1

CreativeRobotics · CreativeRobotics · commit f278293a053b · 2021-07-10T09:31:27.000+01:00
Bug fixes including wonky release.
Fixed some issues surrounding end of kine characters.
Automatically set stripCR to false if end of line character is CR.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,9 @@
 Commander changelog
 (Changelog started at 1.2.3)
+4.1.1
+Minor bugfix related to wonky resease.
+Fixed missing references to endOfLineCharacter that were still '/n'. **Changing endOfLineCharacter may have implications for how streams get printed.
+Changed endOfLineChar(char) so that if the end of line character is set to a carriage return, stripCR is automatically set to false.
 
 4.1.0
 
diff --git a/README.md b/README.md
@@ -205,187 +205,4 @@ We can use any available delimiter in the command string so the command 'set int
 _Disclaimer: I'm not the best software engineer in the world so there may be some bits of silliness in my code. I welcome contributions that will improve Commander so long as they maintain a good balance between features and efficiency._
 
 Written by Bill Bigge.
-MIT license, all text above must be included in any redistributionle via USB and Bluetooth Serial. It also allows different command lists to be dynamically loaded so multiple command lists, and multiple Commander objects can be combined to produce hierarchical command structures.
-
-Commands can be chained together in a single line and Commander incorporates a set of functions for extracting any payload that comes after a command and for sequentially parsing variables in the payload. It can also augment responses sent to its output and auxiliary Streams by adding prefix and postfix text, for example each line can be enclosed with opening and closing html tags, or prefixed with a command.
-
-Built in commands like Help will generate a help page that lists all the commands and any help text. Additional built in commands can be used to toggle error reporting and port echoing and all built in commands can be overridden by the user with their own handler. Lock and Unlock commands can be used to impliment a password system with two levels. A soft lock will allow internal commands to be used (including help) but will not run any user commands. A hard lock will block all commands except unlock. An optional password can be used and is stored outside the Commander object in the users sketch.
-
-Commander can use an optional command prompt with user defined text to emulate the feel of a command line, this prompt can be changed dynamically to indicate the current context, for example it can show the working directory of a file system, or the title of a sub command list. Commander also has a user defined 'reload' character that will reload the last command. By default this is / so, for example, if you sent a command called 'print sensors' and then want to send the same command again, you just need to type / to repeat it. A user defined 'comment' character (# by default) can be put in front of a line to tell Commander to ignore it. This can be handy when reading SD card files if you want to put comments into the file. Comments can also be placed after commands as well as on their own lines.
-
-Visit the [API](https://github.com/CreativeRobotics/Commander/wiki/API) page for a complete list of Commanders methods.
-
-### The following list of examples demonstrate various ways to use Commander
-
-__BasicCommands:__ Demonstrates setting and getting integer and float values with a command list and setting multiple values with a single command.
-
-__QuickSet:__ Demonstrates an in built method for packing some commands in a single command handler for faster coding whilst retaining the help system for listing commands.
-
-__ESP32-SerialBTCommands:__ Uses a BluetoothSerial object so commands can be sent vial Bluetooth.
-
-__FileRead:__ Open an SD card file that contains a set of commands and read the contents into Commander. Responses to commands are fed back to a Serial port.
-
-__FileReadLog:__ Open an SD card file that contains a set of commands and read the contents into Commander. Responses to commands are written to another file and copied to a Serial port.
-
-__FileNavigation:__ Used SDFat and a set of commands for listing files, navigating and creating directories, renaming and deleting files and directories and printing out files.
-
-__FormattedReplies:__ Shows how to use the pre and postfix formatting, and command chaining so formatting for another command can be invoked.
-
-__SimpleMultiLayer:__ Shows how three command lists can be used with one Commander object to create a multi-level command structure. This example has sub commands for setting variable, and more for reading back variables. These commands can be invoked from the top level (e.g 'get int') or the sub level can be invoked ('get') and then commands from that level invoked directly ('int') before an 'exit' command returns you to the top level. The help command can be used to get help for every level.
-
-__FullMultiLayer:__ This example behaves in an almost identical way to SimpleMultiLayer but uses three Commander objects. Navigating between different levels is handled by passing control from one Commander object to another rather than loading different command lists into the same object.
-
-__PrefabFileExplorer:__ Demonstrates the use of a prefabricated command structure (in PrefabFileNavigator.h) to create a sub menu for navigating and manipulating files on an SD card. The prefab allows files to be created and written to but a suitable terminal application needs to be used - The terminal application needs to be able to send the ASCII value 4 in order to terminate the file download and return control to the command system. The Arduino serial terminal will not allow this so we do not recommend using it with the 'write' command.
-
-__NumberCommand:__ (To Be Done!) Demonstrates a special class of command for handling numbers. It is designed to allow data files to be uploaded and unpacked into an array.
-
-__TelnetCommand:__ (To Be Done) Interface a Telnet session to Commander so that commands can be accessed remotely via WiFi.
-
-__htmlCommand:__ (To Be Done) Feed HTML page requests to Commander and generate HTML formatted responses in reply.
-
-### How it works (roughly speaking)
-
-The command list is an array of structures and each element contains the command string, a function pointer, and a help text string. These are all defined before the code is compiles, rather than being assigned dynamically when your code starts in order to reduce the amount of dynamic memory allocation and ensure the sketch starts quickly, particularly if using very large command sets. When you load a command list into a Commander object it scans the list and records the lengths of all the commands - this is used as part of the command matching algorithm.
-
-When Commander reads a Stream or is fed a String it places it in a buffer and tries to match the start of the string to a command (unless it was rejected as a comment or the reload character was detected). If a command match is found it invokes the users command handler function and waits for it to finish. The buffer is a String object and is public so it can be read and manipulated by the users code from their handler function, and all the Arduino String methods can be used with it.
-
-If it can't find a match it looks for a built in command and will execute the handler if a match is found. When Commander is finished it will check to see if the command prompt is enabled and if so, it will print out the prompt on a new line.
-
-Because Commander checks the user commands first you can override any of the built in commands with your own.
-
-There are a full set of Stream print and write functions that can be used, and they ensure that printed responses will be routed to the Commander objects specified output port, and to the aux port if enabled, and they ensure that any pre or postfix formatting is applied.
-
-The command match system relies on each command ending with either a delimiter chgaracter or an end of line character. If the command doesn't have any arguments it will normally end in an end of line but if it has any arguments then they must be separated by one of the delimiters (The defaults are COMMA FWDSLASH BWDSLASH EQUALS OR TAB and SPACE) - The delimiters allow the use of key=value properties like this: 'myvariable=3' where myvariable is the command and 3 is the argument. Delimiters can be changed by the user, or added to.
-
-Any data that comes after a recognised command is called the payload, and this can be easily extracted using the getPayload() and getPayloadString() commands. Commander can also process the payload to extract individual items. An item is any group of characters with a delimiter or end of line at either end. A set of mathods can be used to extract integers and, floats as well as strings. Commander keeps track of where it is in the payload so you can call getInt() repeatedly to extract a series of values, or getString() to extract individual items. Commander will ignore delimiters if they are insude quote marks so enclosing a whole phrase insude quotes will cause COmmander to treat it as a single item.
-
-An autoChain setting will make Commander attempt to reload any part of the buffer left over after processing as a new command line. This allows commands to be chained together on a single line.
-
-### Basic code structure
-
-Visit the wiki [Getting Started](https://github.com/CreativeRobotics/Commander/wiki/GettingStarted) page for more information.
-
-To create a command system the user needs to create the command list array, and all the command function handlers. A command list array will look something like this (This is all taken from the BasicCommands example):
-
-```c++
-const commandList_t masterCommands[] = {
-  {"hello",       helloHandler,     "hello"},
-  {"get int",     getIntHandler,    "get an int"},
-  {"set int",     setIntHandler,    "set an int"},
-  {"get float",   getFloatHandler,  "get a float"},
-  {"set float",   setFloatHandler,  "set a float"},
-  {"myint",       setIntHandler,    "try myint=23"},
-  {"myfloat",     setFloatHandler,  "try myfloat=23.5"},
-  {"set ints",    setIntsHandler,   "set up to four ints"},
-  {"set floats",  setFloatsHandler, "set up to four floats"},
-  {"set strings", setStringsHandler,"set up to four Strings"},
-};
-```
-Each line specifies one command (and is one element in the command array). The first text string is the actual command, the second is the name of the function that will handle the command and the third string is the help text that will print out when you type help. Sometimes you might want a command to be available, but not appear in the help text, in which case you can simply place a '-' character at the start of the help text.
-
-To add a command simply copy and paste in a new line, edit the text and create a command handler that matches the template below.
-
-__Command Handler Functions__
-
-The command handlers need to follow the same template. Each must return a boolean value, and take a Commander object as an argument - When the Commander object calls the function it will pass a reference to its self to the function so the users code can access that Commander object and all its methods and variables.
-
-The function template looks like this:
-
-```c++
-bool myFunc(Commander &Cmdr){
-  //put your command handler code here
-  return 0;
-}
-```
-
-When you write your command handler you can access the Commanders methods and the command buffer using the Cmdr reference.
-
-In this example the command handler simply used the Cmdr objects print methods to reply with a message that includes the contents of the buffer.
-
-```c++
-bool helloHandler(Commander &Cmdr){
-  Cmdr.print("Hello! this is ");
-  Cmdr.println(Cmdr.commanderName);
-  Cmdr.print("This is my buffer: ");
-  Cmdr.print(Cmdr.bufferString);
-  return 0;
-}
-```
-
-Commander has a built in method of parsing integer and float values, this can be used to extract numeric values from a commands payload.
-
-```c++
-bool setIntHandler(Commander &Cmdr){
-  if(Cmdr.getInt(myInt)){
-    Cmdr.print("myInt set to ");
-    Cmdr.println(myInt);
-  }
-  return 0;
-}
-```
-The method Cmdr.getInt(myInt) checks to see if it can find the start of a number in the payload (the part of the command buffer after the actual command) If it finds one then it converts it into an int and assigns it to the variable referenced in the function call - in this case _myInt_ - The function will return a boolean value when it finishes, this will be TRUE if the attempt was successful, and false if it was not (if your variable was not updated).
-
-Commander can also extract Strings from the payload. A string is any series of characters in quotes, or seperated by delimiters.
-
-```c++
-bool setStringHandler(Commander &Cmdr){
-  if(Cmdr.getString(myString)){
-    Cmdr.print("myString set to ");
-    Cmdr.println(String);
-  }
-  return 0;
-}
-```
-
-The method Cmdr.getString(myString) attempts to extract the next item in the payload and assign it to your String object (the myString variable) The function will return a boolean value when it finishes, this will be TRUE if the attempt was successful, and false if it was not (if your variable was not updated). An item is anything seperated by delimiters, or encloded in quote marks. For example sending the command 'setString hello there' would place the text 'hello' in the variable myString because 'hello' is the first item and 'there' is the second. Using the command 'setString "hello there"' would place the text 'hello there' in the variable myString because the text is in quotes.
-
-The _getInt()_ and _getFloat()_ and _getString()_ methods keep track of where they are in the buffer so you can use them to extract a series of numbers with one command. The following code shows how to unpack up to four ints into an array. If you include less than four ints after the command, it will unpack the ones you did send, and if you include too many it will unpack only the first four.
-
-```c++
-bool getIntsHandler(Commander &Cmdr){
-  //create an array to store any values we find
-  int values[4] = {0,0,0,0};
-  for(int n = 0; n < 4; n++){
-    //try and unpack an int, if it fails there are no more left so exit the loop
-    if(Cmdr.getInt(values[n])){
-      Cmdr.print("unpacked ");
-      Cmdr.println(values[n]);
-    }else break;
-  }
-  //print it out
-  Cmdr.println("Array contents after processing:");
-  for(int n = 0; n < 4; n++){
-    Cmdr.print(n);
-    Cmdr.print(" = ");
-    Cmdr.println(values[n]);
-  }
-  return 0;
-}
-```
-In the example we are using the command _set ints_ which has been defined in the command array. Sending the command string 'set ints 12 34 56 78' will produce the following output on the serial port:
-
-> unpacked 12
-
-> unpacked 34
-
-> unpacked 56
-
-> unpacked 78
-
-> Array contents after processing:
-
-> 0 = 12
-
-> 1 = 34
-
-> 2 = 56
-
-> 3 = 78
-
-
-We can use any available delimiter in the command string so the command 'set ints 12,34,56,78' will produce exactly the same result, as will 'set ints 12/34/56/78' and 'set ints 12=34\56/78'
-
-_Disclaimer: I'm not the best software engineer in the world so there may be some bits of silliness in my code. I welcome contributions that will improve Commander so long as they maintain a good balance between features and efficiency._
-
-Written by Bill Bigge.
-MIT license, all text above must be included in any redistribution
+MIT license, all text above must be included in any redistributionle via USB and Bluetooth Serial. It also allows different command lists to be dynamically loaded so multiple command lists, and multiple Commander objects can be combined to produce hierarchical command structures.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Commander
-version=4.1.0
+version=4.1.1
 author=Bill Bigge
 maintainer=Bill Bigge <bbigge@gmail.com>
 sentence=Command line library for Arduino.
diff --git a/src/Commander.cpp b/src/Commander.cpp
@@ -136,7 +136,7 @@ bool Commander::streamData(){
 			//println("EOF Found, tidying up");
 			commandState.bit.dataStreamOn = false;
 			//get rid of any newlines or CRs in the stream
-			while(ports.inPort->peek() == '\n' || ports.inPort->peek() == '\r') ports.inPort->read();
+			while(ports.inPort->peek() == endOfLineCharacter || ports.inPort->peek() == '\r') ports.inPort->read();
 			//call the handler again so it can clean up and close anything that needs closing
 			commandState.bit.commandHandled = !handleCustomCommand();
 			resetBuffer();
@@ -215,7 +215,7 @@ String Commander::getPayload(){
 String Commander::getPayloadString(){
 	//return the payload minus any newline
 	if(hasPayload()){
-		return bufferString.substring(dataReadIndex, bufferString.indexOf('\n'));
+		return bufferString.substring(dataReadIndex, bufferString.indexOf(endOfLineCharacter));
 	}
 	return "";
 	/*
@@ -625,6 +625,13 @@ bool Commander::containsOff(){
 	return false;
 }
 //==============================================================================================================
+
+Commander&  Commander::endOfLineChar(char eol){
+	endOfLineCharacter         = eol;
+	if(endOfLineCharacter == '\r') return stripCR(false);
+	return *this;
+}
+//==============================================================================================================
 void Commander::computeLengths(){
 	//compute the length of each command
 	if(commandListEntries == 0) return;
@@ -661,7 +668,7 @@ bool Commander::handleCommand(){
 		return 0;
 	}
 	 //write a newline if the command prompt is enabled so reply messages appear on a new line
-	if(ports.settings.bit.commandPromptEnabled && !ports.settings.bit.echoTerminal) write('\n');
+	if(ports.settings.bit.commandPromptEnabled && !ports.settings.bit.echoTerminal) write(endOfLineCharacter);
 	if(ports.settings.bit.autoFormat) startFormatting();
 	
 	//Match command will handle internal commands 
diff --git a/src/Commander.h b/src/Commander.h
@@ -95,7 +95,7 @@ typedef union {
 //const String CommanderVersionNumber = "3.0.0";
 const uint8_t majorVersion = 4;
 const uint8_t minorVersion = 1;
-const uint8_t subVersion   = 0;
+const uint8_t subVersion   = 1;
 
 typedef enum streamType_t{
 	UNDEFINED_STREAM 	= 0,
@@ -365,7 +365,7 @@ class Commander{
 	char 				commentChar()     								{return commentCharacter;}
 	Commander&  reloadChar(char reloadChar)   		{reloadCommandCharacter = reloadChar; return *this;}
 	char 				reloadChar()     									{return reloadCommandCharacter;}
-	Commander&  endOfLineChar(char eol) 					{endOfLineCharacter         = eol; return *this;}
+	Commander&  endOfLineChar(char eol);
 	char 				endOfLineChar()     							{return endOfLineCharacter;}
 	Commander&  promptChar(char eol) 			    		{promptCharacter         = eol; return *this;}
 	char  			promptChar() 			    						{return promptCharacter;}
