Major fixes and improvements to Bluetooth device management and menu navigation: **Bluetooth Device Pairing** - Fixed discovered devices not being saved as paired after connection - Only save devices to NVS when successfully connected (not just discovered) - Auto-pair discovered devices on successful A2DP connection - Update device list to show paired status immediately after connection **Critical Bug Fixes** - Fixed dangling pointer crash in NVS request/response mechanism - Was sending pointer to stack variable, now sends result value directly - Prevents crash when connecting to Bluetooth devices - Fixed use-after-free crash when clicking menu items after dynamic updates - Menu context now properly synchronized after adding/removing items - Prevents InstructionFetchError crashes in menu navigation - Fixed memory exhaustion by reducing MAX_BT_DEVICES from 20 to 8 - Prevents heap allocation failures when populating device list **Menu & UX Improvements** - "Clear Paired" button now properly disconnects active connections - "Clear Paired" button always visible when paired devices exist - GUI updates immediately after clearing paired devices - Paired devices marked with asterisk prefix (* Device Name) - Removed redundant "(paired)" suffix text - Long device names scroll smoothly when selected (3-second animation) - Refresh button preserved during menu updates to prevent crashes - Menu focus state properly maintained across all dynamic updates **Technical Details** - bt_add_discovered_device() no longer saves to NVS - Added currentFocusIndex() calls after all menu modifications - Improved clear_bt_device_list() to avoid deleting active buttons - Added bt_disconnect_current_device() for clean disconnections - Fixed NVS notification mechanism to avoid stack variable pointers 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
115 lines
3.1 KiB
C
115 lines
3.1 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
|
|
*
|
|
* SPDX-License-Identifier: Unlicense OR CC0-1.0
|
|
*/
|
|
|
|
#ifndef __BT_APP_CORE_H__
|
|
#define __BT_APP_CORE_H__
|
|
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include "esp_bt_defs.h"
|
|
|
|
/* log tag */
|
|
#define BT_APP_CORE_TAG "BT_APP_CORE"
|
|
|
|
/* signal for dispatcher */
|
|
#define BT_APP_SIG_WORK_DISPATCH (0x01)
|
|
|
|
/**
|
|
* @brief handler for the dispatched work
|
|
*
|
|
* @param [in] event message event id
|
|
* @param [in] param pointer to the parameter
|
|
*/
|
|
typedef void (* bt_app_cb_t) (uint16_t event, void *param);
|
|
|
|
/* message to be sent */
|
|
typedef struct {
|
|
uint16_t sig; /*!< signal to bt_app_task */
|
|
uint16_t event; /*!< message event id */
|
|
bt_app_cb_t cb; /*!< context switch callback */
|
|
void *param; /*!< parameter area needs to be last */
|
|
} bt_app_msg_t;
|
|
|
|
/**
|
|
* @brief parameter deep-copy function to be customized
|
|
*
|
|
* @param [in] p_dest pointer to the destination
|
|
* @param [in] p_src pointer to the source
|
|
* @param [in] len data length in byte
|
|
*/
|
|
typedef void (* bt_app_copy_cb_t) (void *p_dest, void *p_src, int len);
|
|
|
|
/**
|
|
* @brief work dispatcher for the application task
|
|
*
|
|
* @param [in] p_cback handler for the dispatched work (event handler)
|
|
* @param [in] event message event id
|
|
* @param [in] p_params pointer to the parameter
|
|
* @param [in] param_len length of the parameter
|
|
* @param [in] p_copy_cback parameter deep-copy function
|
|
*
|
|
* @return true if work dispatch successfully, false otherwise
|
|
*/
|
|
bool bt_app_work_dispatch(bt_app_cb_t p_cback, uint16_t event, void *p_params, int param_len, bt_app_copy_cb_t p_copy_cback);
|
|
|
|
/**
|
|
* @brief start up the application task
|
|
*/
|
|
void bt_app_task_start_up(void);
|
|
|
|
/**
|
|
* @brief shut down the application task
|
|
*/
|
|
void bt_app_task_shut_down(void);
|
|
|
|
void bt_app_init(void);
|
|
|
|
/* Bluetooth device management for GUI */
|
|
#define MAX_BT_DEVICES 8 // Reduced from 20 to save memory
|
|
#define MAX_BT_NAME_LEN 32
|
|
|
|
typedef struct {
|
|
esp_bd_addr_t bda;
|
|
char name[MAX_BT_NAME_LEN];
|
|
bool is_paired;
|
|
int rssi;
|
|
} bt_device_info_t;
|
|
|
|
typedef struct {
|
|
bt_device_info_t devices[MAX_BT_DEVICES];
|
|
int count;
|
|
bool discovery_active;
|
|
} bt_device_list_t;
|
|
|
|
/* Get current device list for GUI display */
|
|
bt_device_list_t* bt_get_device_list(void);
|
|
|
|
/* Start device discovery */
|
|
bool bt_start_discovery(void);
|
|
|
|
/* Stop device discovery */
|
|
bool bt_stop_discovery(void);
|
|
|
|
/* Connect to specific device by index in device list */
|
|
bool bt_connect_device(int device_index);
|
|
|
|
/* Clear discovered devices (keep paired devices) */
|
|
void bt_clear_discovered_devices(void);
|
|
|
|
/* Clear all devices from the device list (paired and discovered) */
|
|
void bt_clear_all_devices(void);
|
|
|
|
/* Disconnect from currently connected device */
|
|
void bt_disconnect_current_device(void);
|
|
|
|
/* Volume control functions */
|
|
void bt_volume_up(void);
|
|
void bt_volume_down(void);
|
|
int bt_get_current_volume(void);
|
|
|
|
#endif /* __BT_APP_CORE_H__ */
|