[update] fix cali_DAC mode

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/boards_config/elite_boards_select.h

@@ -15,16 +15,16 @@ extern "C" {
  * +------------------------+----------------------+-------------------------+----------------+----------------------+----------------------+----------+
  * |       model name       |   hw upper board     |    hw lower board       | product number |      device name     | data server lib name |    UI    |
  * +------------------------+----------------------+-------------------------+----------------+----------------------+----------------------+----------+
- * | DEF_ELITE_EDC_1_4      | Elite1.4-re Jun.2019 | Elite1.4-re Jun. 2019   |   0, 2, 1, 5   | "Elite-EDC"          | Elite_EDC_1.4        | null     |
- * | DEF_ELITE_EDC_1_5      | Elite1.5 Dec. 2019   | Elite1.5 Dec. 2019      |   0, 2, 1, 6   | "Elite-EDC"          | Elite_EDC_1.5        | EliteEDC |
- * | DEF_ELITE_EDC_1_5_RE   | Elite1.5 Dec. 2019   | Elite1.5-re Jan. 2021   |   0, 2, 1, 7   | "Elite-EDC"          | Elite_EDC_1.5re      | EliteEDC |
- * | DEF_ELITE_EDC_1_5_R2   | Elite1.5 Dec. 2019   | Elite1.5-r2 May. 2022   |   0, 2, 1, 8   | "Elite-EDC"          | Elite_EDC_1.5r2      | EliteEDC |
- * | DEF_ELITE_BAT_1_0      |             Elite2.0 Feb. 2022                 |   0, 3, 1, 0   | "Elite-BAT"          | Elite_BAT_1.0        | EliteEDC |
- * | DEF_ELITE_EIS_1_0      | Elite1.5 Dec. 2019   | Elite EIS1.0 Aug. 2020  |   0, 4, 1, 0   | "Elite-EIS"          | Elite_EIS_1.0        | EliteEIS |
- * | DEF_ELITE_EIS_1_1      | Elite1.5 Dec. 2019   | Elite EIS1.1 Feb. 2022  |   0, 4, 1, 1   | "Elite-EIS"          | Elite_EIS_1.1        | EliteEIS |
- * | DEF_ELITE_EIS_MINI_1_0 |             EIS MINI May. 2022                 |   0, 4, 1, 2   | "Elite-EIS-MINI"     | Elite_EIS_MINI_1.0   | EliteEIS |
- * | DEF_ELITE_TRIG_0_1     |            Elite TRIG01 Jan. 2021              |   0, 5, 1, 0   | "Elite-TRIG"         | Elite_TRIG_0.1       | null     |
- * | DEF_ELITE_MEGAFLY_0_1  | Elite1.5 Dec. 2019   | Elite Megafly Sep. 2020 |   0, 6, 1, 0   | "Elite-MEGAFLY"      | Elite_MEGAFLY_0.1    | null     |
+ * | DEF_ELITE_EDC_14       | Elite1.4-re Jun.2019 | Elite1.4-re Jun. 2019   |   0, 2, 1, 5   | "Elite-EDC"          | Elite_EDC_1.4        | null     |
+ * | DEF_ELITE_EDC_15       | Elite1.5 Dec. 2019   | Elite1.5 Dec. 2019      |   0, 2, 1, 6   | "Elite-EDC"          | Elite_EDC_1.5        | EliteEDC |
+ * | DEF_ELITE_EDC_15RE     | Elite1.5 Dec. 2019   | Elite1.5-re Jan. 2021   |   0, 2, 1, 7   | "Elite-EDC"          | Elite_EDC_1.5re      | EliteEDC |
+ * | DEF_ELITE_EDC_15R2     | Elite1.5 Dec. 2019   | Elite1.5-r2 May. 2022   |   0, 2, 1, 8   | "Elite-EDC"          | Elite_EDC_1.5r2      | EliteEDC |
+ * | DEF_ELITE_BAT_10       |             Elite2.0 Feb. 2022                 |   0, 3, 1, 0   | "Elite-BAT"          | Elite_BAT_1.0        | EliteEDC |
+ * | DEF_ELITE_EIS_10       | Elite1.5 Dec. 2019   | Elite EIS1.0 Aug. 2020  |   0, 4, 1, 0   | "Elite-EIS"          | Elite_EIS_1.0        | EliteEIS |
+ * | DEF_ELITE_EIS_11       | Elite1.5 Dec. 2019   | Elite EIS1.1 Feb. 2022  |   0, 4, 1, 1   | "Elite-EIS"          | Elite_EIS_1.1        | EliteEIS |
+ * | DEF_ELITE_EIS_MINI_10  |             EIS MINI May. 2022                 |   0, 4, 1, 2   | "Elite-EIS-MINI"     | Elite_EIS_MINI_1.0   | EliteEIS |
+ * | DEF_ELITE_TRIG_01      |            Elite TRIG01 Jan. 2021              |   0, 5, 1, 0   | "Elite-TRIG"         | Elite_TRIG_0.1       | null     |
+ * | DEF_ELITE_MEGAFLY_01   | Elite1.5 Dec. 2019   | Elite Megafly Sep. 2020 |   0, 6, 1, 0   | "Elite-MEGAFLY"      | Elite_MEGAFLY_0.1    | null     |
  * +------------------------+----------------------+-------------------------+----------------+----------------------+----------------------+----------+
  * ps.
  *    model name is FW engineer defined
@@ -32,40 +32,40 @@ extern "C" {
  */
 
 
-#define DEF_ELITE_EDC_1_4       0
-#define DEF_ELITE_EDC_1_5       1
-#define DEF_ELITE_EDC_1_5_RE    2
-#define DEF_ELITE_EDC_1_5_R2    3
-#define DEF_ELITE_BAT_1_0       4
-#define DEF_ELITE_EIS_1_0       5
-#define DEF_ELITE_EIS_1_1       6
-#define DEF_ELITE_EIS_MINI_1_0  7
-#define DEF_ELITE_TRIG_0_1      8
-#define DEF_ELITE_MEGAFLY_0_1   9
+#define DEF_ELITE_EDC_14        0
+#define DEF_ELITE_EDC_15        1
+#define DEF_ELITE_EDC_15RE      2
+#define DEF_ELITE_EDC_15R2      3
+#define DEF_ELITE_BAT_10        4
+#define DEF_ELITE_EIS_10        5
+#define DEF_ELITE_EIS_11        6
+#define DEF_ELITE_EIS_MINI_10   7
+#define DEF_ELITE_TRIG_01       8
+#define DEF_ELITE_MEGAFLY_01    9
 #define DEF_ELITE_MAX           10
 
-#define DEF_ELITE_MODEL    DEF_ELITE_EDC_1_5_RE
+#define DEF_ELITE_MODEL    DEF_ELITE_EDC_15RE
 #ifndef DEF_ELITE_MODEL
 #error "DEF_ELITE_MODEL not defined"
 #endif
 
-#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_4)
+#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_14)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_RE)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE)
     #include "boards_config/pin_def_edc15re.h"
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_R2)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15R2)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_0)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_10)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_11)
     #include "boards_config/pin_def_eis11.h"
