1、摄像头添加SD卡录满处理;

2、修复摄像头、科大讯飞等相关问题;
This commit is contained in:
huxi
2026-01-08 11:29:46 +08:00
parent dc11ee3fc4
commit 36e62db3a4
65 changed files with 3092 additions and 2904 deletions
@@ -359,19 +359,19 @@ void notify_update_connect_parameter(u8 table_index)
}
/* static void connection_update_complete_success(u8 *packet) */
/* { */
/* int con_handle, conn_interval, conn_latency, conn_timeout; */
/* */
/* con_handle = hci_subevent_le_connection_update_complete_get_connection_handle(packet); */
/* conn_interval = hci_subevent_le_connection_update_complete_get_conn_interval(packet); */
/* conn_latency = hci_subevent_le_connection_update_complete_get_conn_latency(packet); */
/* conn_timeout = hci_subevent_le_connection_update_complete_get_supervision_timeout(packet); */
/* */
/* log_info("conn_interval = %d\n", conn_interval); */
/* log_info("conn_latency = %d\n", conn_latency); */
/* log_info("conn_timeout = %d\n", conn_timeout); */
/* } */
static void connection_update_complete_success(u8 *packet)
{
int con_handle, conn_interval, conn_latency, conn_timeout;
con_handle = hci_subevent_le_connection_update_complete_get_connection_handle(packet);
conn_interval = hci_subevent_le_connection_update_complete_get_conn_interval(packet);
conn_latency = hci_subevent_le_connection_update_complete_get_conn_latency(packet);
conn_timeout = hci_subevent_le_connection_update_complete_get_supervision_timeout(packet);
log_info("conn_interval = %d\n", conn_interval);
log_info("conn_latency = %d\n", conn_latency);
log_info("conn_timeout = %d\n", conn_timeout);
}
extern void rcsp_user_event_ble_handler(ble_state_e ble_status, u8 flag);
static void set_ble_work_state(ble_state_e state)
@@ -583,6 +583,7 @@ static void cbk_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *p
}
hci_con_handle_t con_handle = little_endian_read_16(packet, 4);
log_info("HCI_SUBEVENT_LE_CONNECTION_COMPLETE: %0x\n", con_handle);
connection_update_complete_success(packet + 8);
bt_rcsp_set_conn_info(con_handle, NULL, true);
log_info_hexdump(packet + 7, 7);
memcpy(cur_peer_addr_info, packet + 7, 7);
@@ -604,6 +605,10 @@ static void cbk_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *p
#endif
}
break;
case HCI_SUBEVENT_LE_CONNECTION_UPDATE_COMPLETE:
log_info("HCI_SUBEVENT_LE_CONNECTION_UPDATE_COMPLETE\n");
connection_update_complete_success(packet);
break;
}
break;
@@ -1108,6 +1113,7 @@ void rcsp_bt_ble_adv_enable(u8 enable)
#endif
log_info("%s, enable:%d, rets=0x%x\n", __FUNCTION__, enable, rets_addr);
adv_enable = enable;
UI_MSG_POST("ble_button:button=%4", adv_enable);
set_adv_enable(0, enable);
}
@@ -503,10 +503,6 @@ int rcsp_user_spp_state_specific(u8 packet_type, u8 *spp_remote_addr)
#endif
switch (packet_type) {
case SPP_USER_ST_CONNECT:
#if TCFG_EDR_SCAN_CONN_CTRL
void rcsp_set_ble_disconnect_by_app_flag(u8 flag);
rcsp_set_ble_disconnect_by_app_flag(0);
#endif
// spp 连接后会走这里
extern void clock_refurbish(void);
clock_refurbish();
@@ -49,7 +49,7 @@ static const char *dev_logo[] = {
[RCSPDevMapUDISK] = "udisk0",
[RCSPDevMapSD0] = "sd0",
[RCSPDevMapSD1] = "sd1",
#if TCFG_NANDFLASH_UI_FAT_ENABLE
#if (TCFG_NANDFLASH_UI_FAT_ENABLE&&(!TCFG_VIRFAT_INSERT_FLASH_ENABLE))
[RCSPDevMapFLASH] = TCFG_NANDFLASH_UI_FAT_LOGO,
#else
[RCSPDevMapFLASH] = "virfat_flash",
@@ -991,7 +991,7 @@ void rcsp_file_transfer_init(void (*end_callback)(void))
ftp_d->end_callback = end_callback;
//如果在超时时间内都没有发文件传输开始命令, 退出文件传输流程
ftp_d->start_timerout = sys_timeout_add(NULL, file_transfer_start_timeout, 2000);
ftp_d->start_timerout = sys_timeout_add(NULL, file_transfer_start_timeout, FTP_FILE_DATA_RECIEVE_TIMEOUT * 2);
}
@@ -50,21 +50,6 @@ static bool g_is_switching = false;
static u8 g_is_switch_to_spp = 0; // 0:BLE; 1:SPP
#if TCFG_EDR_SCAN_CONN_CTRL
/* 用于区分一键连接时候,ble断连原因 */
static u8 ble_disconnect_by_app_flag = 0; /* 1:一键连接时候,app发命令断连ble */
u8 rcsp_get_ble_disconnect_by_app_flag(void)
{
return ble_disconnect_by_app_flag;
}
void rcsp_set_ble_disconnect_by_app_flag(u8 flag)
{
printf("%s flag:%d", __func__, flag);
ble_disconnect_by_app_flag = flag;
}
#endif
extern void ble_app_disconnect(void);
extern u8 check_le_pakcet_sent_finish_flag(void);
@@ -80,9 +65,6 @@ static void wait_response_and_disconn_ble(void *priv)
wait_response_timeout = 0;
}
wait_cnt = 0;
#if TCFG_EDR_SCAN_CONN_CTRL
rcsp_set_ble_disconnect_by_app_flag(1);
#endif
ble_app_disconnect();
/* u16 ble_con_handle = app_ble_get_hdl_con_handle(rcsp_server_ble_hdl); */
/* if (g_ble_con_handle == ble_con_handle) { */