Skip to content

Commit 9061e9a

Browse files
redchenjsredchenjs
committed
kconfig: update configuration definitions
1 parent 7fc9e54 commit 9061e9a

File tree

12 files changed

+96
-133
lines changed

12 files changed

+96
-133
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Bluetooth Visual Speaker based on ESP32 chip.
99
* I2S & PDM input / I2S output
1010
* VFX output (GIFs / Audio FFT / Rainbow / Starsky / ...)
1111
* BLE control interface (OTA firmware update / VFX remote control)
12-
* Audio prompt (Connected / Disconnected / Wake-Up / Sleep)
13-
* Sleep & Wake-Up keys
12+
* Audio prompt (Connected / Disconnected / Sleep / Wake-Up)
13+
* Sleep & Wake-Up key
1414

1515
## Preparing
1616

‎main/Kconfig.projbuild‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ config AUDIO_PROMPT_DISCONNECTED
3131
default y
3232
depends on ENABLE_AUDIO_PROMPT
3333

34-
config AUDIO_PROMPT_RESUME
35-
bool "Resume"
36-
default n
37-
depends on ENABLE_AUDIO_PROMPT
38-
3934
config AUDIO_PROMPT_SLEEP
4035
bool "Sleep"
4136
default n
42-
depends on ENABLE_AUDIO_PROMPT
37+
depends on ENABLE_AUDIO_PROMPT && ENABLE_SLEEP_KEY
38+
39+
config AUDIO_PROMPT_WAKEUP
40+
bool "Wake-Up"
41+
default n
42+
depends on ENABLE_AUDIO_PROMPT && ENABLE_SLEEP_KEY
4343

4444
choice AUDIO_OUTPUT
4545
prompt "Audio Output"
@@ -330,35 +330,6 @@ config LED_PIN
330330
endmenu
331331

332332
menu "Key Configuration"
333-
config ENABLE_WAKEUP_KEY
334-
bool "Enable WakeUp Key"
335-
default n
336-
help
337-
Select this to enable WakeUp Key.
338-
339-
config WAKEUP_KEY_EXTRA_HOLD_TIME
340-
int "WakeUp Key Extra Hold Time (ms)"
341-
default 0
342-
depends on ENABLE_WAKEUP_KEY
343-
344-
choice WAKEUP_KEY_ACTIVE_LEVEL
345-
prompt "WakeUp Key Active Level"
346-
default WAKEUP_KEY_ACTIVE_LOW
347-
depends on ENABLE_WAKEUP_KEY
348-
help
349-
Select WakeUp Key Active Level.
350-
351-
config WAKEUP_KEY_ACTIVE_HIGH
352-
bool "Active High"
353-
config WAKEUP_KEY_ACTIVE_LOW
354-
bool "Active Low"
355-
endchoice
356-
357-
config WAKEUP_KEY_PIN
358-
int "WakeUp Key Pin"
359-
default 0
360-
depends on ENABLE_WAKEUP_KEY
361-
362333
config ENABLE_SLEEP_KEY
363334
bool "Enable Sleep Key"
364335
default n
@@ -367,7 +338,7 @@ config ENABLE_SLEEP_KEY
367338

368339
config SLEEP_KEY_HOLD_TIME
369340
int "Sleep Key Hold Time (ms)"
370-
default 1000
341+
default 50
371342
depends on ENABLE_SLEEP_KEY
372343

373344
choice SLEEP_KEY_ACTIVE_LEVEL

