From 2712a2fa73cf7360dad660e2b27d63ad0d1a2d1b Mon Sep 17 00:00:00 2001
From: YiChin <s880782002@gmail.com>
Date: Thu, 14 Nov 2019 10:26:41 +0800
Subject: [PATCH] error fix

---
 .../simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h | 4 ++--
 .../simple_peripheral/cc26xx/app/headstage/EliteCCMode.h  | 8 ++++----
 .../simple_peripheral/cc26xx/app/headstage/EliteITCurve.h | 2 +-
 .../cc26xx/app/headstage/EliteWorkData.h                  | 8 +++-----
 .../cc26xx/app/headstage/impedance_meter.h                | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h
index 19445719a..60a9df6a0 100644
--- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h
+++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCCMode.h
@@ -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
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 1908ef750..d63210212 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
@@ -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;
     }
diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
index 84550a248..31ee45c03 100644
--- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
+++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteITCurve.h
@@ -71,7 +71,7 @@ static int32_t IT_Plot(WorkMode *WorkModeData) {
 //     }
 
 
-    return Real_Current;
+    return RealCurrent;
 }
 
 
diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h
index 04a9708e5..67c159ffb 100644
--- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h
+++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h
@@ -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;
diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
index e61371b05..3f404d81d 100644
--- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
+++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
@@ -216,7 +216,7 @@ static void EliteADCControl(WorkMode *WorkModeData) {
             }
             case CONSTANT_CURRENT:{
                 CCModeReadCurrent(WorkModeData->CC);
-                CCModeReverseCurrent(WorkModeData->CC);
+//                CCModeReverseCurrent(WorkModeData->CC);
                 break;
             }
             default:{