From bbb7f07feb67289abc3a32ff87c9252e9efeebda Mon Sep 17 00:00:00 2001
From: Emil Muratov <gpm@hotplug.ru>
Date: Tue, 23 Jan 2024 23:49:56 +0900
Subject: [PATCH] add timeout settings for button

Long press time and Multi Click time could be adjusted
---
 data/js/ui_lamp.json.gz        | Bin 2692 -> 2766 bytes
 resources/html/js/ui_lamp.json |  32 ++++++++++++++++++++++++++++----
 src/bencoder.cpp               |   5 -----
 src/bencoder.hpp               |   1 -
 src/char_const.h               |   2 ++
 src/devices.cpp                |   8 ++++++--
 src/interface.cpp              |   2 +-
 src/lamp.cpp                   |   7 ++++++-
 8 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/data/js/ui_lamp.json.gz b/data/js/ui_lamp.json.gz
index 27c7637610ac9284d0c7a9bfdc6926c781599e6f..ad1126cde32fad87daa9571be1645b7687d4c28e 100644
GIT binary patch
literal 2766
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
Up@Je)z-y2G3-7i(;CfR40IKj-{{R30

literal 2692
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

diff --git a/resources/html/js/ui_lamp.json b/resources/html/js/ui_lamp.json
index 3923e208..705a6104 100644
--- a/resources/html/js/ui_lamp.json
+++ b/resources/html/js/ui_lamp.json
@@ -1,6 +1,6 @@
 {
   "type":"interface",
-  "version":4,
+  "version":5,
   "descr":"FireLamp UI objects",
   "settings":{
     "hub75":{
@@ -627,7 +627,7 @@
               "section": "set_button_gpio",
               "block": [
                 {
-                  "section": "enagpio",
+                  "section": "btngpio",
                   "line": true,
                   "block": [
                     {
@@ -638,7 +638,7 @@
                     },
                     {
                       "id": "gpio",
-                      "html": "input",
+                      "html":"input",
                       "value": -1,
                       "type": "number",
                       "label": "GPIO pin",
@@ -648,7 +648,7 @@
                   ]
                 },
                 {
-                  "section": "enagpio",
+                  "section": "btndebnc",
                   "line": true,
                   "block": [
                     {
@@ -665,6 +665,30 @@
                     }
                   ]
                 },
+                {
+                  "section": "btntimes",
+                  "line": true,
+                  "block": [
+                    {
+                      "id":"lpresst",
+                      "html":"input",
+                      "value": 750,
+                      "type": "number",
+                      "label": "Long press time, ms",
+                      "min": 250,
+                      "step": 50
+                    },
+                    {
+                      "id":"mclickt",
+                      "html":"input",
+                      "value": 350,
+                      "type": "number",
+                      "label": "Multi Click time, ms",
+                      "min": 100,
+                      "step": 50
+                    }
+                  ]
+                },
                 {
                   "id": "set_button_gpio",
                   "html": "button",
diff --git a/src/bencoder.cpp b/src/bencoder.cpp
index d1ba5b63..461edd98 100644
--- a/src/bencoder.cpp
+++ b/src/bencoder.cpp
@@ -134,11 +134,6 @@ void ButtonEventHandler::load(JsonVariantConst cfg){
 
 }
 
-void ButtonEventHandler::save(){
-
-}
-
-
 
 
 
diff --git a/src/bencoder.hpp b/src/bencoder.hpp
index 14f510bd..675b5a24 100644
--- a/src/bencoder.hpp
+++ b/src/bencoder.hpp
@@ -85,7 +85,6 @@ class ButtonEventHandler {
 
     void load(JsonVariantConst cfg);
 
-    void save();
 };
 
 
diff --git a/src/char_const.h b/src/char_const.h
index 0399a7f5..7fca1f7d 100644
--- a/src/char_const.h
+++ b/src/char_const.h
@@ -68,6 +68,8 @@ static constexpr const char* T_btn_events = "btn_events";
 static constexpr const char* T_debounce = "debounce";
 static constexpr const char* T_lamp_event = "lamp_event";
 static constexpr const char* T_lamppwr = "lamppwr";
+static constexpr const char* T_lpresst = "lpresst";
+static constexpr const char* T_mclickt = "mclickt";
 
 // Other
 static constexpr const char* T_Active = "Active";
diff --git a/src/devices.cpp b/src/devices.cpp
index 3a462e9f..67c89220 100644
--- a/src/devices.cpp
+++ b/src/devices.cpp
@@ -128,11 +128,16 @@ void button_configure_gpio(JsonVariantConst btn_cfg){
     button = new GPIOButton<ESPEventPolicy> (static_cast<gpio_num_t>(gpio), btn_cfg[T_logicL]);
     if (!button) return;
     button->setDebounce(debn);
+    button->timeouts.setLongPress(btn_cfg[T_lpresst]);
+    button->timeouts.setMultiClick(btn_cfg[T_mclickt]);
   } else {
     if ( gpio != button->getGPIO() ){
       button->setGPIO(static_cast<gpio_num_t>(gpio), btn_cfg[T_logicL]);
-      button->setDebounce(debn);
     }
+    button->setDebounce(debn);
+    button->timeouts.setLongPress(btn_cfg[T_lpresst]);
+    button->timeouts.setMultiClick(btn_cfg[T_mclickt]);
+
     // button obj already exist, so no need to configure it further
     return;
   }
@@ -149,7 +154,6 @@ void button_configure_gpio(JsonVariantConst btn_cfg){
   ESPButton::set_event_loop_hndlr(evt::get_hndlr());
 
   button->enable();
-  Serial.print("Button enabled\n");
 }
 
 void button_configure_events(JsonVariantConst btn_cfg){
diff --git a/src/interface.cpp b/src/interface.cpp
index 64869586..6b0ced12 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -55,7 +55,7 @@ JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov
 #include "evtloop.h"
 
 // версия ресурсов в стороннем джейсон файле
-#define UIDATA_VERSION  4
+#define UIDATA_VERSION  5
 
 // placeholder for effect list rebuilder task
 Task *delayedOptionTask = nullptr;
diff --git a/src/lamp.cpp b/src/lamp.cpp
index 7c118e80..b255dc98 100644
--- a/src/lamp.cpp
+++ b/src/lamp.cpp
@@ -195,7 +195,12 @@ void Lamp::power(bool flag) // флаг включения/выключения
 /*
 temporary disable
 void Lamp::playEffect(bool isPlayName, EFFSWITCH action){
-  if(mp3!=nullptr && mp3->isOn() && effwrkr.getCurrent()>0 && (flags.playEffect || ((isLampOn() || millis()>5000) && flags.playMP3 && action!=EFFSWITCH::SW_NEXT_DEMO && action!=EFFSWITCH::SW_RND))){
+  if( mp3!=nullptr && mp3->isOn() &&
+      effwrkr.getCurrent()>0 &&
+      (flags.playEffect ||
+        ((isLampOn() || millis()>5000) && flags.playMP3 && action!=EFFSWITCH::SW_NEXT_DEMO && action!=EFFSWITCH::SW_RND)
+      )
+    ){
     LOG(printf_P, PSTR("playEffect soundfile:%s, effect:%d, delayed:%d\n"), effwrkr.getSoundfile().c_str(), effwrkr.getCurrent(), (flags.playName && !flags.playMP3));
     if(!flags.playMP3 || (flags.playEffect && action!=EFFSWITCH::SW_NEXT_DEMO && action!=EFFSWITCH::SW_RND)) // для mp3-плеера есть отдельное управление
       mp3->playEffect(effwrkr.getCurrent(), effwrkr.getSoundfile(), (isPlayName && mp3!=nullptr && mp3->isOn() && !flags.playMP3)); // влияние на отложенное воспроизведение, но не для MP3-плеера