‎main/inc/core/os.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
typedef enum user_event_group_bits {
1515
OS_PWR_SLEEP_BIT = BIT0,
16-
OS_PWR_RESTART_BIT = BIT1,
16+
OS_PWR_RESET_BIT = BIT1,
1717

1818
BT_A2DP_IDLE_BIT = BIT2,
1919
BT_A2DP_DATA_BIT = BIT3,
@@ -37,8 +37,8 @@ typedef enum user_event_group_bits {
3737

3838
extern EventGroupHandle_t user_event_group;
3939

40-
extern void os_power_sleep_wait(EventBits_t bits);
41-
extern void os_power_restart_wait(EventBits_t bits);
40+
extern void os_pwr_sleep_wait(EventBits_t bits);
41+
extern void os_pwr_reset_wait(EventBits_t bits);
4242

4343
extern void os_init(void);
4444

‎main/res/snd/snd2.mp3‎

883 Bytes
Binary file not shown.

‎main/res/snd/snd3.mp3‎

-883 Bytes
Binary file not shown.

‎main/src/core/os.c‎

Lines changed: 68 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -17,137 +17,126 @@
1717
#include "core/os.h"
1818
#include "user/audio_player.h"
1919

20-
#define OS_PWR_TAG "os_power"
20+
#define OS_PWR_TAG "os_pwr"
2121

2222
EventGroupHandle_t user_event_group;
2323

24-
#if defined(CONFIG_ENABLE_WAKEUP_KEY) || defined(CONFIG_ENABLE_SLEEP_KEY) || defined(CONFIG_ENABLE_BLE_CONTROL_IF)
24+
#if defined(CONFIG_ENABLE_SLEEP_KEY) || defined(CONFIG_ENABLE_BLE_CONTROL_IF)
2525
static EventBits_t sleep_wait_bits = 0;
26-
static EventBits_t restart_wait_bits = 0;
26+
static EventBits_t reset_wait_bits = 0;
2727

28-
static void os_power_task_handle(void *pvParameters)
28+
static void os_pwr_task_handle(void *pvParameters)
2929
{
3030
ESP_LOGI(OS_PWR_TAG, "started.");
3131

3232
while (1) {
3333
xEventGroupWaitBits(
3434
user_event_group,
35-
OS_PWR_SLEEP_BIT | OS_PWR_RESTART_BIT,
35+
OS_PWR_SLEEP_BIT | OS_PWR_RESET_BIT,
3636
pdFALSE,
3737
pdFALSE,
3838
portMAX_DELAY
3939
);
4040

41-
ESP_LOGW(OS_PWR_TAG, "waiting for unfinished jobs....");
42-
vTaskDelay(500 / portTICK_RATE_MS);
43-
4441
EventBits_t uxBits = xEventGroupGetBits(user_event_group);
4542
if (uxBits & OS_PWR_SLEEP_BIT) {
46-
xEventGroupWaitBits(
47-
user_event_group,
48-
sleep_wait_bits,
49-
pdFALSE,
50-
pdTRUE,
51-
portMAX_DELAY
52-
);
53-
54-
#ifdef CONFIG_ENABLE_WAKEUP_KEY
43+
if (sleep_wait_bits) {
44+
ESP_LOGW(OS_PWR_TAG, "waiting for unfinished jobs....");
45+
46+
vTaskDelay(500 / portTICK_RATE_MS);
47+
48+
xEventGroupWaitBits(
49+
user_event_group,
50+
sleep_wait_bits,
51+
pdFALSE,
52+
pdTRUE,
53+
portMAX_DELAY
54+
);
55+
}
56+
57+
#ifdef CONFIG_ENABLE_SLEEP_KEY
5558
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
56-
rtc_gpio_set_direction(CONFIG_WAKEUP_KEY_PIN, RTC_GPIO_MODE_INPUT_ONLY);
57-
#ifdef CONFIG_WAKEUP_KEY_ACTIVE_LOW
58-
rtc_gpio_pulldown_dis(CONFIG_WAKEUP_KEY_PIN);
59-
rtc_gpio_pullup_en(CONFIG_WAKEUP_KEY_PIN);
60-
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ALL_LOW);
59+
rtc_gpio_set_direction(CONFIG_SLEEP_KEY_PIN, RTC_GPIO_MODE_INPUT_ONLY);
60+
#ifdef CONFIG_SLEEP_KEY_ACTIVE_LOW
61+
rtc_gpio_pulldown_dis(CONFIG_SLEEP_KEY_PIN);
62+
rtc_gpio_pullup_en(CONFIG_SLEEP_KEY_PIN);
63+
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_SLEEP_KEY_PIN, ESP_EXT1_WAKEUP_ALL_LOW);
6164
#else
62-
rtc_gpio_pullup_dis(CONFIG_WAKEUP_KEY_PIN);
63-
rtc_gpio_pulldown_en(CONFIG_WAKEUP_KEY_PIN);
64-
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
65+
rtc_gpio_pullup_dis(CONFIG_SLEEP_KEY_PIN);
66+
rtc_gpio_pulldown_en(CONFIG_SLEEP_KEY_PIN);
67+
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_SLEEP_KEY_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
6568
#endif
6669
#endif
6770

6871
ESP_LOGW(OS_PWR_TAG, "sleep now");
6972
esp_deep_sleep_start();
70-
} else if (uxBits & OS_PWR_RESTART_BIT) {
71-
xEventGroupWaitBits(
72-
user_event_group,
73-
restart_wait_bits,
74-
pdFALSE,
75-
pdTRUE,
76-
portMAX_DELAY
77-
);
78-
79-
ESP_LOGW(OS_PWR_TAG, "restart now");
73+
} else if (uxBits & OS_PWR_RESET_BIT) {
74+
if (reset_wait_bits) {
75+
ESP_LOGW(OS_PWR_TAG, "waiting for unfinished jobs....");
76+
77+
vTaskDelay(500 / portTICK_RATE_MS);
78+
79+
xEventGroupWaitBits(
80+
user_event_group,
81+
reset_wait_bits,
82+
pdFALSE,
83+
pdTRUE,
84+
portMAX_DELAY
85+
);
86+
}
87+
88+
ESP_LOGW(OS_PWR_TAG, "reset now");
8089
esp_restart();
8190
}
8291
}
8392
}
8493

