Merge pull request #56 from vortigont/fixups

add timeout settings for button
vortigont · Jan 23, 2024 · 1f02476 · 1f02476
2 parents f8bc517 + bbb7f07
commit 1f02476
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 14 deletions.
diff --git a/data/js/ui_lamp.json.gz b/data/js/ui_lamp.json.gz
diff --git 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
@@ -134,11 +134,6 @@ void ButtonEventHandler::load(JsonVariantConst cfg){
 
 }
 
-void ButtonEventHandler::save(){
-
-}
-
-
 
 
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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-плеера
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,11 +134,6 @@ void ButtonEventHandler::load(JsonVariantConst cfg){

		}

		void ButtonEventHandler::save(){

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,7 +85,6 @@ class ButtonEventHandler {

		void load(JsonVariantConst cfg);

		void save();
		};