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

error fix

Browse Source
This commit is contained in:
YiChin
2019-11-14 10:26:41 +08:00
parent 8151053d08
commit 2712a2fa73
5 changed files with 11 additions and 13 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/EliteCCCMode.h
+2 -2
View File
@@ -6,7 +6,7 @@
// XXX : should we reset DAC output after STOP?
static void CCModeReverseCurrent(CCMode *CCC){
static void CCModeReverseCurrent(CCCMode *CCC){
if(CCC->StandBy){
if(CT.StandByCounter == CCC->StandByTime){
CCC->StandBy = false;
@@ -29,4 +29,4 @@ static void CCModeReverseCurrent(CCMode *CCC){
}
}
#endif ELITECCC
#endif
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h
+4 -4
View File
@@ -63,7 +63,7 @@ static int32_t CCModeVoltOut(CCMode *CC){
// DAC should not work now
return 0;
}
IUCCurrent = CC->_Transform2RealnA( (struct CCModePara) CC);
IUCCurrent = CC->_Transform2RealnA( (struct CCModePara *) CC);
CCModeDACControl(IUCCurrent - CC->_MeasureData);
@@ -76,9 +76,9 @@ static void CCModeDACControl(int32_t IUC_Measure_Difference){
if(IUC_Measure_Difference < 300 && IUC_Measure_Difference > -300){
step = 0;
}
else if(INSTRUCTION.VoltConstant >= CC->VMax || INSTRUCTION.VoltConstant <= CC->VMin){
step = 0;
}
// else if(INSTRUCTION.VoltConstant >= CC->VMax || INSTRUCTION.VoltConstant <= CC->VMin){
// step = 0;
// }
else{
step = (IUC_Measure_Difference > 0) ? 1:-1;
}
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
+1 -1
View File
@@ -71,7 +71,7 @@ static int32_t IT_Plot(WorkMode *WorkModeData) {
// }
return Real_Current;
return RealCurrent;
}
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h
+3 -5
View File
@@ -99,7 +99,7 @@ typedef void (*InitWorkData) ();
int32_t value; \
uint16_t VMax; \
uint16_t VMin; \
int32_t (*_Transform2RealnA)(struct _CCMode *)
int32_t (*_Transform2RealnA)(struct CCModePara *)
#define LIMIT \
@@ -121,7 +121,7 @@ struct Limit{
struct CCModePara{
CC_PARA;
}
};
/***** End of Measure and VoltOut parameter *****/
@@ -414,7 +414,7 @@ CCMode * InitCCMode(){
ret->value = CC_ZERO_POINT;
ret->VMax = MAX_DAC_UC;
ret->VMin = MIN_DAC_UC
ret->VMin = MIN_DAC_UC;
ret->_Transform2RealnA = &_Transform2RealnA;
return ret;
}
@@ -427,8 +427,6 @@ typedef struct _CCCMode{
/* Vmax and Vmin */
// Vmax protect battery charge
// Vmin protect battery discharge, uint = mV
uint16_t VMax;
uint16_t VMin;
/* Charge/Discharge Current */
int32_t ChargeCurrent;
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
+1 -1
View File
@@ -216,7 +216,7 @@ static void EliteADCControl(WorkMode *WorkModeData) {
}
case CONSTANT_CURRENT:{
CCModeReadCurrent(WorkModeData->CC);
CCModeReverseCurrent(WorkModeData->CC);
// CCModeReverseCurrent(WorkModeData->CC);
break;
}
default:{