Revert "feat: Add configurable wake-up time for button and field detection"

This reverts commit 9b05d35.

Author: zricote

CHANGELOG.md

@@ -4,7 +4,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [v2.0.0][2025-06-28]
  - Added basic script support (@zeusricote)
- - Added configurable wake-up time for button and field detection (1000-60000 ms) (@zeusricote)
+
+
  - Added commands to dump and clone Mifare tags
  - Improved slot LED indication when switching slots
  - Fixed hardnested subprocess call to work in read-only directories

firmware/application/src/app_cmd.c

@@ -233,36 +233,6 @@ static data_frame_tx_t *cmd_processor_set_long_press_threshold(uint16_t cmd, uin
     return data_frame_make(cmd, STATUS_SUCCESS, 0, NULL);
 }
 
-static data_frame_tx_t *cmd_processor_get_wakeup_button_time(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
-    uint16_t time_ms = settings_get_wakeup_button_time();
-    uint8_t resp_data[2] = {(uint8_t)(time_ms >> 8), (uint8_t)(time_ms & 0xFF)};
-    return data_frame_make(cmd, STATUS_SUCCESS, sizeof(resp_data), resp_data);
-}
-
-static data_frame_tx_t *cmd_processor_set_wakeup_button_time(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
-    if (length != 2) {
-        return data_frame_make(cmd, STATUS_PAR_ERR, 0, NULL);
-    }
-    uint16_t time_ms = ((uint16_t)data[0] << 8) | data[1];
-    settings_set_wakeup_button_time(time_ms);
-    return data_frame_make(cmd, STATUS_SUCCESS, 0, NULL);
-}
-
-static data_frame_tx_t *cmd_processor_get_wakeup_field_time(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
-    uint16_t time_ms = settings_get_wakeup_field_time();
-    uint8_t resp_data[2] = {(uint8_t)(time_ms >> 8), (uint8_t)(time_ms & 0xFF)};
-    return data_frame_make(cmd, STATUS_SUCCESS, sizeof(resp_data), resp_data);
-}
-
-static data_frame_tx_t *cmd_processor_set_wakeup_field_time(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
-    if (length != 2) {
-        return data_frame_make(cmd, STATUS_PAR_ERR, 0, NULL);
-    }
-    uint16_t time_ms = ((uint16_t)data[0] << 8) | data[1];
-    settings_set_wakeup_field_time(time_ms);
-    return data_frame_make(cmd, STATUS_SUCCESS, 0, NULL);
-}
-
 #if defined(PROJECT_CHAMELEON_ULTRA)
 
 static data_frame_tx_t *cmd_processor_hf14a_scan(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data) {
@@ -1390,10 +1360,6 @@ static cmd_data_map_t m_data_cmd_map[] = {
     {    DATA_CMD_SET_BLE_PAIRING_ENABLE,       NULL,                        cmd_processor_set_ble_pairing_enable,        NULL                   },
     {    DATA_CMD_GET_LONG_PRESS_THRESHOLD,     NULL,                        cmd_processor_get_long_press_threshold,      NULL                   },
     {    DATA_CMD_SET_LONG_PRESS_THRESHOLD,     NULL,                        cmd_processor_set_long_press_threshold,      NULL                   },
-    {    DATA_CMD_GET_WAKEUP_BUTTON_TIME,       NULL,                        cmd_processor_get_wakeup_button_time,        NULL                   },
-    {    DATA_CMD_SET_WAKEUP_BUTTON_TIME,       NULL,                        cmd_processor_set_wakeup_button_time,        NULL                   },
-    {    DATA_CMD_GET_WAKEUP_FIELD_TIME,        NULL,                        cmd_processor_get_wakeup_field_time,         NULL                   },
-    {    DATA_CMD_SET_WAKEUP_FIELD_TIME,        NULL,                        cmd_processor_set_wakeup_field_time,         NULL                   },
 
 #if defined(PROJECT_CHAMELEON_ULTRA)
 

firmware/application/src/app_cmd.h

@@ -2,9 +2,7 @@
 #define APP_CMD_H
 
 #include <stdint.h>
-#include <stdbool.h>
 #include "dataframe.h"
-#include "settings.h"
 
 
 typedef data_frame_tx_t *(*cmd_processor)(uint16_t cmd, uint16_t status, uint16_t length, uint8_t *data);

firmware/application/src/data_cmd.h

@@ -47,10 +47,6 @@
 #define DATA_CMD_SET_BLE_PAIRING_ENABLE         (1037)
 #define DATA_CMD_GET_LONG_PRESS_THRESHOLD       (1038)
 #define DATA_CMD_SET_LONG_PRESS_THRESHOLD       (1039)
-#define DATA_CMD_GET_WAKEUP_BUTTON_TIME         (1040)
-#define DATA_CMD_SET_WAKEUP_BUTTON_TIME         (1041)
-#define DATA_CMD_GET_WAKEUP_FIELD_TIME          (1042)
-#define DATA_CMD_SET_WAKEUP_FIELD_TIME          (1043)
 
 //
 // ******************************************************************

firmware/application/src/settings.c

@@ -55,13 +55,7 @@ void settings_init_ble_pairing_enable_config(void) {
 
 // add on version6
 void settings_init_long_press_threshold_config(void) {
-    config.long_press_threshold = 500; // 500ms default
-}
-
-// add on version7
-void settings_init_wakeup_time_config(void) {
-    config.wakeup_button_time = 8000; // 8s default for button wake-up
-    config.wakeup_field_time = 4000;  // 4s default for field wake-up
+    config.long_press_threshold = 1000; // default 1000ms
 }
 
 void settings_init_config(void) {
@@ -72,7 +66,6 @@ void settings_init_config(void) {
     settings_init_ble_connect_key_config();
     settings_init_ble_pairing_enable_config();
     settings_init_long_press_threshold_config();
-    settings_init_wakeup_time_config();
 }
 
 void settings_migrate(void) {
@@ -312,30 +305,10 @@ uint16_t settings_get_long_press_threshold(void) {
 }
 
 void settings_set_long_press_threshold(uint16_t duration) {
-    if (duration < 100) duration = 100;
-    if (duration > 2000) duration = 2000;
+    // Enforce minimum value of 200ms
+    if (duration < 200) {
+        duration = 200;
+    }
+    // Maximum value is implicitly handled by uint16_t
     config.long_press_threshold = duration;
-    update_config_crc();
-}
-
-void settings_set_wakeup_button_time(uint16_t time_ms) {
-    if (time_ms < 1000) time_ms = 1000;  // Minimum 1 second
-    if (time_ms > 60000) time_ms = 60000; // Maximum 60 seconds
-    config.wakeup_button_time = time_ms;
-    update_config_crc();
-}
-
-uint16_t settings_get_wakeup_button_time(void) {
-    return config.wakeup_button_time;
-}
-
-void settings_set_wakeup_field_time(uint16_t time_ms) {
-    if (time_ms < 1000) time_ms = 1000;  // Minimum 1 second
-    if (time_ms > 60000) time_ms = 60000; // Maximum 60 seconds
-    config.wakeup_field_time = time_ms;
-    update_config_crc();
-}
-
-uint16_t settings_get_wakeup_field_time(void) {
-    return config.wakeup_field_time;
 }

firmware/application/src/settings.h

@@ -5,7 +5,7 @@
 
 #include "utils.h"
 
-#define SETTINGS_CURRENT_VERSION 7
+#define SETTINGS_CURRENT_VERSION 6
 #define BLE_PAIRING_KEY_LEN 6
 #define DEFAULT_BLE_PAIRING_KEY "123456"  // length must == 6
 
@@ -49,8 +49,6 @@ typedef struct ALIGN_U32 {
 
     // 2 bytes
     uint16_t long_press_threshold; // in ms
-    uint16_t wakeup_button_time;   // in ms
-    uint16_t wakeup_field_time;    // in ms
 
     // 1 byte
     uint8_t reserved1; // see bottom.
@@ -81,11 +79,4 @@ bool settings_get_ble_pairing_enable(void);
 bool settings_get_ble_pairing_enable_first_load(void);
 uint16_t settings_get_long_press_threshold(void);
 void settings_set_long_press_threshold(uint16_t duration);
-
-// Wake-up time settings
-void settings_set_wakeup_button_time(uint16_t time_ms);
-uint16_t settings_get_wakeup_button_time(void);
-void settings_set_wakeup_field_time(uint16_t time_ms);
-uint16_t settings_get_wakeup_field_time(void);
-
 #endif

firmware/application/src/utils/syssleep.h

@@ -2,11 +2,10 @@
 #define SYS_SLEEP_H__
 
 #include <stdint.h>
-#include "settings.h"
 
 //           Wake up equipment
-#define SLEEP_DELAY_MS_BUTTON_WAKEUP            (settings_get_wakeup_button_time())    // The sleep delay of the button awakened
-#define SLEEP_DELAY_MS_FIELD_WAKEUP             (settings_get_wakeup_field_time())     // The sleep delay (including high and low frequencies) of the field wake -up (including high and low frequency)
+#define SLEEP_DELAY_MS_BUTTON_WAKEUP            8000    // The sleep delay of the button awakened
+#define SLEEP_DELAY_MS_FIELD_WAKEUP             4000    // The sleep delay (including high and low frequencies) of the field wake -up (including high and low frequency)
 #define SLEEP_DELAY_MS_FIRST_POWER              1000    // The sleep delay of the first power supply (access to the battery)
 
 //           The operating state is delayed