-#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_1_0)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_10)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_0_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_01)
     #error "code no support"    // need fix
-#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_0_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_01)
     #error "code no support"    // need fix
 #else
     #error "no this model"
@@ -73,61 +73,61 @@ extern "C" {
 
 
 // model information
-#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_4)
+#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_14)
     #define DEVICE_NAME             "Elite-EDC"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    2
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    5
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15)
     #define DEVICE_NAME             "Elite-EDC"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    2
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    6
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_RE)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15RE)
     #define DEVICE_NAME             "Elite-EDC"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    2
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    7
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_R2)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_15R2)
     #define DEVICE_NAME             "Elite-EDC"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    2
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    8
-#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_1_0)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_10)
     #define DEVICE_NAME             "Elite-BAT"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    3
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    0
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_0)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_10)
     #define DEVICE_NAME             "Elite-EIS"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    4
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    0
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_11)
     #define DEVICE_NAME             "Elite-EIS"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    4
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    1
-#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_MINI_1_0)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_MINI_10)
     #define DEVICE_NAME             "Elite-EIS"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    4
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    2
-#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_0_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_01)
     #define DEVICE_NAME             "Elite-TRIG"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    5
     #define MAJOR_VERSION_NUMBER    1
     #define MINOR_VERSION_NUMBER    0
-#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_0_1)
+#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_01)
     #define DEVICE_NAME             "Elite-MEGAFLY"
     #define MAJOR_PRODUCT_NUMBER    0
     #define MINOR_PRODUCT_NUMBER    6

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/elite_task/elite_latch.h

