fix "obey power state" property for button

Author: vortigont

data/benc.json

@@ -1,12 +1,12 @@
 {
 "btn_events":[
-    {"enabled":true,"pwr":false,"btn_event":2,"lamp_event":13},
-    {"enabled":true,"pwr":true,"btn_event":2,"lamp_event":13},
-    {"enabled":true,"pwr":true,"btn_event":5,"lamp_event":24,"arg":1},
-    {"enabled":true,"pwr":true,"btn_event":6,"lamp_event":31,"clicks":2},
-    {"enabled":true,"pwr":true,"btn_event":6,"lamp_event":32,"clicks":3},
-    {"enabled":true,"pwr":true,"btn_event":6,"lamp_event":33,"clicks":4},
-    {"enabled":false,"pwr":false,"btn_event":3,"lamp_event":30,"arg":1}
+    {"enabled":true,"btn_event":2,"lamp_event":13},
+    {"enabled":true,"onpwr":true,"btn_event":2,"lamp_event":13},
+    {"enabled":true,"onpwr":true,"btn_event":5,"lamp_event":24,"arg":1},
+    {"enabled":true,"onpwr":true,"btn_event":6,"lamp_event":31,"clicks":2},
+    {"enabled":true,"onpwr":true,"btn_event":6,"lamp_event":32,"clicks":3},
+    {"enabled":true,"onpwr":true,"btn_event":6,"lamp_event":33,"clicks":4},
+    {"enabled":false,"btn_event":3,"lamp_event":30,"arg":1}
 ],
 "btn_cfg":{"enabled":false,"gpio":-1,"logicL":0,"debounce":true}
 }

resources/html/js/ui.json

@@ -2536,7 +2536,7 @@
           "type":"checkbox"
         },
         {
-          "id":"lamppwr",
+          "id":"onpwr",
           "html":"input",
           "label":"Trigger only when device is On",
           "type":"checkbox"

src/bencoder.cpp

@@ -226,7 +226,7 @@ void ButtonEventHandler::load(JsonVariantConst cfg){
 
   for(JsonVariantConst v : array) {
     //LOG(printf, "Add cfg Event:%u\n", v[T_btn_event].as<int>() );
-    _event_map.emplace_back(ButtonAction(static_cast<ESPButton::event_t>(v[T_btn_event].as<int>()), static_cast<evt::lamp_t>(v[T_lamp_event].as<int>()), v[T_clicks], v[T_arg], v[T_enabled], v[T_pwr] ));
+    _event_map.emplace_back(ButtonAction(static_cast<ESPButton::event_t>(v[T_btn_event].as<int>()), static_cast<evt::lamp_t>(v[T_lamp_event].as<int>()), v[T_clicks], v[T_arg], v[T_enabled], v[T_onpwr] ));
   }
 
 }

src/char_const.h

@@ -270,7 +270,7 @@ static constexpr const char* T_profile = "profile";
 static constexpr const char* T_profiles = "profiles";
 static constexpr const char* T_publish = "publish";
 static constexpr const char* T_publish_rate = "publish_rate";
-static constexpr const char* T_pwr = "pwr";
+static constexpr const char* T_onpwr = "onpwr";                         // used for control button/encoder to respect device power on/off state
 static constexpr const char* T_queue = "queue";
 static constexpr const char* T_queues = "queues";
 static constexpr const char* T_repeat = "repeat";

src/interface.cpp

@@ -313,7 +313,7 @@ void page_button_setup(Interface *interf, JsonVariantConst data, const char* act
         JsonObject obj = value.as<JsonObject>();
         interf->json_section_begin(String("sec") + cnt, P_EMPTY, false, false, true );
         interf->checkbox(P_EMPTY, obj[T_enabled], "Active");
-        interf->checkbox(P_EMPTY, obj[T_pwr], "Pwr On/Off");
+        interf->checkbox(P_EMPTY, obj[T_onpwr], "in PwrOn mode only");
 
         String s;
         switch (obj[T_btn_event].as<int>()){