From 48faeeaf1d5f9259ffaa82c8be0fa495e36a1082 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 27 Sep 2019 15:11:57 +0800 Subject: [PATCH] Elite 1.4-re CCmode test --- .../cc26xx/app/headstage/EliteCCMode.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h index c22d94e67..72c0d54ba 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h @@ -62,6 +62,11 @@ static int32_t CCModeReadCurrent(){ NotifyCurrent[1] = (uint8_t) ((Real_Current & 0x00FF0000) >> 16); NotifyCurrent[2] = (uint8_t) ((Real_Current & 0x0000FF00) >> 8); NotifyCurrent[3] = (uint8_t) (Real_Current & 0x000000FF); + + NotifyVolt[0] = (uint8_t) (Real_Current >> 24); + NotifyVolt[1] = (uint8_t) ((Real_Current & 0x00FF0000) >> 16); + NotifyVolt[2] = (uint8_t) ((Real_Current & 0x0000FF00) >> 8); + NotifyVolt[3] = (uint8_t) (Real_Current & 0x000000FF); return Real_Current; } @@ -81,7 +86,6 @@ static void SetCCModeGain(CURRENT_USER_CODE CurrentUserCode){ INSTRUCTION.ADCGainLevel = GAIN_200K; break; } - case CURRENT_LV_THREE:{ INSTRUCTION.ADCGainLevel = GAIN_10K; break; @@ -109,30 +113,30 @@ static void CCCurrent2IUC(){ if (INSTRUCTION.CurrentLV == CURRENT_LV_MA){ // largest current ( 0~500 mA) CurrentUserCode.lv = CURRENT_LV_FOUR; - CurrentUserCode.value = INSTRUCTION.ConstantCurrent; + CurrentUserCode.value = (uint16_t) (INSTRUCTION.ConstantCurrent); } else if (INSTRUCTION.CurrentLV == CURRENT_LV_UA){ if(INSTRUCTION.ConstantCurrent >= 50000){ // mid range current ( 500 uA ~ 999 uA) CurrentUserCode.lv = CURRENT_LV_THREE; - CurrentUserCode.value = INSTRUCTION.ConstantCurrent - 50000; + CurrentUserCode.value = (uint16_t) (INSTRUCTION.ConstantCurrent - 50000); } else{ // mid range current ( 0 uA ~ 499 uA) CurrentUserCode.lv = CURRENT_LV_TWO; - CurrentUserCode.value = INSTRUCTION.ConstantCurrent; + CurrentUserCode.value = (uint16_t) (INSTRUCTION.ConstantCurrent); } } else{ if(INSTRUCTION.ConstantCurrent >= 50000){ // mid range current ( 500 nA ~ 999 nA) CurrentUserCode.lv = CURRENT_LV_ONE; - CurrentUserCode.value = INSTRUCTION.ConstantCurrent - 50000; + CurrentUserCode.value = (uint16_t) (INSTRUCTION.ConstantCurrent - 50000); } else{ // mid range current ( 0 nA ~ 499 nA) CurrentUserCode.lv = CURRENT_LV_ZERO; - CurrentUserCode.value = INSTRUCTION.ConstantCurrent; + CurrentUserCode.value = (uint16_t) (INSTRUCTION.ConstantCurrent); } } }