85-
void os_power_sleep_wait(EventBits_t bits)
94+
void os_pwr_sleep_wait(EventBits_t bits)
8695
{
87-
if (bits) {
88-
sleep_wait_bits = bits;
89-
xEventGroupSetBits(user_event_group, OS_PWR_SLEEP_BIT);
90-
} else {
91-
#ifdef CONFIG_ENABLE_WAKEUP_KEY
92-
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
93-
rtc_gpio_set_direction(CONFIG_WAKEUP_KEY_PIN, RTC_GPIO_MODE_INPUT_ONLY);
94-
#ifdef CONFIG_WAKEUP_KEY_ACTIVE_LOW
95-
rtc_gpio_pulldown_dis(CONFIG_WAKEUP_KEY_PIN);
96-
rtc_gpio_pullup_en(CONFIG_WAKEUP_KEY_PIN);
97-
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ALL_LOW);
98-
#else
99-
rtc_gpio_pullup_dis(CONFIG_WAKEUP_KEY_PIN);
100-
rtc_gpio_pulldown_en(CONFIG_WAKEUP_KEY_PIN);
101-
esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
102-
#endif
103-
#endif
104-
ESP_LOGW(OS_PWR_TAG, "sleep now");
105-
esp_deep_sleep_start();
106-
}
96+
sleep_wait_bits = bits;
97+
xEventGroupSetBits(user_event_group, OS_PWR_SLEEP_BIT);
10798
}
10899

109-
void os_power_restart_wait(EventBits_t bits)
100+
void os_pwr_reset_wait(EventBits_t bits)
110101
{
111-
if (bits) {
112-
restart_wait_bits = bits;
113-
xEventGroupSetBits(user_event_group, OS_PWR_RESTART_BIT);
114-
} else {
115-
ESP_LOGW(OS_PWR_TAG, "restart now");
116-
esp_restart();
117-
}
102+
reset_wait_bits = bits;
103+
xEventGroupSetBits(user_event_group, OS_PWR_RESET_BIT);
118104
}
119105
#endif
120106

