lmx/99_7018_lmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cun

Browse Source
This commit is contained in:
lmx
2025-12-03 15:11:15 +08:00
parent 86199b822e
commit c870b07b02
6 changed files with 187 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/third_party_profile/jieli/le_client_demo.h
View File

@ -60,7 +60,8 @@ typedef struct {
typedef struct {
//搜索匹配信息
const client_match_cfg_t *match_dev_cfg[CLIENT_MATCH_CONN_MAX];
// const client_match_cfg_t *match_dev_cfg[CLIENT_MATCH_CONN_MAX]; //xtell
client_match_cfg_t *match_dev_cfg[CLIENT_MATCH_CONN_MAX];
//加密保定配置 0 or 1
u8 security_en;
//搜索服务的个数

62
apps/earphone/xtell_remote_control/ble_handler/client_handler.c
View File

@ -31,7 +31,7 @@
#include "le_client_demo.h"
#include "le_common.h"
#include "ble_user.h"
#include "../nvs/nvs.h"
#if (BLE_WIRELESS_CLIENT_EN == 1) // 作为主设备主动去连接其他蓝牙
/*
@ -196,6 +196,7 @@ static void client_timer_start(void);
* 全局/静态变量定义
**************************************************************************************************
*/
static u8 connect_state = 0; //0:连接断开； 1：连接成功
// --- 缓冲区 ---
static u8 att_ram_buffer[ATT_RAM_BUFSIZE] __attribute__((aligned(4))); // ATT协议栈RAM缓冲区
@ -246,9 +247,9 @@ static const target_uuid_t default_search_uuid_table[] = {
};
// 默认匹配的设备名称
static const u8 test_remoter_name1[] = "CM-22222";
static u8 test_remoter_name1[] = "CM-22222";
// 默认匹配规则
static const client_match_cfg_t match_dev01 = {
static client_match_cfg_t match_dev01 = {
.create_conn_mode = BIT(CLI_CREAT_BY_NAME), // 通过名称匹配
.compare_data_len = sizeof(test_remoter_name1) - 1, // 名称长度
.compare_data = test_remoter_name1, // 名称数据
@ -256,7 +257,7 @@ static const client_match_cfg_t match_dev01 = {
};
// 默认客户端连接配置
static const client_conn_cfg_t client_conn_config_default = {
static client_conn_cfg_t client_conn_config_default = {
.match_dev_cfg[0] = &match_dev01,
.match_dev_cfg[1] = NULL,
.match_dev_cfg[2] = NULL,
@ -300,7 +301,7 @@ static const char *const phy_result[] = { // PHY速率类型字符串
};
// --- 接口操作结构体 ---
const struct ble_client_operation_t client_operation = {
static const struct ble_client_operation_t client_operation = {
.scan_enable = bt_ble_scan_enable,
.disconnect = ble_disconnect,
.get_buffer_vaild = get_buffer_vaild_len,
@ -323,6 +324,7 @@ const struct ble_client_operation_t client_operation = {
**************************************************************************************************
*/
/**
* @brief 获取客户端操作接口表
* @return 指向ble_client_operation_t结构体的指针
@ -380,7 +382,7 @@ void bt_ble_init(void)
set_ble_work_state(BLE_ST_INIT_OK);
conn_pair_vm_do(&conn_pair_info, 0); // 读取VM中的配对信息
#if !WIRELESS_PAIR_BONDING
#if !WIRELESS_PAIR_BONDING
device_bonding_init();
#endif
@ -497,6 +499,46 @@ void rcsp_adv_fill_mac_addr(u8 *mac_addr_buf)
#endif
}
////////////////////////////////////////////////////////////////////////////////////////////////////
static u8 new_device_name[MAIN_BOARD_MAC_ADDR_LENGTH] = {0};
static client_match_cfg_t new_match_dev = {
.create_conn_mode = BIT(CLI_CREAT_BY_NAME), // 通过名称匹配
.compare_data_len = MAIN_BOARD_MAC_ADDR_LENGTH, // 名称长度，不包含"\0"
.compare_data = new_device_name, // 名称数据
.bonding_flag = 0, // 不进行绑定
};
/**
* @brief 连接新的设备
*
* @param name 设备的名称
*/
void g_ble_connect_new_device(char* name){
memcpy(new_device_name, name, MAIN_BOARD_MAC_ADDR_LENGTH);
client_config->match_dev_cfg[0] = &new_match_dev;
// client_operation.init_config(NULL, client_config); //新配置
// client_operation.disconnect(NULL); //断开成功后会自动使用新配置进行扫描
client_init_config(NULL, client_config);//新配置
ble_disconnect(NULL); //断开成功后会自动使用新配置进行扫描
connect_state = 0;
}
/**
* @brief 获取当前ble连接状态
*
* @return //0:连接断开； 1：连接成功
*/
u8 g_ble_get_state(void){
return connect_state;
}
/*
**************************************************************************************************
* 内部静态函数实现
@ -1603,9 +1645,12 @@ static void default_event_callback(le_client_event_e event, u8 *packet, int size
break;
case CLI_EVENT_CONNECTED:
connect_state = 1;
log_info("<<<<<<<<<< BLE Connection Successful! >>>>>>>>>>\n");
break;
case CLI_EVENT_DISCONNECT:
connect_state = 0;
if (test_client_timer) {
sys_timeout_del(test_client_timer);
test_client_timer = 0;
@ -1619,4 +1664,9 @@ static void default_event_callback(le_client_event_e event, u8 *packet, int size
}
#endif
#endif /* (TCFG_BLE_DEMO_SELECT == DEF_BLE_DEMO_WIRELESS_MIC_CLIENT) */

52
apps/earphone/xtell_remote_control/ble_handler/client_handler.h Normal file
View File

@ -0,0 +1,52 @@
#ifndef __CLIENT_HANDLER_H__
#define __CLIENT_HANDLER_H__
#include "app_config.h"
#include "ble_user.h"
/**
* @brief BLE客户端退出
*/
extern void bt_ble_exit(void);
/**
* @brief 应用层调用的断开连接接口
*/
extern void ble_app_disconnect(void);
/**
* @brief BLE模块使能/禁止 (兼容旧接口)
* @param enable 1:使能, 0:禁止
*/
extern void bt_ble_adv_enable(u8 enable);
/**
* @brief BLE模块使能/禁止
* @param en 1:使能, 0:禁止
*/
extern void ble_module_enable(u8 en);
/**
* @brief 客户端发起连接参数更新请求
*/
extern void client_send_conn_param_update(void);
/**
* @brief 清除绑定信息
*/
extern void clear_bonding_info(void);
/**
* @brief 连接新的设备
*
* @param name 设备的名称
*/
extern void g_ble_connect_new_device(char* name);
/**
* @brief 获取当前ble连接状态
*
* @return //0:连接断开； 1：连接成功
*/
extern u8 g_ble_get_state(void);
#endif

3
apps/earphone/xtell_remote_control/nvs/nvs.h
View File

@ -2,8 +2,9 @@
#define __NVS_H__
#include "typedef.h"
#include "../task_func.h"
#define MAIN_BOARD_MAC_ADDR_LENGTH 6
#define MAIN_BOARD_MAC_ADDR_LENGTH UID_LENGTH
/**
* @brief 定义用于存储遥控器配对信息的数据结构

122
apps/earphone/xtell_remote_control/task_func.c
View File

@ -2,10 +2,12 @@
#include "./nvs/nvs.h"
#include "timer.h"
#include "system/includes.h"
// 包含BLE HID相关的API
#include "user_cfg.h"
#include "earphone.h" // 宏定义 EARPHONE_STATE_...
#include "ble_user.h"
#include "le_client_demo.h"
#include "le_common.h"
#include "./ble_handler/client_handler.h"
// =================================================================================
// 宏定义与日志
// =================================================================================
@ -22,7 +24,6 @@
// =================================================================================
extern void TYPE_V_EVENT(char* uid);
extern void TYPE_A_EVENT(char* uid);
// =================================================================================
// 静态函数声明
// =================================================================================
@ -41,7 +42,9 @@ static void rc_ble_state_set_disconnected(void);
static RC_Context_t g_rc_context; // 全局上下文实例
static u16 g_rfid_timer_id = 0; // RFID 定时器ID
static u16 g_ble_timer_id = 0; // BLE 定时器ID
extern const struct ble_client_operation_t client_operation;
static u8 current_board_mac[MAIN_BOARD_MAC_ADDR_LENGTH] = {0}; //当前连接主板的名称 -- mac
// =================================================================================
// 核心回调函数 (Core Callback Handlers)
@ -70,30 +73,42 @@ void rc_rfid_callback_handler(void *priv)
if (!is_new_data) {
return; //没有rfid卡靠近，返回
}
rc_log("New RFID card detected.\n");
RFID_Device_Type_t device_type = get_rfid_device_type(uid);
switch (device_type) {
case RFID_DEVICE_TYPE_MAIN_BOARD: //船主板上的rfid卡
rc_log("Device is Main Board. Storing MAC...\n");
if (ble_hid_is_connected()) {
// 先停止扫描和连接尝试，实现断开
EARPHONE_STATE_CANCEL_PAGE_SCAN();
if(strncmp(uid, current_board_mac, UID_LENGTH) == 0){
// 扫到的rfid卡的uid和当前连接的主板mac相同
return;
}
//扫到新的主板
rc_log("Device is Main Board. Storing MAC...\n");
// 将新的MAC地址写入Flash
nvs_write_main_board_mac(uid);
nvs_write_main_board_mac(uid);
// memset(current_board_mac, uid, sizeof(current_board_mac));
// TODO：发送指令，让主板断开经典蓝牙连接
// g_ble_connect_new_device(current_board_mac); //连接新主板
// 重新启动扫描，以连接到新的主板
EARPHONE_STATE_SET_PAGE_SCAN_ENABLE();
// EARPHONE_STATE_SET_PAGE_SCAN_ENABLE();
break;
case RFID_DEVICE_TYPE_REMOTE_CONTROL:
rc_log("Device is another Remote Control.\n");
if (g_rc_context.state == RC_STATE_CONNECTED) {
if (g_ble_get_state() == BLE_ST_NOTIFY_IDICATE) {
rc_log("Sending teaming request to main board...\n");
// report_id 1 通常用于标准键盘/消费者报告
ble_hid_data_send(1, uid, UID_LENGTH);
//TODO:
//向主板发送新的遥控器rfid uid
} else {
rc_log("Not connected to main board, ignoring teaming request.\n");
}
@ -106,48 +121,59 @@ void rc_rfid_callback_handler(void *priv)
}
/**
* @brief BLE回调处理函数 (由定时器周期性调用)
* @brief BLE回调处理函数 (由定时器周期性调用)s
*/
void rc_ble_callback_handler(void *priv)
{
bool is_connected = ble_hid_is_connected();
u8 read_uid[UID_LENGTH] = 0;
nvs_read_main_board_mac(read_uid); //读nvs
// 状态机转换
if (is_connected && g_rc_context.state != RC_STATE_CONNECTED) {
rc_ble_state_set_connected();
} else if (!is_connected && g_rc_context.state != RC_STATE_DISCONNECTED) {
rc_ble_state_set_disconnected();
//读到的是当前连接的主板uid
if((strncmp(read_uid, current_board_mac, UID_LENGTH) == 0) && g_ble_get_state()){
return;
}
// 状态机行为
switch (g_rc_context.state) {
case RC_STATE_DISCONNECTED:
{
u8 target_mac[MAC_ADDR_LENGTH] = {0};
// 检查Flash中是否有已配对的MAC
if (nvs_read_main_board_mac(target_mac) > 0) {
rc_log("Found paired MAC. Start scanning...\n");
// 启动扫描和连接。SDK的HID实现会自动连接到已配对的设备。
EARPHONE_STATE_SET_PAGE_SCAN_ENABLE();
} else {
rc_log("No paired MAC found. Waiting for RFID pairing...\n");
}
}
break;
//
case RC_STATE_CONNECTING:
// 在这个状态下，我们只是等待 is_connected 变为 true
rc_log("Waiting for connection result...\n");
break;
case RC_STATE_CONNECTED:
// 已连接，目前无需周期性操作
// rc_log("BLE is connected.\n");
break;
// bool is_connected = ble_hid_is_connected();
// // 状态机转换
// if (is_connected && g_rc_context.state != RC_STATE_CONNECTED) {
// rc_ble_state_set_connected();
// } else if (!is_connected && g_rc_context.state != RC_STATE_DISCONNECTED) {
// rc_ble_state_set_disconnected();
// }
// // 状态机行为
// switch (g_rc_context.state) {
// case RC_STATE_DISCONNECTED:
// {
// u8 target_mac[MAC_ADDR_LENGTH] = {0};
// // 检查Flash中是否有已配对的MAC
// if (nvs_read_main_board_mac(target_mac) > 0) {
// rc_log("Found paired MAC. Start scanning...\n");
// // 启动扫描和连接。SDK的HID实现会自动连接到已配对的设备。
// EARPHONE_STATE_SET_PAGE_SCAN_ENABLE();
// } else {
// rc_log("No paired MAC found. Waiting for RFID pairing...\n");
// }
// }
// break;
// case RC_STATE_CONNECTING:
// // 在这个状态下，我们只是等待 is_connected 变为 true
// rc_log("Waiting for connection result...\n");
// break;
// case RC_STATE_CONNECTED:
// // 已连接，目前无需周期性操作
// // rc_log("BLE is connected.\n");
// break;
default:
break;
}
// default:
// break;
// }
}
/**

3
apps/earphone/xtell_remote_control/task_func.h
View File

@ -12,7 +12,6 @@
#define UID_PREFIX_REMOTE_CONTROL 0xA2 // 遥控器UID前缀
#define UID_LENGTH 8 // RFID UID 的标准长度
#define MAC_ADDR_LENGTH 6 // 蓝牙MAC地址的长度
// 定时器调用间隔 (ms)
#define RC_RFID_CALLBACK_INTERVAL_MS 500 // RFID轮询间隔，500ms
@ -46,7 +45,7 @@ typedef enum {
*/
typedef struct {
RC_State_t state; // 当前状态机状态
u8 paired_mac_addr[MAC_ADDR_LENGTH]; // 已配对主板的MAC地址
u8 paired_mac_addr[UID_LENGTH]; // 已配对主板的MAC地址(包含前缀)
// ... 可在此处添加更多运行时需要管理的数据
} RC_Context_t;