From ed414956ca39ccfeb0cbc657fcac688ce0ca7a51 Mon Sep 17 00:00:00 2001 From: ROY Date: Fri, 31 Mar 2023 10:24:06 +0800 Subject: [PATCH] [update] hstia pA->nA & hsrtia_b is 8bytes --- .../cc26xx/app/headstage/Elite_version.h | 6 +-- .../cc26xx/app/headstage/eis_cali_cis.h | 45 ++++++++++--------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h index 23bbdd8..c3f0aff 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h @@ -4,9 +4,9 @@ #define VERSION_DATE_YEAR 23 #define VERSION_DATE_MONTH 3 -#define VERSION_DATE_DAY 23 -#define VERSION_DATE_HOUR 14 -#define VERSION_DATE_MINUTE 21 +#define VERSION_DATE_DAY 31 +#define VERSION_DATE_HOUR 10 +#define VERSION_DATE_MINUTE 24 // this is NOT the version hash !! // it's the last version hash diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/eis_cali_cis.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/eis_cali_cis.h index f483f0b..1c05621 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/eis_cali_cis.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/eis_cali_cis.h @@ -86,7 +86,7 @@ static void SendCaliValue2(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue3(void) { @@ -95,18 +95,18 @@ static void SendCaliValue3(void) { uint8_t index = 2; cali_buf[1] = instru.chip_id; - - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 8)& 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_a & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 56)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 48)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 40)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 24)& 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 16) & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 16)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 8) & 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_b & 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 8) & 0xFF; @@ -114,7 +114,7 @@ static void SendCaliValue3(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue4(void) { @@ -124,17 +124,18 @@ static void SendCaliValue4(void) { cali_buf[1] = instru.chip_id; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 8)& 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_a & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 56)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 48)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 40)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 24)& 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 16) & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 16)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 8) & 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_b & 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 8) & 0xFF; @@ -142,7 +143,7 @@ static void SendCaliValue4(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue5(void) { @@ -152,17 +153,18 @@ static void SendCaliValue5(void) { cali_buf[1] = instru.chip_id; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 8)& 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_a & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 56)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 48)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 40)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 24)& 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 16) & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 16)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 8) & 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_b & 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 8) & 0xFF; @@ -170,7 +172,7 @@ static void SendCaliValue5(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue6(void) { @@ -180,17 +182,18 @@ static void SendCaliValue6(void) { cali_buf[1] = instru.chip_id; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 8)& 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_a & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 56)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 48)& 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 40)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 24)& 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 16) & 0xFF; + cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 16)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 8) & 0xFF; cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_b & 0xFF; - cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 32)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 24)& 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 16) & 0xFF; cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 8) & 0xFF; @@ -198,7 +201,7 @@ static void SendCaliValue6(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue7(void) { @@ -244,7 +247,7 @@ static void SendCaliValue8(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue9(void) { @@ -290,7 +293,7 @@ static void SendCaliValue10(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); } static void SendCaliValue11(void) { @@ -336,5 +339,5 @@ static void SendCaliValue12(void) { cali_buf[0] = index - 1; - SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf); + SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf); }