optdata GUI fix and import rules fix

Author: IgorYbema

HeishaMon/decode.cpp

@@ -412,9 +412,9 @@ void decode_optional_heatpump_data(char* data, char* actOptData, PubSubClient &
       int maxvalue = atoi(opttopicDescription[Topic_Number][0]);
       String dataValue = getOptDataValue(actOptData, Topic_Number);
       if (maxvalue == 0) { //this takes the special case where the description is a real value description instead of a mode, so get description index 1
-        sprintf_P(log_msg, PSTR("{\"data\": {\"heishavalues\": {\"topic\": \"OPTTOP%u\", \"value\": %s, \"description\": \"%s\"}}}"), Topic_Number, dataValue.c_str(),opttopicDescription[Topic_Number][1]);
+        sprintf_P(log_msg, PSTR("{\"data\": {\"heishavalues\": {\"topic\": \"OPT%u\", \"value\": %s, \"description\": \"%s\"}}}"), Topic_Number, dataValue.c_str(),opttopicDescription[Topic_Number][1]);
       } else {
-        sprintf_P(log_msg, PSTR("{\"data\": {\"heishavalues\": {\"topic\": \"OPTTOP%u\", \"value\": %s, \"description\": \"%s\"}}}"), Topic_Number, dataValue.c_str(),opttopicDescription[Topic_Number][dataValue.toInt() + 1]);
+        sprintf_P(log_msg, PSTR("{\"data\": {\"heishavalues\": {\"topic\": \"OPT%u\", \"value\": %s, \"description\": \"%s\"}}}"), Topic_Number, dataValue.c_str(),opttopicDescription[Topic_Number][dataValue.toInt() + 1]);
       }      
       rules_event_cb(_F("@"), optTopics[Topic_Number]);
     }

HeishaMon/src/rules/rules.cpp

@@ -296,7 +296,7 @@ static int8_t lexer_parse_number(char *text, uint16_t len, uint16_t *pos) {
      * The dot cannot be the first character
      * and we cannot have more than 1 dot
      */
-    while(*pos <= len &&
+    while(*pos < len &&
         (
           isdigit(current) ||
           (i == 0 && current == '-') ||
@@ -320,7 +320,7 @@ static int8_t lexer_parse_number(char *text, uint16_t len, uint16_t *pos) {
 static uint16_t lexer_parse_string(char *text, uint16_t len, uint16_t *pos) {
   char current = getval(text[*pos]);
 
-  while(*pos <= len &&
+  while(*pos < len &&
       (current != ' ' &&
       current != ',' &&
       current != ';' &&
@@ -363,7 +363,7 @@ static int8_t lexer_parse_quoted_string(char *text, uint16_t len, uint16_t *pos)
 static int8_t lexer_parse_skip_characters(char *text, uint16_t len, uint16_t *pos) {
   char current = getval(text[*pos]);
 
-  while(*pos <= len &&
+  while(*pos < len &&
       (current == ' ' ||
       current == '\n' ||
       current == '\t' ||

HeishaMon/webfunctions.cpp

@@ -1253,7 +1253,7 @@ int handleJsonOutput(struct webserver_t *client, char* actData, char* actDataExt
       webserver_send_content_P(client, PSTR("\",\"Description\":\""), 17);
 
       int maxvalue = atoi(opttopicDescription[topic][0]);
-      int value = actOptData[0] == '\0' ? 0 : getOptDataValue(actDataExtra, topic).toInt();
+      int value = actOptData[0] == '\0' ? 0 : getOptDataValue(actOptData, topic).toInt();
       if (maxvalue == 0) { //this takes the special case where the description is a real value description instead of a mode, so value should take first index (= 0 + 1)
         value = 0;
       }