R133

Author: martinusGH

Command.ino

@@ -20,6 +20,14 @@ void ExecuteCommand(byte source, const char *Line)
   // commands for debugging
   // ****************************************
 
+  if (strcasecmp_P(Command, PSTR("SerialFloat")) == 0)
+  {
+    success = true;
+    pinMode(1,INPUT);
+    pinMode(3,INPUT);
+    delay(60000);
+  }
+
   if (strcasecmp_P(Command, PSTR("meminfo")) == 0)
   {
     success = true;

ESPEasy.ino

@@ -63,9 +63,6 @@
 //   MSP5611 I2C temp/baro sensor
 //   BMP280 I2C Barometric Pressure sensor
 //   SHT1X temperature/humidity sensors
-
-//   Experimental/Preliminary:
-//   =========================
 //   Ser2Net server
 
 // ********************************************************************************
@@ -121,7 +118,7 @@
 #define ESP_PROJECT_PID           2015050101L
 #define ESP_EASY
 #define VERSION                             9
-#define BUILD                             132
+#define BUILD                             133
 #define BUILD_NOTES                        ""
 #define FEATURE_SPIFFS                  false
 

Misc.ino

@@ -1998,6 +1998,15 @@ boolean ruleMatch(String& event, String& rule)
   String tmpEvent = event;
   String tmpRule = rule;
 
+  // Special handling of literal string events, they should start with '!'
+  if (event.charAt(0) == '!')
+  {
+    if (event.equalsIgnoreCase(rule))
+        return true;
+    else
+        return false;
+  }
+
   if (event.startsWith("Clock#Time")) // clock events need different handling...
   {
     int pos1 = event.indexOf("=");

WebServer.ino

@@ -2555,7 +2555,7 @@ void handle_rules() {
 
   // load form data from flash
   reply += F("<form method='post'>");
-  reply += F("<textarea name='rules' rows='15' cols='80' wrap='on'>");
+  reply += F("<textarea name='rules' rows='15' cols='80' wrap='off'>");
 
 #if FEATURE_SPIFFS
   File f = SPIFFS.open("rules.txt", "r+");

_P020_Ser2Net.ino

@@ -9,14 +9,15 @@
 
 #define BUFFER_SIZE 128
 boolean Plugin_020_init = false;
+byte Plugin_020_SerialProcessing = 0;
 
 WiFiServer *ser2netServer;
 WiFiClient ser2netClient;
 
 boolean Plugin_020(byte function, struct EventStruct *event, String& string)
 {
   boolean success = false;
-  static byte connectionState=0;
+  static byte connectionState = 0;
 
   switch (function)
   {
@@ -84,6 +85,29 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
         sprintf_P(tmpString, PSTR("<TR><TD>RX Receive Timeout (mSec):<TD><input type='text' name='plugin_020_rxwait' value='%u'>"), Settings.TaskDevicePluginConfig[event->TaskIndex][0]);
         string += tmpString;
 
+        byte choice2 = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
+        String options2[3];
+        options2[0] = F("None");
+        options2[1] = F("Generic");
+        options2[2] = F("RFLink");
+        int optionValues2[3];
+        optionValues2[0] = 0;
+        optionValues2[1] = 1;
+        optionValues2[2] = 2;
+        string += F("<TR><TD>Event processing:<TD><select name='plugin_020_events'>");
+        for (byte x = 0; x < 3; x++)
+      {
+        string += F("<option value='");
+          string += optionValues2[x];
+          string += "'";
+          if (choice2 == optionValues2[x])
+            string += F(" selected");
+          string += ">";
+          string += options2[x];
+          string += F("</option>");
+        }
+        string += F("</select>");
+
         success = true;
         break;
       }
@@ -102,6 +126,8 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
         ExtraTaskSettings.TaskDevicePluginConfigLong[4] = plugin5.toInt();
         String plugin6 = WebServer.arg("plugin_020_rxwait");
         Settings.TaskDevicePluginConfig[event->TaskIndex][0] = plugin6.toInt();
+        String plugin7 = WebServer.arg("plugin_020_events");
+        Settings.TaskDevicePluginConfig[event->TaskIndex][1] = plugin7.toInt();
         success = true;
         break;
       }
@@ -128,9 +154,10 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
             digitalWrite(Settings.TaskDevicePin1[event->TaskIndex], HIGH);
             pinMode(Settings.TaskDevicePin1[event->TaskIndex], INPUT_PULLUP);
           }
-          
+
           Plugin_020_init = true;
         }
+        Plugin_020_SerialProcessing = Settings.TaskDevicePluginConfig[event->TaskIndex][1];
         success = true;
         break;
       }
@@ -151,7 +178,7 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
 
           if (ser2netClient.connected())
           {
-            connectionState=1;
+            connectionState = 1;
             uint8_t net_buf[BUFFER_SIZE];
             int count = ser2netClient.available();
             if (count > 0)
@@ -169,22 +196,22 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
                 strcpy_P(log, PSTR("Ser2N: network buffer full!"));   // and log buffer full situation
                 addLog(LOG_LEVEL_ERROR, log);
               }
-              net_buf[count]=0; // before logging as a char array, zero terminate the last position to be safe.
-              char log[BUFFER_SIZE+40];
+              net_buf[count] = 0; // before logging as a char array, zero terminate the last position to be safe.
+              char log[BUFFER_SIZE + 40];
               sprintf_P(log, PSTR("Ser2N: N>: %s"), (char*)net_buf);