121107
void os_init(void)
122108
{
123109
user_event_group = xEventGroupCreate();
124110

125-
#ifdef CONFIG_ENABLE_WAKEUP_KEY
126-
ESP_LOGW(OS_PWR_TAG, "checking wakeup cause");
111+
#if defined(CONFIG_ENABLE_SLEEP_KEY) || defined(CONFIG_ENABLE_BLE_CONTROL_IF)
112+
xTaskCreatePinnedToCore(os_pwr_task_handle, "osPwrT", 2048, NULL, 5, NULL, 0);
113+
#endif
114+
115+
#ifdef CONFIG_ENABLE_SLEEP_KEY
127116
if (esp_sleep_get_wakeup_cause() != ESP_SLEEP_WAKEUP_UNDEFINED) {
128-
vTaskDelay(CONFIG_WAKEUP_KEY_EXTRA_HOLD_TIME / portTICK_RATE_MS);
117+
#if CONFIG_SLEEP_KEY_HOLD_TIME > 500
118+
vTaskDelay((CONFIG_SLEEP_KEY_HOLD_TIME - 500) / portTICK_RATE_MS);
129119

130-
#ifdef CONFIG_WAKEUP_KEY_ACTIVE_LOW
131-
if (rtc_gpio_get_level(CONFIG_WAKEUP_KEY_PIN) == 0) {
120+
#ifdef CONFIG_SLEEP_KEY_ACTIVE_LOW
121+
if (rtc_gpio_get_level(CONFIG_SLEEP_KEY_PIN) == 0) {
132122
#else
133-
if (rtc_gpio_get_level(CONFIG_WAKEUP_KEY_PIN) == 1) {
123+
if (rtc_gpio_get_level(CONFIG_SLEEP_KEY_PIN) == 1) {
134124
#endif
135-
ESP_LOGW(OS_PWR_TAG, "resuming from sleep mode");
125+
ESP_LOGW(OS_PWR_TAG, "resuming from sleep mode....");
136126
} else {
137-
ESP_LOGW(OS_PWR_TAG, "resuming aborted");
127+
ESP_LOGW(OS_PWR_TAG, "resuming aborted.");
138128

139-
os_power_sleep_wait(0);
129+
os_pwr_sleep_wait(0);
140130
}
131+
#else
132+
ESP_LOGW(OS_PWR_TAG, "resuming from sleep mode....");
133+
#endif
141134
} else {
142-
os_power_sleep_wait(0);
135+
os_pwr_sleep_wait(0);
143136
}
144137

145138
#ifdef CONFIG_ENABLE_AUDIO_PROMPT
146-
audio_player_play_file(2);
139+
audio_player_play_file(3);
147140
#endif
148-
#endif // CONFIG_ENABLE_WAKEUP_KEY
149-
150-
#if defined(CONFIG_ENABLE_WAKEUP_KEY) || defined(CONFIG_ENABLE_SLEEP_KEY) || defined(CONFIG_ENABLE_BLE_CONTROL_IF)
151-
xTaskCreatePinnedToCore(os_power_task_handle, "osPowerT", 2048, NULL, 5, NULL, 0);
152141
#endif
153142
}

‎main/src/user/audio_player.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ static const char *mp3_file_ptr[][2] = {
3232
#else
3333
{NULL, NULL},
3434
#endif
35-
#ifdef CONFIG_AUDIO_PROMPT_RESUME
36-
{snd2_mp3_ptr, snd2_mp3_end}, // "Resume"
35+
#ifdef CONFIG_AUDIO_PROMPT_SLEEP
36+
{snd2_mp3_ptr, snd2_mp3_end}, // "Sleep"
3737
#else
3838
{NULL, NULL},
3939
#endif
40-
#ifdef CONFIG_AUDIO_PROMPT_SLEEP
41-
{snd3_mp3_ptr, snd3_mp3_end}, // "Sleep"
40+
#ifdef CONFIG_AUDIO_PROMPT_WAKEUP
41+
{snd3_mp3_ptr, snd3_mp3_end}, // "Wake-Up"
4242
#else
4343
{NULL, NULL},
4444
#endif

‎main/src/user/audio_render.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void audio_render_task(void *pvParameter)
148148

149149
uxBits = xEventGroupGetBits(user_event_group);
150150
if ((uxBits & AUDIO_PLAYER_RUN_BIT) || (uxBits & BT_A2DP_IDLE_BIT)
151-
|| (uxBits & OS_PWR_SLEEP_BIT) || (uxBits & OS_PWR_RESTART_BIT)) {
151+
|| (uxBits & OS_PWR_SLEEP_BIT) || (uxBits & OS_PWR_RESET_BIT)) {
152152
vRingbufferReturnItem(audio_buff, (void *)data);
153153
continue;
154154
}

‎main/src/user/ble_gatts.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static void profile_ota_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t
168168
ota_end();
169169

170170
EventBits_t uxBits = xEventGroupGetBits(user_event_group);
171-
if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESTART_BIT)) {
171+
if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESET_BIT)) {
172172
esp_ble_gap_start_advertising(&adv_params);
173173
}
174174

‎main/src/user/bt_av.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
137137
memset(&a2d_remote_bda, 0x00, sizeof(esp_bd_addr_t));
138138

139139
EventBits_t uxBits = xEventGroupGetBits(user_event_group);
140-
if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESTART_BIT)) {
140+
if (!(uxBits & OS_PWR_SLEEP_BIT) && !(uxBits & OS_PWR_RESET_BIT)) {
141141
esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
142142
}
143143

0 commit comments

Comments
 (0)