Merge pull request #6 from neomilium/master

Fix last parameter count and comparison using flash

Author: pvizeli

examples/Parser/Parser.ino

@@ -74,7 +74,7 @@ void loop()
             Serial.println(cmdParser.getParamCount());
 
             const size_t count = cmdParser.getParamCount();
-            for (size_t i = 0; i <= count; i++) {
+            for (size_t i = 0; i < count; i++) {
 
                 Serial.print("Param ");
                 Serial.print(i);

src/CmdCallback.hpp

@@ -172,12 +172,12 @@ template <size_t STORESIZE>
 class CmdCallback_P : public _CmdCallback<STORESIZE, CmdParserString_P>
 {
     /**
-     * @implement CmdCallbackObject with strcmp_P
+     * @implement CmdCallbackObject with strcasecmp_P
      */
     virtual bool equalStoreCmd(size_t idx, char *cmdStr)
     {
         if (this->checkStorePos(idx) &&
-            strcasecmp_P(this->m_cmdList[idx], cmdStr) == 0) {
+            strcasecmp_P(cmdStr, this->m_cmdList[idx]) == 0) {
             return true;
         }
 
@@ -195,7 +195,7 @@ template <size_t STORESIZE>
 class CmdCallback : public _CmdCallback<STORESIZE, CmdParserString>
 {
     /**
-     * @implement CmdCallbackObject with strcmp_P
+     * @implement CmdCallbackObject with strcasecmp
      */
     virtual bool equalStoreCmd(size_t idx, char *cmdStr)
     {

src/CmdParser.cpp

@@ -21,7 +21,7 @@ uint16_t CmdParser::parseCmd(uint8_t *buffer, size_t bufferSize)
     bool isString = false;
 
     // init param count
-    m_paramCount ^= m_paramCount;
+    m_paramCount = 0;
 
     // buffer is not okay
     if (buffer == NULL || bufferSize == 0) {
@@ -38,6 +38,9 @@ uint16_t CmdParser::parseCmd(uint8_t *buffer, size_t bufferSize)
 
         // end
         if (buffer[i] == 0x00 || m_paramCount == 0xFFFE) {
+            if (i > 0 && buffer[i - 1] != 0x00) {
+                m_paramCount++;
+            }
             return m_paramCount;
         }
         // is string "xy zyx" / only the quote option is disabled