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

CV3 read Vscan, when cc i = 0

Browse Source
This commit is contained in:
YiChin
2020-04-20 13:39:07 +08:00
parent 116d4cfb76
commit a22253e384
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h
+13 -4
View File
@@ -46,10 +46,19 @@ static int32_t CCModeReadCurrent(CCMode *CC){
else{
VoltCurrentSwitch = 0;
}
NotifyVolt[0] = (uint8_t) (CC->BatteryV >> 24);
NotifyVolt[1] = (uint8_t) ((CC->BatteryV & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((CC->BatteryV & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (CC->BatteryV & 0x000000FF);
if(INSTRUCTION.VoVi_Switch == 2){
int32_t Vscan = ((INSTRUCTION.VoltConstant - 25000) * 1000 / 5) - CC->BatteryV;
NotifyVolt[0] = (uint8_t) (Vscan >> 24);
NotifyVolt[1] = (uint8_t) ((Vscan & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((Vscan & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (Vscan & 0x000000FF);
}else{
NotifyVolt[0] = (uint8_t) (CC->BatteryV >> 24);
NotifyVolt[1] = (uint8_t) ((CC->BatteryV & 0x00FF0000) >> 16);
NotifyVolt[2] = (uint8_t) ((CC->BatteryV & 0x0000FF00) >> 8);
NotifyVolt[3] = (uint8_t) (CC->BatteryV & 0x000000FF);
}
return CC->_MeasureData;
}
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h
+1 -1
View File
@@ -29,7 +29,7 @@
*/
#define BOARD_C5A7
#define BOARD_ANGUS
typedef struct _formula{
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+3 -3
View File
@@ -4,9 +4,9 @@
#define VERSION_DATE_YEAR 20
#define VERSION_DATE_MONTH 4
#define VERSION_DATE_DAY 17
#define VERSION_DATE_HOUR 10
#define VERSION_DATE_MINUTE 02
#define VERSION_DATE_DAY 20
#define VERSION_DATE_HOUR 13
#define VERSION_DATE_MINUTE 38
// this is NOT the version hash !!
// it's the last version hash
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h
+1
View File
@@ -1166,6 +1166,7 @@ static void update_ZM_instruction(uint8 *ins) {
INSTRUCTION.VoltLimit = 0x61A8;
INSTRUCTION.ConstantCurrent = 0x00;
INSTRUCTION.NotifyRate = 1000;
INSTRUCTION.VoVi_Switch = 0x02;
// uint8 *ins;
// ins[0] = 0xC0;