-              addLog(LOG_LEVEL_DEBUG,log);
+              addLog(LOG_LEVEL_DEBUG, log);
             }
           }
           else
           {
-            if(connectionState == 1) // there was a client connected before...
+            if (connectionState == 1) // there was a client connected before...
             {
-              connectionState=0;
+              connectionState = 0;
               char log[40];
               strcpy_P(log, PSTR("Ser2N: Client disconnected!"));
               addLog(LOG_LEVEL_ERROR, log);
             }
-            
+
             while (Serial.available())
               Serial.read();
           }
@@ -196,54 +223,107 @@ boolean Plugin_020(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_SERIAL_IN:
       {
-        if (Plugin_020_init)
+        uint8_t serial_buf[BUFFER_SIZE];
+        int RXWait = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
+        if (RXWait == 0)
+          RXWait = 1;
+        int timeOut = RXWait;
+        size_t bytes_read = 0;
+        while (timeOut > 0)
         {
-          if (ser2netClient.connected())
-          {
-            uint8_t serial_buf[BUFFER_SIZE];
-            int RXWait = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
-            if (RXWait == 0)
-              RXWait = 1;
-            int timeOut = RXWait;
-            size_t bytes_read = 0;
-            while (timeOut > 0)
-            {
-              while (Serial.available()) {
-                if (bytes_read < BUFFER_SIZE) {
-                  serial_buf[bytes_read] = Serial.read();
-                  bytes_read++;
-                }
-                else
-                  Serial.read();  // when the buffer is full, just read remaining input, but do not store...
-                  
-                timeOut = RXWait; // if serial received, reset timeout counter
-              }
-              delay(1);
-              timeOut--;
+          while (Serial.available()) {
+            if (bytes_read < BUFFER_SIZE) {
+              serial_buf[bytes_read] = Serial.read();
+              bytes_read++;
             }
-            
-            if (bytes_read != BUFFER_SIZE)
+            else
+              Serial.read();  // when the buffer is full, just read remaining input, but do not store...
+
+            timeOut = RXWait; // if serial received, reset timeout counter
+          }
+          delay(1);
+          timeOut--;
+        }
+
+        if (bytes_read != BUFFER_SIZE)
+        {
+          if (bytes_read > 0) {
+            if (Plugin_020_init && ser2netClient.connected())
             {
-              if (bytes_read > 0) {
-                ser2netClient.write((const uint8_t*)serial_buf, bytes_read);
-                ser2netClient.flush();
-              }
+              ser2netClient.write((const uint8_t*)serial_buf, bytes_read);
+              ser2netClient.flush();
             }
-            else // if we have a full buffer, drop the last position to stuff with string end marker
-            {
-              while (Serial.available()) // read possible remaining data to avoid sending rubbish...
-                Serial.read();
-              bytes_read--;
-              char log[40];
-              strcpy_P(log, PSTR("Ser2N: serial buffer full!"));   // and log buffer full situation
-              addLog(LOG_LEVEL_ERROR, log);
-            }  
-            serial_buf[bytes_read]=0; // before logging as a char array, zero terminate the last position to be safe.
-            char log[BUFFER_SIZE+40];
-            sprintf_P(log, PSTR("Ser2N: S>: %s"), (char*)serial_buf);
-            addLog(LOG_LEVEL_DEBUG,log);
           }
+        }
+        else // if we have a full buffer, drop the last position to stuff with string end marker
+        {
+          while (Serial.available()) // read possible remaining data to avoid sending rubbish...
+            Serial.read();
+          bytes_read--;
+          char log[40];
+          strcpy_P(log, PSTR("Ser2N: serial buffer full!"));   // and log buffer full situation
+          addLog(LOG_LEVEL_ERROR, log);
+        }
+        serial_buf[bytes_read] = 0; // before logging as a char array, zero terminate the last position to be safe.
+        char log[BUFFER_SIZE + 40];
+        sprintf_P(log, PSTR("Ser2N: S>: %s"), (char*)serial_buf);
+        addLog(LOG_LEVEL_DEBUG, log);
+
+        // We can also use the rules engine for local control!
+        if (Settings.UseRules)
+        {
+          String message = (char*)serial_buf;
+          int NewLinePos = message.indexOf("\r\n");
+          if (NewLinePos > 0)
+            message = message.substring(0, NewLinePos);
+          String eventString = "";
+
+          switch (Plugin_020_SerialProcessing)
+          {
+            case 0:
+              {
+                break;
+              }
+
+            case 1: // Generic
+              {
+                eventString = F("!Serial#");
+                eventString += message;
+                break;
+              }
+
+            case 2: // RFLink
+              {
+                message = message.substring(6); // RFLink, strip 20;xx; from incoming message
+                //message.replace("\r\n", "");
+                if (message.startsWith("ESPEASY")) // Special treatment for gpio values, strip unneeded parts...
+                {
+                  message = message.substring(8); // Strip "ESPEASY;"
+                  eventString = F("RFLink#");
+                }
+                else
+                  eventString = F("!RFLink#"); // default event as it comes in, literal match needed in rules, using '!'
+                eventString += message;
+                break;
+              }
+          } // switch
+
+          if (eventString.length() > 0)
+            rulesProcessing(eventString);
+
+        } // if rules
+        success = true;
+        break;
+      }
+
+    case PLUGIN_WRITE:
+      {
+        String command = parseString(string, 1);
+        if (command == F("serialsend"))
+        {
           success = true;
+          String tmpString = string.substring(11);
+          Serial.println(tmpString);
         }
         break;
       }

__ReleaseNotes.ino

@@ -1,3 +1,7 @@
+// R133 26-09-2016
+// Added rule events to SerialServer and SerialSend command
+// Changed 'wrap on' to 'wrap off' in rules editor
+
 // R132 24-09-2016
 // Moved ISR handlers for Pulse, RFID and HCSR04 plugins to iram cache