Stickyness, rpn.ops,...

code/espurna/config/arduino.h

@@ -159,6 +159,7 @@
 //#define NTP_SUPPORT            0
 //#define RF_SUPPORT             1
 //#define RFM69_SUPPORT          1
+//#define RPN_RULES_SUPPORT      0
 //#define SCHEDULER_SUPPORT      0
 //#define SENSOR_SUPPORT         1
 //#define SPIFFS_SUPPORT         1

code/espurna/config/general.h

@@ -1165,11 +1165,11 @@
 // -----------------------------------------------------------------------------
 
 #ifndef SCHEDULER_SUPPORT
-#define SCHEDULER_SUPPORT           1           // Enable scheduler (1.77Kb)
+#define SCHEDULER_SUPPORT           1               // Enable scheduler (2.45Kb)
 #endif
 
 #ifndef SCHEDULER_MAX_SCHEDULES
-#define SCHEDULER_MAX_SCHEDULES     10          // Max schedules alowed
+#define SCHEDULER_MAX_SCHEDULES     10              // Max schedules alowed
 #endif
 
 // -----------------------------------------------------------------------------
@@ -1177,11 +1177,11 @@
 // -----------------------------------------------------------------------------
 
 #ifndef RPN_RULES_SUPPORT
-#define RPN_RULES_SUPPORT           1           // Enable RPN Rules (?Kb)
+#define RPN_RULES_SUPPORT           1               // Enable RPN Rules (8.13Kb)
 #endif
 
-#ifndef RPN_BUFFER_DELAY
-#define RPN_BUFFER_DELAY            100         // Execute rules after 100ms without messages
+#ifndef RPN_DELAY
+#define RPN_DELAY                   100             // Execute rules after 100ms without messages
 #endif
 
 // -----------------------------------------------------------------------------

code/espurna/config/hardware.h

@@ -46,6 +46,7 @@
     #define I2C_SUPPORT             0
     #define MQTT_SUPPORT            0
     #define NTP_SUPPORT             0
+    #define RPN_RULES_SUPPORT       0
     #define SCHEDULER_SUPPORT       0
     #define SENSOR_SUPPORT          0
     #define THINGSPEAK_SUPPORT      0

code/espurna/rpnrules.ino

@@ -17,7 +17,7 @@ Copyright (C) 2019 by Xose Pérez <xose dot perez at gmail dot com>
 rpn_context _rpn_ctxt;
 bool _rpn_run = false;
 bool _rpn_inject = true;
-unsigned long _rpn_delay = RPN_BUFFER_DELAY;
+unsigned long _rpn_delay = RPN_DELAY;
 float _rpn_value = 0;
 unsigned long _rpn_last = 0;
 
@@ -31,7 +31,7 @@ void _rpnWebSocketOnSend(JsonObject& root) {
     
     root["rpnVisible"] = 1;
     root["rpnSticky"] = getSetting("rpnSticky", 1).toInt();
-    root["rpnDelay"] = getSetting("rpnDelay", RPN_BUFFER_DELAY).toInt();
+    root["rpnDelay"] = getSetting("rpnDelay", RPN_DELAY).toInt();
     JsonArray& rules = root.createNestedArray("rpnRules");
     JsonArray& topics = root.createNestedArray("rpnTopics");
     JsonArray& names = root.createNestedArray("rpnNames");
@@ -101,7 +101,7 @@ void _rpnConfigure() {
     #if MQTT_SUPPORT
         if (mqttConnected()) _rpnMQTTSubscribe();
     #endif
-    _rpn_delay = getSetting("rpnDelay", RPN_BUFFER_DELAY).toInt();
+    _rpn_delay = getSetting("rpnDelay", RPN_DELAY).toInt();
 }
 
 void _rpnBrokerCallback(const unsigned char type, const char * topic, unsigned char id, const char * payload) {
@@ -134,6 +134,10 @@ void _rpnInit() {
         rpn_stack_push(ctxt, now());
         return true;
     });
+    rpn_operator_set(_rpn_ctxt, "utc", 0, [](rpn_context & ctxt) {
+        rpn_stack_push(ctxt, ntpLocal2UTC(now()));
+        return true;
+    });
     rpn_operator_set(_rpn_ctxt, "dow", 1, [](rpn_context & ctxt) {
         float a;
         rpn_stack_pop(ctxt, a);
@@ -182,7 +186,7 @@ void _rpnInit() {
         });
 
         rpn_operator_set(_rpn_ctxt, "black", 0, [](rpn_context & ctxt) {
-            lightColor(0);
+            lightColor((unsigned long) 0);
             return true;
         });
 
@@ -212,12 +216,21 @@ void _rpnInitCommands() {
                 char * name = rpn_variable_name(_rpn_ctxt, i);
                 float value;
                 rpn_variable_get(_rpn_ctxt, name, value);
-                DEBUG_MSG_P(PSTR("     %s: %s\n"), name, String(value).c_str());
+                DEBUG_MSG_P(PSTR("   %s: %s\n"), name, String(value).c_str());
             }
         }
         terminalOK();
     });
 
+    terminalRegisterCommand(F("RPN.OPS"), [](Embedis* e) {
+        unsigned char num = _rpn_ctxt.operators.size();
+        DEBUG_MSG_P(PSTR("[RPN] Operators:\n"));
+        for (unsigned char i=0; i<num; i++) {
+            DEBUG_MSG_P(PSTR("   %s (%d)\n"), _rpn_ctxt.operators[i].name, _rpn_ctxt.operators[i].argc);
+        }
+        terminalOK();
+    });
+
     terminalRegisterCommand(F("RPN.TEST"), [](Embedis* e) {
         if (e->argc == 2) {
             DEBUG_MSG_P(PSTR("[RPN] Running \"%s\"\n"), e->argv[1]);

code/html/index.html

@@ -1406,7 +1406,7 @@
                         <div class="header">
                             <h1>RULES</h1>
                             <h2>
-                                Here you can configure advanced rules based on RPN sentences. 
+                                Here you can configure advanced rules based on RPN expressions. Check the <a href="https://github.com/xoseperez/espurna/wiki/RPN-Rules" target="_blank">wiki page about the RPN Rules module</a> to know how to use them.
                             </h2>
                         </div>
 
@@ -1436,7 +1436,6 @@
                                 <legend>Rules</legend>
 
                                 <div id="rpnRules"></div>
-
                                 <button type="button" class="pure-button button-add-rpnrule">Add</button>
 
                                 <legend>MQTT</legend>
@@ -1447,7 +1446,6 @@
                                 </div>
 
                                 <div id="rpnTopics"></div>
-
                                 <button type="button" class="pure-button button-add-rpntopic">Add</button>
 
                             </fieldset>