wisetop/past-project-past_code_cc2650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to support all function

Browse Source
This commit is contained in:
weiting2
2020-07-31 17:12:47 +08:00
parent b818a0d4f4
commit f7cf75d526
2 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/mem_board_central.h
+49 -63
View File
@@ -283,70 +283,56 @@ static void mem_connect_device() {
static void mem_send_ins(uint16_t handle, uint8_t *value){
uint8_t len = 0;
if (handle == BLE_CHAR2_HANDLE){
len = BLE_CDR_SAMLL_SIZE;
if (state == BLE_STATE_CONNECTED &&
charHdl != 0 &&
procedureInProgress == FALSE)
{
uint8_t status;
// Do a read or write as long as no other read or write is in progress
// Do a write
attWriteReq_t req;
req.pValue = GATT_bm_alloc(connHandle, ATT_WRITE_REQ, 2, NULL);
if ( req.pValue != NULL )
{
// enable notify
req.handle = handle;
if (handle == BLE_CHAR2_HANDLE){
req.len = BLE_CDR_SAMLL_SIZE;
}
else if(handle == BLE_CHAR3_HANDLE){
req.len = 20;
}
else if(handle == BLE_CHAR4_CONFIG_HANDLE){
req.len = 2;
}
else{
status = bleMemAllocError;
return;
}
for(int i=0 ; i < req.len ; i++){
req.pValue[i] = *(value+i);
}
req.sig = 0;
req.cmd = 0;
status = GATT_WriteCharValue(connHandle, &req, selfEntity);
if ( status != SUCCESS )
{
GATT_bm_free((gattMsg_t *)&req, ATT_WRITE_REQ);
}
}
else
{
status = bleMemAllocError;
}
if (status == SUCCESS)
{
procedureInProgress = TRUE;
}
}
else if(handle == BLE_CHAR3_HANDLE){
len = 20;
}
else if(handle == BLE_CHAR4_CONFIG_HANDLE){
len = 2;
}
else{
return;
}
UART_write(uart_handle, value, len);
// if (state == BLE_STATE_CONNECTED &&
// charHdl != 0 &&
// procedureInProgress == FALSE)
// {
// uint8_t status;
//
// // Do a read or write as long as no other read or write is in progress
// // Do a write
// attWriteReq_t req;
// req.pValue = GATT_bm_alloc(connHandle, ATT_WRITE_REQ, 2, NULL);
// if ( req.pValue != NULL )
// {
// // enable notify
// req.handle = handle;
// if (handle == BLE_CHAR2_HANDLE){
// req.len = BLE_CDR_SAMLL_SIZE;
// }
// else if(handle == BLE_CHAR3_HANDLE){
// req.len = 20;
// }
// else if(handle == BLE_CHAR4_CONFIG_HANDLE){
// req.len = 2;
// }
// else{
// status = bleMemAllocError;
// return;
// }
//
// for(int i=0 ; i < req.len ; i++){
// req.pValue[i] = *(value+i);
// }
// req.sig = 0;
// req.cmd = 0;
//
// status = GATT_WriteCharValue(connHandle, &req, selfEntity);
// if ( status != SUCCESS )
// {
// GATT_bm_free((gattMsg_t *)&req, ATT_WRITE_REQ);
// }
// }
// else
// {
// status = bleMemAllocError;
// }
//
// if (status == SUCCESS)
// {
// procedureInProgress = TRUE;
// }
// }
}
static void mem_read_data_and_return(){
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_version.h
+3 -3
View File
@@ -5,12 +5,12 @@
#define VERSION_DATE_YEAR 20
#define VERSION_DATE_MONTH 7
#define VERSION_DATE_DAY 31
#define VERSION_DATE_HOUR 16
#define VERSION_DATE_MINUTE 17
#define VERSION_DATE_HOUR 17
#define VERSION_DATE_MINUTE 12
// this is NOT the version hash !!
// it's the last version hash
#define VERSION_HASH 4a3cdfb476cd2d4d0942e318e0b729041f2ec0ff
#define VERSION_HASH b818a0d4f4a82bd2f2ad0401510694e9f4b70d83
#define VERSION_GIT_BRANCH simple_central_ma_pin
#endif