Allow to set Button type (high/low)

DrA1ex · Sep 28, 2024 · e3c0074 · e3c0074
1 parent f0874bd
commit e3c0074
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 13 deletions.
diff --git a/src/app/application.cpp b/src/app/application.cpp
@@ -41,7 +41,7 @@ void Application::begin() {
     _api->begin(_bootstrap->web_server());
 
     if (sys_config.button_enabled) {
-        _btn = std::make_unique<Button>(sys_config.button_pin);
+        _btn = std::make_unique<Button>(sys_config.button_pin, sys_config.button_high_state);
 
         _btn->set_on_click([this](auto cnt) {
             if (cnt == 1) {
@@ -181,18 +181,18 @@ void Application::brightness_increase() {
 
     config().brightness = std::min<uint16_t>(PWM_MAX_VALUE,
         config().brightness + max<uint16_t>(1, config().brightness / BRIGHTNESS_CHANGE_DIVIDER));
-    _bootstrap->save_changes();
 
     D_PRINTF("Increase brightness: %u\r\n", config().brightness);
+    update();
 }
 
 void Application::brightness_decrease() {
     if (config().brightness == 0) return;
 
     config().brightness = std::max(0, config().brightness - std::max<uint16_t>(1, config().brightness / BRIGHTNESS_CHANGE_DIVIDER));
-    _bootstrap->save_changes();
 
     D_PRINTF("Decrease brightness: %u\r\n", config().brightness);
+    update();
 }
 
 void Application::trigger_temperature() {
@@ -205,6 +205,8 @@ void Application::trigger_temperature() {
     config().color_temperature = std::min<uint16_t>(current_step * value_step, LED_TEMPERATURE_MAX_VALUE);
 
     D_PRINTF("Change temperature: %u\r\n", config().color_temperature);
+
+    update();
     NotificationBus::get().notify_parameter_changed(this, _metadata->color_temperature.get_parameter());
 }
 

diff --git a/src/app/config.h b/src/app/config.h
@@ -44,6 +44,7 @@ struct __attribute ((packed)) SysConfig {
 
     bool button_enabled = BUTTON_ENABLED;
     uint8_t button_pin = BUTTON_PIN;
+    bool button_high_state = BUTTON_HIGH_STATE;
 
     uint32_t power_change_timeout = POWER_CHANGE_TIMEOUT;
     uint32_t wifi_connect_flash_timeout = WIFI_CONNECT_FLASH_TIMEOUT;

diff --git a/src/app/metadata.h b/src/app/metadata.h
@@ -32,6 +32,9 @@ DECLARE_META(SysConfigMeta, AppMetaProperty,
     MEMBER(Parameter<uint16_t>, led_min_brightness),
     MEMBER(Parameter<uint16_t>, led_min_temperature),
     MEMBER(Parameter<uint16_t>, led_max_temperature),
+    MEMBER(Parameter<bool>, button_enabled),
+    MEMBER(Parameter<uint8_t>, button_pin),
+    MEMBER(Parameter<bool>, button_high_state),
     MEMBER(Parameter<uint32_t>, power_change_timeout),
     MEMBER(Parameter<uint32_t>, wifi_connect_flash_timeout),
     MEMBER(Parameter<float>, time_zone),
@@ -164,6 +167,18 @@ inline ConfigMetadata build_metadata(Config &config) {
                 PacketType::SYS_CONFIG_LED_MAX_TEMPERATURE,
                 &config.sys_config.led_max_temperature
             },
+            .button_enabled = {
+                PacketType::SYS_CONFIG_BUTTON_ENABLED,
+                &config.sys_config.button_enabled
+            },
+            .button_pin = {
+                PacketType::SYS_CONFIG_BUTTON_PIN,
+                &config.sys_config.button_pin
+            },
+            .button_high_state = {
+                PacketType::SYS_CONFIG_BUTTON_HIGH_STATE,
+                &config.sys_config.button_high_state
+            },
             .power_change_timeout = {
                 PacketType::SYS_CONFIG_POWER_CHANGE_TIMEOUT,
                 &config.sys_config.power_change_timeout

diff --git a/src/constants.h b/src/constants.h
@@ -27,6 +27,7 @@
 #define LED_MIN_BRIGHTNESS                      (1u)
 
 #define BUTTON_ENABLED                          (false)
+#define BUTTON_HIGH_STATE                       (true)
 #if ARDUINO_ARCH_ESP32
 #define BUTTON_PIN                              (3u)
 #else

diff --git a/src/lib b/src/lib
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,3 @@
-#include <LittleFS.h>
-
 #include "app/application.h"
 
 Application ApplicationInstance;

diff --git a/src/network/cmd.h b/src/network/cmd.h
@@ -51,8 +51,9 @@ MAKE_ENUM(PacketType, uint8_t,
     SYS_CONFIG_LED_MIN_TEMPERATURE, 0x77,
     SYS_CONFIG_LED_MAX_TEMPERATURE, 0x78,
 
-    MOTION_CONFIG_BUTTON_ENABLED, 0x80,
-    MOTION_CONFIG_BUTTON_PIN, 0x81,
+    SYS_CONFIG_BUTTON_ENABLED, 0x80,
+    SYS_CONFIG_BUTTON_PIN, 0x81,
+    SYS_CONFIG_BUTTON_HIGH_STATE, 0x82,
 
     GET_CONFIG, 0xa0,
     RESTART, 0xb0,

diff --git a/src/sys_constants.h b/src/sys_constants.h
@@ -37,5 +37,5 @@
 #define LED_MIN_TEMPERATURE                     (2700u)
 #define LED_MAX_TEMPERATURE                     (6000u)
 
-#define BRIGHTNESS_CHANGE_DIVIDER               (14u)
+#define BRIGHTNESS_CHANGE_DIVIDER               (20u)
 #define TEMPERATURE_CHANGE_STEPS                (4u)
diff --git a/www/src/cmd.js b/www/src/cmd.js
@@ -46,8 +46,9 @@ export const PacketType = {
     SYS_CONFIG_LED_MIN_TEMPERATURE: 0x77,
     SYS_CONFIG_LED_MAX_TEMPERATURE: 0x78,
 
-    MOTION_CONFIG_BUTTON_ENABLED: 0x80,
-    MOTION_CONFIG_BUTTON_PIN: 0x81,
+    SYS_CONFIG_BUTTON_ENABLED: 0x80,
+    SYS_CONFIG_BUTTON_PIN: 0x81,
+    SYS_CONFIG_BUTTON_HIGH_STATE: 0x82,
 
     GET_CONFIG: 0xa0,
 

diff --git a/www/src/config.js b/www/src/config.js
@@ -77,6 +77,7 @@ export class Config extends AppConfigBase {
 
             button_enabled: parser.readBoolean(),
             button_pin: parser.readUint8(),
+            button_high_state: parser.readBoolean(),
 
             powerChangeTimeout: parser.readUint32(),
             wifiConnectFlashTimeout: parser.readUint32(),

diff --git a/www/src/props.js b/www/src/props.js
@@ -69,8 +69,9 @@ export const PropertyConfig = [{
         {key: "sysConfig.wifiMaxConnectionAttemptInterval", title: "Max Connection Attempt Interval", type: "int", kind: "Uint32", cmd: PacketType.SYS_CONFIG_WIFI_MAX_CONNECTION_ATTEMPT_INTERVAL},
 
         {type: "title", label: "Button"},
-        {key: "sysConfig.button_enabled", title: "Enabled", type: "trigger", kind: "Boolean", cmd: PacketType.MOTION_CONFIG_BUTTON_ENABLED},
-        {key: "sysConfig.button_pin", title: "Pin", type: "int", kind: "Uint8", cmd: PacketType.MOTION_CONFIG_BUTTON_PIN, min: 0, max: 32},
+        {key: "sysConfig.button_enabled", title: "Enabled", type: "trigger", kind: "Boolean", cmd: PacketType.SYS_CONFIG_BUTTON_ENABLED},
+        {key: "sysConfig.button_pin", title: "Pin", type: "int", kind: "Uint8", cmd: PacketType.SYS_CONFIG_BUTTON_PIN, min: 0, max: 32},
+        {key: "sysConfig.button_high_state", title: "High State", type: "trigger", kind: "Boolean", cmd: PacketType.SYS_CONFIG_BUTTON_HIGH_STATE},
 
         {type: "title", label: "LED"},
         {key: "ledType", title: "LED Type", type: "select", kind: "Uint8", cmd: PacketType.SYS_LED_TYPE, list: "ledType"},