From: dxy <1731678236@qq.com> Date: Tue, 26 Mar 2024 11:34:27 +0000 (+0800) Subject: 优化蓝牙协议框架 X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~28 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8e940128dad3f1617b8f72f56c5724f494643909;p=mirrors%2FFD230.git 优化蓝牙协议框架 --- diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c index e03503436..833568605 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c +++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c @@ -14,9 +14,24 @@ #include "osal_task.h" #include "alipay_feature.h" #include "securec.h" -#include "wearable_log.h" -#include "bleService.h" -#include "alipay_bluetooth.h" +/* Gatt service UUID */ +#define ALIPAYY_SERVICE_ID 0x0238 +/* Gatt Characteristic UUID */ +#define ALIPAYY_CHARACTERISTIC_ID 0x024A +/* Client Characteristic Configuration UUID */ +#define ALIPAYY_BLE_UUID_CLIENT_CHARACTERISTIC_CONF 0x2902 +/* Gatt Characteristic max length */ +#define ALIPAY_CHARACTERISTIC_MAX_LENGTH 256 +#define ALIPAY_BLE_ADV_ID 1 +#define ALIPAY_BLE_ADV_DATA_MAX_LENGTH 31 +#define ALIPAY_BLE_ADV_BLE_NAME_MAX_LENGTH 13 // 31-4-2-3-9 = 13 +#define ALIPAY_BLE_NAME_LENGTH 20 +#define ALIPAY_BLE_ADV_MAC_HEAD_LENTH 4 +#define ALIPAY_BLE_ADV_MAC_LENTH 10 +#define ALIPAY_BLE_ADV_TYPE_LENTH 3 +#define ALIPAY_BLE_ADV_UUID_LENTH 4 +#define ALIPAY_BLE_DEFAULT_NAME "KUMIU6" +#define ALIPAY_BLE_DEFAULT_NAME_LEN 9 // Alipay 蓝牙模块全局变量 static gap_ble_callbacks_t g_alipay_gapble_cbs; @@ -56,29 +71,19 @@ static void svr_alipay_ble_adv_data_set(int adv_id) uint8_t adv_mac_head[ALIPAY_BLE_ADV_MAC_LENTH] = {0x9, 0x16, 0x02, 0x38}; gap_ble_config_adv_data_t adv_data_info; memset_s(&adv_data_info, sizeof(gap_ble_config_adv_data_t), 0, sizeof(gap_ble_config_adv_data_t)); - bd_addr_t addr_info; - int32_t ret= 0; - unsigned int len = ALIPAY_BLE_MAC_MAX_LEN; - unsigned char addr[ALIPAY_BLE_MAC_MAX_LEN] = {0}; - bluetooth_get_local_addr(&addr[0],len); - - char watchName[32]; - memset_s(watchName, sizeof(watchName), 0, sizeof(watchName)); - (void)sprintf_s(watchName, sizeof(watchName), "%s %x%x",ALIPAY_BLE_DEFAULT_NAME,addr[1],addr[0]); - - ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1); - if (ret == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ConnectPhonePresenter: bt SetLocalName ret = 0x%x", ret); - } - ret = bluetooth_get_local_name(ble_name, &ble_name_len); + + int32_t ret = gap_ble_get_local_name(ble_name, &ble_name_len); if (ret != 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_name fail, name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); + ALIPAY_PRINT_ERR(0, "gap_ble_get_local_name fail, name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); memset_s(ble_name, ALIPAY_BLE_NAME_LENGTH, 0, ALIPAY_BLE_NAME_LENGTH); - memcpy_s(ble_name, ALIPAY_BLE_NAME_LENGTH,ALIPAY_BLE_DEFAULT_NAME, ALIPAY_BLE_NAME_LENGTH); - ble_name_len = ALIPAY_BLE_NAME_LENGTH + 1; + memcpy_s(ble_name, ALIPAY_BLE_NAME_LENGTH, ALIPAY_BLE_DEFAULT_NAME, ALIPAY_BLE_DEFAULT_NAME_LEN); + ble_name_len = ALIPAY_BLE_DEFAULT_NAME_LEN + 1; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_name name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); + ALIPAY_PRINT_DEBUG(0, "gap_ble_get_local_name name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); + bd_addr_t addr_info; + ret = gap_ble_get_local_addr(&addr_info); + ALIPAY_PRINT_DEBUG(0, "gap_ble_get_local_addr, ret:%u.", ret); memcpy_s(adv_data, sizeof(alipay_adv_type), alipay_adv_type, sizeof(alipay_adv_type)); adv_data_len = sizeof(alipay_adv_type); @@ -96,20 +101,25 @@ static void svr_alipay_ble_adv_data_set(int adv_id) adv_data_len = adv_data_len + sizeof(alipay_adv_uuid); int k = BD_ADDR_LEN; for (int i = 0; i < BD_ADDR_LEN; i++) { - ble_data_mac_switch[--k] = addr[i]; + ble_data_mac_switch[--k] = addr_info.addr[i]; } - ALIPAY_PRINT_DEBUG(0, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1], + ALIPAY_PRINT_ERR(0, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1], ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]); memcpy_s(adv_mac_head + ALIPAY_BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN); memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head)); adv_data_len = adv_data_len + sizeof(adv_mac_head); + uint8_t scan_data[20]; + memset(scan_data,0,20); + adv_data_info.scan_rsp_data = scan_data; + adv_data_info.scan_rsp_length = 0; adv_data_info.adv_data = adv_data; adv_data_info.adv_length = adv_data_len; - ALIPAY_PRINT_DEBUG(0, "adv_data_info.adv_length:%u.", adv_data_len); + ALIPAY_PRINT_ERR(0, "adv_data_info.adv_length:%u.", adv_data_len); - gap_ble_set_adv_data(adv_id, &adv_data_info); + errcode_t gap_ret = gap_ble_set_adv_data(adv_id, &adv_data_info); + ALIPAY_PRINT_ERR(0, "adv_data_info.adv_length: gap_ret %d.", gap_ret); return; } @@ -134,22 +144,24 @@ void svr_alipay_ble_adv_start(void) gap_ble_set_adv_param(adv_id, &adv_para); gap_ble_set_local_appearance(GAP_BLE_APPEARANCE_TYPE_GENERIC_WATCH); svr_alipay_ble_adv_data_set(adv_id); - bool ret = gap_ble_start_adv(adv_id); + errcode_t ret = gap_ble_start_adv(adv_id); if (ret) { - ALIPAY_PRINT_ERR(0, "svr_alipay_ble_adv_start bt gap_ble_start_adv ret = 0x%x", ret); + ALIPAY_PRINT_ERR(0, "svr_alipay_ble_adv_start bt gap_ble_start_adv errror ret = 0x%x", ret); } - ALIPAY_PRINT_DEBUG(0, "svr_alipay_ble_adv_start bt gap_ble_start_adv ret = 0x%x", ret); + ALIPAY_PRINT_ERR(0, "svr_alipay_ble_adv_start bt gap_ble_start_adv ret = 0x%x", ret); } - +extern void svr_alipay_reset_init(void); static void svr_alipay_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_ble_conn_state_t conn_state, gap_ble_pair_state_t pair_state, gap_ble_disc_reason_t disc_reason) { - ALIPAY_PRINT_DEBUG(0, "BleConnStateChangeCallback conn_id 0x%x, conn_state 0x%x, pair_state 0x%x", conn_id, + ALIPAY_PRINT_ERR(0, "BleConnStateChangeCallback conn_id 0x%x, conn_state 0x%x, pair_state 0x%x", conn_id, conn_state, pair_state); g_alipay_conn_id = conn_id; if (GAP_BLE_STATE_DISCONNECTED == conn_state) { // restart ble adv when disconnected - svr_alipay_ble_adv_start(); + // svr_alipay_ble_adv_start(); + svr_alipay_reset_init(); + // gap_ble_start_adv(ALIPAY_BLE_ADV_ID); } else { svr_alipay_set_adv_start_state(false); } @@ -170,10 +182,11 @@ static void svr_alipay_ble_adv_stop_cb(uint8_t adv_id, adv_status_t status) { ALIPAY_PRINT_DEBUG(0, "BleAdvStopCallback adv_id: %d, status:%d\n", adv_id, status); } - +static uint16_t alipay_server_handle = 0; static void svr_alipay_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, errcode_t status) { + alipay_server_handle = srv_handle; ALIPAY_PRINT_DEBUG(0, "BtGattsServiceAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle, *((uint16_t *)uuid->uuid)); int ret; @@ -197,66 +210,7 @@ static void svr_alipay_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uui } } } -void alipay_add_chart_decr_cb(uint8_t server_id,uint16_t srv_handle) -{ - errcode_t ret = 0; - // uint16_t id = ALIPAYY_CHARACTERISTIC_ID; - gatts_add_chara_info_t character; - uint16_t value = 0; - bt_uuid_t alipay_service_uuid = {0}; - bts_data_to_uuid_len2(ALIPAYY_CHARACTERISTIC_ID, &alipay_service_uuid); - memset_s(&character, sizeof(gatts_add_chara_info_t), 0, sizeof(gatts_add_chara_info_t)); - // character.chara_uuid.uuid_len = sizeof(id); - // memcpy_s(character.chara_uuid.uuid, sizeof(character.chara_uuid.uuid), (char *)&id, sizeof(id)); - character.chara_uuid = alipay_service_uuid; - character.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; - character.properties = - GATT_CHARACTER_PROPERTY_BIT_READ | GATT_CHARACTER_PROPERTY_BIT_WRITE | GATT_CHARACTER_PROPERTY_BIT_NOTIFY; - character.value_len = ALIPAY_CHARACTERISTIC_MAX_LENGTH; - character.value = g_alipay_character_buf; - - ret = gatts_add_characteristic(server_id, srv_handle, &character); - if (ret != ERRCODE_SUCC) { - ALIPAY_PRINT_ERR(0, "gatts_add_characteristic fail, ret:%u.\r\n", ret); - } - uint8_t bas_ccc_val[] = { - 0x01, - 0x00 - }; - bt_uuid_t ccc_uuid = { 0 }; - bts_data_to_uuid_len2(ALIPAYY_BLE_UUID_CLIENT_CHARACTERISTIC_CONF, &ccc_uuid); - // bts_data_to_uuid_len2(0x2902, &ccc_uuid); - gatts_add_desc_info_t descriptor; - descriptor.desc_uuid = ccc_uuid; - descriptor.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; - descriptor.value_len = (uint16_t)sizeof(bas_ccc_val); - descriptor.value = bas_ccc_val; - - ret = gatts_add_descriptor(server_id, srv_handle, &descriptor); - if (ret != ERRCODE_SUCC) { - ALIPAY_PRINT_ERR(0, "gatts_add_descriptor fail, ret:%u.\r\n", ret); - } - bd_addr_t addr_info; - gatts_add_desc_info_t descriptor_ap; - gap_ble_get_local_addr(&addr_info); - bts_data_to_uuid_len2(0x4b02, &ccc_uuid); - descriptor_ap.desc_uuid = ccc_uuid; - descriptor_ap.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; - descriptor_ap.value_len = BD_ADDR_LEN; - uint8_t ble_data_mac_switch[BD_ADDR_LEN] = {0}; - int k = BD_ADDR_LEN; - for (int i = 0; i < BD_ADDR_LEN; i++) { - ble_data_mac_switch[--k] = addr_info.addr[i]; - } - descriptor_ap.value = ble_data_mac_switch; - ret = gatts_add_descriptor(server_id, srv_handle, &descriptor_ap); - if (ret != ERRCODE_SUCC) { - ALIPAY_PRINT_ERR(0, "gatts_add_descriptor second fail, ret:%u.\r\n", ret); - } - - -} static void svr_alipay_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, gatts_add_character_result_t *result, errcode_t status) { @@ -337,7 +291,7 @@ static void svr_alipay_bt_gatts_req_read_cb(uint8_t server_id, uint16_t conn_id, static void svr_alipay_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, gatts_req_write_cb_t *write_cb_para, errcode_t status) { - ALIPAY_PRINT_DEBUG(0, "write callback,str:%s len:%u", write_cb_para->value, write_cb_para->length); + ALIPAY_PRINT_ERR(0, "write callback,str:%s len:%u", write_cb_para->value, write_cb_para->length); uint8_t *msg_data = write_cb_para->value; errcode_t ret = svr_alipay_msg_write(ALIPAY_MSG_BT, msg_data, write_cb_para->length, false); if (ret != ERRCODE_SUCC) { @@ -354,17 +308,17 @@ void svr_alipay_bt_gatts_noyify(uint8_t *data, uint16_t data_len) data_info.value_len = data_len; errcode_t ret = gatts_notify_indicate(g_alipay_server_id, g_alipay_conn_id, &data_info); - ALIPAY_PRINT_DEBUG(0, "gatts_notify_indicate ret1:0x%x. serverid:%u,conn_id:%u,handle:%u.", ret, g_alipay_server_id, + ALIPAY_PRINT_ERR(0, "gatts_notify_indicate ret:0x%x. serverid:%u,conn_id:%u,handle:%u.", ret, g_alipay_server_id, g_alipay_conn_id, g_alipay_server_handle); } - +extern void srv_ble_gap_register_cb(void); static void svr_alipay_btcallback_reg(void) { - // g_alipay_gapble_cbs.conn_state_change_cb = svr_alipay_ble_connstate_change_cb; - // g_alipay_gapble_cbs.start_adv_cb = svr_alipay_ble_adv_start_cb; - // g_alipay_gapble_cbs.stop_adv_cb = svr_alipay_ble_adv_stop_cb; - // g_alipay_gapble_cbs.set_adv_data_cb = svr_alipay_ble_set_adv_data_cb; - // gap_ble_register_callbacks(&g_alipay_gapble_cbs); + g_alipay_gapble_cbs.conn_state_change_cb = svr_alipay_ble_connstate_change_cb; + g_alipay_gapble_cbs.start_adv_cb = svr_alipay_ble_adv_start_cb; + g_alipay_gapble_cbs.stop_adv_cb = svr_alipay_ble_adv_stop_cb; + g_alipay_gapble_cbs.set_adv_data_cb = svr_alipay_ble_set_adv_data_cb; + gap_ble_register_callbacks(&g_alipay_gapble_cbs); g_alipay_gatts_cbs.add_service_cb = svr_alipay_bt_gatts_service_add_cb; g_alipay_gatts_cbs.add_characteristic_cb = svr_alipay_bt_gatts_characteristic_add_cb; @@ -377,6 +331,7 @@ static void svr_alipay_btcallback_reg(void) g_alipay_gatts_cbs.mtu_changed_cb = NULL; gatts_register_callbacks(&g_alipay_gatts_cbs); } +//gatts_unregister_server static void svr_alipay_bt_init_gatts(void) { @@ -389,37 +344,51 @@ static void svr_alipay_bt_init_gatts(void) memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&service_id, sizeof(service_id)); ret = gatts_register_server(&uuid, &server_id); /* 注册gatt server */ if (ret != ERRCODE_SUCC) { - ALIPAY_PRINT_ERR(0, "gatts_register_server ret:%u.\r\n", ret); + // ALIPAY_PRINT_ERR(0, "gatts_register_server err ret:%u.\r\n", ret); } - ALIPAY_PRINT_DEBUG(0, "gatts_register_server ret: 0x%x server_id = 0x%x", ret, server_id); + ALIPAY_PRINT_ERR(0, "gatts_register_server ret: 0x%x server_id = 0x%x", ret, server_id); g_alipay_server_id = server_id; uuid.uuid_len = sizeof(service_id); memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&service_id, sizeof(service_id)); ret = gatts_add_service(server_id, &uuid, true); if (ret != ERRCODE_SUCC) { - ALIPAY_PRINT_ERR(0, "gatts_add_service ret:%u.\r\n", ret); + } + ALIPAY_PRINT_ERR(0, "gatts_add_service ret:%u.\r\n", ret); return; } -void ble_alipay_add_characters_input_report_cbk(uint16_t srvc_handle) +void alipay_unregist_server(void) { - + gatts_delete_all_services(g_alipay_server_id); + gatts_unregister_server(g_alipay_server_id); + svr_alipay_ble_adv_stop(); } -static uint8_t g_server_id = 0; +extern void ble_unregist_server(void); void svr_alipay_bluetooth_init(void) { - // bool ret = enable_bt_stack(); - // if (ret != ERRCODE_SUCC) { - // ALIPAY_PRINT_ERR(0, "enable_bt_stack ret:%u.\r\n", ret); - // } - if (g_alipay_ble_init_flag == true) { - return; + ble_unregist_server(); + disable_bt_stack(); + svr_alipay_ble_adv_stop(); + osDelay(100); + bool ret = enable_bt_stack(); + if (ret != ERRCODE_SUCC) { + ALIPAY_PRINT_ERR(0, "enable_bt_stack ret:%u.\r\n", ret); } - // gatts_register_server(&app_uuid, &g_server_id); /* 注册gatt server */ - bt_uuid_t alipay_service_uuid = {0}; - bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid); - gatts_add_service(1, &alipay_service_uuid, true); - + // if (g_alipay_ble_init_flag == true) { + // return; + // } + svr_alipay_btcallback_reg(); + svr_alipay_bt_init_gatts(); + svr_alipay_ble_adv_start(); g_alipay_ble_init_flag = true; return; } +void svr_alipay_reset_init(void)//重新启动alipa的服务 +{ + ble_unregist_server(); + osDelay(100); + svr_alipay_btcallback_reg(); + svr_alipay_bt_init_gatts(); + svr_alipay_ble_adv_start(); + return; +} \ No newline at end of file diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.h b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.h index 07bbd8f95..47f080e39 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.h +++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.h @@ -26,5 +26,6 @@ #define ALIPAY_BLE_MAC_MAX_LEN 6 void ble_alipay_add_characters_input_report_cbk(uint16_t srvc_handle); +void alipay_add_chart_decr_cb(uint8_t server_id,uint16_t srv_handle); #endif diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c index 51aafb24b..df31aa8d5 100755 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.c +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c @@ -22,6 +22,7 @@ #include "osal_msgqueue.h" #include "thread_init.h" #include "alipay_transit.h" +#include "bleService.h" #include "vendor_file.h" #if defined(__FREERTOS__) #include "FreeRTOS.h" @@ -67,13 +68,16 @@ static mc_payment_state_t svr_alipay_get_paystate(void) { return PAYMENT_UNSUPPORTED; } - +extern void svr_alipay_reset_init(void); static int32_t svr_alipay_notify_bt(bool value) { if (value) { - svr_alipay_ble_adv_start(); + printf("svr_alipay_notify_bt true:%d",value); + svr_alipay_bluetooth_init(); } else { - svr_alipay_ble_adv_stop(); + printf("svr_alipay_notify_bt false:%d",value); + svr_bluetooth_init(); + // svr_alipay_ble_adv_stop(); } return 0; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp index 4b88e20ed..0831e6e39 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp @@ -77,8 +77,8 @@ BluetoothModel *BluetoothModel::GetInstance(void) void BluetoothModel::Init() { - bool ret = enable_bt_stack(); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %d", ret); + // bool ret = enable_bt_stack(); + // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %d", ret); BtInitCallBacks(); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp index ecbb0670d..a89f5f38b 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp @@ -77,8 +77,8 @@ BluetoothModel *BluetoothModel::GetInstance(void) void BluetoothModel::Init() { - bool ret = enable_bt_stack(); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %d", ret); + // bool ret = enable_bt_stack(); + // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %d", ret); BtInitCallBacks(); diff --git a/code/sdk/application/wearable/service/ble_service/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleEvent.c index 3db715ced..6cda489f0 100644 --- a/code/sdk/application/wearable/service/ble_service/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleEvent.c @@ -26,12 +26,20 @@ #include "osal_timer.h" #include "bleEvent.h" #include "app_common_api.h" +#include "hidService.h" #include "../../../../../open_source/openharmony/third_party/cJSON/cJSON.h" #include "errcode.h" - +#define PHONE_WATCH_CONFIG_PATH "/user/userdata/phone_watch.json" +#define ALARM_DATA_CONFIG_PATH "/user/userdata/alarm_test.json" +uint8_t *bigDataBuf = NULL;//大数据buf +uint8_t bigDataBufLen=0; +bool sendbigDataBufState = false;//发送大数据表示不要被其他指令打断 +bool recvBigDataBufState = false;//接收大数据标志 +static bool muiltFlag = 0;//多包数据flag +static uint16_t data_len = 0; ble_recv_data_info_t ble_recv_data; ble_recv_msg_callback_t g_recv_msg_toUI = NULL; - +#if 1 // typedef void (*hx3695_msg_callback_t)(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen); uint32_t ble_recv_register_msg_callback(ble_recv_msg_callback_t func) @@ -44,27 +52,123 @@ ble_recv_msg_callback_t ble_recv_get_send_msg_callback_func(void) { return g_recv_msg_toUI; } - +static msg_get_heart_set_param_info_t hr_param; +static msg_get_spo2_set_param_info_t spo2_param; +static msg_drink_set_param_info_t drink_info; +static msg_drink_param_info_t drink_on_t;//喝水提醒开关 +static msg_watch_lcd_param_info_t watch_lcd_param;//手表屏幕参数 +static msg_get_voice_vibration_info_t voice_vibration; +static msg_caramer_info_t caramer_info;//拍照手势状态 0退出拍照 1进入拍照 +static msg_user_info_t user_info;//用户信息 体重 身高 年龄 性别 +//手表TODO 这是一个sample int ble_recv_msg_callback(uint8_t writ_read,uint16_t msg_typeID, uint8_t *msg_data, uint16_t msg_datalen) { + if(writ_read == READ_FLASH_DATA){//读手表数据 WRITE_FLASH_DATA 写手表数据 + switch (msg_typeID) + { + case SET_DRINK_PARAM_CMD: + memset(&drink_info,0,sizeof(msg_drink_set_param_info_t)); + drink_info.drink_on = 1; + drink_info.alarm_mode = 1; + drink_info.start_hour = 8; + drink_info.startt_min = 9; + drink_info.end_hour = 23; + drink_info.end_min = 59; + drink_info.frequenc = 1; + memcpy(msg_data,&drink_info,sizeof(msg_drink_set_param_info_t)); + + break; + case GET_WATCH_HR_SET_PARAM_CMD: + memset(&hr_param,0,sizeof(msg_get_heart_set_param_info_t)); + hr_param.frequence = 1; + hr_param.remind_on = 1; + hr_param.max_min = 1; + hr_param.heart = 180; + memcpy(msg_data,&hr_param,sizeof(msg_get_heart_set_param_info_t)); + + break; + case GET_DRINK_SWITCH_CMD: + + memset(&drink_on_t,0,sizeof(msg_drink_param_info_t)); + drink_on_t.drink_on = 1; + memcpy(msg_data,&drink_on_t,sizeof(msg_drink_param_info_t)); + break; + case GET_WATCH_LCD_PARAM_CMD: + memset(&watch_lcd_param,0,sizeof(msg_watch_lcd_param_info_t)); + watch_lcd_param.brigntess = 10; + watch_lcd_param.screen_time = 3; + watch_lcd_param.wrist_on = 0; + memcpy(msg_data,&watch_lcd_param,sizeof(msg_get_heart_set_param_info_t)); + + break; + default: + break; + } + + + }else{ + switch (msg_typeID) + { + case SET_DRINK_PARAM_CMD: + + memset(&drink_info,0,sizeof(msg_drink_set_param_info_t)); + drink_info.drink_on = msg_data[0]; + drink_info.alarm_mode = msg_data[1]; + drink_info.target_drink = msg_data[2]+msg_data[3]*256; + drink_info.start_hour = msg_data[4]; + drink_info.startt_min = msg_data[5]; + drink_info.end_hour = msg_data[6]; + drink_info.end_min = msg_data[7]; + drink_info.frequenc = msg_data[8]; + printf("drink_info %d %d %d %d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode, + drink_info.target_drink,drink_info.start_hour,drink_info.startt_min,drink_info.end_hour, + drink_info.end_min,drink_info.frequenc); + // memcpy(msg_data,&drink_info,sizeof(msg_drink_set_param_info_t)); + break; + case GET_DRINK_SWITCH_CMD: + + memset(&drink_on_t,0,sizeof(msg_drink_param_info_t)); + drink_on_t.drink_on = 1; + memcpy(msg_data,&drink_on_t,sizeof(msg_drink_param_info_t)); + break; + + default: + break; + } + } + for(uint16_t i = 0;ivaluestring); + printf("设备名称: %s\n", pn->valuestring); + } cJSON* tp = cJSON_GetObjectItem(root, "tp"); if (cJSON_IsNumber(tp)) { printf("类型: %d\n", tp->valueint); + type = tp->valueint; } cJSON* mac = cJSON_GetObjectItem(root, "mac"); @@ -216,7 +297,7 @@ static void jsonCheck_phoneinfor(uint8_t *buf,uint8_t *mac_data)//解析手机 cJSON_ArrayForEach(macElement, mac) { if (cJSON_IsNumber(macElement)) { printf("%d", macElement->valueint); - if (macElement->next != NULL) { + if (macElement->prev != NULL) { phone_mac[count1++] = macElement->valueint; mac_tmp[count2++] = macElement->valueint; printf(", "); @@ -225,7 +306,7 @@ static void jsonCheck_phoneinfor(uint8_t *buf,uint8_t *mac_data)//解析手机 } printf("\n"); } - if(sizeof(mac_tmp) != 0) + if(mac_tmp[0] != 0 && mac_tmp[1] != 0 && mac_tmp[2] != 0 && mac_tmp[3] != 0 && mac_tmp[4] != 0 && mac_tmp[5] != 0) { printf("MAC地址: len %d",sizeof(mac_tmp)); memcpy(mac_data,mac_tmp,6); @@ -248,20 +329,11 @@ errcode_t bondSucessCmd(void)//发送解绑指令,解绑界面调用这个函数 memcpy(value+11,&tmp,4); memcpy(value+15,&tmp,2); value[17] = 1; - value[18] = Calculate_CRC(value+17,1); + value[18] = Calculate_CRC(value,18); sendok = sendBleData(value,19); bool ret = bt_is_acl_connected(&phone_addr); - bool remove = 0; - if(ret == true) - { - errcode_t ret = gap_ble_remove_all_pairs(); - remove = gap_remove_all_pairs(); - printf("remove11111!!!!!!:%d",remove); - }else{ - errcode_t ret = gap_ble_remove_all_pairs(); - remove = gap_remove_all_pairs(); - printf("remove2222!!!!!!:%d",remove); - } + gap_ble_remove_all_pairs(); + gap_remove_all_pairs(); closeBle(); return sendok; } @@ -285,12 +357,12 @@ void clearPaireFlag(uint8_t flag) memcpy(value+11,&tmp,4); memcpy(value+15,&tmp,2); value[17] = flag; - value[18] = Calculate_CRC(value+17,1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } -void clearPaireCmd(uint8_t *crcnum,uint16_t len)//发送清除配对指令 +void clearPaireCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue)//发送清除配对指令 { - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { //弹出清除配对界面不弹出是则发送0x02操作失败 1操作成功 0校验失败 clearPaireFlag(1); @@ -304,7 +376,6 @@ void clearPaireCmd(uint8_t *crcnum,uint16_t len)//发送清除配对指令 void comfirmPaire(uint8_t flag) { uint8_t value[19]; - uint8_t crcvalue = 0; memset(value,0,19); uint32_t tmp = 1; value[0] =0x72; @@ -324,12 +395,12 @@ void alarmData(void) } -uint8_t bond_phone = 0;//是否和手机app绑定过已经绑定就不需要配对指令给app,直接发起配对 -void getPhoneInfo(uint8_t *buf,uint16_t len)//获取手机信息 +uint8_t firts_bond = 0;//是否和手机app绑定过已经绑定就不需要配对指令给app,直接发起配对 +void getPhoneInfo(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取手机信息 { - + //static void * next_tmp; uint8_t value[20]; - uint8_t crcvalue = 0; + // uint8_t crcvalue = 0; memset(value,0,20); uint32_t tmp = 1; uint16_t tmp_fen= 1; @@ -342,58 +413,63 @@ void getPhoneInfo(uint8_t *buf,uint16_t len)//获取手机信息 memcpy(value+15,&tmp_fen,2); phoneDataFlag = 1; - if(Check_CRC(buf,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); - if(func != NULL) - { - func(0x01,0x011a,value,19); - // func(HX3695_MSG_TYPE_HRS_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t)); - } uint8_t *tmp_data; - tmp_data = buf; + tmp_data = crcnum; uint8_t copare_mac[6]; memset(copare_mac,0,6); jsonCheck_phoneinfor(tmp_data,&copare_mac); gap_ble_pair_state_t status; gap_ble_get_pair_state(&phone_addr,&status);//获取配对状态 uint8_t bond = 1;//未与任何手机绑定过 - if(strlen((char *)copare_mac) != 0 && strlen((char *)parie_mac)) //两个都不为空才进行比较 - { - int result = memcmp(copare_mac,parie_mac,6);//两个不一致说明和其他手机绑定了 - if(result == 0)//相等则手机与改手机绑定过 - { - bond = 2;//和该手机绑定过 - } - else{ - bond = 3;//和其他手机绑定过 + errcode_t ret = 0; + firts_bond = 0; + + uint8_t save_mac[6]; + uint8_t save_mac_t[6]; + uint8_t count = 0; + uint8_t count_t = 0; + FILE *jsfile = fopen(PHONE_WATCH_CONFIG_PATH, "r"); + if (jsfile != NULL) { + printf("succes opening file\n"); + fseek(jsfile, 0, SEEK_END); + long fileSize = ftell(jsfile); + fseek(jsfile, 0, SEEK_SET); + + char *jsonData = (char *)malloc(fileSize + 1); + fread(jsonData, 1, fileSize, jsfile); + jsonData[fileSize] = '\0'; + fclose(jsfile); + + // 解析JSON数据 + cJSON *root = cJSON_Parse(jsonData); + free(jsonData); + + if (root != NULL) { + cJSON *modifiedJson = cJSON_GetObjectItem(root,"mac"); + if (cJSON_IsArray(modifiedJson)) { + printf("MAC地址: "); + cJSON* macElement = NULL; + cJSON_ArrayForEach(macElement, modifiedJson) { + if (cJSON_IsNumber(macElement)) { + if ((macElement->prev != NULL)) { + save_mac[count] = macElement->valueint; + count++; + } + + } + } + printf("\n"); + } + // printf("success parsing JSON :save_mac :%d %d %d %d %d %d\n",save_mac[0],save_mac[1],save_mac[2],save_mac[3],save_mac[4],save_mac[5]); } - printf("gap_ble_pair_remote_device result %d\r\n",result); + // 释放资源 + cJSON_Delete(root); } - errcode_t ret = 0; - // errcode_t ret = gap_ble_remove_all_pairs(); - // bool remove = gap_remove_all_pairs(); - printf("gap_ble_pair_remote_device status %d ret:%d\r\n",status,ret); - bond_phone = 0; - if(strlen((char *)copare_mac) == 0) + if(save_mac[0] == 0 && save_mac[1] == 0 && save_mac[2] == 0)//只要手表本地存储没有mac地址就走连接流程重新绑定 { bond = 0x01;//手表未和任何手机绑定过 - - }else - { - bond_phone = 1; - bond = 0x02;//手表与该手机绑定过 - } - value[17] = bond;// - value[18] = Calculate_CRC(value,18); - sendBleData(value,19); - if(1) - { - uint16_t number; - errcode_t ret = gap_ble_get_paired_devices_num(&number); - int gap_ret = gap_get_pair_state(&phone_addr); - gap_ble_pair_state_t status; - gap_ble_get_pair_state(&phone_addr,&status);//获取配对状态 if(strlen((char *)copare_mac) == 0)//只要app没有下发mac就开启弹窗 { comfirmPaire(1); @@ -401,38 +477,94 @@ void getPhoneInfo(uint8_t *buf,uint16_t len)//获取手机信息 }else{ ret = gap_ble_pair_remote_device(&phone_addr); } - printf("gap_ble_pair_remote_device ret:%d number %d phone_mac_data 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x phone_addr->TYPE:%d\n",ret,number,phone_addr.addr[0],phone_addr.addr[1],phone_addr.addr[2],phone_addr.addr[3],phone_addr.addr[4], + printf("gap_ble_pair_remote_device ret: %d phone_mac_data 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x phone_addr->TYPE:%d\n",ret,phone_addr.addr[0],phone_addr.addr[1],phone_addr.addr[2],phone_addr.addr[3],phone_addr.addr[4], phone_addr.addr[5],phone_addr.type); + + }else + { + if(copare_mac[0] != 0 && copare_mac[1] != 0 && copare_mac[2] != 0 ) + { + printf("success parsing JSON :save_mac :%d %d %d %d %d %d copare_mac %d %d %d %d %d %d;\n",save_mac[0],save_mac[1],save_mac[2],save_mac[3],save_mac[4],save_mac[5], + copare_mac[0],copare_mac[1],copare_mac[2],copare_mac[3],copare_mac[4],copare_mac[5]); + int result = memcmp(copare_mac,save_mac,6); + if(result == 0) + { + firts_bond = 1; + bond = 0x02;//手表与该手机绑定过 + }else{ + bond = 0x03;//手表与其他手机绑定过 + } + }else{//如果手机有保存mac app下发是空就提示和其他手机绑定过界面不在发起配对 + bond = 0x03;//手表和其他手机绑定过 + + } + } + printf("bond flag:%d firts_bond:%d\r\n",bond,firts_bond); + value[17] = bond;// + value[18] = Calculate_CRC(value,18); + sendBleData(value,19); + if(bond == 0x03) + { + //加解绑提示界面是否和旧的手机解绑app 弹窗提示 + return; } }else{ value[17] = 0x00; value[18] = Calculate_CRC(value,18); sendBleData(value,19); } - - } void sendParieSuccess(uint8_t flag,uint8_t *mac)//发送配对成功指令to app { - if(bond_phone != 1 && phoneDataFlag == 1){//和该手机绑定过并且是连接app之后下发的数据 正常系统配对是不需要保存的 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sendParieSuccess:0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sendParieSuccess:0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]); + if(firts_bond != 1 && phoneDataFlag == 1){//和该手机绑定过并且是连接app之后下发的数据 正常系统配对是不需要保存的 + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sendParieSuccess:0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]); uint8_t value[25]; uint8_t length = 0; memset(value,0,25); value[0] = 0x72; value[1] = 0x05; value[2] = 0x10; - uint32_t tmp = 1; - uint16_t tmp_data = 1; - memcpy(value+3,&tmp,4); - memcpy(value+7,&tmp,4); - memcpy(value+11,&tmp,4); - memcpy(value+15,&tmp_data,2); + uint32_t totalpack= 1;//总的包数 + uint32_t data_len = 7;//数据长度 + uint32_t pack_index= 1;//分包序号Index + uint16_t pack_dataLen = 7; + memcpy(value+3,&totalpack,4); + memcpy(value+7,&data_len,4); + memcpy(value+11,&pack_index,4); + memcpy(value+15,&pack_dataLen,2); value[17] = flag;//1 配对成功 0 配对失败 if(flag == 1)//配对成功 { + cJSON *dataJSON = cJSON_CreateObject(); + + cJSON* arrayJSON = cJSON_CreateArray(); + for(uint8_t id = 0;id<6;id++) + { + cJSON_AddNumberToObject(arrayJSON,"id",mac[id]); + } + + // cJSON_AddNumberToObject(dataJSON,"id",i); + cJSON_AddItemToObject(dataJSON,"mac",arrayJSON); + char *jsonString = cJSON_PrintUnformatted(dataJSON); + printf("phone %s",jsonString); + FILE *file = fopen(PHONE_WATCH_CONFIG_PATH, "wb"); + if (file) + { + if (fputs(jsonString, file) != EOF) // 将 JSON 字符串写入文件 + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WriteJsonData success\n"); + } + fclose(file); + } + free(jsonString); + + + + // 读取JSON文件 + memcpy(value+18,mac,6); memcpy(parie_mac,mac,6); length = 18+6; @@ -474,10 +606,11 @@ void checkCrcSend(uint8_t type,uint8_t typeID,uint8_t crcflag)//获取时间 sendBleData(sendBuf,19); } -static void jsonCheck_time(uint8_t *buf,char *set_time)//json 格式解析 +static void jsonCheck_time(uint8_t *buf)//json 格式解析 { - uint8_t time_data[24]; + char time_data[24]; memset(time_data,0,24); + uint8_t *json; json = buf; cJSON* root = cJSON_Parse((const char *)json); @@ -485,53 +618,68 @@ static void jsonCheck_time(uint8_t *buf,char *set_time)//json 格式解析 printf("时间 JSON解析错误\n"); return; } - - cJSON* pn = cJSON_GetObjectItem(root, "time"); - if (cJSON_IsNumber(pn)) { - printf("time: %d\n", pn->valueint); + char *locations; + int year = 1970; + uint8_t month = 1; + uint8_t day = 1; + uint8_t week = 4; + uint8_t hour = 0; + uint8_t minute = 0; + uint8_t second = 0; + cJSON* time = cJSON_GetObjectItem(root, "time"); + if (cJSON_IsNumber(time)) { + printf("time: %d\n", time->valueint); } - cJSON* week = cJSON_GetObjectItem(root, "week"); - if (cJSON_IsNumber(week)) { - printf("week: %d\n", week->valueint); - } - cJSON* year = cJSON_GetObjectItem(root, "year"); - if (cJSON_IsNumber(week)) { - printf("year: %d\n", year->valueint); - } - cJSON* month = cJSON_GetObjectItem(root, "month"); - if (cJSON_IsNumber(month)) { - printf("month: %d\n", month->valueint); - } - cJSON* day = cJSON_GetObjectItem(root, "day"); - if (cJSON_IsNumber(day)) { - printf("day: %d\n", day->valueint); - } - cJSON* hour = cJSON_GetObjectItem(root, "hour"); - if (cJSON_IsNumber(hour)) { - printf("hour: %d\n", hour->valueint); - } - cJSON* minute = cJSON_GetObjectItem(root, "minute"); - if (cJSON_IsNumber(minute)) { - printf("minute: %d\n", minute->valueint); - } - cJSON* second = cJSON_GetObjectItem(root, "second"); - if (cJSON_IsNumber(second)) { - printf("second: %d\n", second->valueint); + cJSON* jsweek = cJSON_GetObjectItem(root, "week"); + if (cJSON_IsNumber(jsweek)) { + printf("week: %d\n", jsweek->valueint); + week = jsweek->valueint; + } + cJSON* jsyear = cJSON_GetObjectItem(root, "year"); + if (cJSON_IsNumber(jsyear)) { + printf("year: %d\n", jsyear->valueint); + year = jsyear->valueint; + } + cJSON* jsmonth = cJSON_GetObjectItem(root, "month"); + if (cJSON_IsNumber(jsmonth)) { + printf("month: %d\n", jsmonth->valueint); + month = jsmonth->valueint; + } + cJSON* jsday = cJSON_GetObjectItem(root, "day"); + if (cJSON_IsNumber(jsday)) { + printf("day: %d\n", jsday->valueint); + day = jsday->valueint; + } + cJSON* jshour = cJSON_GetObjectItem(root, "hour"); + if (cJSON_IsNumber(jshour)) { + printf("hour: %d\n", jshour->valueint); + hour = jshour->valueint; + } + cJSON* jsminute = cJSON_GetObjectItem(root, "minute"); + if (cJSON_IsNumber(jsminute)) { + printf("minute: %d\n", jsminute->valueint); + minute = jsminute->valueint; + } + cJSON* jssecond = cJSON_GetObjectItem(root, "second"); + if (cJSON_IsNumber(jssecond)) { + printf("second: %d\n", jssecond->valueint); + second = jssecond->valueint; } cJSON* location = cJSON_GetObjectItem(root, "location"); if (cJSON_IsString(location)) { printf("location: %s\n", location->valuestring); + locations = location->valuestring; } - sprintf((char *)time_data,"%d-%d-%d %d:%d:%d",year->valueint+2000,month->valueint,day->valueint,hour->valueint,minute->valueint,second->valueint); - memcpy(set_time,time_data,strlen((char *)time_data)); + sprintf((char *)time_data,"%d-%d-%d %d:%d:%d",year+2000,month,day,hour,minute,second); + set_system_time(time_data); cJSON_Delete(root); } -void GetUTCtime(uint8_t *crcnum,uint16_t len)//获取时间 +void GetUTCtime(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取时间 { uint32_t tmp = 1; uint16_t tmp_data = 1; @@ -545,20 +693,249 @@ void GetUTCtime(uint8_t *crcnum,uint16_t len)//获取时间 memcpy(sendBuf+11,&tmp,4); memcpy(sendBuf+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { sendBuf[17] = 1; sendBuf[18] = Calculate_CRC(sendBuf,18); sendBleData(sendBuf,19); - char set_time[24]; - memset((uint8_t *)set_time,0,24); uint8_t *data; data = crcnum; - jsonCheck_time(data,&set_time); - if(strlen(set_time) != 0) + jsonCheck_time(data); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} +static void jsonCheck_alarm(uint8_t *buf)//json 解析闹钟数据 +{ + uint8_t *json; + json = buf; + cJSON* root = cJSON_Parse((const char *)json); + if (root == NULL) { + printf("闹钟 JSON解析错误\n"); + return; + } + cJSON* alarms = cJSON_GetObjectItem(root, "alarms"); + int alarmCount = cJSON_GetArraySize(alarms); + printf("alarmCount %d\n",alarmCount); +} +void GetAlarmDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取app下发的屏幕参数 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x21; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + jsonCheck_alarm(crcnum); + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} + + + +void GetWatchLcdParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取app下发的屏幕参数 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x0e; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&watch_lcd_param,0,sizeof(msg_watch_lcd_param_info_t)); + + // printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + watch_lcd_param.brigntess = crcnum[0]; + watch_lcd_param.screen_time = crcnum[1]; + watch_lcd_param.wrist_on = crcnum[2]; + if(func != NULL) + { + func(WRITE_FLASH_DATA,cmd,&watch_lcd_param,sizeof(msg_watch_lcd_param_info_t)); + } + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} + + + +void GetVoiceVibrateParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取app下发的声音与振动参数 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x0f; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&voice_vibration,0,sizeof(msg_get_voice_vibration_info_t)); + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&voice_vibration,sizeof(msg_get_voice_vibration_info_t)); + } + // printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + uint8_t type = crcnum[0]; + if(type == 0)//只改变系统音量参数 其他还是保持不变 按照原来的参数 + { + voice_vibration.sys_volume = crcnum[1]; + }else if(type == 1)//只改变铃声音量参数 其他还是保持不变 按照原来的参数 + { + voice_vibration.ring_volume = crcnum[1]; + }else if(type == 2)//只改变铃声和振动开关 + { + voice_vibration.bell_on = crcnum[1]; + voice_vibration.vibrate_on = crcnum[2]; + } + if(func != NULL) + { + func(WRITE_FLASH_DATA,cmd,&voice_vibration,sizeof(msg_get_voice_vibration_info_t)); + } + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} + +void GetHrSetParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取app下发的声音与振动参数 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x12; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&hr_param,0,sizeof(msg_get_heart_set_param_info_t)); + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&hr_param,sizeof(msg_get_heart_set_param_info_t)); + } + // printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + hr_param.frequence = crcnum[0]; + hr_param.remind_on = crcnum[1]; + hr_param.max_min = crcnum[2]; + hr_param.heart = crcnum[3]; + if(func != NULL) + { + func(WRITE_FLASH_DATA,cmd,&hr_param,sizeof(msg_get_heart_set_param_info_t)); + } + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} + + +void GetSpo2SetParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取app下发的声音与振动参数 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x13; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&spo2_param,0,sizeof(msg_get_spo2_set_param_info_t)); + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&spo2_param,sizeof(msg_get_spo2_set_param_info_t)); + } + // printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + spo2_param.frequence = crcnum[0]; + spo2_param.remind_on = crcnum[1]; + if(spo2_param.remind_on) + { + spo2_param.spo2 = crcnum[2]; + } + + if(func != NULL) { - set_system_time(set_time); + func(WRITE_FLASH_DATA,cmd,&spo2_param,sizeof(msg_get_spo2_set_param_info_t)); } + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); } else { @@ -568,6 +945,61 @@ void GetUTCtime(uint8_t *crcnum,uint16_t len)//获取时间 } } + +void GetDrinkSetParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取喝水提醒s设置 +{ + uint32_t tmp = 1; + uint16_t tmp_data = 1; + uint8_t sendBuf[19]; + memset(sendBuf,0,19); + sendBuf[0] = 0x72; + sendBuf[1] = 0x02; + sendBuf[2] = 0x14; + memcpy(sendBuf+3,&tmp,4); + memcpy(sendBuf+7,&tmp,4); + memcpy(sendBuf+11,&tmp,4); + memcpy(sendBuf+15,&tmp_data,2); + + if(Check_CRC(crcnum,len,crcvalue)) + { + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + msg_drink_set_param_info_t drink_info; + if(func != NULL) + { + func(READ_FLASH_DATA,SET_DRINK_PARAM_CMD,&drink_info,sizeof(msg_drink_set_param_info_t)); + }//读设备内存 + printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + drink_info.drink_on = crcnum[0]; + if(drink_info.drink_on == 0){ + drink_info.drink_on = 0; + }else{ + drink_info.drink_on = crcnum[0]; + drink_info.alarm_mode = crcnum[1]; + drink_info.target_drink = crcnum[2]+crcnum[3]*256; + drink_info.start_hour = crcnum[4]; + drink_info.startt_min = crcnum[5]; + drink_info.end_hour = crcnum[6]; + drink_info.end_min = crcnum[7]; + drink_info.frequenc = crcnum[8]; + } + if(func != NULL) + { + func(WRITE_FLASH_DATA,SET_DRINK_PARAM_CMD,&drink_info,sizeof(msg_drink_set_param_info_t)); + } + + sendBuf[17] = 1; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + else + { + sendBuf[17] = 0; + sendBuf[18] = Calculate_CRC(sendBuf,18); + sendBleData(sendBuf,19); + } + +} + static void jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据 { uint8_t *json; @@ -588,7 +1020,7 @@ static void jsonCheck_weather(uint8_t *buf)//json 格式解析 天气数据 } -void GetWeatherCmd(uint8_t *crcnum,uint16_t len)//获取天气数据 +void GetWeatherCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//获取天气数据 { uint32_t tmp = 1; uint16_t tmp_data = 1; @@ -602,11 +1034,12 @@ void GetWeatherCmd(uint8_t *crcnum,uint16_t len)//获取天气数据 memcpy(sendBuf+11,&tmp,4); memcpy(sendBuf+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { sendBuf[17] = 1; sendBuf[18] = Calculate_CRC(sendBuf,18); sendBleData(sendBuf,19); + jsonCheck_weather(crcnum); } else @@ -618,10 +1051,9 @@ void GetWeatherCmd(uint8_t *crcnum,uint16_t len)//获取天气数据 } //获取用户数据 app下发的 -void getUserInfo(uint8_t *crcnum,uint16_t len)// +void getUserInfo(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totalData,uint8_t crcvalue)// { uint8_t value[19]; - uint8_t crcvalue = 0; memset(value,0,19); uint32_t tmp = 1; value[0] =0x72; @@ -632,20 +1064,27 @@ void getUserInfo(uint8_t *crcnum,uint16_t len)// memcpy(value+11,&tmp,4); memcpy(value+15,&tmp,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t age = crcnum[0]; - uint8_t gender = crcnum[1]; - uint8_t height = crcnum[2]; - uint8_t weight = crcnum[3]; - - uint32_t targetStep = 0; - memcpy(&targetStep,&crcnum[4],4); - uint16_t targetFatTime = 0; - memcpy(&targetFatTime,&crcnum[8],2); - uint8_t targetStand = crcnum[10]; - uint8_t Time = crcnum[11]; + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&user_info,0,sizeof(msg_user_info_t)); + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&user_info,sizeof(msg_user_info_t)); + } + user_info.age = crcnum[0]; + user_info.gender = crcnum[1]; + user_info.height = crcnum[2]; + memcpy(crcnum+3,&user_info.weight,2); + memcpy(crcnum+5,&user_info.target_step,4); + memcpy(crcnum+9,&user_info.fat_time,2); + user_info.target_stand = crcnum[11]; + user_info.timeformat = crcnum[12]; + if(func != NULL) + { + func(WRITE_FLASH_DATA,cmd,&user_info,sizeof(msg_user_info_t)); + } value[17] = 0x01; value[18] = Calculate_CRC(value,18); @@ -658,26 +1097,29 @@ void getUserInfo(uint8_t *crcnum,uint16_t len)// } //02 类型 -void typeHexTwoData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen) +void type2AE4Data(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *totalData,uint8_t crcvalue) { uint16_t typeID = buf_cmd[1]*256+buf_cmd[2]; + printf("type2AE4Data typeID:0x%x",typeID); switch (typeID) //ID { - case USER_INFOR_CMD://获取用户信息 - getUserInfo(data,datalen); + case USER_INFOR_CMD://app下发的获取用户信息 + getUserInfo(typeID,data,datalen,totalData,crcvalue); break; - case GET_PHONE_INFOR_CMD://手机下发的手机信息 - getPhoneInfo(data,datalen); + case SET_PHONE_INFOR_CMD://app下发的下发的手机信息 + getPhoneInfo(typeID,data,datalen,totalData,crcvalue); break; case CURR_TIME_CMD: - GetUTCtime(data,datalen);//获取时间app下发的时间进行解析 + GetUTCtime(typeID,data,datalen,totalData,crcvalue);//获取时间app下发的时间进行解析 break; case SET_BLE_NAME_CMD: getPhoneInfo_test(); break; case SET_TRAIN_TARGET_CMD: break; - case GET_ALARM_DATA_CMD: + case SET_ALARM_DATA_CMD: + GetAlarmDataCmd(typeID,data,datalen,totalData,crcvalue); + printf("alarm infor !!!!!!!!!!\r\n"); break; case DELETE_FILE_CMD: break; @@ -685,8 +1127,23 @@ void typeHexTwoData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen) break; case SYN_TODAY_BASIC_TRAIN_TXT_CMD: break; - case GET_WEATHER_DATA_CMD://天气数据 - GetWeatherCmd(data,datalen); + case SYN_WATCH_LCD_PARAM_CMD://app下发的同步屏幕参数到手表 + GetWatchLcdParamCmd(typeID,data,datalen,totalData,crcvalue); + break; + case SYN_VOICE_VIBRATION_PARAM_CMD://app下发声音与振动参数 + GetVoiceVibrateParamCmd(typeID,data,datalen,totalData,crcvalue); + break; + case SET_WATCH_HR_SET_PARAM_CMD://app下发设置心率参数 + GetHrSetParamCmd(typeID,data,datalen,totalData,crcvalue); + break; + case SET_WATCH_SPO2_SET_PARAM_CMD: + GetSpo2SetParamCmd(typeID,data,datalen,totalData,crcvalue); + break; + case SET_DRINK_PARAM_CMD://app下发的喝水提醒设置 + GetDrinkSetParamCmd(typeID,data,datalen,totalData,crcvalue); + break; + case SET_WEATHER_DATA_CMD://app下发的天气数据 + GetWeatherCmd(typeID,data,datalen,totalData,crcvalue); break; default: break; @@ -694,7 +1151,7 @@ void typeHexTwoData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen) } //切换表盘 -static void switchDialCmd(uint8_t *crcnum,uint16_t len) +static void switchDialCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -708,23 +1165,105 @@ static void switchDialCmd(uint8_t *crcnum,uint16_t len) memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint16_t daila_type = 0; memcpy(&daila_type,&crcnum[17],2); value[17] = 1;//校验成功 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); }else { value[17] = 0;//校验失败 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } } +//获取闹钟数据 +static void SetAlarmDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) +{ + + uint32_t tmp = 1; + uint32_t data_len = 1; + uint16_t tmp_data = 1; + if(Check_CRC(crcnum,len,crcvalue)) + { + + cJSON *dataJSON = cJSON_CreateObject(); + cJSON* data_arryJSON = cJSON_CreateArray(); + cJSON_AddNumberToObject(dataJSON,"code",1); + + for(uint8_t i =0;i<2;i++) + { + cJSON* itemJSON = cJSON_CreateObject(); + cJSON* arrayJSON = cJSON_CreateArray(); + for(uint8_t id = 0;id<7;id++) + { + cJSON_AddNumberToObject(arrayJSON,"id",id); + } + + cJSON_AddNumberToObject(itemJSON,"id",i); + cJSON_AddItemToObject(itemJSON,"repeat",arrayJSON); + cJSON_AddNumberToObject(itemJSON,"hour",2+20*i); + cJSON_AddNumberToObject(itemJSON,"minute",30+i*0); + cJSON_AddNumberToObject(itemJSON,"enable",1); + cJSON_AddItemReferenceToArray(data_arryJSON,itemJSON); + } + cJSON_AddItemToObject(dataJSON,"alarms",data_arryJSON); + + char *json_format = cJSON_PrintUnformatted(dataJSON); + printf("%d\n",strlen(json_format)); + cJSON_Delete(dataJSON); + printf("phone %s",json_format); + char *new_json; + + uint32_t len = strlen(json_format); + uint8_t value[len+17+1]; + memset(value,0,len+17+1); + value[0] = 0x72; + value[1] = 0x01; + value[2] = 0x01; + data_len = len; + tmp_data = len; + memcpy(value+3,&tmp,4); + memcpy(value+7,&data_len,4); + memcpy(value+11,&tmp,4); + memcpy(value+15,&tmp_data,2); + if((data_len+18) > ble_nus_max_data_len && data_len > 0) + { + + }else{ + if(data_len != 0){ + memcpy(value+17,json_format,data_len); + } + + } + value[data_len+17] = Calculate_CRC(value,data_len+17); + sendBleData(value,data_len+17+1); + }else + { + uint8_t value[19]; + memset(value,0,19); + value[0] = 0x72; + value[1] = 0x01; + value[2] = 0x01; + uint32_t tmp = 1; + uint16_t tmp_data = 1; + memcpy(value+3,&tmp,4); + memcpy(value+7,&tmp,4); + memcpy(value+11,&tmp,4); + memcpy(value+15,&tmp_data,2); + value[17] = 0;//校验失败 + value[18] = Calculate_CRC(value,18); + sendBleData(value,19); + } +} + + + //关于本机内容 -static void aboutDeviceCmd(uint8_t *crcnum,uint16_t len) +static void aboutDeviceCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { cJSON *dataJSON = cJSON_CreateObject(); cJSON_AddNumberToObject(dataJSON,"code",1); @@ -751,17 +1290,17 @@ static void aboutDeviceCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { memcpy(value+17,(uint8_t *)json_format,data_len); - unsigned char lrc = Calculate_CRC(value+17,data_len); + unsigned char lrc = Calculate_CRC(value,data_len+17); printf("lrc:%d",lrc); value[data_len+18] = lrc; sendBleData(value,data_len+18); }else { value[17] = 0; - unsigned char lrc = Calculate_CRC(value+17,18-1); + unsigned char lrc = Calculate_CRC(value,18); value[18] = lrc; sendBleData(value,19); } @@ -783,14 +1322,14 @@ void setFindWatchFlag(uint8_t flag) memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); value[17] = flag;//校验标志 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } -static void findWatchCmd(uint8_t *crcnum,uint16_t len) +static void findWatchCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { - uint8_t findFlag = crcnum[17]; - if(Check_CRC(crcnum+17,len-17)) + uint8_t findFlag = crcnum[0]; + if(Check_CRC(crcnum,len,crcvalue)) { //弹窗界面 if(findFlag)//查找手表弹窗界面 @@ -806,7 +1345,7 @@ static void findWatchCmd(uint8_t *crcnum,uint16_t len) } } //获取sd卡剩余空间 -static void GetSDSpaceCmd(uint8_t *crcnum,uint16_t len) +static void GetSDSpaceCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[27]; memset(value,0,27); @@ -819,28 +1358,28 @@ static void GetSDSpaceCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t sdFlag = 0; if(sdFlag == 1)// 1获取失败 2 获取成功 { value[17] = 1;//校验标志 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,27); }else{ value[17] = 2;//校验标志 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } }else { value[17] = 0;//校验标志 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } } //获取当前数据 -static void GetCurDataCmd(uint8_t *crcnum,uint16_t len) +static void GetCurDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { cJSON *dataJSON = cJSON_CreateObject(); const char *string_value[8]={"hr","spo2","stress","steps","duration","standup","calories","distance"}; @@ -873,23 +1412,23 @@ static void GetCurDataCmd(uint8_t *crcnum,uint16_t len) // uint8_t buf[22] = {0x7b,0x22,0x74,0x70,0x22,0x3a,0x31,0x2c,0x22,0x70,0x6e,0x22,0x3a,0x22,0x69,0x50,0x68,0x6f,0x6e,0x65,0x22,0x7d}; - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum,len,crcvalue)) { memcpy(value+17,(uint8_t *)json_format,data_len); - uint8_t lrc = Calculate_CRC(value+17,dataLen); + uint8_t lrc = Calculate_CRC(value,data_len+17); printf("lrc:%d",lrc); value[data_len+18] = lrc; sendBleData(value,data_len+18); }else { value[17] = 0; - uint8_t lrc = Calculate_CRC(value+17,18-1); + uint8_t lrc = Calculate_CRC(value,18); value[18] = lrc; sendBleData(value,19); } } //获取当手表电池电量 -static void GetBatteryLevelCmd(uint8_t *crcnum,uint16_t len) +static void GetBatteryLevelCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -902,23 +1441,23 @@ static void GetBatteryLevelCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum,len,crcvalue)) { float voltage = 0.0F; uint8_t power = 0; power = battery_get_voltage(&voltage); value[17] = power; - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); }else { value[17] = 0; - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } } //获取开关消息推送功能 -static void GetSwitchMessCmd(uint8_t *crcnum,uint16_t len) +static void GetSwitchMessCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -931,22 +1470,22 @@ static void GetSwitchMessCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t switch_on = crcnum[17];//0 关闭 1 开启 + uint8_t switch_on = crcnum[0];//0 关闭 1 开启 value[17] = 1; - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); }else { value[17] = 0; - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } } //撤销当前文件传输 1 OTA 2MP3 3表盘 3天气 5闹钟 -static void RemoveFileCmd(uint8_t *crcnum,uint16_t len) +static void RemoveFileCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -959,17 +1498,17 @@ static void RemoveFileCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t switch_on = crcnum[17];//0 关闭 1 开启 + uint8_t switch_on = crcnum[0];//0 关闭 1 开启 value[17] = 1; //1 操作成功 2 操作失败 - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); }else { value[17] = 0; - value[18] = Calculate_CRC(value+17,18-1); + value[18] = Calculate_CRC(value,18); sendBleData(value,19); } } @@ -988,7 +1527,7 @@ static void GetFileTypeCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,1)) { uint8_t fileType = crcnum[17];//2 mp3 3 表盘 @@ -1003,7 +1542,7 @@ static void GetFileTypeCmd(uint8_t *crcnum,uint16_t len) } } //删除指定类型所有的文件 -static void DeleteFileTypeCmd(uint8_t *crcnum,uint16_t len) +static void DeleteFileTypeCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1016,7 +1555,7 @@ static void DeleteFileTypeCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1029,7 +1568,7 @@ static void DeleteFileTypeCmd(uint8_t *crcnum,uint16_t len) } } //开启指定运动模式 -static void OpenSportModeCmd(uint8_t *crcnum,uint16_t len) +static void OpenSportModeCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1042,9 +1581,9 @@ static void OpenSportModeCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t sportMode = crcnum[17];//运动类型 0 健走 1跑步 2骑行 3 + uint8_t sportMode = crcnum[0];//运动类型 0 健走 1跑步 2骑行 3 value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1057,7 +1596,7 @@ static void OpenSportModeCmd(uint8_t *crcnum,uint16_t len) } } //结束运动模式 -static void StopSportModeCmd(uint8_t *crcnum,uint16_t len) +static void StopSportModeCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1070,7 +1609,7 @@ static void StopSportModeCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1083,7 +1622,7 @@ static void StopSportModeCmd(uint8_t *crcnum,uint16_t len) } } //设置语言 -static void SetLanguageCmd(uint8_t *crcnum,uint16_t len) +static void SetLanguageCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1096,9 +1635,9 @@ static void SetLanguageCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t language = crcnum[17]; + uint8_t language = crcnum[0]; value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1111,7 +1650,7 @@ static void SetLanguageCmd(uint8_t *crcnum,uint16_t len) } } //开启/关闭获取实时训练数据 -static void SetRealTimeDataCmd(uint8_t *crcnum,uint16_t len) +static void SetRealTimeDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1124,9 +1663,9 @@ static void SetRealTimeDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t autoSportData = crcnum[17];//开关 1开启 0关闭 + uint8_t autoSportData = crcnum[0];//开关 1开启 0关闭 value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1139,7 +1678,7 @@ static void SetRealTimeDataCmd(uint8_t *crcnum,uint16_t len) } } //设置训练试试数据采集频率 -static void SetRTDataFreCmd(uint8_t *crcnum,uint16_t len) +static void SetRTDataFreCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1152,9 +1691,9 @@ static void SetRTDataFreCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t Frequence = crcnum[17];//频率单位是s + uint8_t Frequence = crcnum[0];//频率单位是s value[17] = 1; //1 操作成功 2 操作失败 value[18] = Calculate_CRC(value,18); @@ -1218,10 +1757,10 @@ void sendRealTimeDataToAPP(uint8_t flag) } //获取实时训练数据 -static void GetRealTimeDataCmd(uint8_t *crcnum,uint16_t len) +static void GetRealTimeDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { sendRealTimeDataToAPP(1); }else @@ -1230,7 +1769,7 @@ static void GetRealTimeDataCmd(uint8_t *crcnum,uint16_t len) } } //设置最高心率提醒 -static void SetMaxHrRemindCmd(uint8_t *crcnum,uint16_t len) +static void SetMaxHrRemindCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1243,9 +1782,9 @@ static void SetMaxHrRemindCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len))// + if(Check_CRC(crcnum,len,crcvalue))// { - uint8_t maxHr = crcnum[17]; + uint8_t maxHr = crcnum[0]; if(maxHr > 250)maxHr = 250; else if(maxHr <= 0) maxHr = 0; @@ -1262,7 +1801,7 @@ static void SetMaxHrRemindCmd(uint8_t *crcnum,uint16_t len) } //训练暂停/恢复 -static void GetSportPasueResetCmd(uint8_t *crcnum,uint16_t len) +static void GetSportPasueResetCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1275,9 +1814,9 @@ static void GetSportPasueResetCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len))// + if(Check_CRC(crcnum,len,crcvalue))// { - uint8_t PauseStop = crcnum[17];//0 暂停 1恢复 + uint8_t PauseStop = crcnum[0];//0 暂停 1恢复 value[17] = 1; value[18] = Calculate_CRC(value,18); sendBleData(value,19); @@ -1290,7 +1829,7 @@ static void GetSportPasueResetCmd(uint8_t *crcnum,uint16_t len) } //发送当前表盘到app -static void SendDialToAppCmd(uint8_t *crcnum,uint16_t len) +static void SendDialToAppCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[20]; memset(value,0,20); @@ -1304,7 +1843,7 @@ static void SendDialToAppCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len))// + if(Check_CRC(crcnum,len,crcvalue))// { uint16_t dialNum = 450;//0 暂停 1恢复 memcpy(&value[17],&dialNum,2); @@ -1319,7 +1858,7 @@ static void SendDialToAppCmd(uint8_t *crcnum,uint16_t len) } //获取手表当前状态 -static void GetWatchStatusCmd(uint8_t *crcnum,uint16_t len) +static void GetWatchStatusCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[20]; memset(value,0,20); @@ -1340,7 +1879,7 @@ static void GetWatchStatusCmd(uint8_t *crcnum,uint16_t len) sendBleData(value,19); } //获取手表屏幕参数 -static void GetScreenParamCmd(uint8_t *crcnum,uint16_t len) +static void GetScreenParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[21]; memset(value,0,21); @@ -1355,20 +1894,22 @@ static void GetScreenParamCmd(uint8_t *crcnum,uint16_t len) memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - //0空闲状态 9 usb状态 10 运动训练状态 - uint8_t Brightness = 5;//亮度调节 - uint8_t screenTime = 1;//亮屏时长 0 5S 1 10s 2 15s 3 30s 4 1分钟 5 5分钟 - uint8_t wristOn = 0;//抬婉亮屏 - - value[17] = Brightness; - value[18] = screenTime; - value[19] = wristOn; + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&watch_lcd_param,0,sizeof(msg_watch_lcd_param_info_t)); + + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&watch_lcd_param,sizeof(msg_watch_lcd_param_info_t)); + }//读设备内存 + value[17] = watch_lcd_param.brigntess; + value[18] = watch_lcd_param.screen_time; + value[19] = watch_lcd_param.wrist_on; value[20] = Calculate_CRC(value,20); sendBleData(value,21); } //App删除表盘 (仅W4手表) -static void DeleteDialUidCmd(uint8_t *crcnum,uint16_t len) +static void DeleteDialUidCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[20]; memset(value,0,20); @@ -1381,10 +1922,10 @@ static void DeleteDialUidCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint16_t deleteDial = 0;//删除的表盘UID - deleteDial=crcnum[17]+crcnum[18]*256; + deleteDial=crcnum[0]+crcnum[1]*256; value[17] = 1;// 1删除成功 2 没有改资源 0指令校验失败 value[18] = Calculate_CRC(value,18); sendBleData(value,19); @@ -1400,7 +1941,7 @@ static void DeleteDialUidCmd(uint8_t *crcnum,uint16_t len) } //获取手表声音与振动参数 Sound and Vibration -static void GetSoundVibrationCmd(uint8_t *crcnum,uint16_t len) +static void GetSoundVibrationCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[23]; memset(value,0,23); @@ -1409,23 +1950,33 @@ static void GetSoundVibrationCmd(uint8_t *crcnum,uint16_t len) uint16_t tmp_data = 5; value[0] = 0x72; value[1] = 0x01; - value[2] = 0x1b; + value[2] = 0x1c; memcpy(value+3,&tmp,4); memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) - { - uint8_t sysSoundLevel = 0;//系统音量调节 - uint8_t sysRing = 0;//铃声音量调节 - uint8_t sysMedia = 0;//媒体音量调节 - uint8_t RingSwitch = 0;//铃声开关 - uint8_t VibiationSwitch = 0;//振动开关 - value[17] = sysSoundLevel;// - value[18] = sysRing;// - value[19] = sysMedia;// - value[20] = RingSwitch;// - value[21] = VibiationSwitch;// + if(Check_CRC(crcnum,len,crcvalue)) + { + memset(&voice_vibration,0,sizeof(msg_get_voice_vibration_info_t)); + // uint8_t sysSoundLevel = 0;//系统音量调节 + // uint8_t sysRing = 0;//铃声音量调节 + // uint8_t sysMedia = 0;//媒体音量调节 + // uint8_t RingSwitch = 0;//铃声开关 + // uint8_t VibiationSwitch = 0;//振动开关 + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + memset(&voice_vibration,0,sizeof(msg_get_voice_vibration_info_t)); + + // printf("drink_info:%d %d %d\r\n",drink_info.drink_on,drink_info.alarm_mode,drink_info.start_hour); + + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&voice_vibration,sizeof(msg_get_voice_vibration_info_t)); + } + value[17] = voice_vibration.sys_volume;// + value[18] = voice_vibration.ring_volume;// + value[19] = voice_vibration.media_volume;// + value[20] = voice_vibration.bell_on;// + value[21] = voice_vibration.vibrate_on;// value[22] = Calculate_CRC(value,22); sendBleData(value,23); }else @@ -1439,7 +1990,7 @@ static void GetSoundVibrationCmd(uint8_t *crcnum,uint16_t len) } //APP获取手表辅助功能参数Auxiliary functions -static void GetWatchAuxFuncCmd(uint8_t *crcnum,uint16_t len) +static void GetWatchAuxFuncCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[23]; memset(value,0,23); @@ -1452,7 +2003,7 @@ static void GetWatchAuxFuncCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t paramCmt = 0;//辅助功能 0 @@ -1469,7 +2020,7 @@ static void GetWatchAuxFuncCmd(uint8_t *crcnum,uint16_t len) } //APP获取手表心率设置 -static void GetHrSetParamCmd(uint8_t *crcnum,uint16_t len) +static void GetHrGetParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[22]; memset(value,0,22); @@ -1484,16 +2035,24 @@ static void GetHrSetParamCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t hrfreq = 0;//监测频率 uint8_t hrSwitch = 0;//心率提醒开关 uint8_t hrMaxMin = 0;//高于或低于 uint8_t hrValue = 0;//阈值 - value[17] = hrfreq;// - value[18] = hrSwitch;// - value[19] = hrMaxMin;// - value[20] = hrValue;// + msg_get_heart_set_param_info_t heart_param; + memset(&heart_param,0,sizeof(msg_get_heart_set_param_info_t)); + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + if(func != NULL) + { + func(READ_FLASH_DATA,cmd,&heart_param,sizeof(msg_get_heart_set_param_info_t)); + } + + value[17] = heart_param.frequence;// + value[18] = heart_param.remind_on;// + value[19] = heart_param.max_min;// + value[20] = heart_param.heart;// value[21] = Calculate_CRC(value,21); sendBleData(value,22); }else @@ -1506,7 +2065,7 @@ static void GetHrSetParamCmd(uint8_t *crcnum,uint16_t len) } //APP获取手表血氧设置 -static void GetSpo2SetParamCmd(uint8_t *crcnum,uint16_t len) +static void GetSpo2GetParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[21]; memset(value,0,21); @@ -1520,7 +2079,7 @@ static void GetSpo2SetParamCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t spo2freq = 0;//监测频率 uint8_t spo2Switch = 0;//心率提醒开关 @@ -1541,7 +2100,7 @@ static void GetSpo2SetParamCmd(uint8_t *crcnum,uint16_t len) } //手势拍照协议 -static void carmeraCmd(uint8_t *crcnum,uint16_t len) +static void carmeraCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1554,9 +2113,16 @@ static void carmeraCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t carmera = crcnum[17]; + uint8_t carmera_on = crcnum[0]; //0退出拍照界面 1进入拍照界面 + //需要加界面弹窗提示 + if(carmera_on == 1)//进入拍照弹窗界面 + { + + }else{//退出拍照弹窗界面 + + } value[17] = 1;// value[18] = Calculate_CRC(value,18); sendBleData(value,19); @@ -1569,7 +2135,7 @@ static void carmeraCmd(uint8_t *crcnum,uint16_t len) } //APP获取手表喝水提醒设置 -static void GetDrinkParamCmd(uint8_t *crcnum,uint16_t len) +static void GetDrinkParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1582,10 +2148,15 @@ static void GetDrinkParamCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t drinkOn = 0; - value[17] = drinkOn;// + msg_drink_param_info_t drink_on_t; + memset(&drink_on_t,0,sizeof(msg_drink_param_info_t)); + ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func(); + if(func != NULL){ + func(READ_FLASH_DATA,cmd,&drink_on_t,sizeof(msg_drink_param_info_t)); + } + value[17] = drink_on_t.drink_on;// value[18] = Calculate_CRC(value,18); sendBleData(value,19); }else @@ -1597,7 +2168,7 @@ static void GetDrinkParamCmd(uint8_t *crcnum,uint16_t len) } //APP发送恢复出厂设置 -static void GetFactoryCmd(uint8_t *crcnum,uint16_t len) +static void GetFactoryCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1610,7 +2181,7 @@ static void GetFactoryCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1;// @@ -1624,7 +2195,7 @@ static void GetFactoryCmd(uint8_t *crcnum,uint16_t len) } } //APP发送重新启动 -static void GetResetCmd(uint8_t *crcnum,uint16_t len) +static void GetResetCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1637,7 +2208,7 @@ static void GetResetCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1;// @@ -1651,7 +2222,7 @@ static void GetResetCmd(uint8_t *crcnum,uint16_t len) } } //APP发送关机 -static void GetPowerOffCmd(uint8_t *crcnum,uint16_t len) +static void GetPowerOffCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1664,7 +2235,7 @@ static void GetPowerOffCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1;// @@ -1683,7 +2254,7 @@ static void GetPowerOffCmd(uint8_t *crcnum,uint16_t len) //app发送公英制单位 -static void GetMetricCmd(uint8_t *crcnum,uint16_t len) +static void GetMetricCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1696,9 +2267,9 @@ static void GetMetricCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { - uint8_t kmileter = crcnum[17];//公英制单位 0 是公英制 1英制单位 + uint8_t kmileter = crcnum[0];//公英制单位 0 是公英制 1英制单位 value[17] = 1;// value[18] = Calculate_CRC(value,18); sendBleData(value,19); @@ -1711,7 +2282,7 @@ static void GetMetricCmd(uint8_t *crcnum,uint16_t len) } //app获取睡眠设置 -static void GetSleepParamCmd(uint8_t *crcnum,uint16_t len) +static void GetSleepParamCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[24]; memset(value,0,24); @@ -1725,7 +2296,7 @@ static void GetSleepParamCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t sleepTime = 0;//作息时间设定 0关闭 1开启 uint8_t bedTimeHour = 0;//就寝时间 @@ -1750,7 +2321,7 @@ static void GetSleepParamCmd(uint8_t *crcnum,uint16_t len) } //app获取所有表盘UID -static void GetAllDialUidCmd(uint8_t *crcnum,uint16_t len) +static void GetAllDialUidCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[24]; memset(value,0,24); @@ -1763,7 +2334,7 @@ static void GetAllDialUidCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmp,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t sleepTime = 0;//作息时间设定 0关闭 1开启 uint8_t bedTimeHour = 0;//就寝时间 @@ -1787,7 +2358,7 @@ static void GetAllDialUidCmd(uint8_t *crcnum,uint16_t len) } } //app获取目标步数设置 -static void GetTargetStepCmd(uint8_t *crcnum,uint16_t len) +static void GetTargetStepCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[25]; memset(value,0,25); @@ -1801,7 +2372,7 @@ static void GetTargetStepCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint32_t targetStep = 10000;//目标步数 4字节 uint8_t ringOn = 0;//铃声提醒 @@ -1822,7 +2393,7 @@ static void GetTargetStepCmd(uint8_t *crcnum,uint16_t len) } //app其他目标设置 -static void GetTargetOtherCmd(uint8_t *crcnum,uint16_t len) +static void GetTargetOtherCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[26]; memset(value,0,26); @@ -1836,7 +2407,7 @@ static void GetTargetOtherCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint16_t targetKcal = 4556;//目标卡路里 uint8_t targetKm = 0;//目标里程 @@ -1863,7 +2434,7 @@ static void GetTargetOtherCmd(uint8_t *crcnum,uint16_t len) } //app发送解除配对消息 -static void UnpairMessCmd(uint8_t *crcnum,uint16_t len) +static void UnpairMessCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1877,7 +2448,7 @@ static void UnpairMessCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1;// @@ -1891,7 +2462,7 @@ static void UnpairMessCmd(uint8_t *crcnum,uint16_t len) } } //app发送同步数据结束消息 -static void GetSynDataEndCmd(uint8_t *crcnum,uint16_t len) +static void GetSynDataEndCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[19]; memset(value,0,19); @@ -1905,7 +2476,7 @@ static void GetSynDataEndCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&datalen,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1;// value[18] = Calculate_CRC(value,18); @@ -1918,7 +2489,7 @@ static void GetSynDataEndCmd(uint8_t *crcnum,uint16_t len) } } //同步历史步数 -static void stepDataCmd(uint8_t *crcnum,uint16_t len) +static void stepDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[58]; memset(value,0,58); @@ -1932,7 +2503,7 @@ static void stepDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t data_buf[40]; // uint8_t data_len = 0; @@ -1966,7 +2537,7 @@ static void stepDataCmd(uint8_t *crcnum,uint16_t len) } } //同步卡路里历史数据 -static void kcalDataCmd(uint8_t *crcnum,uint16_t len) +static void kcalDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[58]; memset(value,0,58); @@ -1980,7 +2551,7 @@ static void kcalDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t data_buf[40]; // uint8_t data_len = 4; @@ -2007,7 +2578,7 @@ static void kcalDataCmd(uint8_t *crcnum,uint16_t len) } } //同步距离历史数据 -static void disDataCmd(uint8_t *crcnum,uint16_t len) +static void disDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[58]; memset(value,0,58); @@ -2021,7 +2592,7 @@ static void disDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t data_buf[40]; // uint8_t data_len = 4; @@ -2048,7 +2619,7 @@ static void disDataCmd(uint8_t *crcnum,uint16_t len) } } //同步基础训练历史数据 training history data -static void trainiHistoryDataCmd(uint8_t *crcnum,uint16_t len) +static void trainiHistoryDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { cJSON *dataJSON = cJSON_CreateObject(); @@ -2094,7 +2665,7 @@ static void trainiHistoryDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { memcpy(value+17,json_format,data_len); @@ -2109,7 +2680,7 @@ static void trainiHistoryDataCmd(uint8_t *crcnum,uint16_t len) } } //同步睡眠数据 -static void sleepDataCmd(uint8_t *crcnum,uint16_t len) +static void sleepDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[18+1]; memset(value,0,18+1); @@ -2123,7 +2694,7 @@ static void sleepDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 0; value[18] = 0xff; @@ -2136,7 +2707,7 @@ static void sleepDataCmd(uint8_t *crcnum,uint16_t len) } } //同步数据结束完成 -static void synEndDataCmd(uint8_t *crcnum,uint16_t len) +static void synEndDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[18+1]; memset(value,0,18+1); @@ -2150,7 +2721,7 @@ static void synEndDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { value[17] = 1; value[18] = Calculate_CRC(value,18); @@ -2163,7 +2734,7 @@ static void synEndDataCmd(uint8_t *crcnum,uint16_t len) } } //同步站立历史数据 -static void standDataCmd(uint8_t *crcnum,uint16_t len) +static void standDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[58]; memset(value,0,58); @@ -2177,7 +2748,7 @@ static void standDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t data_buf[40]; // uint8_t data_len = 4; @@ -2205,7 +2776,7 @@ static void standDataCmd(uint8_t *crcnum,uint16_t len) } //同步燃脂时间数据 -static void burntimeDataCmd(uint8_t *crcnum,uint16_t len) +static void burntimeDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[48]; memset(value,0,48); @@ -2219,7 +2790,7 @@ static void burntimeDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint8_t data_buf[30]; // uint32_t data_len = 0; @@ -2246,7 +2817,7 @@ static void burntimeDataCmd(uint8_t *crcnum,uint16_t len) } //同步心率历史数据 -static void heartDataCmd(uint8_t *crcnum,uint16_t len) +static void heartDataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[43]; memset(value,0,43); @@ -2260,7 +2831,7 @@ static void heartDataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint32_t data_len = 0; for(uint16_t i = 0;i<5;i++) @@ -2285,7 +2856,7 @@ static void heartDataCmd(uint8_t *crcnum,uint16_t len) } } //同步血氧历史数据 -static void spo2DataCmd(uint8_t *crcnum,uint16_t len) +static void spo2DataCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *totaldata,uint8_t crcvalue) { uint8_t value[43]; memset(value,0,43); @@ -2299,7 +2870,7 @@ static void spo2DataCmd(uint8_t *crcnum,uint16_t len) memcpy(value+7,&tmpToall,4); memcpy(value+11,&tmp,4); memcpy(value+15,&tmp_data,2); - if(Check_CRC(crcnum,len)) + if(Check_CRC(crcnum,len,crcvalue)) { uint32_t data_len = 0; for(uint16_t i = 0;i<5;i++) @@ -2322,16 +2893,172 @@ static void spo2DataCmd(uint8_t *crcnum,uint16_t len) } +//01类型 +/* +cmd: 指令uint16_t 协议01 02 拼接成0x0102 去协议文档对应是切换表盘 +*data:数据,不包含前面17个字节的包头和最后一位的校验和 +len 就是data的长度 +*totaldata:总的数据内容 包含包头和校验预览做接口是用 如果要计算totaldata的长度直接是len+17+1 就是加上包头和校验和 +crcvalue;数据的校验和 不包含包头和校验和的计算结果 +*/ +void type2AE3Data(uint16_t cmd ,uint8_t *data,uint16_t datalen,uint8_t *totaldata,uint8_t crcvalue) +{ + // uint16_t typeID = cmd_buf[1]*256+cmd_buf[2]; + printf("typeHexOneData:0x%x\r\n",cmd); + // uint8_t typeID = cmd_buf[2]; + switch (cmd) + { + case SEND_UPPAIR_CMD://清除配对指令 + clearPaireCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case ALARM_CMD: + SetAlarmDataCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SWITCH_DIAL_CMD://表盘切换 + switchDialCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case ABOUT_DEV_CMD://关于本机内容 + aboutDeviceCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case FIND_WATCH_CMD://查找手表 + findWatchCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_SD_SPACE_CMD://获取sdk的剩余空间 + GetSDSpaceCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_CURR_DATA_CMD://获取当前数据 卡路里 + GetCurDataCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_BATTERY_LEVEL_CMD://获取手表电池电量 + GetBatteryLevelCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SWITCH_MESS_CMD://开关消息推送功能 + GetSwitchMessCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case REVOKE_CURR_FILE_TRANS_CMD://撤销文件传输 + RemoveFileCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_SPECIF_TYPE_FILE_CMD://获取指定类型文件目录 + RemoveFileCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case DELETE_SPECIF_TYPE_FILE_CMD://删除指定类型的所有文件 + DeleteFileTypeCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SWITCH_SPORT_MODE_CMD://开启指定运动模式 + OpenSportModeCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case STOP_SPORT_MODE_CMD://结束运动模式 + StopSportModeCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SET_LANGUGAE_CMD://设置语言 + SetLanguageCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_REAL_HEART_CMD://获取实时训练数据 + GetRealTimeDataCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SWITCH_GET_REAL_HEART_CMD://开启/关闭自动获取实时训练数据 + SetRealTimeDataCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SET_REAL_DATA_FREQ_CMD://设置训练实时数据采集频率 + SetRTDataFreCmd(cmd,data,datalen,totaldata,crcvalue); + break; + + case SET_MAX_HR_REMID_CMD://设置最高心疼提醒 255关闭 + SetMaxHrRemindCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SPORT_PAUSE_RESET_CMD://训练暂停/恢复 + GetSportPasueResetCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SEND_CURR_DIAL_TOAPP_CMD://发送当前表盘 + SendDialToAppCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SEND_CURR_STATUS_CMD: //获取手表当前状态 + GetWatchStatusCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_WATCH_LCD_PARAM_CMD: //获取手表屏幕参数 + GetScreenParamCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case DELETE_DIAL_CMD://删除表盘UID + DeleteDialUidCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_WATCH_VOICE_VIBRATE_CMD://获取手表声音与振动参数 + GetSoundVibrationCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_WATCH_AUXIL_FUN_PARAM_CMD://获取手表辅助功能参数 + GetWatchAuxFuncCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_WATCH_HR_SET_PARAM_CMD://获取手表心率设置 + GetHrGetParamCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_WATCH_SPO2_SET_PARAM_CMD://获取手表血氧设置 + GetSpo2GetParamCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_GESTURE_CARMERA_CMD://获取手势拍照 + carmeraCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_DRINK_SWITCH_CMD://获取喝水提醒设置 + GetDrinkParamCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case FACTORY_SET_CMD://app发送恢复出厂设置 + GetFactoryCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case RESET_WATCH_CMD://app发送重启指令 + GetResetCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case POWER_OFF_CMD://app发送关机 + GetPowerOffCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case KM_MILE_CMD://app设置手表公英制单位 + GetMetricCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SLEEP_SET_CMD://app获取睡眠设置 + GetSleepParamCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case DELETE_ALL_DILA_CMD://app所有表盘UID + GetAllDialUidCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_TARGET_STEP_CMD://app获取目标步数设置 + GetTargetStepCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_OTHER_TARGET_CMD://app获取其他目标 + GetTargetOtherCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case GET_UNPAIR_CMD://发送解除配对消息 + UnpairMessCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SYN_DATA_END_CMD: //app发送同步数据结束消息 + GetSynDataEndCmd(cmd,data,datalen,totaldata,crcvalue); + break; + case SYN_HEART_HISTORY_DATA_CMD://同步心率历史数据 + case SYN_SPO2_HISTORY_DATA_CMD://同步血氧历史数据 + case SYN_STEP_HISTORY_DATA_CMD: //同步步数历史数据 + case SYN_FAT_BURN_HISTORY_DATA_CMD://同步燃脂时间数据 + case SYN_STAND_HISTORY_DATA_CMD://同步站立历史数据 + case SYN_KCAL_HISTORY_DATA_CMD://同步卡路里历史数据 + case SYN_DIS_HISTORY_DATA_CMD://同步距离历史数据 + case SYN_BASIC_TRANIN_HISTORY_DATA_CMD://同步基础训练历史数据 + case SYN_SLEEP_HISTORY_DATA_CMD://睡眠历史数据 + // readDevDataBle(totaldata,datalen+18,crcvalue); + break; + + default: + break; + } + + +} + + //05 类型 void typeHexFiveData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen) { uint16_t typeID = buf_cmd[1]*256+buf_cmd[2]; switch (typeID) //ID { - case FIND_PHONE_CMD://获取用户信息 + case FIND_PHONE_CMD://查找手机 // (data,datalen); break; - case GET_CURR_TIME_CMD://手机下发的手机信息 + case GET_CURR_TIME_CMD://手表获取系统时间 // getPhoneInfo(data,datalen); break; case SEND_PARI_SUCESS_CMD: @@ -2365,7 +3092,8 @@ uint16_t max_mtu_szie_data_len = 200; void sendReadData(void) { - static uint8_t packCount = 0; + sendbigDataBufState = true;//分包同步数据不允许打断 + static uint32_t packCount = 0; uint8_t buf[517]; memset(buf,0,517); uint32_t dataLen = 0; @@ -2373,10 +3101,10 @@ void sendReadData(void) uint32_t totalLen = 0; dataLen = 640; uint32_t dataPack = 1; - uint16_t dataPackLen = 640; + uint16_t dataPackLen = 640;//减掉前面17+2个字节的包头总共就是19个数据(多包) 一包就减去17个字节 uint32_t time = 0; uint32_t step = 0; - packCount = 0; + packCount = 1; uint16_t startDataLen = 17; uint8_t crc = 0x00; @@ -2395,7 +3123,7 @@ void sendReadData(void) } while (1) { - time = 1710833119+3600*packCount; + time = 1711348052+3600*packCount; memcpy(buf+startDataLen,&time,4);//21 startDataLen=startDataLen+4; step = 1000+packCount*1000; @@ -2412,31 +3140,25 @@ void sendReadData(void) // printf("startDataLen22222222222:%d totalEnd:%d crcvalue:%x\r\n",startDataLen,totalEnd,crcvalue); if((totalEnd-17) >= dataLen && totalEnd > 17) { - if(packCount == 0) - { - memcpy(buf+15,&startDataLen,2); - crcvalue = Calculate_CRC(buf,startDataLen);//17+数据+校验和 - printf("end crcvalue1:%x\r\n",crcvalue); - buf[startDataLen] = crcvalue; - sendDataNow(buf,startDataLen+1); - packCount = 0; - }else{//17+MTU-17-校验和+数据+校验和 - memcpy(buf+15,&startDataLen,2); - crcvalue = Calculate_CRC_Big(buf+18,startDataLen+18); - uint16_t pack_data = max_mtu_szie_data_len-17-crcvalue; - memcpy(&buf[17],&pack_data,2); - printf("end crcvalue2:%x\r\n",crcvalue); - buf[startDataLen] = crcvalue; - sendDataNow(buf,startDataLen+1); - packCount = 0; - } + memcpy(buf+11,&packCount,4); + dataPackLen = startDataLen-17; + memcpy(buf+15,&dataPackLen,2); + crcvalue = Calculate_CRC_Big(buf+17,dataPackLen); + printf("end crcvalue1:%x\r\n",crcvalue); + buf[startDataLen] = crcvalue; + sendDataNow(buf,startDataLen+1); + + packCount = 1; + sendbigDataBufState = false; break; }else{ - memcpy(buf+15,&startDataLen,2); - crcvalue = Calculate_CRC_Big(buf+18,startDataLen+18); - uint16_t pack_data = max_mtu_szie_data_len-17-crcvalue; - memcpy(&buf[17],&pack_data,2); - printf("end crcvalue3:%x\r\n",crcvalue); + memcpy(buf+11,&packCount,4); + dataPackLen = startDataLen-19;//减掉前面17+2个字节的包头总共就是19个数据 + memcpy(buf+15,&dataPackLen,2); + crcvalue = Calculate_CRC_Big(buf+19,dataPackLen); + uint16_t pack_size = ble_nus_max_data_len-17-crcvalue; + memcpy(buf+17,&pack_size,2); + printf("end crcvalue3:%x %d %d %d\r\n",crcvalue,ble_nus_max_data_len,pack_size,crcvalue); buf[startDataLen] = crcvalue;// sendDataNow(buf,startDataLen+1); packCount+=1; @@ -2457,28 +3179,30 @@ void sendReadData(void) // printf("pack1 startDataLen22222222222:%d totalEnd:%d crcvalue:%x\r\n",startDataLen,totalEnd,crcvalue); if((totalEnd-17) >= dataLen && totalEnd > 17) { - memcpy(buf+15,&startDataLen,2); - crcvalue = Calculate_CRC(buf,startDataLen+1); + memcpy(buf+11,&packCount,4); + dataPackLen = startDataLen-17; + memcpy(buf+15,&dataPackLen,2); + crcvalue = Calculate_CRC_Big(buf+17,dataPackLen); buf[startDataLen] = crcvalue; sendDataNow(buf,startDataLen+1); - startDataLen = 0; - packCount = 0; + sendbigDataBufState = false; break; } }else{ - if(dataPackLen < max_mtu_szie_data_len) //只有总的包数小于最大的mtu的大小 + if(dataPackLen < ble_nus_max_data_len) //只有总的包数小于最大的mtu的大小 { totalEnd = startDataLen-17;//不包含前17个字节的数据,前17个不是数据类型 // printf("pack0 startDataLen22222222222:%d totalEnd:%d crcvalue:%x\r\n",startDataLen,totalEnd,crcvalue); if(totalEnd >= dataLen && totalEnd > 0) { - memcpy(buf+15,&startDataLen,2); - crcvalue = Calculate_CRC(buf,startDataLen); + memcpy(buf+11,&packCount,4); + dataPackLen = startDataLen-17; + memcpy(buf+15,&dataPackLen,2); + crcvalue = Calculate_CRC_Big(buf+17,dataPackLen); printf("total end crcvalue2:%x\r\n",crcvalue); buf[startDataLen] = crcvalue;//校验和的值 最后一个校验和也要发给app sendDataNow(buf,startDataLen+1); - startDataLen = 17; - packCount = 0; + sendbigDataBufState = false; break; } } @@ -2487,9 +3211,9 @@ void sendReadData(void) } } //手机app下发读设备数据指令 -void readDevDataBle(uint8_t *crcnum,uint16_t len) +void readDevDataBle(uint8_t *crcnum,uint16_t len,uint8_t crcvalue) { - if(Check_CRC(crcnum+17,len-17)) + if(Check_CRC(crcnum+17,len-18,crcvalue)) { bleSendTypeID=crcnum[2]; @@ -2537,148 +3261,8 @@ void readDevDataBle(uint8_t *crcnum,uint16_t len) } -//01类型 -void typeHexOneData(uint8_t *buf,uint16_t len,uint8_t *cmd_buf,uint8_t *totaldata) -{ - uint16_t typeID = cmd_buf[1]*256+cmd_buf[2]; - printf("typeHexOneData:0x%x\r\n",typeID); - // uint8_t typeID = cmd_buf[2]; - switch (typeID) - { - case SEND_UPPAIR_CMD://清除配对指令 - clearPaireCmd(buf,len); - break; - case SWITCH_DIAL_CMD://表盘切换 - switchDialCmd(buf,len); - break; - case ABOUT_DEV_CMD://关于本机内容 - aboutDeviceCmd(buf,len); - break; - case FIND_WATCH_CMD://查找手表 - findWatchCmd(buf,len); - break; - case GET_SD_SPACE_CMD://获取sdk的剩余空间 - GetSDSpaceCmd(buf,len); - break; - case GET_CURR_DATA_CMD://获取当前数据 卡路里 - GetCurDataCmd(buf,len); - break; - case GET_BATTERY_LEVEL_CMD://获取手表电池电量 - GetBatteryLevelCmd(buf,len); - break; - case SWITCH_MESS_CMD://开关消息推送功能 - GetSwitchMessCmd(buf,len); - break; - case REVOKE_CURR_FILE_TRANS_CMD://撤销文件传输 - RemoveFileCmd(buf,len); - break; - case GET_SPECIF_TYPE_FILE_CMD://获取指定类型文件目录 - RemoveFileCmd(buf,len); - break; - case DELETE_SPECIF_TYPE_FILE_CMD://删除指定类型的所有文件 - DeleteFileTypeCmd(buf,len); - break; - case SWITCH_SPORT_MODE_CMD://开启指定运动模式 - OpenSportModeCmd(buf,len); - break; - case STOP_SPORT_MODE_CMD://结束运动模式 - StopSportModeCmd(buf,len); - break; - case SET_LANGUGAE_CMD://设置语言 - SetLanguageCmd(buf,len); - break; - case GET_REAL_HEART_CMD://获取实时训练数据 - GetRealTimeDataCmd(buf,len); - break; - case SWITCH_GET_REAL_HEART_CMD://开启/关闭自动获取实时训练数据 - SetRealTimeDataCmd(buf,len); - break; - case SET_REAL_DATA_FREQ_CMD://设置训练实时数据采集频率 - SetRTDataFreCmd(buf,len); - break; - case SET_MAX_HR_REMID_CMD://设置最高心疼提醒 255关闭 - SetMaxHrRemindCmd(buf,len); - break; - case SPORT_PAUSE_RESET_CMD://训练暂停/恢复 - GetSportPasueResetCmd(buf,len); - break; - case SEND_CURR_DIAL_TOAPP_CMD://发送当前表盘 - SendDialToAppCmd(buf,len); - break; - case SEND_CURR_STATUS_CMD: //获取手表当前状态 - GetWatchStatusCmd(buf,len); - break; - case GET_WATCH_LCD_PARAM_CMD: //获取手表屏幕参数 - GetScreenParamCmd(buf,len); - break; - case DELETE_DIAL_CMD://删除表盘UID - DeleteDialUidCmd(buf,len); - break; - case GET_WATCH_VOICE_VIBRATE_CMD://获取手表声音与振动参数 - GetSoundVibrationCmd(buf,len); - break; - case GET_WATCH_AUXIL_FUN_PARAM_CMD://获取手表辅助功能参数 - GetWatchAuxFuncCmd(buf,len); - break; - case GET_WATCH_HR_SET_PARAM_CMD://获取手表心率设置 - GetHrSetParamCmd(buf,len); - break; - case GET_WATCH_SPO2_SET_PARAM_CMD://获取手表血氧设置 - GetSpo2SetParamCmd(buf,len); - break; - case GET_GESTURE_CARMERA_CMD://获取手势拍照 - carmeraCmd(buf,len); - break; - case GET_DRINK_SWITCH_CMD://获取喝水提醒设置 - GetDrinkParamCmd(buf,len); - break; - case FACTORY_SET_CMD://app发送恢复出厂设置 - GetFactoryCmd(buf,len); - break; - case RESET_WATCH_CMD://app发送重启指令 - GetResetCmd(buf,len); - break; - case POWER_OFF_CMD://app发送关机 - GetPowerOffCmd(buf,len); - break; - case KM_MILE_CMD://app设置手表公英制单位 - GetMetricCmd(buf,len); - break; - case SLEEP_SET_CMD://app获取睡眠设置 - GetSleepParamCmd(buf,len); - break; - case DELETE_ALL_DILA_CMD://app所有表盘UID - GetAllDialUidCmd(buf,len); - break; - case GET_TARGET_STEP_CMD://app获取目标步数设置 - GetTargetStepCmd(buf,len); - break; - case GET_OTHER_TARGET_CMD://app获取其他目标 - GetTargetOtherCmd(buf,len); - break; - case GET_UNPAIR_CMD://发送解除配对消息 - UnpairMessCmd(buf,len); - break; - case SYN_DATA_END_CMD: //app发送同步数据结束消息 - GetSynDataEndCmd(buf,len); - break; - case SYN_HEART_HISTORY_DATA_CMD://同步心率历史数据 - case SYN_SPO2_HISTORY_DATA_CMD://同步血氧历史数据 - case SYN_STEP_HISTORY_DATA_CMD: //同步步数历史数据 - case SYN_FAT_BURN_HISTORY_DATA_CMD://同步燃脂时间数据 - case SYN_STAND_HISTORY_DATA_CMD://同步站立历史数据 - case SYN_KCAL_HISTORY_DATA_CMD://同步卡路里历史数据 - case SYN_DIS_HISTORY_DATA_CMD://同步距离历史数据 - case SYN_BASIC_TRANIN_HISTORY_DATA_CMD://同步基础训练历史数据 - case SYN_SLEEP_HISTORY_DATA_CMD://睡眠历史数据 - readDevDataBle(totaldata,len+17); - break; - - default: - break; - } -} + void getPhoneInfo_test(void) { /* @@ -2755,17 +3339,17 @@ void getPhoneInfo_test(void) } //长数据解析 -void bleLongRecvData(uint8_t *data, uint32_t data_size,uint8_t *buf_cmd)//buf_cmd 指令前17个字节数据 +void bleLongRecvData(uint8_t *data, uint16_t data_size,uint8_t *buf_cmd,uint8_t *totalData,uint8_t crcvalue)//buf_cmd 指令前17个字节数据 { uint8_t type=buf_cmd[1]; - printf("type:%d %d data_size:%d data:%d",buf_cmd[0],type,data_size,data[0]); + printf("type:%d %d data_size:%d data:%d crcvalue:%x",buf_cmd[0],type,data_size,data[0],crcvalue); switch(buf_cmd[0]) { case 0x73://传输方向 0x73是app下发的 switch (type) { case 0x02://获取手机信息 - typeHexTwoData(buf_cmd,data,data_size); + type2AE4Data(buf_cmd,data,data_size,totalData,crcvalue); break; default: break; @@ -2773,24 +3357,23 @@ void bleLongRecvData(uint8_t *data, uint32_t data_size,uint8_t *buf_cmd)//buf_cm break; } } + +uint8_t *recvData; +uint32_t packdataLen = 0; +uint32_t totalDataLen = 0; +uint8_t totalpack = 0; uint8_t cmd_data[17]; -uint8_t *bigDataBuf = NULL;//大数据buf -uint8_t bigDataBufLen=0; -bool sendbigDataBufState = false;//发送大数据表示不要被其他指令打断 -bool recvBigDataBufState = false;//接收大数据标志 -static bool muiltFlag = 0;//多包数据flag -static uint16_t data_len = 0; -void longDataRecv(uint8_t *buf, uint16_t event_size,uint16_t handle) +void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle) { - if(sendbigDataBufState == true) + if(sendbigDataBufState == true)//正在发送大数据不接收任何app指令下发的数据 { return; } - uint8_t data[514]; - static uint8_t totalpack = 0; - static uint32_t totalDataLen = 0; - if(shortCmdChara == handle)//短指令 + + uint8_t crcvalue= 0x00; + + if(data2ae3Cmd == handle)//短指令 { if(recvBigDataBufState == true)//在接收大数据时未接收完成时,不能被其他指令打断 { @@ -2798,60 +3381,64 @@ void longDataRecv(uint8_t *buf, uint16_t event_size,uint16_t handle) } if(event_size > 17) { - memset(cmd_data,0,17); - memcpy(cmd_data,buf,17); - uint8_t type=cmd_data[1]; + uint16_t cmd = totalData[1]*256+totalData[2]; + crcvalue = totalData[event_size-1]; - - printf("short:%d type_id:%x %d %d %d\r\n",shortCmdChara,cmd_data[1],cmd_data[2]); - switch(buf[0]) + memcpy(&packdataLen,&totalData[3],4); + recvData = malloc(packdataLen); + memcpy(recvData,totalData+17,packdataLen); + printf("recv crcvalue:%x packdataLen-1:%d\r\n",crcvalue,packdataLen); + type2AE3Data(cmd,recvData,packdataLen,totalData,crcvalue); + if(recvData != NULL) { - case 0x73://传输方向 0x73是app下发的 - switch (type) - { - case 0x01: - typeHexOneData(buf+17,event_size-17,cmd_data,buf); - break; - default: - break; - } - break; + free(recvData); } } - }else if(longCmdChara == handle) + }else if(data2ae4Cmd == handle) { while (1) { - printf("longData!!!! muiltFlag%d event_size:%d\r\n",muiltFlag,event_size); if(muiltFlag == 0) { //每包的数据长度 如果当前报数的数据小于总的数据包数时认为就发送完成,没有就还有继续接收 - // data_len = data_len+event_size-18;// 减掉18个数据 0+517 730总的数据长度 517还是小于730 说明还有数据没有接收完成 继续接收 - if(event_size >= 20) + // packdataLen = packdataLen+event_size-18;// 减掉18个数据 0+517 730总的数据长度 517还是小于730 说明还有数据没有接收完成 继续接收 + if(event_size >= 17) { - data_len = event_size-17;//第一包的数据大小 第二包不走这里 - memcpy(&totalDataLen,buf+7,4);//总的数据大小 - printf("totalDataLen;%d data_len:%d",totalDataLen,data_len); - if(totalDataLen > data_len)//如果总的数据长度大于每次增加后的 + packdataLen = event_size;//第一包的数据大小 第二包不走这里 514-17 = 497 + memcpy(&totalDataLen,totalData+7,4);//总的数据大小 + printf("totalDataLen;%d totaldataLen:%d",totalDataLen,packdataLen); + if(totalDataLen > event_size-18)//如果514-18 = 496 497 > 496 { - printf("muilt totalDataLen;%d data_len:%d",totalDataLen,data_len); - bigDataBuf = malloc(totalDataLen); - if(bigDataBuf == NULL)return; + printf("muilt totalDataLen;%d packdataLen:%d",totalDataLen,packdataLen); + + recvData = malloc(totalDataLen+18); + if(recvData == NULL)return; muiltFlag = 1;//表示有两包以上的数据 - memcpy(bigDataBuf,buf+17,data_len);//从第十七个字节开始接收数据data + memcpy(recvData,totalData,event_size);//从第十七个字节开始接收数据data memset(cmd_data,0,17); - memcpy(cmd_data,buf,17); + memcpy(cmd_data,totalData,17); totalpack=1; break; }else{//直接发送数据解析 - printf("muilt totalDataLen11;%d data_len:%d",totalDataLen,data_len); + printf("muilt totalDataLen11;%d packdataLen:%d",totalDataLen,packdataLen); muiltFlag = 0; - data_len = event_size-17; + packdataLen = event_size-17; memset(cmd_data,0,17); - memcpy(cmd_data,buf,17); - memset(data,0,514); - memcpy(data,buf+17,data_len); - bleLongRecvData(&data,data_len,&cmd_data); + memcpy(cmd_data,totalData,17); + + recvData = malloc(packdataLen-1); + if(recvData == NULL)return; + memcpy(recvData,totalData+17,packdataLen-1); + if(totalDataLen == 0){ + crcvalue = 0x00; + }else{ + crcvalue = totalData[event_size-1]; + } + bleLongRecvData(recvData,packdataLen-1,&cmd_data,totalData,crcvalue); + if(recvData != NULL){ + free(recvData); + } + packdataLen = 0; break; } } @@ -2860,20 +3447,29 @@ void longDataRecv(uint8_t *buf, uint16_t event_size,uint16_t handle) }else//这是接收两包以上的数据 { totalpack+=1;//包数 - printf("muilt 122222;%d data_len:%d",totalDataLen,data_len); - memcpy(bigDataBuf+data_len,buf,event_size); //先copy再加 - data_len = data_len+event_size; - printf("muilt 133333;%d data_len:%d",totalDataLen,data_len); - if((totalDataLen+1) >= data_len)//总的数据包大于等于增加之后说明已经接收完成 + printf("muilt 122222;%d packdataLen:%d",totalDataLen,packdataLen); + memcpy(recvData+packdataLen,totalData,event_size); //先copy再加 + packdataLen = packdataLen+event_size; + printf("muilt 133333;%d packdataLen:%d",totalDataLen,packdataLen); + if(totalDataLen >= (packdataLen-18))//总的数据包 packdataLen-18把前面17个字节的包头和一个字节的校验和去掉得到数据部分和校验和部分 { - bleLongRecvData(bigDataBuf,data_len,&cmd_data); + bigDataBuf = malloc(totalDataLen); + crcvalue = totalData[event_size-1]; + memcpy(bigDataBuf,recvData+17,totalDataLen); + bleLongRecvData(bigDataBuf,totalDataLen,&cmd_data,recvData,crcvalue); totalDataLen = 0; - data_len = 0; + packdataLen = 0; muiltFlag = 0; totalpack = 0; if(bigDataBuf != NULL){ free(bigDataBuf); } + if(recvData != NULL){ + free(recvData); + } + break; + }else{ + break; } } @@ -2881,18 +3477,23 @@ void longDataRecv(uint8_t *buf, uint16_t event_size,uint16_t handle) { totalpack = 0; muiltFlag = 0; - data_len = 0; + packdataLen = 0; totalDataLen = 0; if(bigDataBuf != NULL){ free(bigDataBuf); } + if(recvData != NULL){ + free(recvData); + } break; } } } } +//接收app下发的原始数据 void revBleOldData(uint8_t *buf, uint16_t event_size,uint16_t handle)//每包的数据大小 { - printf("handle :%d shortCmdChara:%d longCmdChara:%d buf:%d event_size %d\r\n",handle,shortCmdChara,longCmdChara,buf,event_size); - longDataRecv(buf,event_size,handle); + printf("handle :%d data2ae3Cmd:%d data2ae4Cmd:%d buf:%d event_size %d\r\n",handle,data2ae3Cmd,data2ae4Cmd,buf,event_size); + bleDataRecv(buf,event_size,handle); } +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/service/ble_service/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleEvent.h index b367c3787..933b7a499 100644 --- a/code/sdk/application/wearable/service/ble_service/bleEvent.h +++ b/code/sdk/application/wearable/service/ble_service/bleEvent.h @@ -4,7 +4,7 @@ #include #include "stdbool.h" #include "errcode.h" -#define REDA_FLASH_DATA 0x01 //读flash数据 +#define READ_FLASH_DATA 0x01 //读flash数据 #define WRITE_FLASH_DATA 0x02 //写flash数据 typedef struct { uint8_t *data; /* data */ @@ -21,6 +21,7 @@ ble_recv_msg_callback_t ble_recv_get_send_msg_callback_func(void); //返回值 解析数据成功返回 1 解析失败返回 0 // int ble_recv_msg_callback(uint8_t writ_read,uint16_t msg_typeID, uint8_t *msg_data, uint16_t msg_datalen); +void cameram_send_data(void); /*********************TYPE+ID*********************************** * TYPE:01 */ @@ -323,9 +324,8 @@ typedef struct uint8_t sys_volume;//系统音量调节 0-100 uint8_t ring_volume;//铃声音量调节 0-100 uint8_t media_volume;//媒体音量调节0-100 - uint8_t bell_volume;//铃声开关0关闭 1开启 - uint8_t vibrate_volume;//振动开关0关闭 1开启 - + uint8_t bell_on;//铃声开关0关闭 1开启 + uint8_t vibrate_on;//振动开关0关闭 1开启 }msg_get_voice_vibration_info_t;// 获取手表声音和振动参数 #pragma pack() @@ -358,7 +358,7 @@ typedef struct //对应数据的指令类型 uint8_t frequence;//检测频率 0关闭 1 1分 2 五分钟 3 10分钟 uint8_t remind_on;//血压提醒 0关闭 1开启 - uint8_t heart;//血压区间阈值90-99 + uint8_t spo2;//血压区间阈值90-99 }msg_get_spo2_set_param_info_t;// 获取手表血氧设置参数 #pragma pack() @@ -471,12 +471,40 @@ TYPE:02 #define CURR_TIME_CMD 0x0202 //发送当前时间app->watch #define SET_BLE_NAME_CMD 0x0203 //修改蓝牙名称 #define SET_TRAIN_TARGET_CMD 0x0204 //设置训练目标 -#define GET_PHONE_INFOR_CMD 0x0210 //app发送手机信息 -#define GET_WEATHER_DATA_CMD 0x0220 //发送天气数据 -#define GET_ALARM_DATA_CMD 0x0221 //发送闹钟数据 +#define SYN_WATCH_LCD_PARAM_CMD 0x020E//同步屏幕参数app-watch +#define SYN_VOICE_VIBRATION_PARAM_CMD 0x020f //同步参数app-watch +#define SET_PHONE_INFOR_CMD 0x0210 //app发送手机信息 +#define SET_WATCH_HR_SET_PARAM_CMD 0x0212 //app发送心率设置参数 +#define SET_WATCH_SPO2_SET_PARAM_CMD 0x0213 //app发送血氧设置参数 +#define SET_DRINK_PARAM_CMD 0x0214 //app发送喝水提醒设置 +#define SET_WEATHER_DATA_CMD 0x0220 //发送天气数据 +#define SET_ALARM_DATA_CMD 0x0221 //发送闹钟数据 #define DELETE_FILE_CMD 0x0222 //删除指定文件 #define SYN_BASIC_REAL_HEATR_CMD 0x024B //同步基础训练试试心率记录 #define SYN_TODAY_BASIC_TRAIN_TXT_CMD 0x024D //同步当天任意时间之后的基础训练记录 +#pragma pack(1) +typedef struct { + uint8_t drink_on;//提醒开关 0关闭 1开启 + uint8_t alarm_mode;//0每天提醒一次 1间隔提醒 + uint16_t target_drink;//目标饮水量 500-5000ml + uint8_t start_hour;//开始小时 + uint8_t startt_min;//开始分钟 + uint8_t end_hour;//结束小时 + uint8_t end_min;//结束分钟 + uint8_t frequenc;//提醒频率 +}msg_drink_set_param_info_t; + +typedef struct +{ + uint8_t age;//年龄 + uint8_t gender;//性别 0男性 1女性 + uint8_t height;//身高 + uint16_t weight;//体重 + uint32_t target_step;//目标步数 + uint16_t fat_time;//燃脂时间目标 + uint8_t target_stand;//目标站立 + uint8_t timeformat;//时间制 0 24小时制 1 12小时制 +}msg_user_info_t;//获取用户信息 身高体重 /****************************************** * @@ -538,8 +566,8 @@ typedef struct void revBleOldData(uint8_t *buf, uint16_t event_size,uint16_t handle);//协议接收client下发的数据接口 //02类型的指令数据 -void typeHexTwoData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen); -void typeHexOneData(uint8_t *buf,uint16_t len,uint8_t *cmd_buf,uint8_t *totaldata);//对不同指令ID进行区分 +void typeHexTwoData(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t crcvalue); +void type2AE3Data(uint16_t cmd ,uint8_t *data,uint16_t datalen,uint8_t *totaldata,uint8_t crcvalue);//对不同指令ID进行区分 errcode_t sendBleData(uint8_t *buf,uint16_t len); void sendParieSuccess(uint8_t flag,uint8_t *mac);//发送配对成功指令to app mac手机端的地址 void getPhoneInfo_test(void); diff --git a/code/sdk/application/wearable/service/ble_service/bleService.c b/code/sdk/application/wearable/service/ble_service/bleService.c index 5ee24a2a4..445b5fa5e 100644 --- a/code/sdk/application/wearable/service/ble_service/bleService.c +++ b/code/sdk/application/wearable/service/ble_service/bleService.c @@ -64,15 +64,16 @@ static gap_call_backs_t g_btGapCallBacks; static a2dp_src_callbacks_t g_a2dpSrcCallbacks; static bool g_ble_adv_start_state = false; -static uint16_t g_ble_server_id = 1; -static uint16_t g_ble_server_handle = 0; +uint16_t g_ble_server_id = 1; + static uint16_t g_ble_read_handle = 0; -static uint16_t g_ble_conn_id = 0; +uint16_t g_ble_conn_id = 0; +static uint16_t g_ble_server_handle = 0; static uint8_t g_ble_character_buf[BLE_CHARACTERISTIC_MAX_LENGTH] = {0}; static bool g_ble_init_flag = false; static const uint8_t ble_adv_type[BLE_ADV_TYPE_LENTH] = {2, 1, 2}; static const uint8_t ble_adv_uuid[BLE_ADV_UUID_LENTH] = {0x3, 0x3, 0xe0, 0x18}; -static const uint8_t ble_adv_tx[3] = {0x02,0x0a,0x00}; +static const uint8_t ble_adv_tx[4] = {0x03,0x03,0xe0,0x18}; static bool AdverFlag = true; static uint8_t scan_data[BLE_SCAN_MAC_LENTH] = {0}; @@ -86,12 +87,18 @@ uint16_t ble_nus_max_data_len = SDK_BLE_MTU_MIN - 3; #define A2DP_STREAM_ACCEPT_TIMER_PERIOD 500 static osal_timer g_a2dp_stream_accept_timer = {NULL, NULL, 0, 0}; -uint8_t shortCmdChara = 0;//2ae3短指令特征值 -uint8_t longCmdChara = 0; +uint8_t data2ae3Cmd = 0;//2ae3短指令特征值 +uint8_t data2ae4Cmd = 0; static void set_phone_info(bd_addr_t *addr)//保存手机信息 包含手机mac地址 { + phone_addr.addr[0] = addr->addr[5]; + phone_addr.addr[1] = addr->addr[4]; + phone_addr.addr[2] = addr->addr[3]; + phone_addr.addr[3] = addr->addr[2]; + phone_addr.addr[4] = addr->addr[1]; + phone_addr.addr[5] = addr->addr[0]; memcpy(&phone_addr,addr,sizeof(bd_addr_t)); } @@ -104,11 +111,11 @@ enum{ BLE_CHARACTERISTIC_READ_BATTERY_ID_PROPERTIES = GATT_CHARACTER_PROPERTY_BIT_READ, }; -static void svr_ble_ble_adv_stop(void) +void svr_ble_adv_stop(void) { gap_ble_stop_adv(BLE_ADV_ID); } -void svr_ble_ble_adv_start(void) +void svr_ble_adv_start(void) { gap_ble_start_adv(BLE_ADV_ID); } @@ -116,121 +123,6 @@ bool get_ble_status(void) { return AdverFlag; } -#if 0 -/* adapt ios adv data. *///设置广播和扫描数据 -static void svr_ble_adv_data_set(int adv_id) -{ - uint8_t ble_name[BLE_NAME_LENGTH] = {0}; - uint8_t ble_name_len = BLE_NAME_LENGTH; - uint8_t adv_data[BLE_ADV_DATA_MAX_LENGTH] = {0}; - uint8_t adv_data_len = 0; - uint8_t scan_data_len = 0; - uint8_t ble_data_name[BLE_ADV_BLE_NAME_MAX_LENGTH + 1 ] = {0}; // +TYPE LENGTH - uint8_t ble_data_mac_switch[BD_ADDR_LEN] = {0}; - uint8_t adv_mac_head[BLE_ADV_MAC_LENTH] = {0x9, 0x16, 0x12, 0x18}; - gap_ble_config_adv_data_t adv_data_info; - memset_s(&adv_data_info, sizeof(gap_ble_config_adv_data_t), 0, sizeof(gap_ble_config_adv_data_t)); - - unsigned char set_mac[6] = {0x61,0x22,0x33,0x44,0x09,0x11}; - bluetooth_set_local_addr(set_mac,6); - bd_addr_t addr_info; - int32_t ret= 0; - unsigned int len = BLE_MAC_MAX_LEN; - - unsigned char addr[BLE_MAC_MAX_LEN] = {0}; - bluetooth_get_local_addr(&addr[0],len); - char watchName[32]; - memset_s(watchName, sizeof(watchName), 0, sizeof(watchName)); - (void)sprintf_s(watchName, sizeof(watchName), "%s %x%x",BLE_DEFAULT_NAME,addr[1],addr[0]); - - // ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1); - if (ret == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt SetLocalName ret = 0x%x", ret); - } - ret = bluetooth_get_local_name(ble_name, &ble_name_len); - if (ret != 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_name fail, name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); - memset_s(ble_name, BLE_NAME_LENGTH, 0, BLE_NAME_LENGTH); - memcpy_s(ble_name, BLE_NAME_LENGTH,BLE_DEFAULT_NAME, BLE_DEFAULT_NAME_LEN); - ble_name_len = BLE_DEFAULT_NAME_LEN + 1; - } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_name name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret); - - ret = gap_br_set_bt_scan_mode(GAP_SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE, 60); // start scan - if (ret == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ConnectPhonePresenter bt gap_br_set_bt_scan_mode ret = 0x%x", ret); - } - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_addr, ret:%u.", ret); - memcpy_s(adv_data, sizeof(ble_adv_type), ble_adv_type, sizeof(ble_adv_type)); - adv_data_len = sizeof(ble_adv_type); - - if (ble_name_len > BLE_ADV_BLE_NAME_MAX_LENGTH) { - ble_name_len = BLE_ADV_BLE_NAME_MAX_LENGTH; - } - ble_data_name[0] = ble_name_len; - ble_data_name[1] = 0x9; - memcpy_s(&ble_data_name[2], ble_name_len - 1, ble_name, ble_name_len - 1); - - memcpy_s(adv_data + adv_data_len, ble_name_len + 1, ble_data_name, ble_name_len + 1); - - adv_data_len = adv_data_len + ble_name_len + 1; - memcpy_s(adv_data + adv_data_len, sizeof(ble_adv_tx), ble_adv_tx, sizeof(ble_adv_tx));//这是tx power - adv_data_len = adv_data_len + sizeof(ble_adv_tx); - - int k = BD_ADDR_LEN; - for (int i = 0; i < BD_ADDR_LEN; i++) { - ble_data_mac_switch[--k] = addr[i]; - } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1], - ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]); - // memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN); - - // memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head)); - // adv_data_len = adv_data_len + sizeof(adv_mac_head); - - scan_data[0] = 0x0f;//长度 - scan_data[1] = 0xff;//数据类型 manufactory data - scan_data[2] = 'J'; - scan_data[3] = 'H'; - scan_data[4] = bond_flag;//是否绑定 - scan_data[5] = ble_data_mac_switch[0]; - scan_data[6] = ble_data_mac_switch[1]; - scan_data[7] = ble_data_mac_switch[2]; - scan_data[8] = ble_data_mac_switch[3]; - scan_data[9] = ble_data_mac_switch[4]; - scan_data[10] = ble_data_mac_switch[5]; - // memcpy_s(scan_data+5,BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN);//拷贝蓝牙设备地址到厂商数据里面做广播扫描使用,app会扫描这里做连接使用 - // scan_data_len = strlen((char *)scan_data);//转换成char型 - scan_data_len = 11; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adv_data_info.adv_length.scan_data_len:%d\r\n",scan_data_len); - scan_data[scan_data_len++] = 0x05;//未知 app - scan_data[scan_data_len++] = 0x05; - scan_data[scan_data_len++] = 0x00; - scan_data[scan_data_len++] = 0x00; - scan_data[scan_data_len++] = 0x01; - - if (scan_data_len > BLE_SCAN_MAC_LENTH){ - scan_data_len = BLE_SCAN_MAC_LENTH; - } - adv_data_info.scan_rsp_data = scan_data;//扫描数据 - adv_data_info.scan_rsp_length = scan_data_len;//扫描长度 - adv_data_info.adv_data = adv_data;//广播数据 - adv_data_info.adv_length = adv_data_len;//广播长度 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adv_data_info.adv_length:%u. scan_data_len:%d\r\n", adv_data_len,scan_data_len); - gap_conn_param_update_t params;//更改连接参数 - params.interval_min = 0x30; - params.interval_max = 0x60; - params.conn_handle = 1; - params.slave_latency = 0; - params.timeout_multiplier = 4000; - ret = gap_ble_connect_param_update(¶ms); - gap_ble_set_adv_data(adv_id, &adv_data_info); - - return; -} -#endif - #if 1 /* adapt ios adv data. *///设置广播和扫描数据 static void svr_ble_adv_data_set(int adv_id) @@ -246,7 +138,7 @@ static void svr_ble_adv_data_set(int adv_id) gap_ble_config_adv_data_t adv_data_info; memset_s(&adv_data_info, sizeof(gap_ble_config_adv_data_t), 0, sizeof(gap_ble_config_adv_data_t)); - unsigned char set_mac[6] = {0x61,0x22,0x33,0x44,0x09,0x12}; + unsigned char set_mac[6] = {0x61,0x22,0x33,0x44,0x09,0x14}; bluetooth_set_local_addr(set_mac,6); bd_addr_t addr_info; int32_t ret= 0; @@ -257,6 +149,7 @@ static void svr_ble_adv_data_set(int adv_id) char watchName[32]; memset_s(watchName, sizeof(watchName), 0, sizeof(watchName)); (void)sprintf_s(watchName, sizeof(watchName), "%s %x%x",BLE_DEFAULT_NAME,addr[1],addr[0]); + // (void)sprintf_s(watchName, sizeof(watchName), "%s",BLE_DEFAULT_NAME); ret = bluetooth_set_local_name((unsigned char*)watchName, strlen((char*)watchName) + 1); if (ret == false) { @@ -290,8 +183,8 @@ static void svr_ble_adv_data_set(int adv_id) memcpy_s(adv_data + adv_data_len, ble_name_len + 1, ble_data_name, ble_name_len + 1); adv_data_len = adv_data_len + ble_name_len + 1; - memcpy_s(adv_data + adv_data_len, sizeof(ble_adv_tx), ble_adv_tx, sizeof(ble_adv_tx));//这是tx power - adv_data_len = adv_data_len + sizeof(ble_adv_tx); + memcpy_s(adv_data + adv_data_len, sizeof(ble_adv_uuid), ble_adv_uuid, sizeof(ble_adv_uuid));//这是tx power + adv_data_len = adv_data_len + sizeof(ble_adv_uuid); int k = BD_ADDR_LEN; for (int i = 0; i < BD_ADDR_LEN; i++) { @@ -299,10 +192,10 @@ static void svr_ble_adv_data_set(int adv_id) } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1], ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]); - // memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN); + memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN); - // memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head)); - // adv_data_len = adv_data_len + sizeof(adv_mac_head); + memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head)); + adv_data_len = adv_data_len + sizeof(adv_mac_head); scan_data[0] = 0x0f;//长度 scan_data[1] = 0xff;//数据类型 manufactory data @@ -339,7 +232,7 @@ static void svr_ble_adv_data_set(int adv_id) -void svr_ble_adv_start(void) +void svr_ble_adv_start_param(void) { int adv_id = BLE_ADV_ID; if (AdverFlag == false) { //已经开始广播了,不需要重复开启广播 @@ -371,17 +264,17 @@ static void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, { uint16_t number; errcode_t ret = gap_ble_get_paired_devices_num(&number); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "number :%d addr!!! 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\r\n",number,addr->addr[0],addr->addr[1],addr->addr[2],addr->addr[3], - addr->addr[4],addr->addr[5]); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "number :%d addr!!! 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x addr->type:%d\r\n",number,addr->addr[0],addr->addr[1],addr->addr[2],addr->addr[3], + addr->addr[4],addr->addr[5],addr->type); g_ble_conn_id = conn_id; if (GAP_BLE_STATE_DISCONNECTED == conn_state) { // restart ble adv when disconnected - Bleconnect = GAP_BLE_STATE_DISCONNECTED;//蓝牙已断开 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_DISCONNECTED!!! 0x%x ret:%d\r\n",pair_state,AdverFlag); if(AdverFlag == true){ - svr_ble_ble_adv_start(); + svr_ble_adv_start(); } } else { + set_phone_info(addr); Bleconnect = GAP_BLE_STATE_CONNECTED;//蓝牙已连接 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_CONNECTED!!! 0x%x\r\n",pair_state); @@ -391,13 +284,6 @@ static void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, static void svr_pair_result_cbt_cb(uint16_t conn_id, const bd_addr_t *addr, errcode_t status) { - bond_flag = 1; - uint16_t number; - errcode_t ret = gap_ble_get_paired_devices_num(&number); - gap_ble_pair_state_t paire_status; - gap_ble_get_pair_state(addr,&paire_status);//获取配对状态 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_pair_result_cbt_cb status %d number:%d\r\n",paire_status,number); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_pair_result_cbt_cb!!! addr 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x status:0x%x\r\n",addr->addr[0],addr->addr[1], addr->addr[2],addr->addr[3],addr->addr[4],addr->addr[5],status); } @@ -630,11 +516,73 @@ static void srv_ble_add_chart_decr_recv_cmd(uint8_t server_id,uint16_t srv_handl // ALIPAY_PRINT_ERR(0, "gatts_add_descriptor fail, ret:%u.\r\n", ret); } } -extern void alipay_add_chart_decr_cb(uint8_t server_id,uint16_t srv_handle); +static uint16_t ble_server_handle = 0; +static uint8_t g_alipay_character_buf[256] = {0}; +void alipay_add_chart_decr_cb(uint8_t server_id,uint16_t srv_handle) +{ + errcode_t ret = 0; + // uint16_t id = ALIPAYY_CHARACTERISTIC_ID; + gatts_add_chara_info_t character; + uint16_t value = 0; + bt_uuid_t alipay_service_uuid = {0}; + bts_data_to_uuid_len2(0x4a02, &alipay_service_uuid); + memset_s(&character, sizeof(gatts_add_chara_info_t), 0, sizeof(gatts_add_chara_info_t)); + // character.chara_uuid.uuid_len = sizeof(id); + // memcpy_s(character.chara_uuid.uuid, sizeof(character.chara_uuid.uuid), (char *)&id, sizeof(id)); + character.chara_uuid = alipay_service_uuid; + character.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; + character.properties = + GATT_CHARACTER_PROPERTY_BIT_READ | GATT_CHARACTER_PROPERTY_BIT_WRITE | GATT_CHARACTER_PROPERTY_BIT_NOTIFY; + character.value_len = 256; + character.value = g_alipay_character_buf; + + ret = gatts_add_characteristic(server_id, srv_handle, &character); + if (ret != ERRCODE_SUCC) { + ALIPAY_PRINT_ERR(0, "gatts_add_characteristic fail, ret:%u.\r\n", ret); + } + + uint8_t bas_ccc_val[] = { + 0x01, + 0x00 + }; + bt_uuid_t ccc_uuid = { 0 }; + bts_data_to_uuid_len2(0x2902, &ccc_uuid); + // bts_data_to_uuid_len2(0x2902, &ccc_uuid); + gatts_add_desc_info_t descriptor; + descriptor.desc_uuid = ccc_uuid; + descriptor.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; + descriptor.value_len = (uint16_t)sizeof(bas_ccc_val); + descriptor.value = bas_ccc_val; + + ret = gatts_add_descriptor(server_id, srv_handle, &descriptor); + if (ret != ERRCODE_SUCC) { + ALIPAY_PRINT_ERR(0, "gatts_add_descriptor fail, ret:%u.\r\n", ret); + } + bd_addr_t addr_info; + gatts_add_desc_info_t descriptor_ap; + gap_ble_get_local_addr(&addr_info); + bts_data_to_uuid_len2(0x4b02, &ccc_uuid); + descriptor_ap.desc_uuid = ccc_uuid; + descriptor_ap.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; + descriptor_ap.value_len = BD_ADDR_LEN; + uint8_t ble_data_mac_switch[BD_ADDR_LEN] = {0}; + int k = BD_ADDR_LEN; + for (int i = 0; i < BD_ADDR_LEN; i++) { + ble_data_mac_switch[--k] = addr_info.addr[i]; + } + descriptor_ap.value = ble_data_mac_switch; + ret = gatts_add_descriptor(server_id, srv_handle, &descriptor_ap); + if (ret != ERRCODE_SUCC) { + ALIPAY_PRINT_ERR(0, "gatts_add_descriptor second fail, ret:%u.\r\n", ret); + } + + +} //这个回调函数添加新的服务UUID static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, errcode_t status) { + ble_server_handle = srv_handle; // ALIPAY_PRINT_DEBUG(0, "BtGattsServiceAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle, // *((uint16_t *)uuid->uuid)); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb 0x%x\r\n",srv_handle); @@ -648,8 +596,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, bt_uuid_t hid_service_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid); - bt_uuid_t alpay_service_uuid = {0}; - bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alpay_service_uuid); + errcode_t ret = 0; if (ble_gatts_cmp_uuid(uuid, &ble_service_uuid) == true) {//通过传入的uuid进行比较 @@ -660,6 +607,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, srv_ble_add_chart_decr_short_cmd(server_id,srv_handle); srv_ble_add_chart_decr_long_cmd(server_id,srv_handle); srv_ble_add_chart_decr_recv_cmd(server_id,srv_handle); + alipay_add_chart_decr_cb(server_id,srv_handle); gatts_start_service(server_id, srv_handle); } if (ble_gatts_cmp_uuid(uuid, &hid_service_uuid) == true){ @@ -667,14 +615,9 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, ret = gatts_start_service(server_id, srv_handle); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret); } - if (ble_gatts_cmp_uuid(uuid, &alpay_service_uuid) == true){ - alipay_add_chart_decr_cb(server_id,srv_handle); - - ret = gatts_start_service(server_id, srv_handle); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "alipay_add_chart_decr_cb ret:%d\r\n",ret); - } } - +uint16_t g_alipay_server_handle = 0; +uint16_t g_hid_server_handle = 0; static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, gatts_add_character_result_t *result, errcode_t status) { @@ -699,8 +642,6 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t bt_uuid_t hid_report_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_REPORT, &hid_report_uuid); - bt_uuid_t alipay_uuid = {0}; - bts_data_to_uuid_len2(ALIPAYY_CHARACTERISTIC_ID, &alipay_uuid); if(ble_gatts_cmp_uuid(uuid, &chara_uuid_data1)) { @@ -711,7 +652,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t if(ble_gatts_cmp_uuid(uuid, &chara_uuid_data2)) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "result->value_handle2 %d\r\n",result->value_handle); - shortCmdChara = result->value_handle; + data2ae3Cmd = result->value_handle; } if(ble_gatts_cmp_uuid(uuid, &chara_uuid_data4)) @@ -733,16 +674,15 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t if(ble_gatts_cmp_uuid(uuid, &chara_uuid_data3)) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "result->value_handle3 %d\r\n",result->value_handle); - longCmdChara = result->value_handle; + data2ae4Cmd = result->value_handle; } if (ble_gatts_cmp_uuid(uuid, &hid_report_uuid) == true) { - ble_hid_add_characters_input_report_cbk(srv_handle); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "result->hid_report_uuid %d\r\n",result->value_handle); - } - if (ble_gatts_cmp_uuid(uuid, &alipay_uuid) == true) { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_alipay_add_characters_input_report_cbk \r\n"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "result->alipay_uuid %d\r\n",result->value_handle); - ble_alipay_add_characters_input_report_cbk(srv_handle); + if(g_hid_server_handle == 0){ + g_hid_server_handle = result->value_handle; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_hid_server_handle %d\r\n",g_hid_server_handle); + ble_hid_add_characters_input_report_cbk(g_hid_server_handle); + } } return; } @@ -799,6 +739,12 @@ static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, g } revBleOldData(write_cb_para->value,write_cb_para->length,write_cb_para->handle); + if(write_cb_para->handle == g_alipay_server_handle) + { + printf("g_alipay_server_handle:%d",g_alipay_server_handle); + uint8_t *msg_data = write_cb_para->value; + svr_alipay_msg_write(ALIPAY_MSG_BT, msg_data, write_cb_para->length, false); + } } static void svr_ble_mtu_exchange(uint8_t server_id, uint16_t conn_id, uint16_t mtu_size, errcode_t status) @@ -885,7 +831,7 @@ static void svr_gap_br_AclStateChangedCallback(const bd_addr_t *bdAddr, gap_acl_ } if(state == GAP_ACL_STATE_DISCONNECTED || state == GAP_ACL_STATE_LE_DISCONNECTED) { - gap_remove_all_pairs(); + // gap_remove_all_pairs(); } } @@ -1099,13 +1045,13 @@ static a2dp_snk_callbacks_t g_a2dp_snk_callbacks = { BtA2dpSnkPlayingStateChangedCb, BtA2dpSnkConfigChangedCb }; - void svr_ble_btcallback_reg(void)//ble基础通讯服务注册回调函数 { - gap_ble_sec_params_t sec_params = { 0 }; + + gap_ble_sec_params_t sec_params = {0}; sec_params.bondable = 0x01; sec_params.io_capability = GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT;//最好选择没有输入输出IO能力 - sec_params.sc_enable = 0x01; + sec_params.sc_enable = 0x00; sec_params.sc_mode = GAP_BLE_GAP_SECURITY_MODE1_LEVEL2; errcode_t ret = gap_ble_set_sec_param(&sec_params);//设置配对参数 发起配对弹窗 @@ -1162,15 +1108,15 @@ static void svr_ble_bt_init_gatts(void) uint8_t serverId = 0; bt_uuid_t uuid; errcode_t ret = 0; - uuid.uuid_len = (uint8_t)sizeof(ser_id); - memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&ser_id, sizeof(ser_id)); + uuid.uuid_len = (uint8_t)sizeof(id); + memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&id, sizeof(id)); ret = gatts_register_server(&uuid, &serverId); /* 注册gatt server */ WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_register_server ret: 0x%x serverId = 0x%x uuid.uuid_len:%d", ret, serverId,uuid.uuid_len); g_ble_server_id = serverId; bt_uuid_t ble_service_uuid = {0}; bts_data_to_uuid_len2(id, &ble_service_uuid); - ret = gatts_add_service(1, &ble_service_uuid, true); + ret = gatts_add_service(serverId, &ble_service_uuid, true); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_add_service ret: 0x%x", ret); @@ -1195,29 +1141,35 @@ bool ble_gatts_cmp_uuid(const bt_uuid_t *tgt_uuid, const bt_uuid_t *src_uuid)// bt_os_free(tgt); return result; } - - +extern void alipay_unregist_server(void); +void ble_unregist_server(void) +{ + gatts_delete_all_services(g_ble_server_id); + gatts_unregister_server(g_ble_server_id); + svr_ble_adv_stop(); + +} +void svr_ble_reset_init(void)//重新启ble服务 +{ + alipay_unregist_server(); + osDelay(100); + svr_ble_btcallback_reg(); + svr_ble_bt_init_gatts(); + ble_hid_server_init(); + svr_ble_adv_start_param(); +} void svr_bluetooth_init(void) { bool ret = enable_bt_stack(); if (ret != ERRCODE_SUCC) { - // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "svr_bluetooth_init enable_bt_stack ret:%u.\r\n", ret); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "svr_bluetooth_init enable_bt_stack ret:%u.\r\n", ret); } - if (g_ble_init_flag == true) { - return; - } - + // osDelay(100); svr_ble_btcallback_reg(); svr_ble_bt_init_gatts(); -#ifdef SUPPORT_ALIPAY_SEC - // uapi_alipay_svr_init(); - svr_alipay_bluetooth_init(); -#endif ble_hid_server_init(); - svr_ble_adv_start(); - ble_nus_max_data_len = 100; - g_ble_init_flag = true; + svr_ble_adv_start_param(); WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "svr_bluetooth_init22222222222\r\n"); ble_recv_register_msg_callback(ble_recv_msg_callback);//注册驱动回调 return; @@ -1238,11 +1190,11 @@ void closeBle(void) if(Bleconnect == GAP_BLE_STATE_CONNECTED){//设备连接需要断开 ret = gap_ble_disconnect_remote_device((const bd_addr_t *)&bd_addr);//与固定的mac设置地址进行断开连接 } - ret = gap_ble_remove_all_pairs();//删除和所有配对的手机app - gap_remove_all_pairs(); - svr_ble_ble_adv_stop();//停止广播 不发送广播数据 就是app搜索不到该设备了 + // ret = gap_ble_remove_all_pairs();//删除和所有配对的手机app + // gap_remove_all_pairs(); + svr_ble_adv_stop();//停止广播 不发送广播数据 就是app搜索不到该设备了 ret = disable_bt_stack();//关闭ble 直接断开和当前连接的手机app - // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "closeBle ret%d 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",ret,bd_addr.addr[0],bd_addr.addr[1],bd_addr.addr[2],bd_addr.addr[3],bd_addr.addr[4],bd_addr.addr[5]); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "closeBle ret%d 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",ret,bd_addr.addr[0],bd_addr.addr[1],bd_addr.addr[2],bd_addr.addr[3],bd_addr.addr[4],bd_addr.addr[5]); } } //开启蓝牙 diff --git a/code/sdk/application/wearable/service/ble_service/bleService.h b/code/sdk/application/wearable/service/ble_service/bleService.h index bf07df485..f2ae7c71c 100644 --- a/code/sdk/application/wearable/service/ble_service/bleService.h +++ b/code/sdk/application/wearable/service/ble_service/bleService.h @@ -5,22 +5,26 @@ #include "stdbool.h" #include "bts_def.h" #include "errcode.h" +extern uint16_t g_ble_conn_id; +extern uint16_t g_ble_server_id; +extern uint16_t g_alipay_server_handle; extern bd_addr_t phone_addr; extern uint8_t bond_flag; extern uint8_t phone_mac_data[6]; extern uint8_t Bleconnect;//蓝牙默认是断开 0 1 为连接 -extern uint8_t shortCmdChara;//2ae3短指令特征值 -extern uint8_t longCmdChara;//长指令特征值 大于20个字节的数据app下发的 +extern uint8_t data2ae3Cmd;//2ae3短指令特征值 +extern uint8_t data2ae4Cmd;//长指令特征值 大于20个字节的数据app下发的 extern uint16_t ble_nus_max_data_len; void svr_bluetooth_init(void);//蓝牙服务初始化 void closeBle(void);//主动关闭蓝牙 void openBle(void);//主动开启蓝牙 -void svr_ble_adv_start(void);//开始蓝牙广播 +void svr_ble_adv_start_param(void);//开始蓝牙广播 bool get_ble_status(void);//默认是开启一开机 void svr_ble_btcallback_reg(void); bool ble_gatts_cmp_uuid(const bt_uuid_t *tgt_uuid, const bt_uuid_t *src_uuid); void srv_ble_server_register_gatt_callbacks(void); errcode_t svr_ble_bt_gatts_noyify(uint8_t *data, uint16_t data_len); -void svr_ble_ble_adv_start(void); +void svr_ble_adv_start(void); +void svr_ble_adv_stop(void); #endif diff --git a/code/sdk/application/wearable/service/hid_service/hidService.c b/code/sdk/application/wearable/service/hid_service/hidService.c index e1c88266f..3005e12fa 100644 --- a/code/sdk/application/wearable/service/hid_service/hidService.c +++ b/code/sdk/application/wearable/service/hid_service/hidService.c @@ -255,7 +255,7 @@ static void ble_hid_add_character_protocol_mode(uint8_t server_id, uint16_t srvc /* 添加HID服务的所有特征和描述符 */ void ble_hid_add_characters_and_descriptors(uint8_t server_id, uint16_t srvc_handle) { - g_hid_service_handle = srvc_handle; + // g_hid_service_handle = srvc_handle; /* HID Information */ ble_hid_add_character_hid_information(server_id, srvc_handle); /* Report Map */ @@ -275,21 +275,13 @@ void ble_hid_server_init(void) { /* HID server app uuid for test */ static char server_app_uuid_for_test[] = {0x00, 0x00}; - // ble_server_register_gatt_callbacks(); - // srv_ble_server_register_gatt_callbacks(); - // bt_uuid_t app_uuid = {0}; - // app_uuid.uuid_len = (uint8_t)sizeof(server_app_uuid_for_test); - // if (memcpy_s(app_uuid.uuid, BT_UUID_MAX_LEN, - // server_app_uuid_for_test, sizeof(server_app_uuid_for_test)) != EOK) { - // return; - // } - // gatts_register_server(&app_uuid, &g_server_id); /* 注册gatt server */ ble_hid_add_service(); /* 添加HID服务 */ } /* device向host发送数据:input report */ errcode_t ble_hid_server_send_input_report(const uint8_t *data, uint8_t len) { + // printf("ble_hid_server_send_input_report:%d %d %d",data[0],data[1],len); gatts_ntf_ind_t param = {0}; param.attr_handle = (uint16_t)g_hid_input_report_att_hdl; param.value_len = len; @@ -303,18 +295,18 @@ errcode_t ble_hid_server_send_input_report(const uint8_t *data, uint8_t len) bt_os_free(param.value); return ERRCODE_BT_FAIL; } - gatts_notify_indicate(g_server_id, BLE_SINGLE_LINK_CONNECT_ID, ¶m); + errcode_t ret = 0; + ret = gatts_notify_indicate(g_ble_server_id, g_ble_conn_id, ¶m); + // printf("ble_hid_server_send_input_report: 0x%x g_ble_conn_id:%d g_hid_input_report_att_hdl:%d\r\n",ret,g_ble_conn_id,g_hid_input_report_att_hdl); bt_os_free(param.value); return ERRCODE_BT_SUCCESS; } void ble_hid_add_characters_input_report_cbk(uint16_t srvc_handle) { - if ((srvc_handle == 0) || (g_hid_service_handle != srvc_handle)) { - // bt_acore_log1(LOG_ACORE_DRV_BT, LOG_LEVEL_ERROR, - // "[hid][ERROR]add report error, service_handle:%d\r\n", srvc_handle); - return; - } - g_hid_input_report_att_hdl = srvc_handle + BLE_HID_CHARACTER_INPUT_REPORT_VALUE_HANDLE_OFFSET; + + // printf("ble_hid_add_characters_input_report_cbk:success:%d\r\n",srvc_handle); + g_hid_input_report_att_hdl = srvc_handle; } + #endif \ No newline at end of file