@@ -44,6 +44,8 @@ extern "C" {
 #define E_LATCH_OFF             LOAD2, D6
 #define E_LATCH_VOUT_SMALL_ON   LOAD2, D7
 
+#define HIGH_Z_OPEN()           latch_single_ctrl(E_LATCH_HIGH_Z, 0);
+#define HIGH_Z_CLOSE()          latch_single_ctrl(E_LATCH_HIGH_Z, 1);
 uint8_t update_latch_stat(uint8_t latch, uint8_t dio, uint8_t value);
 uint8_t latch_single_ctrl(uint8_t latch, uint8_t dio, uint8_t value);
 uint8_t latch_multi_ctrl(void);

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/adc_ads1118.h

@@ -9,8 +9,8 @@ extern "C" {
 
 #define ADC_CH_CURR     AIN0_GND
 #define ADC_CH_VIN      AIN1_GND
-#define ADC_CH_VOUT     AIN2_GND
 #define ADC_CH_BAT      AIN3_GND
+#define ADC_CH_VOUT     AIN2_GND
 
 #define MEASURE_CURRENT()   read_adc_data(ADC_CH_CURR, FSR3)
 #define MEASURE_VOLT()      read_adc_data(ADC_CH_VIN, FSR3)

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h

@@ -23,7 +23,7 @@
 *
 */
 
-#define BOARD_F0_9F
+#define BOARD_EE_EF
 
 struct formula_ctx_t {
     long long coeff;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteInstruction.h

@@ -47,7 +47,7 @@ struct HEADSTAGE_INSTRUCTION {
     uint16_t cycleNumber;
     uint8_t  charge;
     int32_t  constantCurrent;
-    uint8_t  cc_resistance;
+    // uint8_t  cc_resistance;
     uint8_t  cc_cp_speed;
 
     // uni pulse mode

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLED.h

@@ -74,6 +74,7 @@ static void WorkModeLED()
         case CURVE_CV:
         case CURVE_CA:
         case CURVE_CC:
+        case CURVE_CP:
         case CURVE_OCP:
         case CURVE_LSV:
         case CURVE_IV_CY:
@@ -85,7 +86,7 @@ static void WorkModeLED()
             led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_CYAN);
             break;
 
-        case CURVE_CALI_ADC:
+        case CURVE_CALI:
             if (instru.AdcChannel == RIS_ADC_IIN) {
                 led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_RED);
             } else if (instru.AdcChannel == RIS_ADC_VIN) {

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h

@@ -205,6 +205,27 @@ struct wm_ocp_ctx_t {
     struct wm_meas_t measure;
 };
 
+
+
+struct wm_adc_cali_ctx_t {
+    struct wm_meas_t measure;
+    uint16_t _cali_count;
+    int32_t _ADCValueSUM;
+};
+
+#define GET_ADC_SUM(_m)  (((struct wm_adc_cali_ctx_t *)(_m))->_ADCValueSUM)
+#define GET_CALI_COUNT(_m)  (((struct wm_adc_cali_ctx_t *)(_m))->_cali_count)
+
+struct wm_cp_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vmax;
+    int32_t _Vmin;
+    int32_t _Vset;
+    int32_t _Iset;
+    uint8_t _charge;
+};
+
 int wm_init(void);
 int wm_deinit(void);
 void *wm_get(void);
@@ -698,6 +719,57 @@ static int __ocp_create(void)
     return 0;
 }
 
+static int __adc_cali_create()
+{
+    struct wm_meas_t *m;
+    struct wm_adc_cali_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_adc_cali_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_ADCValueSUM = 0;
+    p->_cali_count = 0;
+    *wm = p;
+
+    return 0;
+}
+
+static int __cp_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_cp_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_cp_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vset           = 0;
+    p->_charge         = instru.charge;
+    p->_Iset           = instru.constantCurrent * 200 ;
+    //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
+
+    *wm = p;
+
+    return 0;
+}
+
 int wm_init(void)
 {
     int mode = instru.eliteFxn;
@@ -762,7 +834,14 @@ int wm_init(void)
         case CURVE_DPV_ADVANCE_SMPRATE:
             if (__dpv_advance_create()) return -2;
             break;
+        case CURVE_CALI:
+            if (__adc_cali_create()) return -2;
+            break;
 
+        case CURVE_CP:
+            if (__cp_create()) return -2;
+            break;
+            
         default:
             // printf("DO NOT support!!");
             return -3;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_def.h

@@ -31,13 +31,14 @@ enum all_mode_e {
     CURVE_CV                       =  0x09, // Cyclic Voltammetry (CV)
     CURVE_LSV                      =  0x0A, // Linear Sweep Voltammetry (LSV)
     CURVE_CA                       =  0x0B, // Chronoamperometric Graph (CA)
+    CURVE_CP                       =  0x0C,
     CURVE_UNI_PULSE                =  0x0D, // Pulse Sensing (universal pulse)
     CURVE_DPV                      =  0x0E, // Differential Pulse Voltammetry (DPV)
     CURVE_DPV_SMPRATE              =  0x0F,
     CURVE_DPV_ADVANCE              =  0x10,
     CURVE_DPV_ADVANCE_SMPRATE      =  0x11,
 
-    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test
+    CURVE_CALI                     =  0xF1,
 
 
     SET_SAMPLE_RATE                =  0xE0,

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_mode_ADC_DAC.h

@@ -78,6 +78,11 @@ static void DACenable(uint8_t afterRead){
                 volt_out();
                 break;
 
+            case CURVE_CP:
+                cp_vscan();
+                volt_out();
+                break;
+
             case CURVE_UNI_PULSE:
                 volt_out();
                 break;
@@ -658,8 +663,6 @@ static void Vout_Plot(void)
 static void cali_IT_plot(void) {
     void *wm = wm_get();
 
-    static int32_t ADCValueSUM = 0;
-    static uint16_t cali_count = 0;
     static uint8_t ADC_cnt = 0;
     static uint8_t rec_cnt = 0;
     static uint16_t cali_count_max = 1000;
@@ -689,8 +692,8 @@ static void cali_IT_plot(void) {
         if (curr_rec_en == false) {
             rec_cnt++;
         } else {
-            if (cali_count >= cali_count_max) {
-                ADCValueAVG = ADCValueSUM / cali_count;
+            if (GET_CALI_COUNT(wm) >= cali_count_max) {
+                ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
 
                 InputNotify(NOTIFY_CURRENT, ADCValueAVG);
                 SendNotify();
@@ -705,19 +708,19 @@ static void cali_IT_plot(void) {
                 SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
 
                 PeriodicEvent = false;
-                ADCValueSUM = 0;
-                cali_count = 0;
                 ModeLED(NO_EVENT);
             } else {
-                cali_count++;
-                ADCValueSUM = ADCValueSUM + MEAS_CURR(wm);
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-                InputNotify(NOTIFY_VOLT, ADCValueSUM);
-                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+                GET_CALI_COUNT(wm)++;
+                GET_ADC_SUM(wm) = GET_ADC_SUM(wm) + MEAS_CURR(wm);
+                ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                InputNotify(NOTIFY_VOLT, MEAS_CURR(wm));
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)GET_CALI_COUNT(wm));
             }
         }
 
         if (rec_cnt == 2) {
+            volt_rec_en = true;
             curr_rec_en = true;
             rec_cnt = 0;
         }
@@ -746,8 +749,6 @@ static void cali_IT_plot(void) {
 static void cali_VT_plot(void) {
     void *wm = wm_get();
 
-    static int32_t ADCValueSUM = 0;
-    static uint16_t cali_count = 0;
     static uint8_t ADC_cnt = 0;
     static uint8_t rec_cnt = 0;
     uint16_t cali_count_max = 0;
@@ -775,8 +776,8 @@ static void cali_VT_plot(void) {
         if (volt_rec_en == false) {
            rec_cnt++;
         } else {
-            if (cali_count >= cali_count_max) {
-                ADCValueAVG = ADCValueSUM / cali_count;
+            if (GET_CALI_COUNT(wm) >= cali_count_max) {
+                ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
 
                 InputNotify(NOTIFY_VOLT, ADCValueAVG);
                 SendNotify();
@@ -791,20 +792,21 @@ static void cali_VT_plot(void) {
                 SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
 
                 PeriodicEvent = false;
-                ADCValueSUM = 0;
-                cali_count = 0;
+
                 ModeLED(NO_EVENT);
             } else {
-                cali_count++;
-                ADCValueSUM = ADCValueSUM + MEAS_VIN(wm);
+                GET_CALI_COUNT(wm)++;
+                GET_ADC_SUM(wm) = GET_ADC_SUM(wm) + MEAS_VIN(wm);
+                ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
                 InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
-                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)GET_CALI_COUNT(wm));
             }
         }
 
         if (rec_cnt == 2) {
             volt_rec_en = true;
+            curr_rec_en = true;
             rec_cnt = 0;
         }
         ADC_cnt++;
@@ -828,20 +830,29 @@ static void cali_VT_plot(void) {
 
     return;
 }
+static void count_sum_clear(void) {
+    void *wm = wm_get();
+    if(wm) {
+        GET_CALI_COUNT(wm) = 0;
+        GET_ADC_SUM(wm) = 0;
+    }
+    
+    return;
+}
+
+
 static void cali_Vout_plot(void) {
     void *wm = wm_get();
-
-    static int32_t ADCValueSUM = 0;
-    static uint16_t cali_count = 0;
     static uint8_t ADC_cnt = 0;
     static uint8_t rec_cnt = 0;
-    uint16_t cali_count_max = 1000;
+    uint16_t cali_count_max = 2000;
     int32_t ADCValueAVG = 0;
-
     /* ADC_cnt:  0 - read Vin and do NOT buffer the Vin after changing gain twice
      *           1 - read Vin and increase ADC_cnt
      *           2 - read Vin and reset ADC_cnt
      */
+    if(vscanReset)
+        return;
     if (ADC_cnt == 0) {
 
         ADC_rxbuf = MEASURE_DAC();
@@ -850,36 +861,36 @@ static void cali_Vout_plot(void) {
         if (volt_rec_en == false) {
            rec_cnt++;
         } else {
-            if (cali_count >= cali_count_max) {
-                ADCValueAVG = ADCValueSUM / cali_count;
+            // if (!GET_CALI_COUNT(wm) && GET_CALI_COUNT(wm) != 0) {
 
-                InputNotify(NOTIFY_VOLT, ADCValueAVG);
-                SendNotify();
+            //     ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
+            //     InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+            //     SendNotify();
 
-                uint8_t CIS_buf[9]   = {0};
-                CIS_buf[0] = 5; //data len
-                CIS_buf[1] = instru.chip_id;
-                CIS_buf[2] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
-                CIS_buf[3] = (uint8_t) (ADCValueAVG & 0x00FF);
-                CIS_buf[4] = 0x00;
-                CIS_buf[5] = instru.VinADCGainLv;
-                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+            //     uint8_t CIS_buf[9]   = {0};
+            //     CIS_buf[0] = 5; //data len
+            //     CIS_buf[1] = instru.chip_id;
+            //     CIS_buf[2] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+            //     CIS_buf[3] = (uint8_t) (ADCValueAVG & 0x00FF);
+            //     CIS_buf[4] = 0x00;
+            //     CIS_buf[5] = instru.VinADCGainLv;
+            //     SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
 
-                PeriodicEvent = false;
-                ADCValueSUM = 0;
-                cali_count = 0;
-                ModeLED(NO_EVENT);
-            } else {
-                cali_count++;
-                ADCValueSUM = ADCValueSUM + MEAS_VOUT(wm);
-                InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
-                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
-                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
-            }
+            //     PeriodicEvent = false;
+            //     ModeLED(NO_EVENT);
+            // } else {
+            GET_CALI_COUNT(wm)++;
+            GET_ADC_SUM(wm) = GET_ADC_SUM(wm) + MEAS_VOUT(wm);
+            ADCValueAVG = GET_ADC_SUM(wm) / GET_CALI_COUNT(wm);
+            InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
+            InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+            InputNotify(NOTIFY_IMPEDANCE, (int32_t)GET_CALI_COUNT(wm));
+            // }
         }
 
         if (rec_cnt == 2) {
             volt_rec_en = true;
+            curr_rec_en = true;
             rec_cnt = 0;
         }
         ADC_cnt++;

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      22
 #define VERSION_DATE_MONTH     8
-#define VERSION_DATE_DAY       2
-#define VERSION_DATE_HOUR      11
-#define VERSION_DATE_MINUTE    33
+#define VERSION_DATE_DAY       22
+#define VERSION_DATE_HOUR      13
+#define VERSION_DATE_MINUTE    46
 
 // 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

@@ -443,6 +443,15 @@ enum send_ins_para_order_e {
     PARA_FINAL      = 0xFF,
 };
 
+enum dev_led_item_e {
+  DEV_LED_LIMIT_COLOR       = 0,
+  DEV_LED_DARK_COLOR,
+  DEV_LED_LIGHT_COLOR,
+  DEV_LED_RAINBOW,
+
+  DEV_LED_MAX,
+};
+
 #define UC_TO_5NV(_v) (_v - 25000) * 4 * 10000;  //userode to 5nv per unit
 
 #include "Elite_def.h"
@@ -544,6 +553,7 @@ static void    lsv_vscan(void);
 static void    ca_vscan(void);
 static void    cv_vscan(void);
 static void    cc_vscan(void);
+static void    cp_vscan(void);
 
 //mode (DAC)
 static void     DACenable(uint8_t afterRead);
@@ -716,7 +726,31 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.Vmax            = (uint32_t)(ins[8])  << 8  | (uint32_t)(ins[9]);
             instru.Vmin            = (uint32_t)(ins[10]) << 8  | (uint32_t)(ins[11]);
             instru.hign_z_en       = ins[13] & 0x0F;
-            instru.cc_resistance   = ins[16] & 0xF0;   // 0:vout has 0R 1:vout has 100R
+            // instru.cc_resistance   = ins[16] & 0xF0;   // 0:vout has 0R 1:vout has 100R
+            instru.cc_cp_speed     = ins[16] & 0x0F;   // 0:low 1:normal 2:high
+
+            instru.VoutGainLv   = VOUT_GAIN_240K;
+
+            ModeLED(WORKING);
+            /*******************************************************
+            controller instruction
+            ins[3]   -> Charge, 0:discharge 1:charge
+            ins[6:9] -> ConstantCurrent, 0 ~ 15000uA : 0 ~ 1500000
+            ********************************************************/
+
+            break;
+        }
+
+        case CURVE_CP: { //vscan's cc
+            instru.eliteFxn        = CURVE_CP;
+            instru.notifyRate      = ((uint32_t)ins[14] << 8) | (uint32_t)ins[15];
+            instru.notifyRate      = 10000 / instru.notifyRate * 10;
+            instru.charge          = ins[3]; //0:discharge 1:charge
+            instru.constantCurrent = (uint32_t)(ins[4])  << 24 | (uint32_t)(ins[5]) << 16 | (uint32_t)(ins[6]) << 8 | (uint32_t)(ins[7]);
+            instru.Vmax            = (uint32_t)(ins[8])  << 8  | (uint32_t)(ins[9]);
+            instru.Vmin            = (uint32_t)(ins[10]) << 8  | (uint32_t)(ins[11]);
+            instru.hign_z_en       = ins[13] & 0x0F;
+            // instru.cc_resistance   = ins[16] & 0xF0;   // 0:vout has 0R 1:vout has 100R
             instru.cc_cp_speed     = ins[16] & 0x0F;   // 0:low 1:normal 2:high
 
             instru.VoutGainLv   = VOUT_GAIN_240K;
@@ -860,14 +894,16 @@ static void update_ZM_instruction(uint8 *ins) {
                     switch(ins[4]) {
                         case 0x00 : {
                             if (PeriodicEvent) {
-                                latch_single_ctrl(E_LATCH_HIGH_Z, 0);   // 0 => open high_z mode
+                                //latch_single_ctrl(E_LATCH_HIGH_Z, 0);   // 0 => open high_z mode
+                                HIGH_Z_OPEN();
                             }
                             
                             break;
                         }
                         case 0x01 : {
                             if (PeriodicEvent) {
-                                latch_single_ctrl(E_LATCH_HIGH_Z, 1);   // 1 => close high_z mode
+                                //latch_single_ctrl(E_LATCH_HIGH_Z, 1);   // 1 => close high_z mode
+                                HIGH_Z_CLOSE();
                             }
                             break;
                         }
@@ -884,29 +920,50 @@ static void update_ZM_instruction(uint8 *ins) {
             break;
         }
 
-        case CURVE_CALI_ADC: {
+        case CURVE_CALI: {
             switch(ins[3]) {
                 case RIS_ADC_IIN : {             // 0x00
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_ADC_IIN;
                     instru.notifyRate    = 1000;
                     ModeLED(WORKING);
                     break;
                 }
                 case RIS_ADC_VIN : {             // 0x01
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_ADC_VIN;
                     instru.notifyRate    = 1000;
                     ModeLED(WORKING);
                     break;
                 }
                 case RIS_DAC_VOUT : {             // 0x02
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_DAC_VOUT;
                     instru.notifyRate    = 1000;
-                    instru.VoltConstant  = ( ((uint16_t)(ins[4])) << 8) | (uint16_t)(ins[5]);      // output voltage
+                    instru.hign_z_en = 1;
+
+                    switch(ins[4]) {
+                        case 0x00: {
+                            instru.VoltConstant = 0x2710;
+                            break;
+                        }
+                        case 0x01: {
+                            instru.VoltConstant =  0x61A8;
+                            break;
+                        }
+                        case 0x02: {
+                            instru.VoltConstant = 0xC350;
+                            break;
+                        }
+                        case 0x03: {
+                            instru.VoltConstant =  0xEA60;
+                            break;
+                        }
+                    }
                     DAC0_W_T(instru.VoltConstant);
+                    
                     ModeLED(WORKING);
+                    count_sum_clear();
                     break;
                 }
                 default : {
@@ -1316,60 +1373,27 @@ static void update_ZM_instruction(uint8 *ins) {
                 }
 
                 case LED_DEV_TEST: {
-                    led_rainbow(LED_BR_LV8);
-                    break;
-                }
+                    uint8_t *p = ins;
+                    struct led_color_t led_c;
+                    uint8_t led_item = p[4];
+                    uint8_t c_num = p[5];
 
-                case 0x50: {
-                    initCISBuf();
-                    
-                    cis_buf[0] = 2;
-                    cis_buf[1] = (uint8_t) ADC_rxbuf >> 8;
-                    cis_buf[2] = (uint8_t) ADC_rxbuf;
-                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
-                    break;
-                }
+                    led_c.r = p[5];
+                    led_c.g = p[6];
+                    led_c.b = p[7];
 
+                    if (led_item == DEV_LED_RAINBOW)
+                        led_rainbow(LED_BR_LV1);
 
-                case 0x51: {
-                    initCISBuf();
-                    cis_buf[0] = 2;
-                    cis_buf[1] = (uint8_t) ADC_rxbuf >> 8;
-                    cis_buf[2] = (uint8_t) ADC_rxbuf;
-                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
-                    break;
-                }
+                    if (led_item == DEV_LED_LIMIT_COLOR)
+                        led_color_set(LED_NB_MAX, LED_BR_LV1, (enum led_color_e)c_num);
 
+                    if (led_item == DEV_LED_DARK_COLOR)
+                        led_color_code_set(LED_NB_MAX, LED_BR_LV1, &led_c);
 
-                case 0x61: {
-                    dac_ldac_mode(ins[4], ins[5]);
-                    break;
-                }
+                    if (led_item == DEV_LED_LIGHT_COLOR)
+                        led_color_code_set(LED_NB_MAX, LED_BR_LV8, &led_c);
 
-                case 0x62: {
-                    dac_clear_mode();
-                    break;
-                }
-
-                case 0x63: {
-                    dac_power_control_mode(ins[4], ins[5], ins[6]);
-                    break;
-                }
-
-                case 0x64: {
-                    dac_linearity_mode(ins[4]);
-                    break;
-                }
-
-                case 0x65: {
-                    uint16_t volts = (uint16_t)ins[6] << 8 | ins[7]; 
-                    dac_write_mode(ins[4], ins[5], volts);
-                    break;
-                }
-
-                case 0x66: {
-                    uint16_t volts = (uint16_t)ins[6] << 8 | ins[7]; 
-                    DAC0_W_T(volts);
                     break;
                 }
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h

@@ -51,12 +51,13 @@ static void device_init(void)
 (instru.eliteFxn == CURVE_VT)                 || \
 (instru.eliteFxn == CURVE_RT)                 || \
 (instru.eliteFxn == CURVE_CC)                 || \
+(instru.eliteFxn == CURVE_CP)                 || \
 (instru.eliteFxn == CURVE_CV)                 || \
 (instru.eliteFxn == CURVE_LSV)                || \
 (instru.eliteFxn == CURVE_CA)                 || \
 (instru.eliteFxn == CURVE_VO)                 || \
 (instru.eliteFxn == CURVE_OCP)                || \
-(instru.eliteFxn == CURVE_CALI_ADC)              \
+(instru.eliteFxn == CURVE_CALI)              \
 )
 
 #define Ve1MatchVe2Mode() (                      \
@@ -74,10 +75,16 @@ static void peri_mode(void)
     if (leadTimeReset && GPT.cnt_lead_time <= 2000) {
         vscanReset = true;
         if (first_highz_flag && GPT.cnt_lead_time >= 1000) {
-            if (instru.eliteFxn == CURVE_OCP) {
-                latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+            if (instru.eliteFxn == CURVE_OCP || instru.eliteFxn == CURVE_CC || instru.eliteFxn == CURVE_CP) {
+                HIGH_Z_OPEN(); // HIGH Z MODE // 1: close; 0: open;
             } else {
-                latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+                //latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+                if(instru.hign_z_en == 1) {
+                    HIGH_Z_CLOSE();
+                }
+                else{
+                    HIGH_Z_OPEN();
+                }
             }
             first_highz_flag = false;
         }
@@ -85,6 +92,9 @@ static void peri_mode(void)
         if (notifyFirst_flag) {
             GPT.cnt_notify_rate = instru.notifyRate - 20;
             notifyFirst_flag = false;
+            if (instru.eliteFxn == CURVE_CC || instru.eliteFxn == CURVE_CP) {
+                latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+            }
         }
         vscanReset = false;
         leadTimeReset = false;
@@ -112,6 +122,7 @@ static void peri_mode(void)
         if ((instru.eliteFxn == CURVE_IV) ||
                 (instru.eliteFxn == CURVE_IV_CY) ||
                 (instru.eliteFxn == CURVE_CC) ||
+                (instru.eliteFxn == CURVE_CP) ||
                 (instru.eliteFxn == CURVE_CV) ||
                 (instru.eliteFxn == CURVE_LSV) ||
                 (instru.eliteFxn == CURVE_CA) ||
@@ -121,7 +132,7 @@ static void peri_mode(void)
                 (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
+                (instru.eliteFxn == CURVE_CALI)) {
             batteryCheck_flag = false;
             tempCheck_flag = false;
 
@@ -225,7 +236,7 @@ static void uni_pulse_mode(void)
                 (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
+                (instru.eliteFxn == CURVE_CALI)) {
             batteryCheck_flag = false;
             tempCheck_flag = false;
 
@@ -457,6 +468,18 @@ static void EliteADCControl(uint32_t time)
             }
             break;
 
+        case CURVE_CP:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
+            break;
+
         case CURVE_CV:
         case CURVE_CA:
         case CURVE_LSV:
@@ -516,7 +539,7 @@ static void EliteADCControl(uint32_t time)
             }
             break;
 
-        case CURVE_CALI_ADC:
+        case CURVE_CALI:
             if (instru.AdcChannel == RIS_ADC_IIN) {
                 cali_IT_plot();
             } else if (instru.AdcChannel == RIS_ADC_VIN) {
@@ -574,7 +597,9 @@ static void mode_done(void)
         (instru.eliteFxn == CURVE_DPV) ||
         (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
         (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE)) {
+        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
+        (instru.eliteFxn == CURVE_CALI))
+         {
         if (!PeriodicEvent) {
             finishMode = true;
             SendNotify();

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/scan_volt.h

@@ -198,66 +198,106 @@ static void cc_vscan(void)
     int32_t Iin;
     int32_t Voutin;
     uint8_t cc_cp_speed = instru.cc_cp_speed; // 0:low 1:normal 2:high
-    uint8_t cc_resistance = instru.cc_resistance; // 0:vout has 0R 1:vout has 100R
+    // uint8_t cc_resistance = instru.cc_resistance; // 0:vout has 0R 1:vout has 100R
     static int32_t i_set = 0;
 
     if (vscanReset) {
-        Vset = 0;
-
         if (cc->_charge == 0) {
             i_set = cc->_Iset * (-1);
-        } else if(cc->_charge == 1) {
+        } else {
             i_set = cc->_Iset;
         }
 
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
         Voutin = m->_measureVout * 200; //[5nV]
 
-        if (cc_resistance == 1) //vout has 100R
-            Vset = Voutin + (i_set * RESISTANCE_100R); //[5nV]
-        else
-            Vset = Voutin; //[5nV]
+        Vset = Voutin + (i_set * RESISTANCE_100R); //[5nV]
 
         if (Vset >= 1100000000) { // 5.5V
             Vset = 1100000000;
         } else if (Vset <= -1000000000) { //-5V
             Vset = -1000000000;
         }
+
+        return;
+    }
+
+
+    Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
+    deltaI = Iin - i_set;
+
+    if (deltaI > 400000 || deltaI < -400000) { //20uA
+        if (cc_cp_speed == 0) { // 0:low 1:normal 2:high
+            divisionRate = 100;
+        } else if (cc_cp_speed == 1) {
+            divisionRate = 10;
+        } else {
+            divisionRate = 1;
+        }
+    } else {
+        if (cc_cp_speed == 0) { // 0:low 1:normal 2:high
+            divisionRate = 100;
+        } else if (cc_cp_speed == 1) {
+            divisionRate = 20;
+        } else {
+            divisionRate = 20;
+        }
     }
 
-    if (!vscanReset) {
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - i_set;
+    deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
 
-        if (deltaI > 400000 || deltaI < -400000) { //20uA
-            if (instru.cc_cp_speed == 0) { // 0:low 1:normal 2:high
-                cc_cp_speed = 100;
-            } else if (instru.cc_cp_speed == 1) {
-                cc_cp_speed = 10;
-            } else {
-                cc_cp_speed = 1;
-            }
-        } else {
-            if (instru.cc_cp_speed == 0) { // 0:low 1:normal 2:high
-                cc_cp_speed = 100;
-            } else if (instru.cc_cp_speed == 1) {
-                cc_cp_speed = 20;
-            } else {
-                cc_cp_speed = 20;
-            }
+    if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
+        deltaV = DELTAVOLTMAX;
+    } else if (deltaV < (-DELTAVOLTMAX)) {
+        deltaV = (-DELTAVOLTMAX);
+    }
+
+    Vset = Vset + deltaV; //[5nV]
+
+    if (Vset >= 1100000000) { // 5.5V
+        Vset = 1100000000;
+    } else if (Vset <= -1000000000) { //-5V
+        Vset = -1000000000;
+    }
+
+    if (Vset <= cc->_Vmin) {
+        Vset = cc->_Vmin;
+    } else if (Vset >= cc->_Vmax) {
+        Vset = cc->_Vmax;
+    }
+
+    return;
+}
+
+static void cp_vscan(void)
+{
+    /* Transform setting CC into IUC
+     *
+     * User code in CC mode : 0 ~ 3000000
+     * Real current value : -15.00000 ~ 15.00000 mA
+     *  => user code = 1500000 mapping to 0.00000 mA
+     */
+
+    struct wm_cp_ctx_t *cp = (struct wm_cp_ctx_t *)wm_get();
+    struct wm_meas_t *m = &cp->measure;
+    uint16_t divisionRate;
+    int32_t deltaI;
+    int32_t deltaV;
+    int32_t Iin;
+    int32_t Voutin;
+    uint8_t cc_cp_speed = instru.cc_cp_speed; // 0:low 1:normal 2:high
+    // uint8_t cc_resistance = instru.cc_resistance; // 0:vout has 0R 1:vout has 100R
+    static int32_t i_set = 0;
+
+    if (vscanReset) {
+        if (cp->_charge == 0) {
+            i_set = cp->_Iset * (-1);
+        } else if(cp->_charge == 1) {
+            i_set = cp->_Iset;
         }
 
-        divisionRate = cc_cp_speed;
+        Voutin = m->_measureVout * 200; //[5nV]
 
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
-            deltaV = DELTAVOLTMAX;
-        } else if (deltaV < (-DELTAVOLTMAX)) {
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
+        Vset = Voutin; //[5nV]
 
         if (Vset >= 1100000000) { // 5.5V
             Vset = 1100000000;
@@ -265,11 +305,44 @@ static void cc_vscan(void)
             Vset = -1000000000;
         }
 
-        if (Vset <= cc->_Vmin) {
-            Vset = cc->_Vmin;
-        } else if (Vset >= cc->_Vmax) {
-            Vset = cc->_Vmax;
+        return;
+    }
+
+    Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
+    deltaI = Iin - i_set;
+
+    if (deltaI > 400000 || deltaI < -400000) { //20uA
+        if (cc_cp_speed == 0) { // 0:low 1:normal 2:high
+            divisionRate = 100;
+        } else if (cc_cp_speed == 1) {
+            divisionRate = 10;
+        } else {
+            divisionRate = 1;
         }
+    } else {
+        if (cc_cp_speed == 0) { // 0:low 1:normal 2:high
+            divisionRate = 100;
+        } else if (cc_cp_speed == 1) {
+            divisionRate = 20;
+        } else {
+            divisionRate = 20;
+        }
+    }
+
+    deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
+
+    Vset = Vset + deltaV; //[5nV]
+
+    if (Vset >= 1100000000) { // 5.5V
+        Vset = 1100000000;
+    } else if (Vset <= -1000000000) { //-5V
+        Vset = -1000000000;
+    }
+
+    if (Vset <= cp->_Vmin) {
+        Vset = cp->_Vmin;
+    } else if (Vset >= cp->_Vmax) {
+        Vset = cp->_Vmax;
     }
 
     return;