Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 20:47:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reworking BT output

Browse Source
This commit is contained in:
Sebastien
2020-11-03 17:54:31 -05:00
parent 2c64f50093
commit 8fbe1159f5
27 changed files with 1029 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/services/battery.c
View File

@@ -40,6 +40,8 @@ static struct {
.cells = 2,
};
extern void wifi_manager_update_status();
/****************************************************************************************
*
*/
@@ -64,6 +66,7 @@ static void battery_callback(TimerHandle_t xTimer) {
battery.avg = battery.sum / battery.count;
battery.sum = battery.count = 0;
ESP_LOGI(TAG, "Voltage %.2fV", battery.avg);
wifi_manager_update_status();
}
}

3
components/services/messaging.h
View File

@@ -12,7 +12,8 @@ typedef enum {
MESSAGING_CLASS_OTA,
MESSAGING_CLASS_SYSTEM,
MESSAGING_CLASS_STATS,
MESSAGING_CLASS_CFGCMD
MESSAGING_CLASS_CFGCMD,
MESSAGING_CLASS_BT
} messaging_classes;
typedef struct messaging_list_t *messaging_handle_t;

9
components/services/monitor.c
View File

@@ -41,11 +41,14 @@ bool jack_inserted_svc(void);
void (*spkfault_handler_svc)(bool inserted);
bool spkfault_svc(void);
extern void wifi_manager_update_status();
/****************************************************************************************
*
*/
static void task_stats( cJSON* top ) {
#ifdef CONFIG_FREERTOS_USE_TRACE_FACILITY
#pragma message("Compiled with trace facility")
static struct {
TaskStatus_t *tasks;
uint32_t total, n;
@@ -60,6 +63,7 @@ static void task_stats( cJSON* top ) {
*scratch = '\0';
#ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
#pragma message("Compiled with runtime stats")
uint32_t elapsed = current.total - previous.total;
for(int i = 0, n = 0; i < current.n; i++ ) {
@@ -87,6 +91,8 @@ static void task_stats( cJSON* top ) {
}
}
#else
#pragma message("Compiled WITHOUT runtime stats")
for (int i = 0, n = 0; i < current.n; i ++) {
n += sprintf(scratch + n, "%16s s:%5u\t", current.tasks[i].pcTaskName, current.tasks[i].usStackHighWaterMark);
cJSON * t=cJSON_CreateObject();
@@ -106,6 +112,8 @@ static void task_stats( cJSON* top ) {
cJSON_AddItemToObject(top,"tasks",tlist);
if (previous.tasks) free(previous.tasks);
previous = current;
#else
#pragma message("Compiled WITHOUT trace facility")
#endif
}
@@ -140,6 +148,7 @@ static void monitor_callback(TimerHandle_t xTimer) {
static void jack_handler_default(void *id, button_event_e event, button_press_e mode, bool long_press) {
ESP_LOGD(TAG, "Jack %s", event == BUTTON_PRESSED ? "inserted" : "removed");
messaging_post_message(MESSAGING_INFO, MESSAGING_CLASS_SYSTEM,"jack is %s",BUTTON_PRESSED ? "inserted" : "removed");
wifi_manager_update_status();
if (jack_handler_svc) (*jack_handler_svc)(event == BUTTON_PRESSED);
}