note

WGAmp
CTL_WRT_WGAMPL added
2020-12-29 15:35:40 +08:00 · 2020-12-29 14:14:03 +08:00 · 2020-12-28 15:35:59 +08:00 · 2020-12-25 10:53:53 +08:00 · 2020-12-25 10:50:50 +08:00 · 2020-12-25 10:47:18 +08:00
34 changed files with 3257 additions and 5077 deletions
@@ -106,7 +106,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_BP_Pin_J2_15             DIO8         /* MOSI */
 #define Board_BP_Pin_J2_14             DIO7         /* MISO */
 #define Board_BP_Pin_J2_13             DIO9         /* DAC_CS */
-#define Board_BP_Pin_J2_12             DIO12        /* ADC_CS */
+#define Board_BP_Pin_J2_12             DIO12        /* AD_CS */
 #define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */

 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
@@ -6,7 +6,6 @@
 #include "EliteSPI.h"
 #include "EliteNotify.h"

-
 // Elite ADC macro
 // ADC command, Elite will use these cmd to control ADC
 #define CMD_CURRENT_MEASURE 0xC5
@@ -47,7 +46,6 @@ static void ADC_write(uint8_t ADCin) {
    spi_ADC_txbuf[0] = ADCin;
    spi_ADC_txbuf[1] = 0b11101011;

-
    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }

@@ -57,37 +55,30 @@ static void ADC_read(uint8_t *ADCdata){
        spi_ADC_rxbuf[i] = 0;
    }

-    ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }

-static void ADCGainControl(uint8_t ADCLevel){
-    if(ADCLevel == 0){
-        // ADC gain level = 0, using 200K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
-    }
-    else if(ADCLevel == 1){
-        // ADC gain level = 1, using 10K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
-    }
-    else if(ADCLevel == 2){
-        // ADC gain level = 2, using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
-    }
-    else if(ADCLevel == 3){
-        // ADC gain level = 0, auto gain (using 200R resister)
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
-    }
-    else{
-        // default using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
-    }
-}
+/* Elite1.5 Calibration Usage */
+static void CAL_ADC_read(uint8_t *ADCdata){
+     for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+         spi_ADC_txbuf[i] = 0;
+         spi_ADC_rxbuf[i] = 0;
+     }

+     CAL_ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+ }
+
+static void CAL_ADC_write(uint8_t ADCin) {
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
+    }
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}

 static void ADCChannelSelect(uint8_t ADCChannel){
    // set ADC parameter
@@ -126,8 +117,20 @@ static void ADCChannelSelect(uint8_t ADCChannel){
    }
 }

-static void ReadVolt(uint8_t *buf){
+static void ReadADCIin(uint8_t *buf){
    // Read data twice since the first data we get is previous data
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+}
+
+static void ReadADCVin(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+
+//    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
    ADCChannelSelect(ADC_CH_VOLT);
    ADC_read(buf);

@@ -135,7 +138,7 @@ static void ReadVolt(uint8_t *buf){
    ADC_read(buf);
 }

-static void ReadVoutVolt(uint8_t *buf){
+static void ReadADCVout(uint8_t *buf){
    // Read data twice since the first data we get is previous data
    ADCChannelSelect(ADC_CH_DAC);
    ADC_read(buf);
@@ -144,17 +147,7 @@ static void ReadVoutVolt(uint8_t *buf){
    ADC_read(buf);
 }

-static void ReadCurrent(uint8_t *buf){
-    // Read data twice since the first data we get is previous data
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-}
-
-static void ReadBatVolt(uint8_t *buf){
+static void ReadADCBat(uint8_t *buf){
    // Read data twice since the first data we get is previous data
    ADCChannelSelect(ADC_CH_BAT);
    ADC_read(buf);
@@ -163,124 +156,363 @@ static void ReadBatVolt(uint8_t *buf){
    ADC_read(buf);
 }

+/* for Elite1.5-re */
+// Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2000  // 2    uA =     2,000,000 pA
+#define I_GAIN_MID1_BOUNDARY2    90000  // 90   uA =    90,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    70000  // 70   uA =    70,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  1800000  // 1800 uA =     1,800,000 nA
+#define I_GAIN_LARGE_BOUNDARY   950000  // 950  uA =       950,000 nA

-// theoretical boundary <20, 10~500, >100 (uA)
-//#define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
-//#define GAIN_MID_BOUNDARY1  20000  // 20 uA = 20,000,000 pA
-//#define GAIN_MID_BOUNDARY2  400000 // 400 uA = 400,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
+// Vin theoretical boundary <7, 5~200, >100 (mV)
+#define VIN_GAIN_SMALL_BOUNDARY   7000  // 7    mV =     7,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY1   5000  // 5    mV =     5,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY2 300000  // 300  mV =   300,000,000 nV
+#define VIN_GAIN_LARGE_BOUNDARY 250000  // 250  mV =   250,000,000 nV

-//#define GAIN_SMALL_BOUNDARY 8000  // 8 uA = 8,000,000 pA
-//#define GAIN_MID_BOUNDARY1  3000  // 3 uA = 3,000,000 pA
-//#define GAIN_MID_BOUNDARY2  90000 // 90 uA = 90,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
+static int32_t AutoGainReadIin(uint8_t *buf){
+     int32_t RealCurrent = 0;

-/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
-// theoretical boundary <40, 30~1350, >1000 (uA)
-#define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
-#define GAIN_MID_BOUNDARY1  30000  // 30 uA = 30,000,000 pA
-#define GAIN_MID_BOUNDARY2  1350000 // 1350 uA = 1350,000,000 pA
-#define GAIN_LARGE_BOUNDARY 1000000 // 1000 uA = 1000,000 nA
+     ReadADCIin(spi_ADC_rxbuf);
+     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);

-static int32_t AutoGainReadCurrent(uint8_t *buf){
+     return RealCurrent;
+ }

-    int32_t Real_Current = 0;
+static int32_t AutoGainReadVin(uint8_t *buf){
+    int32_t RealVolt = 0;

-    if(INSTRUCTION.ADCGainLevel == GAIN_AUTO){
-        INSTRUCTION.ADCGainLevel = GAIN_200R;
-    }
+    ReadADCVin(spi_ADC_rxbuf);
+    RealVolt = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);

-    ReadCurrent(spi_ADC_rxbuf);
-    Real_Current = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-
-    return Real_Current;
+    return RealVolt;
 }

+//static void AutoGainChangeIin(int32_t RealCurrent){
+//    // switch to 1 level current(small)   3M
+//    // switch to 2 level current        100K
+//    // switch to 3 level current          3K
+//    // switch to 4 level current(large) 100R
+//    if(INSTRUCTION.ADCGainLevel == I_GAIN_100R){
+//        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level current(small)
+//            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else{
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
+//        // switch to 4 level current(large)
+//        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//            I_GAIN_100R_counter++;
+//            if(I_GAIN_100R_counter > 2){
+//                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                I_GAIN_100R_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//            if(I_GAIN_3M_counter > 0){
+//                I_GAIN_3M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
+//            // switch to 1 level current(small)
+//            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+//                I_GAIN_3M_counter++;
+//                if(I_GAIN_3M_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                 // switch to 4 level current(large)
+//                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                    I_GAIN_100R_counter++;
+//                    if(I_GAIN_100R_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_100R_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//                 // switch to 3 level current
+//                 else{
+//                    I_GAIN_3K_counter++;
+//                    if(I_GAIN_3K_counter > 2){
+//                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        I_GAIN_3K_counter = 0;
+//                        record_flag = false;
+//                    }
+//                }
+//            }else{
+//                if(I_GAIN_100R_counter > 0){
+//                    I_GAIN_100R_counter--;
+//                }
+//                if(I_GAIN_3K_counter > 0){
+//                    I_GAIN_3K_counter--;
+//                }
+//                if(I_GAIN_3M_counter > 0){
+//                    I_GAIN_3M_counter--;
+//                }
+//            }
+//        }
+//    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
+//        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
+//            // switch to 4 level current(large)
+//            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+//                I_GAIN_100R_counter++;
+//                if(I_GAIN_100R_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100R_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 3 level current
+//            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+//                I_GAIN_3K_counter++;
+//                if(I_GAIN_3K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_3K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level current
+//            else{
+//                I_GAIN_100K_counter++;
+//                if(I_GAIN_100K_counter > 2){
+//                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+//                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                    I_GAIN_100K_counter = 0;
+//                    record_flag = false;
+//                }
+//
+//            }
+//        }else{
+//            if(I_GAIN_100R_counter > 0){
+//                I_GAIN_100R_counter--;
+//            }
+//            if(I_GAIN_3K_counter > 0){
+//                I_GAIN_3K_counter--;
+//            }
+//            if(I_GAIN_100K_counter > 0){
+//                I_GAIN_100K_counter--;
+//            }
+//        }
+//    }
+//}

-static void AutoGainChange(int32_t Real_Current){
-    if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-        // switch to mid range current
-        if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
-            // switch to small range current
-            if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-                GAIN_200K_counter++;
-                if(GAIN_200K_counter > 5){
-                    INSTRUCTION.ADCGainLevel = GAIN_200K;
-                    GAIN_200K_counter = 0;
-                }
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 5){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    GAIN_10K_counter = 0;
-                }
-            }
-        }else{
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
-            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
-            }
-        }
+//static void AutoGainChangeVin(int32_t RealVin){
+//    // switch to 1 level volt(small)      1M
+//    // switch to 2 level volt            30K
+//    // switch to 3 level volt(large)      1K
+//    if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1M){
+//        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
+//            // switch to 3 level volt(large)
+//            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//                VIN_GAIN_1K_counter++;
+//                if(VIN_GAIN_1K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_30K){
+//        // switch to 1 level volt(small)
+//        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//            VIN_GAIN_1M_counter++;
+//            if(VIN_GAIN_1M_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1M_counter = 0;
+//                record_flag = false;
+//            }
+//        }
+//        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+//            // switch to 3 level volt
+//            VIN_GAIN_1K_counter++;
+//            if(VIN_GAIN_1K_counter > 2){
+//                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                VIN_GAIN_1K_counter = 0;
+//                record_flag = false;
+//            }
+//        }else{
+//            if(VIN_GAIN_1K_counter > 0){
+//                VIN_GAIN_1K_counter--;
+//            }
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//        }
+//    }
+//    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
+//        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
+//            // switch to 1 level volt(small)
+//            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+//                VIN_GAIN_1M_counter++;
+//                if(VIN_GAIN_1M_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_1M_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//            // switch to 2 level volt
+//            else{
+//                VIN_GAIN_30K_counter++;
+//                if(VIN_GAIN_30K_counter > 2){
+//                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//                    VIN_GAIN_30K_counter = 0;
+//                    record_flag = false;
+//                }
+//            }
+//        }else{
+//            if(VIN_GAIN_1M_counter > 0){
+//                VIN_GAIN_1M_counter--;
+//            }
+//            if(VIN_GAIN_30K_counter > 0){
+//                VIN_GAIN_30K_counter--;
+//            }
+//        }
+//    }
+//}
+
+static uint16_t ADC_CURRENT_AVG_calibration (uint8_t ADC_channel) {
+    uint32_t ADCValueTemp           = 0;
+    uint32_t ADCValueSUM            = 0;
+    uint32_t ADCValueAVG            = 0;
+    uint16_t ADCValueAVG_RAW        = 0;
+    #define avgcount   10000
+
+    // Red light for start acquiring data
+    Elite_led_color(COLOR_RED);
+//    CPUdelay(10);
+    for(int i=0; i<avgcount; i++){
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(10);
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(500);
+
+        ADCValueTemp = 0x0000FFFF & (((uint32_t) (spi_ADC_rxbuf[0]) << 8) | ((uint32_t) (spi_ADC_rxbuf[1])));
+        ADCValueSUM = ADCValueSUM + ADCValueTemp;
    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-        // switch to large range current
-        if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-            GAIN_200R_counter++;
-            if(GAIN_200R_counter > 5){
-                INSTRUCTION.ADCGainLevel = GAIN_200R;
-                GAIN_200R_counter = 0;
-            }
-        }

-        // switch to small range current
-        else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-            GAIN_200K_counter++;
-            if(GAIN_200K_counter > 5){
-                INSTRUCTION.ADCGainLevel = GAIN_200K;
-                GAIN_200K_counter = 0;
-            }
+    ADCValueAVG = ADCValueSUM / avgcount;
+    ADCValueAVG_RAW = (uint16_t) (ADCValueAVG & 0x0000FFFF);

-        }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
-            }
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
-            }
-        }
+    // Blue light for data acquire done
+    Elite_led_color(COLOR_BLUE);
+
+    if (ADCValueAVG_RAW > 0x7FFF) {
+        ADCValueAVG_RAW = 0x0000;
    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-        // switch to mid range current
-        if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
-            // switch to large range current
-            if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-                GAIN_200R_counter++;
-                if(GAIN_200R_counter > 5){
-                    INSTRUCTION.ADCGainLevel = GAIN_200R;
-                    GAIN_200R_counter = 0;
-                }

-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 5){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    GAIN_10K_counter = 0;
-                }
+    // clean data
+    ADCValueAVG = 0;
+    ADCValueSUM = 0;
+    ADCValueTemp = 0;

-            }
-       }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
-            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
-            }
-        }
-    }
+//    // Blue light for data acquire done
+//    Elite_led_color(COLOR_BLUE);
+
+
+
+    return ADCValueAVG_RAW;
 }

-#define ReadADCVolt(x) ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
-
 #endif
@@ -2,319 +2,82 @@
 #ifndef ELITECCMODE
 #define ELITECCMODE

-#define Iset CC->Iset
 #define Vset INSTRUCTION.Vset
 #define DELTAVOLTMAX 100000

-static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference);
-
-static int32_t CCModeReadCurrent(CCMode *CC){
-
-    static uint8_t VoltCurrentSwitch = 0;
-
-    CCModeDACEnable = 1;    // This flag will control DAC working
-
-    // decode ADC value and put it into notify buffer
-    // Use 5-th measure value as real-measure value
-    // because some value in the begin are garbage
-    if(VoltCurrentSwitch < 5){
-        ReadCurrent(spi_ADC_rxbuf);
-        VoltCurrentSwitch ++;
-    }
-    else if(VoltCurrentSwitch == 5){
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            CC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-        }
-        else{
-            ReadCurrent(spi_ADC_rxbuf);
-            CC->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-        VoltCurrentSwitch ++;
-    }
-    else if(VoltCurrentSwitch <10){
-        // read volt
-        ReadVolt(spi_ADC_rxbuf);
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 10){
-        /** read battery voltage **/
-        ReadVolt(spi_ADC_rxbuf);
-        CC->BatteryV = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-
-        // if Iin have a offset if current !=0
-        CC->BatteryV = CC->BatteryV - (CC->value - CC_ZERO_POINT)*10/1e5;   // I_set * 10R = V_Iin2GND (mA * ohm)
-        VoltCurrentSwitch++;
-//        NotifyReady = true;
-    }
-    else{
-        VoltCurrentSwitch = 0;
-    }
-
-    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;
-}
-
-static int32_t CCModeVoltOut(CCMode *CC){
-    int32_t IUCCurrent = 0;
-
-    if(!CCModeDACEnable){
-        // DAC should not work now
-        return 0;
-    }
-    IUCCurrent = CC->_Transform2RealnA( (struct CCModePara *) CC);
-
-    CCModeDACControl(CC, IUCCurrent - CC->_MeasureData);
-
-    CCModeDACEnable = 0;
-    return CC->_MeasureData;
-}
-
-static void CCModeDACControl(CCMode *CC, int32_t IUC_Measure_Difference){
-    int32_t step;
-
-    if(IUC_Measure_Difference < 300 && IUC_Measure_Difference > -300){
-        step = 0;
-    }
-    else if( CC->Charge && CC->BatteryV >= ( (int32_t) (CC->VMax - DAC_ZERO)/5 ) ){
-        CC->value = 0;
-        step = (IUC_Measure_Difference > 0) ? 1:-1;
-    }
-    else if( (!CC->Charge) && CC->BatteryV <= ( (int32_t) (CC->VMin - DAC_ZERO)/5 ) ){
-        // Ignore VMin condition
-        if(CC->Done < 25000){
-            CC->Done ++;
-            step = (IUC_Measure_Difference > 0) ? 2:-2;
-        }
-        // after ignore few second, active VMin condition
-        else{
-            CC->value = 0;
-            step = (IUC_Measure_Difference > 0) ? 1:-1;
-        }
-
-    }
-    else{
-        step = (IUC_Measure_Difference > 0) ? 1:-1;
-    }
-    // over/under flow
-    if( (INSTRUCTION.VoltConstant + step) > MAX_DAC_UC || (INSTRUCTION.VoltConstant + step) < MIN_DAC_UC ){
-        if(step > 0){
-            INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MAX_DAC_UC)/2;
-        }
-        else{
-            INSTRUCTION.VoltConstant = (INSTRUCTION.VoltConstant + MIN_DAC_UC)/2;
-        }
-    }
-    else{
-        INSTRUCTION.VoltConstant = INSTRUCTION.VoltConstant + step;
-    }
-
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
-//    step = CC->Done;
-//    NotifyImpedance[0] = (uint8_t) (step >> 24);
-//    NotifyImpedance[1] = (uint8_t) ((step & 0x00FF0000) >> 16);
-//    NotifyImpedance[2] = (uint8_t) ((step & 0x0000FF00) >> 8);
-//    NotifyImpedance[3] = (uint8_t) (step & 0x000000FF);
-}
-
 /* 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
 */
-static void CCCurrent2IUC(CCMode *CC){
-    int32_t CurrentValue = 0;
-
-    CC->value = INSTRUCTION.ConstantCurrent;
-    CurrentValue = CC->value - CC_ZERO_POINT;
-}
-
-
-
-static uint16_t CCCurve(CCMode *CC){
-    static uint16_t DACOutCode;
-    static int32_t Vout;
-    static int32_t DeltaVout;
-
-    if(DACReset){
-        Vout = Vset;
-        DACReset = false;
-    }else{
-        DeltaVout = Vset - (Vout);
-        Vout = Vout + DeltaVout;
-    }
-
-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
-    DAC_outputV(DACOutCode);
-
-    int32_t RealV;
-    RealV = (int32_t)(Vout / 200); //[5nV]
-    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-
-    return DACOutCode;
-}
-
-static void CC_Plot(CCMode *CC){
-    /**********************************************
-    CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
-                ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            CC->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(CC->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            CC->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, CC->_MeasureData);
-
-
-        CC_Vscan(CC);
-        CCCurve(CC);
-
-        // read Volt
-        if(INSTRUCTION.VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x02){
-            ReadVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(INSTRUCTION.VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x02){
-            ReadVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(INSTRUCTION.VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
-            CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }else if(INSTRUCTION.VoVi_Switch == 0x02){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            CC->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }
-
-        if(INSTRUCTION.VoVi_Switch == 0x02){
-            int32_t Vscan = (Vset / 200 - CC->MeasureVolt);
-            Vscan = (int32_t)(Vscan);//[1uV]
-            InputNotify(NOTIFY_VOLT, Vscan);
-        }else{
-            InputNotify(NOTIFY_VOLT, CC->MeasureVolt);
-        }
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        ReadCurrent(spi_ADC_rxbuf);
-        VoltCurrentSwitch = 0;
-    }
-}
-
-
 static void CC_Vscan(CCMode *CC){
    static int32_t Iin = 0;
    static int32_t deltaI = 0;
    static int32_t deltaV = 0;
-    static int32_t Vmax = 0;
-    static int32_t Vmin = 0;
-    uint8_t divisionRate;
+    uint16_t divisionRate;

-    if(VscanReset){
+    if(vscanReset){
        Vset = 0;
-        Vmax = ((int32_t)(CC->VMax) - 25000) * 4 * 10000; //[5nV]
-        Vmin = ((int32_t)(CC->VMin) - 25000) * 4 * 10000; //[5nV]
-        Iset = INSTRUCTION.ConstantCurrent * 200 ; //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
-        if(CC->Charge == 0){
-            Iset *= -1;
+
+        if(CC->_charge == 0){
+            CC->_Iset *= -1;
        }
-        Iin = CC->_MeasureData * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - Iset;
+
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
+
        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
            divisionRate = 1000;
        }else{
            divisionRate = 10;
        }
+
        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
+
        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
            deltaV = DELTAVOLTMAX;
        }else if(deltaV < (-DELTAVOLTMAX)){
            deltaV = (-DELTAVOLTMAX);
        }
+
        Vset = Vset + deltaV; //[5nV]

-        if(Vset <= Vmin){
-            Vset = Vmin;
-        }else if(Vset >= Vmax){
-            Vset = Vmax;
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
        }
    }

-    if(!VscanReset){
-        Iin = CC->_MeasureData * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - Iset;
+    if(!vscanReset){
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;
+
        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
            divisionRate = 1000;
        }else{
            divisionRate = 10;
        }
+
        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-        if(deltaV > DELTAVOLTMAX){
+
+        if(deltaV > DELTAVOLTMAX){ //100000 = 500uV
            deltaV = DELTAVOLTMAX;
        }else if(deltaV < (-DELTAVOLTMAX)){
            deltaV = (-DELTAVOLTMAX);
        }
+
        Vset = Vset + deltaV; //[5nV]

-        if(Vset <= Vmin){
-            Vset = Vmin;
-        }else if(Vset >= Vmax){
-            Vset = Vmax;
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
        }
    }
-
 //    int32_t RealV;
 //    RealV = (int32_t)(deltaV);
 //    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
 }
-
-
 #endif
@@ -9,7 +9,7 @@ static uint16_t CV3Curve(CV3Mode *CV3){
    static int32_t Vout;
    static int32_t DeltaVout;

-    Vin = CV3->MeasureVolt * 200;//[5nV]
+    Vin = CV3->_measureVin * 200;//[5nV]
    if(DACReset){
        Vout = Vset + Vin;
        DACReset = false;
@@ -19,7 +19,7 @@ static uint16_t CV3Curve(CV3Mode *CV3){
    }

    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -34,173 +34,123 @@ static uint16_t CV3Curve(CV3Mode *CV3){
     return DACOutCode;
 }

-
-static void CV3_Plot(CV3Mode *CV3){
-    /**********************************************
-    CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
-                ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            CV3->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(CV3->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            CV3->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, CV3->_MeasureData);
-
-        // read Volt
-        if(CV3->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CV3->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(CV3->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CV3->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(CV3->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            CV3->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(CV3->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
-            CV3->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }
-
-        CV3Curve(CV3);
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch = 0;
-    }
-}
-
 static void CV3_Vscan(CV3Mode *CV3){
-    static int32_t Vmax;
-    static int32_t Vmin;
-    static int32_t Vinit;
-    static uint32_t Vstep;
    static int16_t VminCounter;
    static int16_t VmaxCounter;
-    static bool direction_up;           // direction_up = true, if InitDirection=1
-    static bool current_direction_up;   // current_direction_up = true, Vstep => positive. vice versa
    static uint16_t CycleCounter;

-    NotifyCycleNumber = (INSTRUCTION.CycleNumber - CV3->CycleNumber + 1);
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV3->_cycleNumber + 1);

-    if(VscanReset){
+    if(vscanReset){
        VmaxCounter = 0;
        VminCounter = 0;
        CycleCounter = 0;
-        Vmax = ((int32_t)(CV3->VMax) - 25000) * 4 * 10000; //[5nV]
-        Vmin = ((int32_t)(CV3->VMin) - 25000) * 4 * 10000; //[5nV]
-        Vinit = ((int32_t)(CV3->VInit) - 25000) * 4 * 10000; //[5nV]
-        Vset = Vinit;

-        if(CV3->InitDirection){
-            direction_up         = true;
-            current_direction_up = true;
+        if(INSTRUCTION.directionInit == 1){
+            CV3->_direction_up         = true;
+            CV3->_current_direction_up = true;
        }else{
-            direction_up         = false;
-            current_direction_up = false;
+            CV3->_direction_up         = false;
+            CV3->_current_direction_up = false;
        }

-        if(Vmin == Vinit){
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            CV3->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
+        }else{
+            CV3->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
+        }
+
+        if(CV3->_Vmin == CV3->_Vinit){
            VminCounter = -1;
        }
-        if(Vmax == Vinit){
+        if(CV3->_Vmax == CV3->_Vinit){
            VmaxCounter = -1;
        }

-        if(INSTRUCTION.Step <= 10){
-            Vstep = INSTRUCTION.Step *  INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        }else{
-            Vstep = INSTRUCTION.Step / 5 *  INSTRUCTION.VscanRate; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        }
+        Vset = CV3->_Vinit;
    }

-    if(!VscanReset){
-        /*stop condition*/
-        if (Vset >= Vmax){
-            VmaxCounter++;
-        }else if (Vset <= Vmin){
-            VminCounter++;
-        }
+    if(!vscanReset){
+        if((INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2) ||
+        (INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2)
+        ){
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep;
+            }else{
+                Vset = Vset - CV3->_Vstep;
+            }

-        if (current_direction_up){
-            Vset = Vset + Vstep;
+            if(INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2){
+                if(Vset == CV3->_Vmin){
+                    VminCounter = -1;
+                    INSTRUCTION.Vinit = INSTRUCTION.Vmin;
+                    CV3->_Vinit = CV3->_Vmin;
+                }
+            }else if(INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2){
+                if(Vset == CV3->_Vmax){
+                    VmaxCounter = -1;
+                    INSTRUCTION.Vinit = INSTRUCTION.Vmax;
+                    CV3->_Vinit = CV3->_Vmax;
+                }
+            }
        }else{
-            Vset = Vset - Vstep;
-        }
+            if (Vset >= CV3->_Vmax){
+                VmaxCounter++;
+            }else if (Vset <= CV3->_Vmin){
+                VminCounter++;
+            }

-        if(VmaxCounter != 0 && VminCounter != 0){
-            if(VmaxCounter == VminCounter && direction_up && current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset >= Vinit){
-                        CV3->CycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
+            }else{
+                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
+            }
+
+            if(VmaxCounter != 0 && VminCounter != 0){
+                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset >= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
+                    }
+                }
+                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset <= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
                    }
                }
            }
-            if(VmaxCounter == VminCounter && !direction_up && !current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset <= Vinit){
-                        CV3->CycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                    }
-                }
+
+            if (Vset >= CV3->_Vmax){
+                CV3->_current_direction_up = false;
+            }else if (Vset <= CV3->_Vmin){
+                CV3->_current_direction_up = true;
+            }
+
+            /*stop condition*/
+            if(CV3->_cycleNumber == 0){
+    //            PeriodicEvent = false;
+                ModeLED(POST_WORK);
+                InitEliteFlag();
+                INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+                INSTRUCTION.sampleRate = 15;
+                INSTRUCTION.charge     = 0x01;
+                INSTRUCTION.constantCurrent = 0x00;
+                INSTRUCTION.Vmax       = 0xC350;
+                INSTRUCTION.Vmin       = 0x0000;
+                INSTRUCTION.notifyRate = 500;
+                INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
            }
        }

-        /*stop condition*/
-        if (Vset >= Vmax){
-            current_direction_up = false;
-        }else if (Vset <= Vmin){
-            current_direction_up = true;
-        }
-
-        /*stop condition*/
-        if(CV3->CycleNumber == 0){
-//            PeriodicEvent = false;
-            InitEliteFlag();
-            INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
-            INSTRUCTION.SampleRate = 15;
-            INSTRUCTION.Charge = 0x01;
-            INSTRUCTION.ConstantCurrent = 0x00;
-            INSTRUCTION.MaxVolt = 0xC350;
-            INSTRUCTION.MinVolt = 0x0000;
-            INSTRUCTION.NotifyRate = 500;
-            INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
-        }
    }
-
 //    int32_t RealV;
 //    RealV = (int32_t)(Vset / 500);//[1uV]
 //    InputNotify(NOTIFY_VOLT, RealV);
 }
-
 #endif
@@ -10,9 +10,9 @@ static uint16_t SWVCurve(WorkMode *WorkModeData) {

    // reset origin volt at the begin
    if (DACReset) {
-        Volt    = INSTRUCTION.VoltOrigin;
-        outputV = INSTRUCTION.VoltOrigin;
-        if (INSTRUCTION.VoltOrigin < INSTRUCTION.VoltFinal)
+        Volt    = INSTRUCTION.Ve1;
+        outputV = INSTRUCTION.Ve1;
+        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
            direction_up = true;
        else
            direction_up = false;
@@ -32,7 +32,7 @@ static uint16_t SWVCurve(WorkMode *WorkModeData) {
    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;

    // check if we reach the final volt
-    if ((outputV >= INSTRUCTION.VoltFinal && direction_up) || (outputV <= INSTRUCTION.VoltFinal && !direction_up)) {
+    if ((outputV >= INSTRUCTION.Ve2 && direction_up) || (outputV <= INSTRUCTION.Ve2 && !direction_up)) {
        PeriodicEvent = false;
        DACReset      = true;
    }
@@ -42,14 +42,14 @@ static uint16_t SWVCurve(WorkMode *WorkModeData) {
        if (counter == PulseWidth)
            Volt = Volt + Amplitude;
        else if (counter == 2 * PulseWidth)
-            Volt = Volt - (Amplitude - INSTRUCTION.Step);
+            Volt = Volt - (Amplitude - INSTRUCTION.step);
        else
            Volt = Volt;
    } else {
        if (counter == PulseWidth)
            Volt = Volt - Amplitude;
        else if (counter == 2 * PulseWidth)
-            Volt = Volt + (Amplitude - INSTRUCTION.Step);
+            Volt = Volt + (Amplitude - INSTRUCTION.step);
        else
            Volt = Volt;
    }
@@ -66,16 +66,16 @@ static uint16_t DPVCurve(WorkMode *WorkModeData) {

    // reset origin volt at the begin
    if (DACReset) {
-        if (INSTRUCTION.VoltOrigin < INSTRUCTION.VoltFinal)
+        if (INSTRUCTION.Ve1 < INSTRUCTION.Ve2)
            direction_up = true;
        else
            direction_up = false;

-        Volt1 = INSTRUCTION.VoltOrigin;
+        Volt1 = INSTRUCTION.Ve1;
        if (direction_up)
-            Volt2 = INSTRUCTION.VoltOrigin + Amplitude;
+            Volt2 = INSTRUCTION.Ve1 + Amplitude;
        else
-            Volt2 = INSTRUCTION.VoltOrigin - Amplitude;
+            Volt2 = INSTRUCTION.Ve1 - Amplitude;

        counter  = 1;
        DACReset = false;
@@ -99,30 +99,30 @@ static uint16_t DPVCurve(WorkMode *WorkModeData) {
    // VoltValue = (ramp1*16 + ramp0/16) * 3.05;

    // check if we reach the final volt
-    if (((outputV >= INSTRUCTION.VoltFinal) && direction_up) || ((outputV <= INSTRUCTION.VoltFinal) && !direction_up)) {
+    if (((outputV >= INSTRUCTION.Ve2) && direction_up) || ((outputV <= INSTRUCTION.Ve2) && !direction_up)) {
        PeriodicEvent = false;
        DACReset      = true;
    }

    // check overflow/underflow and prepare for next output
    if (direction_up) {
-        if (Volt1 + INSTRUCTION.Step < Volt1)
+        if (Volt1 + INSTRUCTION.step < Volt1)
            Volt1 = 0xffff;
        else
-            Volt1 = Volt1 + INSTRUCTION.Step;
-        if (Volt2 + INSTRUCTION.Step < Volt2)
+            Volt1 = Volt1 + INSTRUCTION.step;
+        if (Volt2 + INSTRUCTION.step < Volt2)
            Volt2 = 0xffff;
        else
-            Volt2 = Volt2 + INSTRUCTION.Step;
+            Volt2 = Volt2 + INSTRUCTION.step;
    } else {
-        if (Volt1 - INSTRUCTION.Step > Volt1)
+        if (Volt1 - INSTRUCTION.step > Volt1)
            Volt1 = 0x0000;
        else
-            Volt1 = Volt1 - INSTRUCTION.Step;
-        if (Volt2 - INSTRUCTION.Step > Volt2)
+            Volt1 = Volt1 - INSTRUCTION.step;
+        if (Volt2 - INSTRUCTION.step > Volt2)
            Volt2 = 0x0000;
        else
-            Volt2 = Volt2 - INSTRUCTION.Step;
+            Volt2 = Volt2 - INSTRUCTION.step;
    }

    if (counter + 1 <= (PulsePeriod - PulseWidth)) {
@@ -132,174 +132,86 @@ static uint16_t DPVCurve(WorkMode *WorkModeData) {
    }
 }

-static uint16_t CVCurve(CVMode *CV) {
-    static uint16_t DACOutCode;
-      //firstADCdata=true,when min<x<max,cyclenumber--
-    return DACOutCode;
-}
-
-static void CV_Plot(CVMode *CV){
-    /**********************************************
-    CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
-                ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            CV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(CV->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            CV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, CV->_MeasureData);
-
-        // read Volt
-        if(CV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CV->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(CV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CV->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(CV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            CV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(CV->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
-            CV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_VOLT, CV->MeasureVolt);
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch = 0;
-    }
-}
-
 static void CV_Vscan(CVMode *CV){
-    static int32_t Vmax;
-    static int32_t Vmin;
-    static int32_t Vinit;
-    static uint32_t Vstep;
    static int16_t VminCounter;
    static int16_t VmaxCounter;
-    static bool direction_up;           // direction_up = true, if InitDirection=1
-    static bool current_direction_up;   // current_direction_up = true, Vstep => positive. vice versa
    static uint16_t CycleCounter;

-    NotifyCycleNumber = (INSTRUCTION.CycleNumber - CV->_CycleNumber + 1);
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - CV->_cycleNumber + 1);

-    if(VscanReset){
+    if(vscanReset){
        VmaxCounter = 0;
        VminCounter = 0;
        CycleCounter = 0;
-        if(CV->_VOrigin <= CV->_VStop){
-            direction_up         = true;
-            current_direction_up = true;
-            Vmin = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
-            Vmax = ((int32_t)(CV->_VStop) - 25000) * 4 * 10000; //[5nV]
-            Vinit = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
-        }else{
-            direction_up         = false;
-            current_direction_up = false;
-            Vmax = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
-            Vmin = ((int32_t)(CV->_VStop) - 25000) * 4 * 10000; //[5nV]
-            Vinit = ((int32_t)(CV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
+
+        if(INSTRUCTION.directionInit == 1){
+            CV->_direction_up         = true;
+            CV->_current_direction_up = true;
+        }else if(INSTRUCTION.directionInit == 0){
+            CV->_direction_up         = false;
+            CV->_current_direction_up = false;
        }

-        if(Vmin == Vinit){
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            CV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
+        }else{
+            CV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
+        }
+
+        if(CV->_Vmin == CV->_Vinit){
            VminCounter = -1;
        }
-        if(Vmax == Vinit){
+        if(CV->_Vmax == CV->_Vinit){
            VmaxCounter = -1;
        }

-        if(INSTRUCTION.Step <= 10){
-            Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        }else{
-            Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate;; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        }
-
-        Vset = Vinit;
-        OneWayVoltScan();
+        Vset = CV->_Vinit;
    }

-    if(!VscanReset){
-        /*stop condition*/
-        if (Vset >= Vmax){
+    if(!vscanReset){
+        if (Vset >= CV->_Vmax){
            VmaxCounter++;
-        }else if (Vset <= Vmin){
+        }else if (Vset <= CV->_Vmin){
            VminCounter++;
        }

-        if (current_direction_up){
-            Vset = Vset + Vstep;
+        if (CV->_current_direction_up){
+            Vset = Vset + CV->_Vstep * GPT.GptimerMultiple;
        }else{
-            Vset = Vset - Vstep;
+            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
        }

        if(VmaxCounter != 0 && VminCounter != 0){
-            if(VmaxCounter == VminCounter && direction_up && current_direction_up){
+            if(VmaxCounter == VminCounter && CV->_direction_up && CV->_current_direction_up){
                if(CycleCounter != VmaxCounter){
-                    if(Vset >= Vinit){
-                        CV->_CycleNumber--;
+                    if(Vset >= CV->_Vinit){
+                        CV->_cycleNumber--;
                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                    }
                }
            }
-            if(VmaxCounter == VminCounter && !direction_up && !current_direction_up){
+            if(VmaxCounter == VminCounter && !CV->_direction_up && !CV->_current_direction_up){
                if(CycleCounter != VmaxCounter){
-                    if(Vset <= Vinit){
-                        CV->_CycleNumber--;
+                    if(Vset <= CV->_Vinit){
+                        CV->_cycleNumber--;
                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                    }
                }
            }
        }

-        /*stop condition*/
-        if (Vset >= Vmax){
-            current_direction_up = false;
-        }else if (Vset <= Vmin){
-            current_direction_up = true;
+        if (Vset >= CV->_Vmax){
+            CV->_current_direction_up = false;
+        }else if (Vset <= CV->_Vmin){
+            CV->_current_direction_up = true;
        }

        /*stop condition*/
-        if(CV->_CycleNumber == 0){
+        if(CV->_cycleNumber == 0){
            PeriodicEvent = false;
-            InitEliteFlag();
+            ModeLED(NO_EVENT);
        }
    }
-    //test version add
-//    int32_t RealV;
-//    RealV = (int32_t)(Vset / 200);//[1uV]
-//    InputNotify(NOTIFY_IMPEDANCE, RealV);
 }
-
 #endif
@@ -9,7 +9,7 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
    static int32_t Vout;
    static int32_t DeltaVout;

-    Vin = CVSCAN->MeasureVolt * 200;//[5nV]
+    Vin = CVSCAN->_measureVin * 200;//[5nV]
    if(DACReset){
        Vout = Vset + Vin;
        DACReset = false;
@@ -19,7 +19,7 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
    }

    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -34,86 +34,14 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
    return DACOutCode;
 }

-
-static void CVSCAN_Plot(CVSCANMode *CVSCAN){
-    /**********************************************
-    CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
-                ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            CVSCAN->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(CVSCAN->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            CVSCAN->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, CVSCAN->_MeasureData);
-
-        // read Volt
-        if(CVSCAN->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CVSCAN->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(CVSCAN->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(CVSCAN->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(CVSCAN->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            CVSCAN->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(CVSCAN->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
-            CVSCAN->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }
-
-        CVSCANCurve(CVSCAN);
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch = 0;
-    }
-}
-
 static void CVSCAN_Vscan(CVSCANMode *CVSCAN){
-    static int32_t Vinit;

-    if(VscanReset){
-        Vinit = ((int32_t)(CVSCAN->VInit) - 25000) * 4 * 10000; //[5nV]
-        Vset = Vinit;
+    if(vscanReset){
+        Vset = CVSCAN->_Vinit;
    }

-    if(!VscanReset){
-        Vset = Vinit;
+    if(!vscanReset){
+        Vset = CVSCAN->_Vinit;
    }
-
-//    int32_t RealV;
-//    RealV = (int32_t)(Vset / 500);//[1uV]
-//    InputNotify(NOTIFY_VOLT, RealV);
 }
-
 #endif
@@ -5,34 +5,31 @@
 static bool DACReset;


-//#ifdef ELITE_VERSION_1_3
-//#define DACOUT 0x30
-//
-//static void DAC_outputV(uint16_t voltLV) {
-//    // C = command, X = don't care, D = data
-//    // CCCC XXXX = command
-//    // DDDD DDDD = v1
-//    // DDDD XXXX = v2
-//
-//    uint8_t v1, v2 = 0;
-//    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
-//    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
-//
-//    spi_DACtxbuf[0] = command;
-//    spi_DACtxbuf[1] = v1;
-//    spi_DACtxbuf[2] = v2;
-//    for (int i = 3; i < SPI_DAC_SIZE; i++) {
-//        spi_DACtxbuf[i] = 0;
-//    }
-//
-//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-//}
-//#endif
+#ifdef ELITE_VERSION_1_3
+#define DACOUT 0x30
+static void DAC_outputV(uint16_t voltLV) {
+    // C = command, X = don't care, D = data
+    // CCCC XXXX = command
+    // DDDD DDDD = v1
+    // DDDD XXXX = v2
+
+    uint8_t v1, v2 = 0;
+    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
+    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
+
+    spi_DACtxbuf[0] = command;
+    spi_DACtxbuf[1] = v1;
+    spi_DACtxbuf[2] = v2;
+    for (int i = 3; i < SPI_DAC_SIZE; i++) {
+        spi_DACtxbuf[i] = 0;
+    }
+
+    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+}
+#endif

 #ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
 #define DACOUT 0x31
-
 static uint16_t DAC_outputV(uint16_t voltLV) {
    // C = command, X = don't care, D = data
    // CCCC CCCC = command
@@ -52,9 +49,22 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
    spi_DACtxbuf[2] = v2;

    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+
    return voltLV;
 }
+#endif

+#ifdef ELITE_VERSION_EIS
+static uint32_t DAC_outputV(uint32_t voltLV) {
+
+//    uint8_t v1, v2 = 0;
+//    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
+//    v2 = (uint8_t) (voltLV & 0x00FF);
+
+    EIS_LPDAC_SPI(voltLV);
+
+    return voltLV;
+}
 #endif

 static int32_t User2Real(uint16_t UserCode){
@@ -62,4 +72,34 @@ static int32_t User2Real(uint16_t UserCode){
    return (int32_t)((UserCode - 25000) / 5);
 }

+
+// DAC Vout theoretical boundary <300, 100~ (mV)
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY  100000  // 100  mV =    25500(usercode)
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY  300000  // 300  mV =    26500(usercode)
+
+static void AutoGainChangeVout(int32_t RealVolt){
+    RealVolt = (RealVolt - 25000) * 200; // (RealVolt - 25000) / 5 * 1000
+    // switch to 1 level volt(small)   15K
+    // switch to 2 level volt(large)   240K
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    }
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
+        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
+            // switch to 2 level volt(large)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            record_flag = false;
+        }
+    }
+    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
+        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
+            // switch to 1 level volt(small)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            record_flag = false;
+        }
+    }
+}
+
 #endif
@@ -2,6 +2,29 @@
 #ifndef ELITE_FLAG_CT_INIT
 #define ELITE_FLAG_CT_INIT

+// CT counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+    uint32_t StandByCounter;
+}CT = {0};
+
+// GPT counter
+struct _GPT{
+    uint32_t GptimerCounter;
+    uint32_t GptimerCounter0;
+    uint8_t  DeltaGptimerCounter;
+    uint32_t SampleRateCounter;
+    uint32_t NotifyCounter;
+    uint32_t VscanRateCounter;
+    uint32_t LeadTimeCounter;
+    uint32_t BatteryADCCounter;
+    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+    uint32_t TestCounter;
+}GPT = {0};
+
 static void InitCT(){
    CT.SampleRate_counter = 1;
    CT.StepTimeCounter = 1;
@@ -10,34 +33,14 @@ static void InitCT(){
 }

 static void InitGPT(){
-    GPT.GptimerCounter = 0;
-    GPT.GptimerCounter0 = 0;
+    GPT.GptimerCounter      = 0;
+    GPT.GptimerCounter0     = 0;
    GPT.DeltaGptimerCounter = 0;
-    GPT.SampleRate_counter = 0;
-    GPT.StepTimeCounter = 0;
-    GPT.NotifyCounter = 0;
-    GPT.VscanRateCounter = 0;
-    GPT.LeadTimeCounter = 0;
-
+    GPT.SampleRateCounter   = 0;
+    GPT.NotifyCounter       = 0;
+    GPT.VscanRateCounter    = 0;
+    GPT.LeadTimeCounter     = 0;
+    GPT.BatteryADCCounter   = 0;
+    GPT.BatteryCheckCounter = 0;
 }
-
-static void InitFlag(){
-    PeriodicEvent = false;      // is there an PeriodicEvent?
-    InitPeriodicEvent = true;   // need to create a WorkModeData?
-    DACReset = true;
-    VscanReset = true;
-    NotifyReset = true;
-    ADCReset = true;
-    EliteWorkReset = true;
-    LeadTimeReset = true;
-    CCModeDACEnable = 0;        // to make sure DAC work after ADC
-    Free_Work_Mode = true;      // Free(WorkModeData)
-    GAIN_200R_counter = 0;
-    GAIN_200K_counter = 0;
-    GAIN_10K_counter = 0;
-
-//    NotifyReady = false;
-//    DiscardIVFirstData = 0;
-}
-
 #endif
@@ -1,30 +0,0 @@
-
-#ifndef ELITEIT
-#define ELITEIT
-
-static void IT_Plot(ITMode *IT) {
-    static uint8_t ADCSwitch = 0;
-
-    if(ADCSwitch == 0){ /**read Iin(buffer)**/
-        if(INSTRUCTION.AutoGainEnable){
-            IT->_MeasureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(IT->_MeasureCurrent);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            IT->_MeasureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-        InputNotify(NOTIFY_CURRENT, IT->_MeasureCurrent);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read Iin**/
-        ReadCurrent(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read Iin**/
-        ReadCurrent(spi_ADC_rxbuf);
-        ADCSwitch = 0;
-    }
-}
-
-
-#endif
@@ -4,173 +4,45 @@

 #define Vset INSTRUCTION.Vset

-static uint16_t VoltScan(WorkMode *WorkModeData) {
-    uint16_t Voltage;
-    if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
-        Voltage = Usercode_Correction_to_DAC(INSTRUCTION.VoltOrigin);
-        DAC_outputV(Voltage);
-        PeriodicEvent = false;
-        return Voltage;
-    } else if (INSTRUCTION.eliteFxn == SQUARE_WAVE_VOLTAMMETRY) {
-        Voltage = SWVCurve(WorkModeData);
-    } else if (INSTRUCTION.eliteFxn == DIFFERENTIAL_PULSE_VOLTAMMETRY) {
-        Voltage = DPVCurve(WorkModeData);
-    } else if (INSTRUCTION.eliteFxn == CV_CURVE) {
-        Voltage = CVCurve(WorkModeData->CV);
-    }
-
-    // IV plot mode
-    else {
-        Voltage = OneWayVoltScan();
-    }
-
-    return Voltage;
-}
-
-static uint16_t OneWayVoltScan() {
-    static uint16_t DACOutCode;
-    static int32_t Vout;
-    static int32_t DeltaVout;
-
-    if(DACReset){
-        Vout = Vset;
-        DACReset = false;
-    }else{
-        DeltaVout = Vset - (Vout);
-        Vout = Vout + DeltaVout;
-    }
-
-    INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
-    DAC_outputV(DACOutCode);
-
-    if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
-        int32_t RealV;
-        RealV = (int32_t)(Vout / 200);//[1uV]
-        InputNotify(NOTIFY_IMPEDANCE, RealV);
-    }
-
-
-    return DACOutCode;
-}
-
-static void IV_Plot(IVMode *IV) {
-    /**********************************************
-    CURRENT_MODE->_VoVi_Switch : 1 read Vin volt
-                ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            IV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(IV->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            IV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, IV->_MeasureData);
-
-        // read Volt
-        if(IV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(IV->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(IV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(IV->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(IV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-            IV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(IV->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);
-            IV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_VOLT, IV->MeasureVolt);
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch = 0;
-    }
-}
-
 static void IV_Vscan(IVMode *IV){
-    static int32_t Voringin;
-    static int32_t Vstop;
-    static uint32_t Vstep;
-    static bool direction_up;
-    static bool current_direction_up;
-
-    if(VscanReset){
-        if(IV->_VOrigin <= IV->_VStop){
-            direction_up         = true;
-            current_direction_up = true;
-        }else{
-            direction_up         = false;
-            current_direction_up = false;
+    if(vscanReset){
+        if(INSTRUCTION.directionInit == 1){
+            IV->_direction_up         = true;
+            IV->_current_direction_up = true;
+        }else if(INSTRUCTION.directionInit == 0){
+            IV->_direction_up         = false;
+            IV->_current_direction_up = false;
        }

-        if(INSTRUCTION.Step <= 10){
-            Vstep = INSTRUCTION.Step * INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            IV->_Vstep = INSTRUCTION.step * INSTRUCTION.VsetRate / 5;
        }else{
-            Vstep = INSTRUCTION.Step / 5 * INSTRUCTION.VscanRate;; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+            IV->_Vstep = INSTRUCTION.step / 5 * INSTRUCTION.VsetRate;
        }

-        Voringin = ((int32_t)(IV->_VOrigin) - 25000) * 4 * 10000; //[5nV]
-        Vstop = ((int32_t)(IV->_VStop) - 25000) * 4 * 10000; //[5nV]
-        Vset = Voringin;
-        OneWayVoltScan();
+        Vset       = IV->_Vinit;
    }

-    if(!VscanReset){
-        if(current_direction_up){
-            if(Vset >= Vstop){
+    if(!vscanReset){
+        if(IV->_current_direction_up){
+            if(Vset >= IV->_Vmax){
                PeriodicEvent = false;
-                InitEliteFlag();
+                ModeLED(NO_EVENT);
            }
        }else{
-            if(Vset <= Vstop){
+            if(Vset <= IV->_Vmin){
                PeriodicEvent = false;
-                InitEliteFlag();
+                ModeLED(NO_EVENT);
            }
        }

-
-        if (current_direction_up){
-            Vset = Vset + Vstep;
+        if (IV->_current_direction_up){
+            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
        }else{
-            Vset = Vset - Vstep;
+            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
        }
-
    }
-    //test version add
-//    int32_t RealV;
-//    RealV = (int32_t)(Vset / 200);//[1uV]
-//    InputNotify(NOTIFY_IMPEDANCE, RealV);
 }

 #endif
@@ -2,28 +2,32 @@
 #ifndef ELITEINSTRUCTION
 #define ELITEINSTRUCTION

-/** ADC gain level **/
-#define GAIN_200K   0x00 // largest gain
-#define GAIN_10K    0x01
-#define GAIN_200R   0x02 // the least gain
-#define GAIN_AUTO   0x03
+/** Iin, Vin, Vout **/
+#define IIN_ADC         0x00
+#define VIN_ADC         0x01
+#define VOUT_DAC        0x02
+#define HIGH_Z          0x03

-/** Resister meter **/
-#define RESISTER_METER_SMALL    0x00
-#define RESISTER_METER_MIDDLE1  0x01
-#define RESISTER_METER_MIDDLE2  0x02
-#define RESISTER_METER_LARGE    0x03
+/** ADC Iin gain level **/
+#define I_GAIN_3M       0x00    // largest gain
+#define I_GAIN_100K     0x01
+#define I_GAIN_3K       0x02
+#define I_GAIN_100R     0x03    // the least gain
+#define I_GAIN_AUTO     0x04

-/** CC mode parameter **/
-// CurrentLV
-#define CURRENT_LV_NA 0x00
-#define CURRENT_LV_UA 0x01
-#define CURRENT_LV_MA 0x02
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M     0x00
+#define VIN_GAIN_30K    0x01
+#define VIN_GAIN_1K     0x02
+#define VIN_GAIN_AUTO   0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K  0x00
+#define VOUT_GAIN_15K   0x01
+#define VOUT_GAIN_AUTO  0x02

 /* DAC reset parameter */
-#define DAC_ZERO 25000
-#define DAC_POS_MAX 0x0000
-#define DAC_NEG_MAX 0xFFFF
+#define DAC_ZERO    25000

 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -34,64 +38,47 @@
 ==== headstage instruction ====
 =============================*/
 struct HEADSTAGE_INSTRUCTION {
-    /** chip ID */
-    uint8_t chip_id;

-    /** Sample rate **/
-     // SampleRate = SampleRateTable[SampleRateIndex]
-    uint8_t SampleRateIndex;
-    uint32_t SampleRate;
+    uint8_t  chip_id;
+    uint8_t  eliteFxn;

    /** DAC parameter **/
-     // volt san parameter
-    uint16_t VoltOrigin;
-    uint16_t VoltFinal;
-    uint32_t Step;
-    uint16_t StepTime;
-
-     // constant volt
-     // which is used in CC mode as VMax and VMin
+    uint8_t  VsetRateIndex;
+    uint32_t VsetRate;
+    int32_t  Vset;
    uint16_t VoltConstant;
+    uint8_t  directionInit;
+    uint32_t step;
+    uint16_t Ve1;
+    uint16_t Ve2;
+    int32_t  Vinit;
+    int32_t  Vmax;
+    int32_t  Vmin;

    /** ADC parameter **/
-    uint8_t ADCGainLevel;
-
-    uint8_t AutoGainEnable;
+    uint8_t  sampleRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;

    /** Notify parameter **/
-    uint32_t NotifyRate;
+    uint32_t notifyRate;

-    /** Constant Current Parameter **/
-    // Charge is a bool; true => current > 0, vice versa
-    uint8_t Charge;
-    int32_t ConstantCurrent;
-    uint16_t VoltLimit;
+    /** mode parameter **/
+    uint16_t cycleNumber;
+    uint8_t  charge;
+    int32_t  constantCurrent;
+    int32_t  Currentmax;

-    /** Resister Measure **/
-    uint8_t ResisterMeter;
+    uint16_t StepTime;

-    // elite function
-    uint8_t eliteFxn;
-
-    uint16_t CycleNumber;
-
-    uint8_t VoVi_Switch;
-
-    uint16_t InitVolt;
-
-    uint16_t MaxVolt;
-
-    uint16_t MinVolt;
-
-    uint16_t InitDirection;
-
-    uint32_t MaxCurrent;
-
-    uint8_t VscanRateIndex;
-
-    uint32_t VscanRate;
-
-    int32_t Vset;
+    uint8_t AdcChannel;

 } INSTRUCTION = {0};

@@ -105,57 +92,34 @@ struct HEADSTAGE_INSTRUCTION {
 * @return  None.
 */
 static void InitEliteInstruction(){
-    INSTRUCTION.chip_id = 0;
-    INSTRUCTION.SampleRateIndex = 1;
-    INSTRUCTION.SampleRate = 100;
-    INSTRUCTION.VoltOrigin = DAC_ZERO;
-    INSTRUCTION.VoltFinal = DAC_ZERO;
-    INSTRUCTION.Step = 0x0005; // 0x0005 = 1mV
-    INSTRUCTION.StepTime = STEPTIME_ONE_SEC;    // about 0.5 sec
-    INSTRUCTION.VoltConstant = DAC_ZERO;  // is about 0V
-    INSTRUCTION.ADCGainLevel = GAIN_AUTO;
-    INSTRUCTION.AutoGainEnable = 1;
-    INSTRUCTION.NotifyRate = STEPTIME_ONE_SEC/10;
-    INSTRUCTION.ResisterMeter = RESISTER_METER_LARGE;
-    INSTRUCTION.Charge = 1;
-    INSTRUCTION.ConstantCurrent = 0x00000000;
-    INSTRUCTION.VoltLimit = 0x0000;
-    INSTRUCTION.eliteFxn = 0; // default is a null event
-    INSTRUCTION.CycleNumber = 0;
-    INSTRUCTION.VoVi_Switch = 0x01;    //VoVi_Switch == 0 => user see Vo / VoVi_Switch == 1 => user see Vi
-    INSTRUCTION.InitVolt = DAC_ZERO;
-    INSTRUCTION.MaxVolt = DAC_ZERO;
-    INSTRUCTION.MinVolt = DAC_ZERO;
-    INSTRUCTION.InitDirection = 1;    //0:reverse   1:forward
-    INSTRUCTION.VscanRate = 1;
-    INSTRUCTION.Vset = DAC_ZERO;
+    INSTRUCTION.chip_id         = 0;
+    INSTRUCTION.eliteFxn        = 0;         //default is a null event
+    INSTRUCTION.VsetRateIndex   = 0;
+    INSTRUCTION.VsetRate        = 2;
+    INSTRUCTION.Vset            = 0;
+    INSTRUCTION.VoltConstant    = DAC_ZERO; //DAC_ZERO is about 0V
+    INSTRUCTION.directionInit   = 1;        //0:reverse        1:forward
+    INSTRUCTION.step            = 0;
+    INSTRUCTION.Ve1             = DAC_ZERO;
+    INSTRUCTION.Ve2             = DAC_ZERO;
+    INSTRUCTION.Vinit           = 0;
+    INSTRUCTION.Vmax            = 0;
+    INSTRUCTION.Vmin            = 0;
+    INSTRUCTION.sampleRateIndex = 1;
+    INSTRUCTION.sampleRate      = 100;
+    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
+    INSTRUCTION.AutoGainEnable  = 1;
+    INSTRUCTION.VinAutoGainEnable = 1;
+    INSTRUCTION.VoutAutoGainEnable = 1;
+    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
+    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
+    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
+    INSTRUCTION.notifyRate      = STEPTIME_ONE_SEC;
+    INSTRUCTION.cycleNumber     = 1;
+    INSTRUCTION.charge          = 1;      //0:discharge        1:charge
+    INSTRUCTION.constantCurrent = 0;
+    INSTRUCTION.Currentmax      = 0;
+    INSTRUCTION.StepTime        = STEPTIME_ONE_SEC;
+    INSTRUCTION.AdcChannel      = 0;
 }
-
-/*********************************************************************
- * @fn      GetInstructionParameter
- *
- * @brief   Get Constant Current mode parameter.
- *
- * @param   ins - instruction including current value and unit
- *
- * @return  None.
- */
-static void GetInstructionParameter(uint8 *ins){
-    // CurrentLV=0 => unit is nA
-    // CurrentLV=1 => unit is uA
-    // CurrentLV=2 => unit is mA
-//    INSTRUCTION.CurrentLV = (*ins);
-
-    // ConstantCurrentRange=0 => current value is 0~499
-    // ConstantCurrentRange=1 => current value is 500~999
-//    INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
-
-    // ConstantCurrent divide ConstantCurrentRange into 50000 count (thus each count is 0.01)
-        // e.g. 485.7 uA can be represent by
-        // CurrentLV = 1 (unit is uA)
-        // ConstantCurrentRange = 0 (current range is 0~499)
-        // ConstantCurrent = 48570
-    INSTRUCTION.ConstantCurrent = (uint32_t) (*(ins+1))<<24 | (uint32_t) (*(ins+2))<<16 | (uint32_t) (*(ins+3))<<8 | (uint32_t) (*(ins+4));
-}
-
 #endif
@@ -2,33 +2,25 @@
 #ifndef ELITEKEYDETECT
 #define ELITEKEYDETECT

-#define CLOCK_ONE_SECOND 10000
-
 static bool TurnOnElite(uint8_t key) {
    static uint16_t TurnOnCounter = 0;

    if (key == 0) {
-        // press 1 sec, power on LED
+        // press 1 sec, power on LED, read bat power
        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-            headstage_battery_volt();
-            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-            if( bat < 768 && bat > 20){
-                PIN_setOutputValue(pin_handle, enable_5v, 0);
-                return false;
-            }else{
-                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
-                TurnOn10V();
-                LEDPowerON();
-                return true;
-            }
+            PIN_setOutputValue(pin_handle, enable_5v, 1);// enable 5V
+            Elite_SPI_init();
+            ModeLED(BT_WAIT);
+            AD5940_init();
+            // DAC_outputV(0x3FFFF);
+            return true;
        } else {
            TurnOnCounter++;
            return false;
        }
    } else {
        TurnOnCounter = 0;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -42,7 +34,7 @@ static void EliteKeyPress(uint8_t key) {
        // press key => bight LED

        if (ShutDownCounter == CLOCK_ONE_SECOND) {
-            KeyWorkModeLED();
+            KEYLED();
        }

        // press 3~4 sec, shutdown 2650
@@ -55,7 +47,7 @@ static void EliteKeyPress(uint8_t key) {
        if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
            if (ShutDownCounter != 0) {
                // dark LED
-                WorkModeLED();
+                checkFlafLED();
                ShutDownCounter = 0;
            }
        } else {  // old function != currunt instruction
@@ -63,16 +55,9 @@ static void EliteKeyPress(uint8_t key) {
            if (ShutDownCounter != 0) {
                ShutDownCounter = 0;
            }
-            // dark mode LED
-            WorkModeLED();
+            checkFlafLED();
        }
    }
 }

-static void TurnOn10V() {
-    If10Von = true;
-    PIN_setOutputValue(pin_handle, enable_10v, 1);
-    CPUdelay(8000);
-}
-
 #endif
@@ -2,12 +2,10 @@
 #ifndef ELITELED
 #define ELITELED

-#define DARKLED 0xE1
-#define LIGHTLED 0xE8
-static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
-#define LEDPowerON() LED_color(DARKLED, 0x00, 0xFA, 0x00)
-#define WORKLED() LED_color(0xE2, 0x00, 0x40, 0x40)
-#define KEYLED() LED_color(LIGHTLED, 0xF0, 0xA0, 0x00)
+#define DARKLED                  0xE1
+#define LIGHTLED                 0xE8
+
+static void WorkModeLED();

 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
    spi_LEDtxbuf[0] = 0x0000;
@@ -21,72 +19,94 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue)
    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;

    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
+
 }

-static void WorkModeLED() {
-    switch (INSTRUCTION.eliteFxn) {
-    case IV_CURVE: {
-        WORKLED();
+static void Elite_led_color(uint16_t color){
+    switch (color) {
+        case COLOR_RED: {
+            LED_color(DARKLED, 0x50, 0x00, 0x00);
+            break;
+        }
+        case COLOR_ORANGE: {
+            LED_color(DARKLED, 0x50, 0x58, 0x09);
+            break;
+        }
+        case COLOR_YELLOW: {
+            LED_color(LIGHTLED, 0x50, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN: {
+            LED_color(DARKLED, 0x00, 0xFA, 0x00);
+            break;
+        }
+        case COLOR_YELLOWGREEN: {
+            LED_color(DARKLED, 0x64, 0xA6, 0x00);
+            break;
+        }
+        case COLOR_BLUE: {
+            LED_color(DARKLED, 0x00, 0x00, 0xAA);
+            break;
+        }
+        case COLOR_CYAN: {
+            LED_color(DARKLED, 0x00, 0x40, 0x40);
+            break;
+        }
+        case COLOR_MAGENTA: {
+            LED_color(DARKLED, 0x50, 0x00, 0x80);
+            break;
+        }
+        case COLOR_PURPLE: {
+            LED_color(DARKLED, 0x50, 0x00, 0xFF);
+            break;
+        }
+        case COLOR_WHITE: {
+            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
+            break;
+        }
+        case COLOR_BLACK: {
+            LED_color(0x00, 0x00, 0x00, 0x00);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static void ModeLED(uint16_t modeStatus) {
+    btWaitLedFlag   = 0;
+    noEventLedFlag  = 0;
+    preWorkLedFlag  = 0;
+    workingLedFlag  = 0;
+    postWorkLedFlag = 0;
+
+    switch (modeStatus) {
+    case BT_WAIT: {
+        btWaitLedFlag = 1;
+        BT_WAIT_LED();
        break;
    }
-    case CV_CURVE: {
-        WORKLED();
-        break;
-    }
-    case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case SQUARE_WAVE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case VOLT_OUTPUT: {
-        WORKLED();
-        break;
-    }
-    case ZT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case VT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case IT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case CONSTANT_CURRENT:{
-//        WORKLED();
-        LED_color(0xE2, 0x00, 0x00, 0xAA);
-        break;
-    }
-    case VIS_RST: {
+    case NO_EVENT: {
+        noEventLedFlag = 1;
        LEDPowerON();
        break;
    }
-    case ADC_TEST: {
-        WORKLED();
+    case PRE_WORK: {
+        preWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
        break;
    }
-    case CYCLIC_VOLTAMMETRY: {
-        WORKLED();
+    case WORKING: {
+        workingLedFlag = 1;
+        WorkModeLED();
        break;
    }
-    case LINEAR_SWEEP_VOLTAMMETRY: {
-        WORKLED();
+    case POST_WORK: {
+        postWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
        break;
    }
-    case CONSTANT_VSCAN: {
-        WORKLED();
-        break;
-    }
-//    case READ_VOUT_VALUE: {
-//        WORKLED();
-//        break;
-//    }
-
    default: {
        LEDPowerON();
        break;
@@ -94,58 +114,63 @@ static void WorkModeLED() {
    }
 }

-static void KeyWorkModeLED() {
-    KEYLED();
-    /*
-    switch(INSTRUCTION.eliteFxn){
-        case IV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case CV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case DIFFERENTIAL_PULSE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case SQUARE_WAVE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VOLT_OUTPUT:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ZT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case IT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        case VIS_RST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ADC_TEST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        default:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
+static void checkFlafLED() {
+    if(btWaitLedFlag == 1){
+        ModeLED(BT_WAIT);
+    }
+    else if(noEventLedFlag == 1){
+        ModeLED(NO_EVENT);
+    }
+    else if(preWorkLedFlag == 1){
+        ModeLED(PRE_WORK);
+    }
+    else if(workingLedFlag == 1){
+        ModeLED(WORKING);
+    }
+    else if(postWorkLedFlag == 1){
+        ModeLED(POST_WORK);
+    }
+}
+
+static void WorkModeLED() {
+    switch (INSTRUCTION.eliteFxn) {
+    case IV_CURVE:
+    case CV_CURVE:
+    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
+    case SQUARE_WAVE_VOLTAMMETRY:
+    case VOLT_OUTPUT:
+    case ZT_CURVE:
+    case VT_CURVE:
+    case IT_CURVE:
+    case ADC_TEST:
+    case CYCLIC_VOLTAMMETRY:
+    case LINEAR_SWEEP_VOLTAMMETRY:
+    case CONSTANT_VSCAN:{
+        WORKLED();
+        break;
+    }
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
+    }
+    case CALI_ADC_MODE:{
+        if(INSTRUCTION.AdcChannel == IIN_ADC){
+            Elite_led_color(COLOR_RED);
+        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+            Elite_led_color(COLOR_ORANGE);
+        }
+
+        break;
+    }
+//    case VIS_RST: {
+//        LEDPowerON();
+//        break;
+//    }
+    default: {
+        WORKLED();
+        break;
+    }
    }
-    */
 }

 #endif
@@ -9,7 +9,7 @@ static uint16_t LSVCurve(LSVMode *LSV){
    static int32_t Vout;
    static int32_t DeltaVout;

-    Vin = LSV->MeasureVolt * 200;//[5nV]
+    Vin = LSV->_measureVin * 200;//[5nV]
    if(DACReset){
        Vout = Vset + Vin;
        DACReset = false;
@@ -19,7 +19,7 @@ static uint16_t LSVCurve(LSVMode *LSV){
    }

    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -34,153 +34,65 @@ static uint16_t LSVCurve(LSVMode *LSV){
     return DACOutCode;
 }

-
-static void LSV_Plot(LSVMode *LSV){
-    /**********************************************
-    MODE->_VoVi_Switch : 1 read Vin volt
-        ->_VoVi_Switch : 0 read Vout volt
-
-    ***********************************************/
-    static uint8_t VoltCurrentSwitch = 0;
-
-    if(VoltCurrentSwitch == 0){ /**read Iin(buffer),read Vin**/
-        // read current
-        if(INSTRUCTION.AutoGainEnable){
-            LSV->_MeasureData = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(LSV->_MeasureData);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            LSV->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-
-        InputNotify(NOTIFY_CURRENT, LSV->_MeasureData);
-
-        // read Volt
-        if(LSV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(LSV->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 1){ /**read Vin**/
-        // read Volt
-        if(LSV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);
-        }else if(LSV->_VoVi_Switch == 0x00){
-             ReadVoutVolt(spi_ADC_rxbuf);
-        }
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 2){ /**read Vin(buffer),read Iin**/
-        // read Volt
-        if(LSV->_VoVi_Switch == 0x01){
-            ReadVolt(spi_ADC_rxbuf);// read vin volt
-            LSV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
-        }else if(LSV->_VoVi_Switch == 0x00){
-            ReadVoutVolt(spi_ADC_rxbuf);// read vout volt
-            LSV->MeasureVolt = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-        }
-
-        LSVCurve(LSV);
-
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch++;
-    }
-    else if(VoltCurrentSwitch == 3){ /**read Iin**/
-        // read current
-        ReadCurrent(spi_ADC_rxbuf);
-
-        VoltCurrentSwitch = 0;
-    }
-}
-
 static void LSV_Vscan(LSVMode *LSV){
-    static int32_t Vmax;
-    static int32_t Vmin;
-    static int32_t Vinit;
-    static uint32_t Vstep;
-    static int16_t VminCounter;
-    static int16_t VmaxCounter;
-    static bool direction_up;           // direction_up = true, if InitDirection=1
-    static bool current_direction_up;   // current_direction_up = true, Vstep => positive. vice versa
-    static uint16_t CycleCounter;

-    NotifyCycleNumber = (INSTRUCTION.CycleNumber - LSV->CycleNumber + 1);
+    NotifyCycleNumber = (INSTRUCTION.cycleNumber - LSV->_cycleNumber + 1);

-    if(VscanReset){
-        VmaxCounter = 0;
-        VminCounter = 0;
-        CycleCounter = 0;
-        if(LSV->VOrigin <= LSV->VStop){
-            direction_up         = true;
-            current_direction_up = true;
-            Vmin = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
-            Vmax = ((int32_t)(LSV->VStop) - 25000) * 4 * 10000; //[5nV]
-            Vinit = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
+    if(vscanReset){
+        if(INSTRUCTION.directionInit == 1){
+            LSV->_direction_up         = true;
+            LSV->_current_direction_up = true;
        }else{
-            direction_up         = false;
-            current_direction_up = false;
-            Vmax = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
-            Vmin = ((int32_t)(LSV->VStop) - 25000) * 4 * 10000; //[5nV]
-            Vinit = ((int32_t)(LSV->VOrigin) - 25000) * 4 * 10000; //[5nV]
+            LSV->_direction_up         = false;
+            LSV->_current_direction_up = false;
        }

-        if(INSTRUCTION.Step <= 10){
-            Vstep = INSTRUCTION.Step *  INSTRUCTION.VscanRate / 5 ; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(INSTRUCTION.step <= 10){
+            LSV->_Vstep = INSTRUCTION.step *  INSTRUCTION.VsetRate / 5;
        }else{
-            Vstep = INSTRUCTION.Step / 5 *  INSTRUCTION.VscanRate; //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+            LSV->_Vstep = INSTRUCTION.step / 5 *  INSTRUCTION.VsetRate;
        }

-        Vset = Vinit;
+        Vset = LSV->_Vinit;
    }

-    if(!VscanReset){
+    if(!vscanReset){

-        if (current_direction_up){
-            Vset = Vset + Vstep;
+        if (LSV->_current_direction_up){
+            Vset = Vset + LSV->_Vstep * GPT.GptimerMultiple;
        }else{
-            Vset = Vset - Vstep;
+            Vset = Vset - LSV->_Vstep * GPT.GptimerMultiple;
        }

-
        /*stop condition*/
-        if (Vset >= Vmax){
-            Vset = Vmin;
-
-            INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
-            INSTRUCTION.SampleRate = 15;
-            INSTRUCTION.Charge = 0x01;
-            INSTRUCTION.ConstantCurrent = 0x00;
-            INSTRUCTION.MaxVolt = 0xC350;
-            INSTRUCTION.MinVolt = 0x0000;
-            INSTRUCTION.NotifyRate = 500;
-            INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
+        if (Vset >= LSV->_Vmax){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
+            Vset = LSV->_Vmin;
            InitEliteFlag();
-        }else if (Vset <= Vmin){
-            Vset = Vmax;
-
-            INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
-            INSTRUCTION.SampleRate = 15;
-            INSTRUCTION.Charge = 0x01;
-            INSTRUCTION.ConstantCurrent = 0x00;
-            INSTRUCTION.MaxVolt = 0xC350;
-            INSTRUCTION.MinVolt = 0x0000;
-            INSTRUCTION.NotifyRate = 500;
-            INSTRUCTION.VoVi_Switch = 0x02;//read Vscan = Vout - Vin
+            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+            INSTRUCTION.sampleRate = 15;
+            INSTRUCTION.charge     = 0x01;
+            INSTRUCTION.constantCurrent = 0x00;
+            INSTRUCTION.Vmax       = 0xC350;
+            INSTRUCTION.Vmin       = 0x0000;
+            INSTRUCTION.notifyRate = 500;
+            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+        }else if (Vset <= LSV->_Vmin){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
+            Vset = LSV->_Vmax;
            InitEliteFlag();
+            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+            INSTRUCTION.sampleRate = 15;
+            INSTRUCTION.charge     = 0x01;
+            INSTRUCTION.constantCurrent = 0x00;
+            INSTRUCTION.Vmax       = 0xC350;
+            INSTRUCTION.Vmin       = 0x0000;
+            INSTRUCTION.notifyRate = 500;
+            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
        }
    }
-    //test version add
-//    int32_t RealV;
-//    RealV = (int32_t)(Vset / 200);//[1uV]
-//    InputNotify(NOTIFY_VOLT, RealV);
 }
-
 #endif
@@ -0,0 +1,16 @@
+
+#ifndef ELITE_LATCH_INIT
+#define ELITE_LATCH_INIT
+
+static void InitLH() {
+    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
+        LH.LATCH0[i]       = 0;
+        LH.LATCH1[i]       = 0;
+        LH.LATCH2[i]       = 0;
+    }
+    LH.LoadState    = 0;
+}
+
+
+#endif
+
@@ -1,43 +1,34 @@
-
-#ifndef ELITENOTIFY
-#define ELITENOTIFY
-
-#include "headstage.h"
-
 /**
 * notify data buffer.
 * the length equals to the characteristic 4 which value is 20 bytes.
 *
 */

+#ifndef ELITENOTIFY
+#define ELITENOTIFY

-#define NOT_BUF_OFFSET_INIT 8
+#include "headstage.h"

 /*notify's input type*/
-#define NOTIFY_CURRENT 0
-#define NOTIFY_VOLT 1
+#define NOTIFY_CURRENT   0
+#define NOTIFY_VOLT      1
 #define NOTIFY_IMPEDANCE 2
-#define NOTIFY_VOLT_BAT 3
+#define NOTIFY_VOLT_BAT  3
+
+#define NOT_BUF_OFFSET_INIT 8

 /**
 * the index where to start insert data into buffer.
 * start from 6.
 */
-static size_t not_buf_offset = NOT_BUF_OFFSET_INIT;
-
+static size_t   not_buf_offset = NOT_BUF_OFFSET_INIT;
 static uint32_t not_time_stamp;

-static uint8_t NotifyCurrent[4] = {0};
-static uint8_t NotifyVolt[4] = {0};
-static uint8_t NotifyImpedance[4] = {0};
-static uint8_t NotifyVoltBat[4] = {0};
-static uint16_t NotifyCycleNumber = 0;
-
-/**
- * counter of notify send.
- */
-static uint32_t notify_counter = 0;
-static bool NotifyEnable = 0;
+static uint8_t  NotifyCurrent[4]   = {0};
+static uint8_t  NotifyVolt[4]      = {0};
+static uint8_t  NotifyImpedance[4] = {0};
+static uint8_t  NotifyVoltBat[4]   = {0};
+static uint16_t NotifyCycleNumber  = 0;

 // ****************** New Notify Format ******************************** //
 /*
@@ -90,12 +81,14 @@ static bool NotifyEnable = 0;
         0xFF

  * header = device ID
-  * I = current (0.001nA), V = voltage (mV),
-  * Z = impedance (k ohm), T = time (ms)
+  * I = current (nA),    V = voltage (uV),
+  * Z = impedance (ohm), T = time (ms)
  *
  *
 */
 static void SendNotify() {
+    initDATBuf();
+
    not_buf[0] = INSTRUCTION.chip_id;

    for (int i = 0; i < 4; i++) {
@@ -112,39 +105,50 @@ static void SendNotify() {
    not_buf[15] = (not_time_stamp >> 16) & 0xff;
    not_buf[16] = (not_time_stamp >> 24) & 0xff;

-    // cyclic voltametry cycle number
    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
    not_buf[18] = NotifyCycleNumber & 0xff;

+    for (int i = 19; i < BLE_DAT_BUFF_SIZE; i++){
+        not_buf[i] = 0;
+    }
+
    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }

-static void FlushNotify(){
-    not_buf[0] = INSTRUCTION.chip_id;
+static void initDATBuf(){
+    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++){
+        not_buf[i] = 0;
+    }
+}

-    for (int i = 0; i < 4; i++) {
-        not_buf[i + 1] = 0;
-        not_buf[i + 5] = 0;
-        not_buf[i + 9] = 0;
-        NotifyCurrent[i] = 0;
-        NotifyVolt[i] = 0;
+static void initINSBuf(){
+    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++){
+        ins_buf[i] = 0;
+    }
+}
+
+static void initCISBuf(){
+    for (int i = 0; i < BLE_CIS_BUFF_SIZE; i++){
+        cis_buf[i] = 0;
+    }
+}
+
+static void initRawDataBuf(){
+    not_time_stamp    = 0;
+    NotifyCycleNumber = 0;
+
+    for (int i = 0; i < 4; i++){
+        NotifyCurrent[i]   = 0;
+        NotifyVolt[i]      = 0;
        NotifyImpedance[i] = 0;
    }
+}

+static void FlushNotify(){
+    initRawDataBuf();
+    initDATBuf();

-
-    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
-    not_time_stamp = 0;  // msec
-
-    not_buf[13] = not_time_stamp & 0xff;
-    not_buf[14] = (not_time_stamp >> 8) & 0xff;
-    not_buf[15] = (not_time_stamp >> 16) & 0xff;
-    not_buf[16] = (not_time_stamp >> 24) & 0xff;
-
-    // cyclic voltametry cycle number
-    not_buf[17] = 0x00;
-    not_buf[18] = 0x00;
-    NotifyCycleNumber = 0;
+    not_buf[0] = INSTRUCTION.chip_id;

    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
 }
@@ -181,11 +185,4 @@ static void InputNotify(int NotifyType, int32_t Data){
            break;
    }
 }
-
-static void FlushCISNotify(){
-    for (int i = 0; i < 20; i++) {
-        cis_buf[i] = 0;
-
-    }
-}
 #endif
@@ -1,22 +0,0 @@
-
-#ifndef ELITERVout
-#define ELITERVout
-
-static void RVout_Plot(RVoutMode *RVout) {
-    // ADC gain is don't care when measuring voltage
-    INSTRUCTION.ADCGainLevel = GAIN_200R;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-
-    // read ADC VoutVolt
-    ReadVoutVolt(spi_ADC_rxbuf);
-
-    // decode ADC value and put it into notify buffer
-    RVout->_MeasureData = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
-
-    NotifyVolt[0] = (uint8_t) (RVout->_MeasureData >> 24);
-    NotifyVolt[1] = (uint8_t) ((RVout->_MeasureData & 0x00FF0000) >> 16);
-    NotifyVolt[2] = (uint8_t) ((RVout->_MeasureData & 0x0000FF00) >> 8);
-    NotifyVolt[3] = (uint8_t) (RVout->_MeasureData & 0x000000FF);
-}
-
-#endif
@@ -3,27 +3,18 @@
 #define ELITERESET

 static void reset() {
+    ModeLED(NO_EVENT);
+    InitEliteFlag();
    InitFlag();
    InitCT();
    InitGPT();
+    InitLH();

-    // IV/CV mode reset
-    DiscardIVFirstData = 0;
-    avg_number          = 0;
-    ADCRealCurrent_long = 0;
-
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
-    if (INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
-        INSTRUCTION.eliteFxn = 0;
-
-    }
-
-    LEDPowerON();
-    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++) {
-        ins_buf[i] = 0;
-    }
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+    initINSBuf();
+    initDATBuf();

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -40,31 +31,25 @@ static void reset() {
        spi_ADC_rxbuf[i] = 0;
    }

-    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
-        not_buf[i] = 0;
-    }
-
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
+//    PIN15_setOutputValue(DAC_CS, 1);  // DAC_CS HIGH
    CPUdelay(1600);
 }

 static void Eliteinterrupt() {
    InitFlag();
+    ModeLED(NO_EVENT);
+
+    InitEliteFlag();
    InitCT();
    InitGPT();
+    InitLH();

-    // IV/CV mode reset
-    DiscardIVFirstData = 0;
-    avg_number          = 0;
-    ADCRealCurrent_long = 0;
-    ADCGainControl(GAIN_AUTO);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
-    LEDPowerON();
-    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++) {
-        ins_buf[i] = 0;
-    }
+//    VinADCGainControl(VIN_GAIN_AUTO);
+//    IinADCGainControl(I_GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+    initINSBuf();
+    initDATBuf();

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -81,46 +66,7 @@ static void Eliteinterrupt() {
        spi_ADC_rxbuf[i] = 0;
    }

-    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
-        not_buf[i] = 0;
-    }
-
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
    CPUdelay(8000);
 }
-
-static void CleanBuffer() {
-    InitFlag();
-    InitEliteInstruction();
-    InitCT();
-    InitGPT();
-    DiscardIVFirstData = 0;
-    avg_number          = 0;
-    ADCRealCurrent_long = 0;
-
-    for (int i = 0; i < SPI_LED_SIZE; i++) {
-        spi_LEDtxbuf[i] = 0;
-        spi_LEDrxbuf[i] = 0;
-    }
-
-    for (int i = 0; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-        spi_rxbuf[i]    = 0;
-    }
-
-    for (int i = 0; i < SPI_ADC_SIZE; i++) {
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
-    for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
-        not_buf[i] = 0;
-    }
-
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-    CPUdelay(8000);
-}
-
 #endif
@@ -16,7 +16,7 @@

 /* application use SPI parameters and buffers */
 #define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 3
+#define SPI_DAC_SIZE 5
 #define SPI_ADC_SIZE 4

 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -36,11 +36,10 @@ static SPI_Params      spiParams1;
 static SPI_Transaction LED_transaction;
 static SPI_Transaction ADC_DAC_transaction;

-
 static void Elite_SPI_init(){
    SPI_init();
    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 2000;  // 12k
+    spiParams0.bitRate     = 2000;  // 2k
    spiParams0.mode        = SPI_MASTER;
    spiParams0.dataSize    = 16;
    spiParams0.frameFormat = SPI_POL0_PHA1;
@@ -50,7 +49,8 @@ static void Elite_SPI_init(){
    spiParams1.bitRate     = 1000000;  // 1M
    spiParams1.mode        = SPI_MASTER;
    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA1;
+    spiParams1.frameFormat = SPI_POL0_PHA0;
+
    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
 }

@@ -63,26 +63,236 @@ static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
 }

 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC
+
    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
    ADC_DAC_transaction.rxBuf = spi_rxbuf;

-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-    PIN_setOutputValue(pin_handle, ADC_CS, 0);  // ADC_CS LOW
    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH

+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }

 static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-   ADC_DAC_transaction.count = length;
-   ADC_DAC_transaction.txBuf = spi_txbuf;
-   ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;

-   PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-   PIN_setOutputValue(pin_handle, DAC_CS, 0);  // DAC_CS LOW
-   SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-   PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
 }

+/* Elite1.5 Calibration SPI */
+static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
+}
+
+static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+
+
+#ifdef ELITE_VERSION_EIS
+//define SPI command
+#define SPICMD_SETADDR  0x20
+#define SPICMD_WRITEREG 0x2D
+#define SPICMD_READREG  0x6D
+
+//define REG
+#define LPDACCON0       0x2128
+#define LPDACSW0        0x2124
+#define LPDACDAT0       0x2120
+#define LPREFBUFCON     0x2050
+#define SWMUX           0x235C
+#define LPTIASW0        0x20E4
+#define SWCON           0x200C
+#define HSDACCON        0x2010
+#define HSDACDAT        0x2048
+#define LPTIACON0       0x20EC
+#define HSTIACON        0x20FC
+#define AFECON          0x2000
+#define DSWFULLCON      0x2150
+#define NSWFULLCON      0x2154
+#define PSWFULLCON      0x2158
+#define TSWFULLCON      0x215C
+#define WGFCW           0x2030
+#define WGPHASE         0x2034
+#define WGOFFSET        0x2038
+#define WGAMPLITUDE     0x203C
+#define WGCON           0x2014
+#define DE0RESCON       0x20F8
+#define ADCCON          0x21A8
+#define DFTCON          0x20D0
+#define ADCFILTERCON    0x2044
+
+static void select_REG(uint16_t addr){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+//    CPUdelay(16000);
+
+    spi_DACtxbuf[0] = SPICMD_SETADDR;
+    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+//    CPUdelay(16000);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void w16_REG(uint16_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void r16_REG(){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+
+    ADC_DAC_transaction.count = 4;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void w32_REG(uint32_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
+    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
+    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
+    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
+
+    ADC_DAC_transaction.count = 5;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void r32_REG(){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+    spi_DACtxbuf[4] = 0x00;
+    spi_DACtxbuf[5] = 0x00;
+
+    ADC_DAC_transaction.count = 6;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void AD5940_init(){
+        PIN_setOutputValue(pin_handle, AD_reset, 0);
+        PIN_setOutputValue(pin_handle, AD_reset, 1);
+        select_REG(0x0908);//initiation
+        w16_REG(0x02C9);
+        select_REG(0x0C08);
+        w16_REG(0x206C);
+        select_REG(0x21F0);
+        w16_REG(0x0010);
+        select_REG(0x0410);
+        w16_REG(0x02C9);
+        select_REG(0x0A28);
+        w16_REG(0x0009);
+        select_REG(0x238C);
+        w16_REG(0x0104);
+        select_REG(0x0A04);
+        w16_REG(0x4859);
+        select_REG(0x0A04);
+        w16_REG(0xF27B);
+        select_REG(0x0A00);
+        w16_REG(0x8009);
+        select_REG(0x0A04);
+        w16_REG(0x4859);
+        select_REG(0x22F0);
+        w16_REG(0x0000);
+
+        select_REG(SWCON);  //200C
+        w32_REG(0x402B5);
+
+        select_REG(HSDACCON);  //2010  //ac gain
+        w32_REG(0x001E);
+
+        select_REG(WGFCW);  //2030
+        w32_REG(0x340000);
+        select_REG(WGCON);  //2014
+        w32_REG(0x4);   //AC on/off;  0x0:DC 0x4:AC 0x5:trapezoid
+
+        select_REG(LPDACCON0);  //2128 //DC on
+        w32_REG(0b0000001);
+        select_REG(LPDACSW0);  //2124  //operation
+        w32_REG(0b101011);
+        select_REG(LPDACDAT0);  //2120 //output Vout
+        w32_REG(0x00000);
+
+        // select_REG(HSTIACON);  //20FC //SE0's gain
+        // w32_REG(0x0);
+        select_REG(DE0RESCON);  //20F8 //DE0's gain
+        w32_REG(0x68);
+
+        select_REG(ADCCON);  //21A8
+        w32_REG(0x101);
+        select_REG(DFTCON);  //20D0
+        w32_REG(0x00C1);
+        select_REG(ADCFILTERCON);  //2044
+        w32_REG(0x00D0);
+
+        select_REG(AFECON);  //2000
+        w32_REG(0x30CFC0);
+//        w32_REG(0b1100011100111111000000);
+}
+
+static void EIS_LPDAC_SPI(){
+//    uint32_t con = 0b00001;//12 bit DAC
+//    uint32_t sw = 0b01010;//test mode
+//    uint32_t volt = 0;//2.4v
+//    uint32_t buf = 0;//LP reference
+//    uint32_t cm = 0;//common mode disabled
+//    select_REG(LPDACCON0);
+//    w32_REG(con);
+//    select_REG(LPDACSW0);
+//    w32_REG(sw);
+//    select_REG(LPDACDAT0);
+//    w32_REG(volt);
+//    select_REG(LPREFBUFCON);
+//    w32_REG(buf);
+//    select_REG(SWMUX);
+//    w32_REG(cm);
+}
+
+#endif
+
 #endif // ELITE_SPI
@@ -1,48 +0,0 @@
-
-#ifndef ELITEVT
-#define ELITEVT
-static int32_t VTInputVoltData(uint16_t VoVi_Switch, VTMode *VT);
-
-static void VT_Plot(VTMode *VT) {
-
-    // ADC gain is don't care when measuring voltage
-    INSTRUCTION.ADCGainLevel = GAIN_200R;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-
-    static uint8_t ADCSwitch = 0;
-    int32_t VoltData;
-
-    if(ADCSwitch == 0){ /**read V(buffer)**/
-        ReadADCVolt(VT->_VoVi_Switch);
-        VoltData = VTInputVoltData(VT->_VoVi_Switch, VT);
-        InputNotify(NOTIFY_VOLT, VoltData);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadADCVolt(VT->_VoVi_Switch);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V**/
-        ReadADCVolt(VT->_VoVi_Switch);
-        ADCSwitch = 0;
-    }
-}
-
-static int32_t VTInputVoltData(uint16_t VoVi_Switch, VTMode *VT){
-    uint8_t ADCChannel;
-    int32_t VoltData;
-
-    if(VoVi_Switch == 0x01){
-        ADCChannel = ADC_CH_VOLT;
-        VT->_MeasureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
-        VoltData = VT->_MeasureVin;
-    }else if(VoVi_Switch == 0x00){
-        ADCChannel = ADC_CH_DAC;
-        VT->_MeasureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
-        VoltData = VT->_MeasureVout;
-    }
-
-    return VoltData;
-}
-
-#endif
@@ -1,25 +1,33 @@
 #ifndef ELITE_WORK_DATA
 #define ELITE_WORK_DATA

+#define CLOCK_ONE_SECOND 00001
+
 #include "EliteInstruction.h"

 static bool Free_Work_Mode = false;
 typedef void (*InitWorkData) ();

 /***** Template of Measure and VoltOut parameter *****/
-#define MEASURE \
-    int32_t _MeasureData; \
-    uint16_t _VoVi_Switch
+#define MEASURE                      \
+    int32_t  _measureCurrent;        \
+    int32_t  _measureVin;            \
+    int32_t  _measureVout;           \
+    int32_t  _measureBat;            \
+    uint8_t  _VoViSwitch

-/* VoltOut is an UserCode */
-/* VOrigin, VStop, Step are all UserCode */
-#define VOUT_PARA \
-    uint16_t _VoltOut;  \
-    uint16_t _VOrigin;  \
-    uint16_t _VStop;    \
-    uint16_t _Step;     \
-    uint16_t _StepTime;  \
-    uint16_t _CycleNumber
+#define VOUT_PARA                    \
+    int32_t  _Vinit;                 \
+    int32_t  _Vmax;                  \
+    int32_t  _Vmin;                  \
+    int32_t  _Vset;                  \
+    uint32_t _Vstep;                 \
+    bool     _direction_up;          \
+    bool     _current_direction_up;  \
+    uint16_t _cycleNumber
+
+// direction_up = true, if directionInit=1
+// current_direction_up = true, Vstep => positive. vice versa

 /*  CC Mode parameter
 *   @ Measure : measure current value (nA)
@@ -39,64 +47,24 @@ typedef void (*InitWorkData) ();
 *   @_Transform2RealnA : transform a current user code (IUC) to real current in nA
 */
 #define CC_PARA \
-    int32_t _MeasureData; \
-    uint16_t _VoVi_Switch; \
+    int32_t _measureCurrent; \
+    uint8_t _VoViSwitch; \
    uint8_t Charge; \
    int32_t BatteryV;   \
    int32_t value;  \
    uint16_t Done;   \
-    uint16_t VMax;  \
+    uint32_t VMax;  \
    uint16_t VMin;  \
-    int32_t MeasureVolt; \
+    int32_t _measureVin; \
    int32_t Vset; \
    int32_t Iset; \
    int32_t (*_Transform2RealnA)(struct CCModePara *)

-
 #define LIMIT \
    uint32_t _LimitValue; \
    void (*SetLimitValue) (struct Limit *, uint32_t); \
    uint32_t (*GetLimitValue) (struct Limit*)

-#define CV3_PARA \
-    int32_t _MeasureData; \
-    uint16_t _VoVi_Switch; \
-    int32_t MeasureVolt; \
-    uint16_t VInit; \
-    uint16_t VMax; \
-    uint16_t VMin;  \
-    uint16_t VOrigin;  \
-    uint16_t VStop;  \
-    uint16_t InitDirection;   \
-    uint16_t Step;     \
-    uint16_t StepTime;     \
-    uint16_t CycleNumber;     \
-    uint32_t VscanRate;     \
-    int32_t Vset
-
-#define LSV_PARA \
-    int32_t _MeasureData; \
-    uint16_t _VoVi_Switch; \
-    int32_t MeasureVolt; \
-    uint16_t VInit; \
-    uint16_t VMax; \
-    uint16_t VMin;  \
-    uint16_t VOrigin;  \
-    uint16_t VStop;  \
-    uint16_t InitDirection;   \
-    uint16_t Step;     \
-    uint16_t StepTime;     \
-    uint16_t CycleNumber;     \
-    uint32_t VscanRate;     \
-    int32_t Vset
-
-#define CVSCAN_PARA \
-    int32_t _MeasureData; \
-    uint16_t _VoVi_Switch; \
-    int32_t MeasureVolt; \
-    uint16_t VInit; \
-    int32_t Vset
-
 struct Measure{
    MEASURE;
 };
@@ -112,14 +80,8 @@ struct Limit{
 struct CCModePara{
    CC_PARA;
 };
-
-struct CV3ModePara{
-    CV3_PARA;
-};
 /***** End of Measure and VoltOut parameter *****/

-
-
 /**** Limit Mode ****/
 //LimitValue
 void _SetLimitValue(struct Limit *self, uint32_t LimitValue){
@@ -141,127 +103,111 @@ VoltOutMode *InitVoltOutMode(){
    return ret;
 }
 /* End of VoltOut Mode Data */
-/**** End of VoltOut Only Mode ****/
-

 /* IT Mode Data */
 typedef struct _ITMode{
-    int32_t _MeasureCurrent;
+    MEASURE;
 }ITMode;

 ITMode * InitITMode(){
    ITMode *ret = malloc(sizeof(ITMode));
-    ret->_MeasureCurrent = 0;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
    return ret;
 }
 /* End of IT Mode Data */

 /* VT Mode Data */
 typedef struct _VTMode{
-    int32_t _MeasureVin;
-    int32_t _MeasureVout;
-    uint16_t _VoVi_Switch;
+    MEASURE;
 }VTMode;

 VTMode * InitVTMode(){
    VTMode *ret = malloc(sizeof(VTMode));
-    ret->_MeasureVin = 0;
-    ret->_MeasureVout = 0;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
    return ret;
 }
 /* End of VT Mode Data */

-
 /* RT Mode Data */
 typedef struct _RTMode{
-    int32_t  _MeasureCurrent;
-    int32_t  _MeasureVin;
-    int32_t  _MeasureVout;
-    uint16_t _VoVi_Switch;
+    MEASURE;
    int32_t  _Vset;
 }RTMode;

 RTMode * InitRTMode(){
    RTMode *ret = malloc(sizeof(RTMode));
-    ret->_MeasureCurrent = 0;
-    ret->_MeasureVin = 0;
-    ret->_MeasureVout = 0;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
-    ret->_Vset = INSTRUCTION.VoltConstant;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+    ret->_Vset           = INSTRUCTION.VoltConstant;
    return ret;
 }
 /* End of RT Mode Data */

 /* IV Mode Data */
 typedef struct _IVMode{
-    int32_t _MeasureData;
-    uint16_t _VoVi_Switch;
-    int32_t MeasureVolt;
+    MEASURE;
    VOUT_PARA;
-    LIMIT;
-    int32_t _MeasureBatvolt;
 }IVMode;

 IVMode *InitIVMode(){
    IVMode *ret = malloc(sizeof(IVMode));
-    ret->_MeasureData = 0;
-    ret->MeasureVolt = (INSTRUCTION.VoltOrigin - DAC_ZERO)/5;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
-
-    ret->_VoltOut = DAC_ZERO;
-    ret->_VOrigin = INSTRUCTION.VoltOrigin;
-    ret->_VStop = INSTRUCTION.VoltFinal;
-    ret->_Step  = INSTRUCTION.Step;
-    ret->_StepTime = INSTRUCTION.StepTime;
-    ret->_CycleNumber = 1;
-    ret->_MeasureBatvolt = 0;
-    ret->_LimitValue = 1e5;
-    ret->SetLimitValue = &_SetLimitValue;
-    ret->GetLimitValue = &_GetLimitValue;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+    ret->_Vinit          = (INSTRUCTION.Vinit - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmax           = (INSTRUCTION.Vmax  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmin           = (INSTRUCTION.Vmin  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
+    ret->_Vstep          = 0;
+    ret->_direction_up   = true;
+    ret->_current_direction_up = true;
+    ret->_cycleNumber    = INSTRUCTION.cycleNumber;
    return ret;
 }
 /* End of IV Mode Data */
-/* CV Mode*/
+
+/* CV Mode(CYCLE_IV)*/
 typedef struct _CVMode{
-    int32_t _MeasureData;
-    uint16_t _VoVi_Switch;
-    int32_t MeasureVolt;
+    MEASURE;
    VOUT_PARA;
-    int32_t _MeasureBatvolt;
 }CVMode;

 CVMode * InitCVMode(){
    CVMode *ret = malloc(sizeof(CVMode));
-    ret->_MeasureData = (INSTRUCTION.VoltOrigin- DAC_ZERO)/5;
-    ret->MeasureVolt = 20000;
-    ret->_VoltOut = DAC_ZERO;  // 25000 is DAC_ZERO
-    ret->_VOrigin = INSTRUCTION.VoltOrigin;
-    ret->_VStop = INSTRUCTION.VoltFinal;
-    ret->_Step  = INSTRUCTION.Step;
-    ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
-    ret->_CycleNumber = INSTRUCTION.CycleNumber;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
-    ret->_MeasureBatvolt = 0;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+    ret->_Vinit          = (INSTRUCTION.Vinit - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmax           = (INSTRUCTION.Vmax  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmin           = (INSTRUCTION.Vmin  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
+    ret->_Vstep          = 0;
+    ret->_direction_up   = true;
+    ret->_current_direction_up = true;
+    ret->_cycleNumber    = INSTRUCTION.cycleNumber;
    return ret;
 }
 /*End of CV Mode*/

-
-/* Const Current Mode */
+/* CC Mode(CONSTANT_CURRENT)*/
 #define CC_ZERO_POINT     0
 #define MAX_DAC_UC    50000
 #define MIN_DAC_UC      0
-
-/*********************************************************************
- * @struct  Constant Current Code
- *
- * @brief   A struct to handle CC mode command
- */
-typedef struct _CCMode{
-    CC_PARA;
-}CCMode;
-
 /*********************************************************************
 * @fn      Transform2RealnA
 *
@@ -284,95 +230,117 @@ int32_t _Transform2RealnA(struct CCModePara *self){
    return IUCReal;
 }

+typedef struct _CCMode{
+    MEASURE;
+    int32_t  _Vmax;
+    int32_t  _Vmin;
+    int32_t  _Vset;
+    int32_t  _Iset;
+    uint8_t  _charge;
+    int32_t (*_Transform2RealnA)(struct CCModePara *);
+}CCMode;
+
 CCMode * InitCCMode(){
    CCMode *ret = malloc(sizeof(CCMode));
-    ret->_MeasureData = 0;
-    ret->Charge = INSTRUCTION.Charge;
-    ret->BatteryV = 0;
-    ret->Done = 0;
-
-    ret->value = INSTRUCTION.ConstantCurrent;
-    ret->VMax = INSTRUCTION.MaxVolt;
-    ret->VMin = INSTRUCTION.MinVolt;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+    ret->_Vmax           = (INSTRUCTION.Vmax  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmin           = (INSTRUCTION.Vmin  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
+    ret->_Iset           = INSTRUCTION.constantCurrent * 200 ; //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA]
+    ret->_charge         = INSTRUCTION.charge;
    ret->_Transform2RealnA = &_Transform2RealnA;
-    ret->MeasureVolt = 0;
-    ret->Vset = 0;
-    ret->Iset = INSTRUCTION.ConstantCurrent;
    return ret;
 }
-/*End of Const Current Mode Mode*/
-
+/*End of CC Mode*/

 /* CV3 Mode(CYCLIC_VOLTAMMETRY)*/
 typedef struct _CV3Mode{
-    CV3_PARA;
+    MEASURE;
+    VOUT_PARA;
 }CV3Mode;

 CV3Mode * InitCV3Mode(){
    CV3Mode *ret = malloc(sizeof(CV3Mode));
-    ret->_MeasureData = 0;
-    ret->MeasureVolt = 0;
-    ret->VInit = INSTRUCTION.InitVolt;
-    ret->VMax = INSTRUCTION.MaxVolt;
-    ret->VMin = INSTRUCTION.MinVolt;
-    ret->VOrigin = INSTRUCTION.MinVolt;
-    ret->VStop = INSTRUCTION.MaxVolt;
-    ret->InitDirection  = INSTRUCTION.InitDirection;
-    ret->Step = INSTRUCTION.Step;
-    ret->StepTime = INSTRUCTION.StepTime;
-    ret->VscanRate = INSTRUCTION.VscanRate;
-    ret->CycleNumber = INSTRUCTION.CycleNumber;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
-    ret->Vset = INSTRUCTION.InitVolt;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+	ret->_Vinit          = (INSTRUCTION.Vinit - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmax           = (INSTRUCTION.Vmax  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmin           = (INSTRUCTION.Vmin  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
+    ret->_Vstep          = 0;
+    ret->_direction_up   = true;
+    ret->_current_direction_up = true;
+    ret->_cycleNumber    = INSTRUCTION.cycleNumber;
    return ret;
 }
 /*End of CV3 Mode*/

-
 /* LSV Mode(LINEAR_SWEEP_VOLTAMMETRY)*/
 typedef struct _LSVMode{
-    LSV_PARA;
+    MEASURE;
+    VOUT_PARA;
 }LSVMode;

 LSVMode * InitLSVMode(){
    LSVMode *ret = malloc(sizeof(LSVMode));
-    ret->_MeasureData = 0;
-    ret->MeasureVolt = 0;
-    ret->VInit = 25000;
-    ret->VMax = 25000;
-    ret->VMin = 25000;
-    ret->VOrigin = INSTRUCTION.VoltOrigin;
-    ret->VStop = INSTRUCTION.VoltFinal;
-    ret->InitDirection  = INSTRUCTION.InitDirection;
-    ret->Step = INSTRUCTION.Step;
-    ret->StepTime = INSTRUCTION.StepTime;
-    ret->VscanRate = INSTRUCTION.VscanRate;
-    ret->CycleNumber = INSTRUCTION.CycleNumber;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
-    ret->Vset = INSTRUCTION.InitVolt;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+	ret->_Vinit          = (INSTRUCTION.Vinit - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmax           = (INSTRUCTION.Vmax  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vmin           = (INSTRUCTION.Vmin  - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
+    ret->_Vstep          = 0;
+    ret->_direction_up   = true;
+    ret->_current_direction_up = true;
+    ret->_cycleNumber    = INSTRUCTION.cycleNumber;
    return ret;
 }
 /*End of LSV Mode*/

 /* CONSTANT_VSCAN Mode(CONSTANT_VSCAN)*/
 typedef struct _CVSCANMode{
-    LSV_PARA;
+    MEASURE;
+    int32_t  _Vinit;
+    int32_t  _Vset;
 }CVSCANMode;

 CVSCANMode * InitCVSCANMode(){
    CVSCANMode *ret = malloc(sizeof(CVSCANMode));
-    ret->_MeasureData = 0;
-    ret->MeasureVolt = 0;
-    ret->VInit = INSTRUCTION.VoltOrigin;
-    ret->Vset = INSTRUCTION.VoltOrigin;
-    ret->_VoVi_Switch = INSTRUCTION.VoVi_Switch;
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+	ret->_Vinit          = (INSTRUCTION.Vinit - 25000) * 4 * 10000; //[5nV]
+    ret->_Vset           = 0;
    return ret;
 }
 /*End of CONSTANT_VSCAN Mode*/

 /* Cycle CC Mode */
 typedef struct _CCCMode{
-    CC_PARA;
+    int32_t _measureCurrent;
+    uint8_t _VoViSwitch;
+    uint8_t Charge;
+    int32_t BatteryV;
+    int32_t value;
+    uint16_t Done;
+    uint32_t VMax;
+    uint32_t VMin;
+    int32_t _measureVin;
+    int32_t Vset;
+    int32_t Iset;
+    int32_t (*_Transform2RealnA)(struct CCModePara *);

    /* Vmax and Vmin */
    // Vmax protect battery charge
@@ -389,7 +357,7 @@ typedef struct _CCCMode{

 CCCMode * InitCCCMode(){
    CCCMode *ret = malloc(sizeof(CCCMode));
-    ret->_MeasureData = 0;
+    ret->_measureCurrent = 0;
    ret->Charge = 1;
    ret->BatteryV = 0;

@@ -404,50 +372,39 @@ CCCMode * InitCCCMode(){
    ret->_Transform2RealnA = &_Transform2RealnA;
    return ret;
 }
-
 /* End of Cycle CC Mode */

 /** Potential State Mode **/
 typedef struct _PS{
    // measure
-    int32_t _MeasureData;
-    uint16_t _VoVi_Switch;
+    int32_t _measureCurrent;
+    uint8_t _VoViSwitch;
    int32_t ReferenceVolt;
    int32_t _MeasureVolt;
-    VOUT_PARA;
+    uint16_t _VoltOut;
+    uint16_t _originVolt;
+    uint16_t _stopVolt;
+    uint16_t _step;
+    uint16_t _StepTime;
+    uint16_t _cycleNumber;
 }PSMode;

 PSMode *InitPSMode(){
    PSMode *ret = malloc(sizeof(PSMode));
-    ret->_MeasureData = 0;
+    ret->_measureCurrent = 0;
    ret->ReferenceVolt = 0;
-    ret->_MeasureVolt = INSTRUCTION.VoltOrigin;
+    ret->_MeasureVolt = INSTRUCTION.Ve1;

    ret->_VoltOut = DAC_ZERO;  // 25000 is DAC_ZERO
-    ret->_VOrigin = INSTRUCTION.VoltOrigin;
-    ret->_VStop = INSTRUCTION.VoltFinal;
-    ret->_Step  = INSTRUCTION.Step;
+    ret->_originVolt = INSTRUCTION.Ve1;
+    ret->_stopVolt = INSTRUCTION.Ve2;
+    ret->_step  = INSTRUCTION.step;
    ret->_StepTime = INSTRUCTION.StepTime; // STEPTIME_ONE_SEC
-    ret->_CycleNumber = INSTRUCTION.CycleNumber;
+    ret->_cycleNumber = INSTRUCTION.cycleNumber;
    return ret;
 }
-
 /** End of Potential State Mode **/

-
-
-/* ReadVOut Mode Data */
-typedef struct _RVoutMode{
-    int32_t _MeasureData;
-    uint16_t _VoVi_Switch;
-}RVoutMode;
-
-RVoutMode * InitRVoutMode(){
-    RVoutMode *ret = malloc(sizeof(RVoutMode));
-    ret->_MeasureData = 0;
-    return ret;
-}
-
 typedef union _WorkMode{

    // Output Only
@@ -467,9 +424,6 @@ typedef union _WorkMode{
    CVSCANMode *CVSCAN;
    PSMode *PS;
 //    CCCMode *CCC;
-
-    //test mode
-    RVoutMode *RVout;
 }WorkMode;

 WorkMode *CreateWorkMode(){
@@ -480,6 +434,7 @@ WorkMode *CreateWorkMode(){
 void InitWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
            WM->VO = InitVoltOutMode();
            break;
        case IT_CURVE:
@@ -511,9 +466,6 @@ void InitWorkMode(WorkMode *WM){
            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            WM->CCC = InitCCCMode();
-//            break;
-//        case READ_VOUT_VALUE:
-//            WM->RVout = InitRVoutMode();
 //            break;
        default:
            WM->VT = InitVTMode();
@@ -524,6 +476,7 @@ void InitWorkMode(WorkMode *WM){
 void FreeWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
            if(WM->VO != NULL){
                free(WM->VO);
                WM->VO = NULL;
@@ -583,12 +536,6 @@ void FreeWorkMode(WorkMode *WM){
                WM->CVSCAN = NULL;
            }
            break;
-//        case READ_VOUT_VALUE:
-//            if(WM->RVout != NULL){
-//                free(WM->RVout);
-//                WM->RVout = NULL;
-//            }
-//            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            if(WM->CCC != NULL){
 //                free(WM->CCC);
@@ -8,77 +8,14 @@
 // change the output voltage step
 // => get a R-T curve (with resolution = 1 sample/volt step )

-static int32_t RTInputVoltData(uint16_t VoVi_Switch, RTMode *RT);
-
-static void ZT_Plot(RTMode *RT) {
-
-    static uint8_t ADCSwitch = 0;
-    int32_t VoltData;
-
-    if(ADCSwitch == 0){ /**read Iin(buffer),read Vin**/
-        if(INSTRUCTION.AutoGainEnable){
-            RT->_MeasureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
-            AutoGainChange(RT->_MeasureCurrent);
-        }else{
-            ReadCurrent(spi_ADC_rxbuf);
-            RT->_MeasureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
-        }
-        InputNotify(NOTIFY_CURRENT, RT->_MeasureCurrent);
-
-        ReadADCVolt(RT->_VoVi_Switch);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read Vin**/
-        ReadADCVolt(RT->_VoVi_Switch);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read Vin(buffer),read Iin**/
-        ReadADCVolt(RT->_VoVi_Switch);
-        VoltData = RTInputVoltData(RT->_VoVi_Switch, RT);
-
-        ReadCurrent(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 3){ /**read Iin**/
-        ReadCurrent(spi_ADC_rxbuf);
-        ADCSwitch = 0;
+static void ZT_Vscan(RTMode *RT){
+    if(vscanReset){
+        Vset = ((int32_t)(INSTRUCTION.VoltConstant) - 25000) * 4 * 10000; //[5nV]
+        OneWayVoltScan();
    }

-    int32_t resister_32 = 0;
-    resister_32 = 1000000000 / RT->_MeasureCurrent;
-//    if(RT->_MeasureCurrent < 1000){
-//        resister_32 = VoltData * (1000 / RT->_MeasureCurrent);
-//    }else{
-//        resister_32 = VoltData * 1000 / RT->_MeasureCurrent ;
-//    }
+    if(!vscanReset){

-    InputNotify(NOTIFY_VOLT, VoltData);
-    InputNotify(NOTIFY_CURRENT, RT->_MeasureCurrent);
-    InputNotify(NOTIFY_IMPEDANCE, resister_32);
-
-    /* Elite 100 = 100R
-       Elite 1000 = 1KR
-       Elite 10000 = 10KR
-       Elite 100000 = 100KR
-       Elite 1000000 = 1MR
-    */
+    }
 }
-
-static int32_t RTInputVoltData(uint16_t VoVi_Switch, RTMode *RT){
-    uint8_t ADCChannel;
-    int32_t VoltData;
-
-    if(VoVi_Switch == 0x01){
-        ADCChannel = ADC_CH_VOLT;
-        RT->_MeasureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
-        VoltData = RT->_MeasureVin;
-    }else if(VoVi_Switch == 0x00){
-        ADCChannel = ADC_CH_DAC;
-        RT->_MeasureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADCChannel, spi_ADC_rxbuf);
-        VoltData = RT->_MeasureVout;
-    }
-
-    return VoltData;
-}
-
 #endif
@@ -8,50 +8,42 @@

 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_1
-#define Board_SPI0_CLK                  IOID_0
+#define Board_SPI0_MOSI                 IOID_4
+#define Board_SPI0_CLK                  IOID_3
 #define Board_SPI0_CS                   PIN_UNASSIGNED

-#define Board_SPI1_MISO                 IOID_3
-#define Board_SPI1_MOSI                 IOID_2
-#define Board_SPI1_CLK                  IOID_4
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
 #define Board_SPI1_CS                   PIN_UNASSIGNED

-#define ADC_CS                          IOID_8
-#define DAC_CS                          IOID_9
+#define AD_CS                           IOID_10

-#define Turnon200R                      IOID_5
-#define Turnon10K                       IOID_6
+//#define SD_MISO                         IOID_11
+//#define SD_CS                           IOID_8
+//#define SD_CLK                          IOID_7
+//#define SD_MOSI                         IOID_13

-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 IOID_7
-#define Board_I2C0_SDA0                 IOID_14
-#endif
-
-#define shutdown_6994                   IOID_10
-#define switch_on                       IOID_11
-#define power_enable                    IOID_12
-#define extreme_waste_of_current        IOID_13
+#define switch_on                       IOID_14
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13

 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;

 const PIN_Config BLE_IO[] = {
-    //
-    ADC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // ADC_CS
-    DAC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // DAC_CS
-
-    power_enable | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // +5v, +10v, -10v enable
-    extreme_waste_of_current | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // extreme current waste
-    shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // turn off power
-    Turnon200R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
+    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
-
+    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
    PIN_TERMINATE
 };

+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+
 /*!
 *  @def    BOOSTXL_CC2650MA_SPIName
 *  @brief  Enum of SPI names on the CC2650 Booster Pack
@@ -167,8 +159,6 @@ const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
        .intNum = INT_I2C_IRQ,
        .intPriority = ~0,
        .swiPriority = 0,
-        .sdaPin = Board_I2C0_SDA0,
-        .sclPin = Board_I2C0_SCL0,
    }
 };

@@ -2,12 +2,12 @@
 ***********************************************************
    Read battery's method
 ***********************************************************
-1.ReadBatVolt(spi_ADC_rxbuf)
+1.ReadADCBat(spi_ADC_rxbuf)
  let "spi_ADC_rxbuf" be 8000
-  8000 * 187.5uV * 2 = 3V ;
+  8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
  let "AONBatMonBatteryVoltageGet()" be 768
-  768 * 125 / 320 / 100 = 3V ;
+  768 * 125 / 320 / 100 = 768 / 256 = 3V ;

 if you want to use first method, and get value 768
 conversion: 8000 * 187.5 * 1e-6 * 2 / 125 * 320 * 100 = 768
@@ -31,28 +31,10 @@ static uint8_t headstage_battery_percent() {
    return battery_percent;
 }

-static uint8_t headstage_battery_volt1() {
-    uint32_t internal_batt_sense;
-    uint8_t internal_battery_percent;
-
-    internal_batt_sense = AONBatMonBatteryVoltageGet();
-    internal_battery_percent     = internal_batt_sense & 0xFF;
-    return internal_battery_percent;
-}
-
-static uint8_t headstage_battery_volt2() {
-    uint32_t internal_batt_sense;
-    uint8_t internal_battery_percent;
-
-    internal_batt_sense = AONBatMonBatteryVoltageGet();
-    internal_battery_percent     = (internal_batt_sense >> 8) & 0xFF;
-    return internal_battery_percent;
-}
-
 static void headstage_battery_volt(){
    uint32_t bat_volt = 0;

-    ReadBatVolt(spi_ADC_rxbuf);
+    ReadADCBat(spi_ADC_rxbuf);
    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
    bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
    InputNotify(NOTIFY_VOLT_BAT, bat_volt);
@@ -60,19 +42,50 @@ static void headstage_battery_volt(){

 static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-
-    if(ADCSwitch == 0){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheckFlag = false;
+    if(INSTRUCTION.eliteFxn == ADC_TEST){
        ADCSwitch = 0;
+    }else{
+        if(ADCSwitch == 0){ /**read V**/
+            ReadADCBat(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read V**/
+            ReadADCBat(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read V(buffer)**/
+            headstage_battery_volt();
+            batteryCheck_flag = false;
+            ADCSwitch = 0;
+        }
+    }
+}
+
+static void measureBat(){
+    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+    GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+
+    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
+        GPT.BatteryCheckCounter = 0;
+        batteryCheck_flag = true;
+    }
+
+    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
+        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
+        batteryADC_flag = true;
+        if(batteryADC_flag){
+            EliteADCBattery();
+            batteryADC_flag = false;
+        }
+    }
+
+    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
    }
 }

@@ -0,0 +1,88 @@
+#ifndef ELITE_DEF
+#define ELITE_DEF
+
+// define BT instruction
+#define INS_TYPE_RIS                    0x30
+#define INS_TYPE_VIS                    0xC0
+#define INS_TYPE_CIS                    0x70
+
+// VIS (virtual instruction)
+#define VIS_RST                         0xF0
+#define VIS_ASK                         0x30
+#define VIS_STI                         0xC0
+#define VIS_FUH                         0x90
+#define VIS_INT                         0x60
+#define VIS_SHIFT_200K                  0xA0
+#define VIS_SHIFT_10K                   0xE0
+#define VIS_SHIFT_200R                  0x80
+#define VIS_DEVICE_SHINY                0x10
+#define VIS_SHINY_DIS                   0x20
+#define VIS_CC_ZERO                     0x40
+
+// RIS (real instruction)
+#define IV_CURVE                        0x10
+#define CV_CURVE                        0x20
+#define VOLT_OUTPUT                     0x30
+#define ZT_CURVE                        0x40
+#define VT_CURVE                        0x50
+#define IT_CURVE                        0x60
+#define SET_SAMPLE_RATE                 0x70
+#define SET_ADC_DAC_GAIN                    0x80
+#define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
+#define SQUARE_WAVE_VOLTAMMETRY         0xB0
+#define CYCLIC_VOLTAMMETRY              0xC0
+#define CONSTANT_CURRENT                0xD0
+#define CYCLE_CONSTANT_CURRENT          0xF0
+#define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
+#define LINEAR_SWEEP_VOLTAMMETRY        0x02
+#define CONSTANT_VSCAN                  0x03
+#define ADC_TEST                        0x91
+#define CALI_DAC_MODE                   0x93
+#define CALI_ADC_MODE                   0x92
+
+// CIS (control instruction)
+#define CIS_VERSION                     0x40
+#define CIS_VOLT                        0x10
+#define CIS_LED_TEST                    0x70
+#define CTL_WRT                         0x20
+#define CTL_RD                          0x21
+#define CTL_RD_DFTR                     0x78
+#define CTL_RD_DFTI                     0x7C
+#define CTL_WRT_WGAMPL                  0x3C
+// mode parameter
+#define STEP_TO_VSETRATE(step)   step2VsetRate(step)
+#define VMAX(v1,v2)              ((v1 >= v2) ? v1 : v2)
+#define VMIN(v1,v2)              ((v1 < v2)  ? v1 : v2)
+#define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
+#define AFTER_READ_I             0
+#define AFTER_READ_V             1
+#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
+#define PARA_1                   0x01
+#define PARA_2                   0x02
+
+//Elite LED
+#define COLOR_BLACK              0x00
+#define COLOR_RED                0x01
+#define COLOR_ORANGE             0x02
+#define COLOR_YELLOW             0x03
+#define COLOR_GREEN              0x04
+#define COLOR_BLUE               0x05
+#define COLOR_CYAN               0x06
+#define COLOR_MAGENTA            0x07
+#define COLOR_PURPLE             0x08
+#define COLOR_WHITE              0x09
+#define COLOR_YELLOWGREEN        0x0A
+#define LEDPowerON()             Elite_led_color(COLOR_GREEN)
+#define WORKLED()                Elite_led_color(COLOR_CYAN)
+#define KEYLED()                 Elite_led_color(COLOR_YELLOW)
+#define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)
+
+
+#define BT_WAIT                  0x01
+#define NO_EVENT                 0x02
+#define PRE_WORK                 0x03
+#define WORKING                  0x04
+#define POST_WORK                0x05
+
+
+#endif
@@ -0,0 +1,760 @@
+#ifndef ELITE_MODE_ADC_DAC
+#define ELITE_MODE_ADC_DAC
+
+#define Vset INSTRUCTION.Vset
+
+static void readIin(WorkMode *WorkModeData);
+static int32_t readVinVout(WorkMode *WorkModeData);
+
+static uint16_t OneWayVoltScan() {
+    static uint16_t DACOutCode;
+    static int32_t Vout;
+    static int32_t DeltaVout;
+
+    if(DACReset){
+        Vout = Vset;
+        DACReset = false;
+    }else{
+        DeltaVout = Vset - (Vout);
+        Vout = Vout + DeltaVout;
+    }
+
+    INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+    DAC_outputV(DACOutCode);
+
+    if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
+        int32_t RealV;
+        RealV = (int32_t)(Vout / 200);//[1uV]
+        InputNotify(NOTIFY_IMPEDANCE, RealV);
+    }
+
+
+    return DACOutCode;
+}
+
+static void CalcuResistance(RTMode *RT, int32_t VoltData){
+    /* Elite 100 = 100R
+       Elite 1000 = 1KR
+       Elite 10000 = 10KR
+       Elite 100000 = 100KR
+       Elite 1000000 = 1MR
+    */
+    static int32_t resister_32 = 0;
+    int32_t Vtemp;
+    Vtemp = (VoltData * 1000) - (RT->_measureCurrent * 10); //V = Vin - Iin * 10
+    resister_32 = Vtemp / RT->_measureCurrent; //R = V / Iin;
+    InputNotify(NOTIFY_IMPEDANCE, resister_32);
+}
+
+static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRead){
+    if(afterRead == AFTER_READ_I){
+        switch (INSTRUCTION.eliteFxn) {
+            case CONSTANT_CURRENT:{
+                CC_Vscan(WorkModeData->CC);
+                OneWayVoltScan();
+                break;
+            }
+            case IV_CURVE:
+            case CV_CURVE:
+            case ZT_CURVE:
+            case IT_CURVE:
+            case VT_CURVE:
+            case CYCLIC_VOLTAMMETRY:
+            case LINEAR_SWEEP_VOLTAMMETRY:
+            case CONSTANT_VSCAN:{
+                break;
+            }
+            default:{
+                break;
+            }
+        }
+    }else if(afterRead == AFTER_READ_V){
+        switch (INSTRUCTION.eliteFxn) {
+            case IV_CURVE:
+            case CV_CURVE:{
+                OneWayVoltScan();
+                break;
+            }
+            case ZT_CURVE:{
+                CalcuResistance(WorkModeData->RT, VoltData);
+            break;
+            }
+            case IT_CURVE:
+            case VT_CURVE:
+            case CONSTANT_CURRENT:{
+                break;
+            }
+            case CYCLIC_VOLTAMMETRY:{
+                CV3Curve(WorkModeData->CV3);
+                break;
+            }
+            case LINEAR_SWEEP_VOLTAMMETRY:{
+                LSVCurve(WorkModeData->LSV);
+                break;
+            }
+            case CONSTANT_VSCAN:{
+                CVSCANCurve(WorkModeData->CVSCAN);
+                break;
+            }
+            default:{
+                break;
+            }
+        }
+    }
+}
+
+static void CC_Plot(WorkMode *WorkModeData){
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static uint8_t BatSwitch = 0;
+    static int32_t VoltData  = 0;
+
+    if(batteryCheck_flag){
+        if(BatSwitch == 0){
+            if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
+                readIin(WorkModeData);
+                if(record_flag == false){
+                    static int recordCount = 0;
+                    recordCount++;
+                    if(recordCount == 2){
+                        record_flag = true;
+                        recordCount = 0;
+                    }
+                }else{
+                    InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                }
+                DACenable(WorkModeData, VoltData, AFTER_READ_I);
+
+                ReadADCBat(spi_ADC_rxbuf);
+                BatSwitch++;
+            }else if(ADCSwitch == 1 || ADCSwitch == 3){ /**read Bat**/
+                ReadADCBat(spi_ADC_rxbuf);
+                BatSwitch++;
+            }else if(ADCSwitch == 2){ /**read V(buffer),read bat**/
+                VoltData = readVinVout(WorkModeData);
+                if(INSTRUCTION.VoViSwitch == 0x02){
+                    int32_t Vscan = (Vset / 200 - CURRENT_MODE->_measureVin);
+                    Vscan = (int32_t)(Vscan);//[1uV]
+                    InputNotify(NOTIFY_VOLT, Vscan);
+                }else{
+                    InputNotify(NOTIFY_VOLT, VoltData);
+                }
+                DACenable(WorkModeData, VoltData, AFTER_READ_V);
+
+                ReadADCBat(spi_ADC_rxbuf);
+                BatSwitch++;
+            }
+        }else if(BatSwitch == 1){
+            ReadADCBat(spi_ADC_rxbuf);
+            BatSwitch++;
+        }else if(BatSwitch == 2){
+            headstage_battery_volt();
+            ReadADCIin(spi_ADC_rxbuf);
+            batteryCheck_flag = false;
+            BatSwitch = 0;
+            ADCSwitch = 3;
+        }
+    }else{
+        BatSwitch = 0;
+        if(ADCSwitch == 0){ /**read Iin(buffer),read V**/
+            readIin(WorkModeData);
+            if(record_flag == false){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
+                    record_flag = true;
+                    recordCount = 0;
+                }
+            }else{
+                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+            }
+            DACenable(WorkModeData, VoltData, AFTER_READ_I);
+
+            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read V**/
+            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read V(buffer),read Iin**/
+            VoltData = readVinVout(WorkModeData);
+            if(INSTRUCTION.VoViSwitch == 0x02){
+                int32_t Vscan = (Vset / 200 - CURRENT_MODE->_measureVin);
+                Vscan = (int32_t)(Vscan);//[1uV]
+                InputNotify(NOTIFY_VOLT, Vscan);
+            }else{
+                InputNotify(NOTIFY_VOLT, VoltData);
+            }
+            DACenable(WorkModeData, VoltData, AFTER_READ_V);
+
+            ReadADCIin(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 3){ /**read Iin**/
+            ReadADCIin(spi_ADC_rxbuf);
+            ADCSwitch = 0;
+        }
+    }
+    #undef CURRENT_MODE
+}
+
+static void IT_Plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+
+    if(batteryCheck_flag){
+        EliteADCBattery();
+        if(!batteryCheck_flag){
+            ReadADCIin(spi_ADC_rxbuf);
+            ADCSwitch = 2;
+        }
+    }else{
+        if(ADCSwitch == 0){ /**read Iin(buffer)**/
+            readIin(WorkModeData);
+            if(record_flag == false){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
+                    record_flag = true;
+                    recordCount = 0;
+                }
+            }else{
+                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+            }
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read Iin**/
+            ReadADCIin(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read Iin**/
+            ReadADCIin(spi_ADC_rxbuf);
+            ADCSwitch = 0;
+        }
+    }
+    #undef CURRENT_MODE
+}
+
+static void VT_Plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    // ADC gain is don't care when measuring voltage
+//    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t VoltData;
+
+    if(batteryCheck_flag){
+        EliteADCBattery();
+        if(!batteryCheck_flag){
+            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ADCSwitch = 2;
+        }
+    }else{
+        if(ADCSwitch == 0){ /**read V(buffer)**/
+            VoltData = readVinVout(WorkModeData);
+            if(record_flag == false){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
+                    record_flag = true;
+                    recordCount = 0;
+                }
+            }else{
+                InputNotify(NOTIFY_VOLT, VoltData);
+            }
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read V**/
+            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read V**/
+            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+            ADCSwitch = 0;
+        }
+    }
+    #undef CURRENT_MODE
+}
+
+static void readIin(WorkMode *WorkModeData){
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define TEMP_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define TEMP_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define TEMP_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define TEMP_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define TEMP_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define TEMP_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define TEMP_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define TEMP_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define TEMP_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    if(INSTRUCTION.AutoGainEnable){
+        TEMP_MODE->_measureCurrent = AutoGainReadIin(spi_ADC_rxbuf);
+//        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
+    }else{
+        ReadADCIin(spi_ADC_rxbuf);
+        TEMP_MODE->_measureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            record_flag = false;
+        }
+    }
+    #undef TEMP_MODE
+}
+
+static int32_t readVinVout(WorkMode *WorkModeData){
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define TEMP_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define TEMP_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define TEMP_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define TEMP_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define TEMP_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define TEMP_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define TEMP_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define TEMP_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define TEMP_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    static int32_t VoltData;
+
+    if(TEMP_MODE->_VoViSwitch == 0x01 || TEMP_MODE->_VoViSwitch == 0x02){
+        if(INSTRUCTION.VinAutoGainEnable){
+            TEMP_MODE->_measureVin = AutoGainReadVin(spi_ADC_rxbuf);
+//            AutoGainChangeVin(TEMP_MODE->_measureVin);
+        }else{
+            ReadADCVolt(TEMP_MODE->_VoViSwitch);
+            TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+            if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+//                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                record_flag = false;
+            }
+
+        }
+        VoltData = TEMP_MODE->_measureVin;
+    }else if(TEMP_MODE->_VoViSwitch == 0x00){
+        ReadADCVolt(TEMP_MODE->_VoViSwitch);
+        TEMP_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+        VoltData = TEMP_MODE->_measureVout;
+    }
+    #undef TEMP_MODE
+    return VoltData;
+}
+
+static void cali_IT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(INSTRUCTION.AutoGainEnable){
+            CURRENT_MODE->_measureCurrent = 0xFFFF;
+        }else{
+            ReadADCIin(spi_ADC_rxbuf);
+            CURRENT_MODE->_measureCurrent = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+//                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                record_flag = false;
+            }
+        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= 1000){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.ADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureCurrent;
+                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                InputNotify(NOTIFY_VOLT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
+static void cali_VT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t VoltData;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(CURRENT_MODE->_VoViSwitch == 0x01 || CURRENT_MODE->_VoViSwitch == 0x02){
+            if(INSTRUCTION.VinAutoGainEnable){
+                CURRENT_MODE->_measureVin = 0xFFFF;
+            }else{
+                ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+                CURRENT_MODE->_measureVin = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+                if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+//                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    record_flag = false;
+                }
+
+            }
+            VoltData = CURRENT_MODE->_measureVin;
+        }
+//        else if(CURRENT_MODE->_VoViSwitch == 0x00){
+//            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+//            CURRENT_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+//            VoltData = CURRENT_MODE->_measureVout;
+//        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= 1000){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.VinADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureVin;
+                InputNotify(NOTIFY_VOLT, CURRENT_MODE->_measureVin);
+                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
+#endif
@@ -3,10 +3,10 @@
 #define VERSION_DATE

 #define VERSION_DATE_YEAR      20
-#define VERSION_DATE_MONTH     7
-#define VERSION_DATE_DAY       8
-#define VERSION_DATE_HOUR      10
-#define VERSION_DATE_MINUTE    19
+#define VERSION_DATE_MONTH     9
+#define VERSION_DATE_DAY       7
+#define VERSION_DATE_HOUR      17
+#define VERSION_DATE_MINUTE    58

 // this is NOT the version hash !!
 // it's the last version hash
@@ -47,18 +47,11 @@ static void ZM_init() {
    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);

-    PIN_setOutputValue(pin_handle, shutdown_6994, 1);  // OFF = 1 => turn off 6994
-    PIN_setOutputValue(pin_handle, enable_10v, 0);     // enable 10V
-
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH

    InitEliteInstruction();
-    ADCGainControl(GAIN_AUTO);
-    elite_gptimer_open();

-    //    PIN_registerIntCb(pin_handle, switch_on_callback);
-    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
+    elite_gptimer_open();
 }

 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
@@ -66,7 +59,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui

 static void DACCode2Real2Notify(uint16_t DACcode) {
    int32_t RealV;
-    RealV = DAC_to_realV(DACcode);
+    RealV = DAC_to_realV(INSTRUCTION.VoutGainLevel, DACcode);

    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -74,16 +67,24 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
    NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
 }

-#define IsPeriodicMode() (  \
-(INSTRUCTION.eliteFxn == IV_CURVE) || \
-(INSTRUCTION.eliteFxn == CV_CURVE) || \
-(INSTRUCTION.eliteFxn == IT_CURVE) || \
-(INSTRUCTION.eliteFxn == VT_CURVE) || \
-(INSTRUCTION.eliteFxn == ZT_CURVE) || \
-(INSTRUCTION.eliteFxn == CONSTANT_CURRENT) || \
-(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY) || \
+#define IsPeriodicMode() (                            \
+(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == IT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == VT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == ZT_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)         || \
+(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
 (INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
-(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)  \
+(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)           || \
+(INSTRUCTION.eliteFxn == CALI_ADC_MODE)               \
+)
+
+#define Ve1MatchVe2Mode() (                           \
+(INSTRUCTION.eliteFxn == IV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CV_CURVE)                 || \
+(INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
+(INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY)    \
 )

 /*********************************************************************
@@ -98,59 +99,74 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
    if ( IsPeriodicMode() ){
        /** Periodic Event **/
-        // Default working flow is DAC out -> ADC read -> send notify
-        // We will need a flag to control DAC, if we want to exchange to ADC -> DAC -> notify
-        // This flag can be named by FxnNameDACReset
+        // Default working flow is vscan -> ADC read -> send notify
+        // We will need a flag to control vscan, ADC and notify

        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
        GPT.GptimerCounter0 = GPT.GptimerCounter;

        if(EliteWorkReset){
            InitEliteGPtimer();
-            EliteWorkReset = false;
+            EliteWorkReset  = false;
+            batteryADC_flag = false;
+            record_flag     = true;
+//            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+//            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            if( Ve1MatchVe2Mode() ){
+                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
+                    PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
+                }
+            }
        }


        GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-        if(LeadTimeReset && GPT.LeadTimeCounter <= 2000){
-            VscanReset = true;
+        if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
+            vscanReset = true;
        }else{
-            if(firstNotifyFlag){
-                GPT.NotifyCounter = INSTRUCTION.NotifyRate - 20;
-                firstNotifyFlag = false;
+            if(notifyFirst_flag){
+                GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
+                notifyFirst_flag = false;
            }
-            VscanReset = false;
-            LeadTimeReset = false;
+            vscanReset = false;
+            leadTimeReset = false;
        }

-        //DAC counter
-        // In IV, CV, and func-gen mode, DAC will output voltage
-        // else DAC do nothing.
-        GPT.StepTimeCounter = GPT.StepTimeCounter + GPT.DeltaGptimerCounter;
-        if(GPT.StepTimeCounter >= INSTRUCTION.StepTime){
-            GPT.StepTimeCounter -= INSTRUCTION.StepTime; //To get the time right
-            DAC_flag = true;
-            if(DAC_flag){
-                EliteDACControl(WorkModeData);
-                DAC_flag = false;
-            }
-        }
-
-        //Vscan counter
+        //vscan counter
        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-        if(GPT.VscanRateCounter >= INSTRUCTION.VscanRate){
-            GPT.VscanRateCounter -= INSTRUCTION.VscanRate; //To get the time right
-            Vscan_flag = true;
-            if(Vscan_flag){
+        if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
+            if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
+                GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
+            }else{
+                GPT.GptimerMultiple = 1;
+            }
+            GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
+            vscan_flag = true;
+            if(vscan_flag){
                EliteVscanControl(WorkModeData);
-                Vscan_flag = false;
+                vscan_flag = false;
            }
        }

-        //ADC counter(Control ADC to sample rate)
-        GPT.SampleRate_counter = GPT.SampleRate_counter + GPT.DeltaGptimerCounter;
-        if(GPT.SampleRate_counter >= INSTRUCTION.SampleRate){
-            GPT.SampleRate_counter = 0; //To get the data right, ADC must be delay 1.5ms
+        //battery counter
+        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+        if(GPT.BatteryCheckCounter >= 50000){
+            GPT.BatteryCheckCounter -= 50000; //To get right time
+            batteryCheck_flag = true;
+        }
+
+        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+        if( bat < 768 && bat > 20){
+            PIN_setOutputValue(pin_handle, enable_5v, 0);
+        }
+
+        //ADC counter
+        GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+        if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
+            GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
            ADC_flag = true;
            if(ADC_flag){
                EliteADCControl(WorkModeData);
@@ -159,11 +175,12 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        }

        //Notify counter(Notify control, check if we need to send notify)
+        //please don't put Notify counter before ADC counter, maybe get wrong data
        GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-        if(GPT.NotifyCounter >= INSTRUCTION.NotifyRate){
-            GPT.NotifyCounter -= INSTRUCTION.NotifyRate; //To get the time right
+        if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
+            GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
            notify_flag = true;
-            if(VscanReset){
+            if(vscanReset){
                notify_flag = false;
            }
            if(notify_flag){
@@ -172,152 +189,84 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            }
        }

-        EliteDone();
-    }
-
-    else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+//        EliteDone();
+    }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
        WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
-        DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
+        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
        FreeWorkMode(WorkModeData);
        PeriodicEvent = false;
-        InitPeriodicEvent = true;
-    }
-    else{
+    }else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
+        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
        PeriodicEvent = false;
    }
-}
-
-static void EliteDACControl(WorkMode *WorkModeData) {
-
-    if (INSTRUCTION.eliteFxn == ZT_CURVE){
-        if(INSTRUCTION.ResisterMeter == RESISTER_METER_SMALL){
-            // output 1V
-            if (DACReset) {
-                INSTRUCTION.VoltConstant = 25000 + 5000;
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-                DACReset = false;
-            }
-        }
-        else{
-            // output 1V
-            if (DACReset) {
-                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-                DACReset = false;
-            }
-        }
-    }
-//    else if(INSTRUCTION.eliteFxn == CONSTANT_CURRENT){
-//        if (DACReset) {
-//            DAC_outputV(Usercode_Correction_to_DAC(25000));
-//            DACReset = false;
-//        }
-//        CCModeVoltOut(WorkModeData->CC);
-//    }
-
    else{
-        // IT, VT need only ADC measure
-        return;
+        InitFlag();
    }
 }

 static void EliteADCControl(WorkMode *WorkModeData) {
    switch (INSTRUCTION.eliteFxn) {
        case IV_CURVE:{
-            OneWayVoltScan();
-            IV_Plot(WorkModeData->IV);
+            CC_Plot(WorkModeData);
            break;
        }
        case CV_CURVE:{
-            OneWayVoltScan();
-            CV_Plot(WorkModeData->CV);
+            CC_Plot(WorkModeData);
            break;
        }
        case IT_CURVE:{
-            IT_Plot(WorkModeData->IT);
+            IT_Plot(WorkModeData);
            break;
        }
        case VT_CURVE:{
-            // read volt through ADC and put it into notify buffer
-            VT_Plot(WorkModeData->VT);
+            VT_Plot(WorkModeData);
            break;
        }
        case ZT_CURVE:{
-            ZT_Plot(WorkModeData->RT);
+            CC_Plot(WorkModeData);
            break;
        }
        case CONSTANT_CURRENT:{
-            CC_Plot(WorkModeData->CC);
-//            CCModeReadCurrent(WorkModeData->CC);
-//                CCModeReverseCurrent(WorkModeData->CC);
+            CC_Plot(WorkModeData);
            break;
        }
        case CYCLIC_VOLTAMMETRY:{
-            if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
-                PeriodicEvent = false;
-            }
-            CV3_Plot(WorkModeData->CV3);
+            CC_Plot(WorkModeData);
            break;
        }
        case LINEAR_SWEEP_VOLTAMMETRY:{
-            if (INSTRUCTION.VoltOrigin == INSTRUCTION.VoltFinal) {
-                PeriodicEvent = false;
-            }
-            LSV_Plot(WorkModeData->LSV);
+            CC_Plot(WorkModeData);
            break;
        }
        case CONSTANT_VSCAN:{
-            CVSCAN_Plot(WorkModeData->CVSCAN);
+            CC_Plot(WorkModeData);
            break;
        }
+        case CALI_ADC_MODE:{
+            if(INSTRUCTION.AdcChannel == IIN_ADC){
+                cali_IT_plot(WorkModeData);
+            }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+                cali_VT_plot(WorkModeData);
+            }

-//            case READ_VOUT_VALUE:{
-//                RVout_Plot(WorkModeData->RVout);
-//                break;
-//            }
+            break;
+        }
        default:{
-            IT_Plot(WorkModeData->IT);
            break;
        }
    }
 }

-static void EliteNotifyControl() {
-    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
-        if (!PeriodicEvent) {
-            SendNotify();
-            reset();
-        }
-    }
-}
-
 static void EliteDone() {
    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
        if (!PeriodicEvent) {
            SendNotify();
-            reset();
+            Eliteinterrupt();
        }
    }
 }

-static void InitEliteGPtimer() {
-    GPT.SampleRate_counter = INSTRUCTION.SampleRate - 10;
-    GPT.VscanRateCounter =  INSTRUCTION.VscanRate - 1;
-    firstNotifyFlag = true;
-//    GPT.GptimerCounter = 0;
-//    GPT.GptimerCounter0 = 0;
-//    GPT.DeltaGptimerCounter = 0;
-//    GPT.StepTimeCounter = 0;
-}
-
-static void InitEliteFlag() {
-    DACReset = true;
-    VscanReset = true;
-    NotifyReset = true;
-    ADCReset = true;
-    EliteWorkReset = true;
-    LeadTimeReset = true;
-}
-
 static void EliteVscanControl(WorkMode *WorkModeData) {
    switch (INSTRUCTION.eliteFxn) {
        case IV_CURVE:{
@@ -328,6 +277,10 @@ static void EliteVscanControl(WorkMode *WorkModeData) {
            CV_Vscan(WorkModeData->CV);
            break;
        }
+        case ZT_CURVE:{
+            ZT_Vscan(WorkModeData->RT);
+            break;
+        }
        case CYCLIC_VOLTAMMETRY:{
            CV3_Vscan(WorkModeData->CV3);
            break;
@@ -350,43 +303,66 @@ static void EliteVscanControl(WorkMode *WorkModeData) {
    }
 }

-static uint16_t StepCode2DACcode(uint16_t StepCode){
-    return (StepCode * 0x0005 / 10);
-}
-
-static uint16_t OldStep2NewStepTime(uint8_t StepTime) {
+static uint32_t OldStep2NewStepTime(uint32_t StepTime){
    uint8_t StepTimeLevel = 0;
    StepTimeLevel = StepTime / 0x12;

    switch (StepTimeLevel) {
-    case 0: {  //0.5 sec
-        return STEPTIME_HALF_SEC;
+        case 0: {  //0.5 sec
+            return STEPTIME_HALF_SEC;
+        }
+        case 1: {  //1 sec
+            return STEPTIME_ONE_SEC;
+        }
+        case 2: {  //2 sec
+            return STEPTIME_TWO_SEC;
+        }
+        default: {  //1 sec
+            return STEPTIME_ONE_SEC;
+        }
    }
-    case 1: {  //1 sec
-        return STEPTIME_ONE_SEC;
-    }
-    case 2: {  //2 sec
-        return STEPTIME_TWO_SEC;
-    }
-    default: {  //1 sec
-        return STEPTIME_ONE_SEC;
-    }
-    }
-    //test version add
-//    switch (StepTimeLevel) {
-//    case 0: {  //0.5 sec
-//        return 100;
-//    }
-//    case 1: {  //1 sec
-//        return 200;
-//    }
-//    case 2: {  //2 sec
-//        return 1000;
-//    }
-//    default: {  //1 sec
-//        return STEPTIME_ONE_SEC;
-//    }
-//    }
 }

+static void step2VsetRate(uint32_t step){
+    /*step = 100 mv, index = 0, n = 2
+             10  mv, index = 1, n = 10
+             1   mv, index = 2, n = 100
+             0.1 mv, index = 3, n = 1000
+             0.01mv, index = 4, n = 10000  */
+
+    if(step >= 10000){
+        INSTRUCTION.VsetRateIndex = 0;
+    }else if (step >= 1000){
+        INSTRUCTION.VsetRateIndex = 1;
+    }else if (step >= 100){
+        INSTRUCTION.VsetRateIndex = 2;
+    }else if (step >= 10){
+        INSTRUCTION.VsetRateIndex = 3;
+    }else if (step >= 1){
+        INSTRUCTION.VsetRateIndex = 4;
+    }
+}
+
+static void InitFlag(){
+    PeriodicEvent     = false;     // is there an PeriodicEvent?
+    Free_Work_Mode    = true;      // Free(WorkModeData)
+}
+
+static void InitEliteGPtimer() {
+    GPT.SampleRateCounter = INSTRUCTION.sampleRate - 10;
+    GPT.VscanRateCounter  = INSTRUCTION.VsetRate - 1;
+    notifyFirst_flag      = true;
+}
+
+static void InitEliteFlag() {
+    InitPeriodicEvent = true;      // need to create a WorkModeData?
+    DACReset          = true;
+    vscanReset        = true;
+    EliteWorkReset    = true;
+    leadTimeReset     = true;
+    I_GAIN_100R_counter = 0;
+    I_GAIN_3K_counter   = 0;
+    I_GAIN_100K_counter = 0;
+    I_GAIN_3M_counter   = 0;
+}
 #endif /* IMPEDANCE_METER_H_ */
@@ -544,27 +544,24 @@ static void SimpleBLEPeripheral_init(void) {

 static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {

-#define CLOCK_ONE_SECOND 10000
-
    // Initialize application
    SimpleBLEPeripheral_init();

    ZM_init();
-    Elite_SPI_init();
    WorkMode *WorkModeData = CreateWorkMode();

-    uint8_t key         = 0;
+    uint8_t  key         = 0;
    uint16_t counter6994 = 0;
-    bool    EliteOn     = 0;
+    bool     EliteOn     = 0;

    // init DAC, set output ~= 0 V
-    DAC_outputV(Usercode_Correction_to_DAC(25000));
+//    DAC_outputV(25000);
    elite_gptimer_start();

    // Application main loops
    GPT.GptimerCounter0 = GPT.GptimerCounter;
-    ADCbattery_flag = false;
-    headstage_battery_volt();
+    batteryADC_flag = false;
+//    headstage_battery_volt();
    headstage_init_device_info();

    for (;;) {
@@ -616,67 +613,42 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
        }
        if(events & SBP_PERIODIC_EVT){
            events &= ~SBP_PERIODIC_EVT;
-            if (!PeriodicEvent) {                 // if there is no periodic event
+            if (!PeriodicEvent) {                // if there is no periodic event
                key = PIN_getInputValue(switch_on);
                if (EliteOn) {
                    if (counter6994 < CLOCK_ONE_SECOND/2) {  // counter6994 enable a IC after 35 counts
                        counter6994++;
                    } else if (counter6994 == CLOCK_ONE_SECOND/2) {
-                        PIN_setOutputValue(pin_handle, shutdown_6994, 1);  // OFF = 1 => turn off 6994
                        counter6994++;
                    }
                    EliteKeyPress(key);
-                    if(key != 0){
-                        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                        GPT.GptimerCounter0 = GPT.GptimerCounter;

-                        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-                        if(GPT.BatteryCheckCounter >= 50000){
-                            GPT.BatteryCheckCounter = 0;
-                            batteryCheckFlag = true;
-                        }
-
-                        if(GPT.BatteryADCCounter >= 15 && batteryCheckFlag){
-                            GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
-                            ADCbattery_flag = true;
-                            if(ADCbattery_flag){
-                                EliteADCBattery();
-                                ADCbattery_flag = false;
-                            }
-                        }
-
-                        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                                       ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-                        if( bat < 768 && bat > 20){
-                            PIN_setOutputValue(pin_handle, enable_5v, 0);
-                        }
-
-                    }
-                    if(Free_Work_Mode){
-                        FreeWorkMode(WorkModeData);
-                        InitEliteInstruction();
-                        ADCGainControl(INSTRUCTION.ADCGainLevel);
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
-                        Free_Work_Mode = false;
-                    }
+//                    if(key != 0){  //detect Elite battery power when no periodic event
+//                        measureBat();
+//                    }
+//                    if(Free_Work_Mode){
+//                        FreeWorkMode(WorkModeData);
+//                        InitEliteInstruction();
+////                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+//                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+//
+//                        Free_Work_Mode = false;
+//                    }
                } else {
                    EliteOn = TurnOnElite(key);
                }
            }
-            else {                               // if there is periodic event
-                if(InitPeriodicEvent){
-                    InitWorkMode(WorkModeData);
-                    InitPeriodicEvent = false;
-                }
-
-                // Perform periodic application task
-                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
-                key = PIN_getInputValue(switch_on);
-                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
-            }
+//            else {                               // if there is periodic event
+//                if(InitPeriodicEvent){
+//                    InitWorkMode(WorkModeData);
+//                    InitPeriodicEvent = false;
+//                }
+//
+//                // Perform periodic application task
+//                SimpleBLEPeripheral_performPeriodicTask(WorkModeData);
+//                key = PIN_getInputValue(switch_on);
+//                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
+//            }
        }

 #ifdef FEATURE_OAD
@@ -952,6 +924,17 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

        numActive = linkDB_NumActive();

+//        uint16_t cxnHandle;
+//
+//        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
+//        uint16_t requestedPDUSize = 251; //251 roy
+//        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
+//        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
+//
+//        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
+////            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+//        }
+
        // Use numActive to determine the connection handle of the last
        // connection
        if (linkDB_GetInfo(numActive - 1, &linkInfo) == SUCCESS) {
@@ -986,7 +969,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

    case GAPROLE_WAITING:
        SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-
+        ModeLED(BT_WAIT);
        break;

    case GAPROLE_WAITING_AFTER_TIMEOUT:
Author	SHA1	Message	Date
weiting2	83e2a6537c	note	2020-12-29 15:35:40 +08:00
weiting2	509419610b	WGAmp	2020-12-29 14:14:03 +08:00
frankydtai	4d5c4182fd	CTL_WRT_WGAMPL added	2020-12-28 15:35:59 +08:00
weiting2	91fadb0d97	WGAmp	2020-12-25 10:53:53 +08:00
weiting2	0ff4833fb0	WGAmp	2020-12-25 10:50:50 +08:00
weiting2	2f2967c09a	WGAmp	2020-12-25 10:47:18 +08:00
frankydtai	ba5b306fd5	CTL_WRT_WGAMPL added	2020-12-23 15:07:26 +08:00
frankydtai	2190115d6f	CTL_WRT_WGAMPL added	2020-12-23 14:07:50 +08:00
frankydtai	a7d083c6bc	Merge remote-tracking branch 'origin/EliteEIS_developement' into EliteEIS_developement # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteSPI.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_def.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h	2020-12-23 13:59:53 +08:00
frankydtai	7f51e113d6	CTL_WRT_WGAMPL added	2020-12-23 13:58:25 +08:00
weiting2	651e42d218	DFT finished	2020-12-21 10:54:17 +08:00
weiting2	8bbd4dbb41	commit	2020-12-11 17:01:49 +08:00
weiting2	a032346630	DFT in test	2020-11-24 10:16:33 +08:00
weiting2	6b78e8ebbe	Waveform Generation Done	2020-11-19 11:43:35 +08:00
weiting2	824ec33776	Waveform Generation Done	2020-11-10 16:14:41 +08:00
weiting2	969a726332	AC debug	2020-11-04 21:10:26 +08:00
weiting2	1215f8a30c	SPI fixed	2020-10-29 14:50:20 +08:00
weiting2	89e7706ac2	adjust more READ again....	2020-10-28 16:16:27 +08:00
weiting2	352e6f5e3b	adjust more READ again....	2020-10-27 16:12:40 +08:00
weiting2	87c82df18c	adjust more READ again...	2020-10-23 13:29:14 +08:00
weiting2	8f4eb259cf	adjust more READ again..	2020-10-22 14:47:34 +08:00
weiting2	ad12b9e857	adjust more READ again.	2020-10-20 16:37:17 +08:00
weiting2	3c91123424	adjust more READ again	2020-10-19 17:29:43 +08:00
weiting2	0c602842a3	adjust more READ	2020-10-13 16:23:44 +08:00
weiting2	a36b9e3ec2	adjust READ	2020-10-13 09:46:43 +08:00
YiChin	c7a92aa317	test SPICMD_READREG	2020-10-07 18:47:09 +08:00
YiChin	9ea145192e	update SPI1 phase	2020-10-07 17:30:18 +08:00
frankydtai	82abbcc528	AD_CS to Board_SP1_CS	2020-10-07 15:17:54 +08:00
YiChin	b99b75a31d	verification by bluetooth communication	2020-10-06 18:10:21 +08:00
YiChin	f5fa44b95a	verification by bluetooth communication	2020-10-06 16:50:18 +08:00
frankydtai	ff64788ba4	verification by bluetooth communication	2020-10-06 15:02:48 +08:00
frankydtai	1c49b2e204	INITIALIZATION debug	2020-10-06 14:01:06 +08:00
YiChin	171e3b2df6	INITIALIZATION set	2020-10-05 16:42:14 +08:00
frankydtai	16636e1c1d	INITIALIZATION set	2020-10-05 16:28:13 +08:00
YiChin	817eb45cb8	test volt output	2020-09-29 17:54:14 +08:00
YiChin	2ea3c76a49	test volt output	2020-09-29 14:17:56 +08:00
YiChin	4fc2c9c348	test volt output	2020-09-29 14:10:43 +08:00
YiChin	a321ea5f3e	test volt output	2020-09-29 13:42:22 +08:00
frankydtai	13ace26dd0	Merge remote-tracking branch 'origin/EliteEIS_developement' into EliteEIS_developement	2020-09-29 12:04:30 +08:00
frankydtai	ceb73191dc	SPI DAC registers set	2020-09-29 11:57:58 +08:00
YiChin	d5b5ebdadb	power test passed	2020-09-23 14:48:42 +08:00
YiChin	9ac63d8313	SPI DAC	2020-09-15 17:40:53 +08:00
frankydtai	0966c99b20	SPI DAC	2020-09-15 17:13:45 +08:00
roy	6f51cc35e2	delete something	2020-09-14 15:05:50 +08:00
frankydtai	e85974b12b	updated pins	2020-09-14 11:16:58 +08:00
frankydtai	f342ff0763	test EIS	2020-09-11 16:08:21 +08:00
YiChin	cbe9bd8211	CV mode foolproof	2020-09-07 17:58:18 +08:00
YiChin	0293647d0c	update cali dac mod	2020-09-04 16:32:53 +08:00
YiChin	87d187c3a5	add cali dac mode, need to take away auto change voutgain	2020-09-03 18:30:39 +08:00
YiChin	09fbfd9dda	update cali adc mode	2020-09-03 14:49:33 +08:00
YiChin	74ca631309	add cali adc mode	2020-09-02 15:49:49 +08:00
YiChin	03e86e175d	add cali mode 9/1	2020-09-01 15:44:42 +08:00
YiChin	1c54525256	update cali code	2020-09-01 13:41:02 +08:00
YiChin	d49874a666	add Vout of DAC	2020-08-28 13:30:35 +08:00
YiChin	6d6ba43d81	fix Iin of ADC	2020-08-26 09:50:37 +08:00
YiChin	4914498732	fix Vin of ADC	2020-08-25 18:10:08 +08:00
YiChin	85220734de	spi hold when run mode	2020-08-24 15:59:18 +08:00
YiChin	7531a6638b	update Iin boundary	2020-08-20 11:50:21 +08:00
Benny Liu	4088a4d38b	Calibration data of BOARD_C6D4.	2020-08-19 18:18:53 +08:00
YiChin	1b3d057d33	update LED fun	2020-08-18 14:18:35 +08:00
YiChin	17e1846afa	fix slowly vscan of CV3 & CV & LSV mode	2020-08-18 14:09:14 +08:00
YiChin	0407690197	fix slowly vscan of IV mode	2020-08-14 09:22:21 +08:00
YiChin	55e8b37f13	test Vout & highZ	2020-08-12 14:52:47 +08:00
YiChin	fb4c0a59e8	update Vin boundary	2020-08-11 16:35:39 +08:00
YiChin	ea3d146c86	test Vin change level	2020-08-11 15:38:32 +08:00
YiChin	cddafdffff	Modify ADC test for calibration.	2020-08-11 15:11:50 +08:00
YiChin	05e953d6e2	test Vin change level	2020-08-11 15:09:57 +08:00
YiChin	9b7e960bec	test Vin change level	2020-08-11 14:42:27 +08:00
YiChin	c3aa2f7178	test Vin change level	2020-08-11 14:37:37 +08:00
YiChin	5b4970d814	test Vin change level	2020-08-11 14:09:19 +08:00
YiChin	46c43afa26	test Vin change level	2020-08-10 18:08:27 +08:00
YiChin	6bcfc74d1a	test Vin change level	2020-08-10 17:25:23 +08:00
YiChin	4d920209f7	test ADC code	2020-08-10 16:11:36 +08:00
YiChin	52f8708905	test ADC code	2020-08-10 15:46:53 +08:00
YiChin	b7024363ee	test ADC code	2020-08-10 14:54:09 +08:00
YiChin	1a6d30606c	test ADC code	2020-08-10 10:48:09 +08:00
YiChin	e72698dea3	test ADC code	2020-08-07 14:36:04 +08:00
YiChin	3100dded42	update BOARD_C6E1 calibration data.	2020-08-06 18:23:55 +08:00
YiChin	53584f2b5b	add BOARD_C6E1 calibration data.	2020-08-06 15:35:03 +08:00
YiChin	b2d924228a	fix auto change level	2020-08-06 13:48:28 +08:00
YiChin	f3de02477d	fix change level ok	2020-08-06 10:01:48 +08:00
YiChin	77a2bc2d8f	fix change level ok	2020-08-06 09:49:25 +08:00
YiChin	c56a07ead8	test ADC_TEST	2020-08-05 09:37:25 +08:00
YiChin	2e3ca56ece	test ADC_TEST	2020-08-04 16:35:42 +08:00
YiChin	b8588393b7	test ADC_TEST	2020-08-04 16:31:27 +08:00
YiChin	ea33b37080	test ADC_TEST	2020-08-04 15:22:40 +08:00
YiChin	ea7815dc64	Elite 1.4 upgrade to Elite 1.5	2020-08-04 12:36:31 +08:00
YiChin	2340b0e88c	add BOARD_7C4F calibration data.	2020-08-03 17:22:36 +08:00
YiChin	d05d42415a	add BOARDs calibration data.	2020-08-03 17:10:03 +08:00
YiChin	e34db21efd	update BOARDs calibration data.	2020-07-30 17:07:02 +08:00
YiChin	f6a1a9fa4e	take away ZT_plot	2020-07-29 15:21:38 +08:00
YiChin	a567483ffa	Merge branch 'Elite_OBJ_0.2mv_fixLV_0727_1' into Elite_OBJ_0.2mv	2020-07-29 14:38:11 +08:00
YiChin	9dc0a0109a	cv mode instruction split twice	2020-07-29 14:29:06 +08:00
YiChin	afd9ac1223	update BOARDs calibration data.	2020-07-29 09:57:02 +08:00
YiChin	30ff3a6d69	test	2020-07-28 18:15:22 +08:00
YiChin	50781513dc	take away BT config	2020-07-28 17:22:07 +08:00
YiChin	fab091d3ec	fix change level	2020-07-28 10:09:33 +08:00
YiChin	b734f2d44c	fix change level	2020-07-27 18:27:10 +08:00
YiChin	576c6e5177	fix change level	2020-07-27 18:17:13 +08:00
YiChin	70a8640327	fix change level	2020-07-27 18:06:12 +08:00
YiChin	72d95dac61	fix change level	2020-07-27 17:21:20 +08:00
YiChin	84367ae2d3	fix change level	2020-07-27 11:22:38 +08:00
YiChin	c06a9a996e	Merge branch 'Elite_OBJ_0.2mv_datalength_07211' into Elite_OBJ_0.2mv_fixLV_0727_1	2020-07-27 10:00:04 +08:00
YiChin	699c6d1365	update LED code	2020-07-22 10:42:24 +08:00
YiChin	cbad40dc5a	add BOARD_5AB8 calibration data.	2020-07-22 09:41:06 +08:00
YiChin	53afd6dd2f	add BOARD_5AB8 calibration data.	2020-07-22 09:39:44 +08:00
YiChin	5f12e4b10d	update LED code	2020-07-22 09:31:20 +08:00
YiChin	28f6c39288	update LED code	2020-07-21 17:26:38 +08:00
YiChin	ec7bd09b70	update CV3 surge & update BT config	2020-07-21 16:31:22 +08:00
YiChin	dc6ac4cf19	BT config(data length)	2020-07-21 14:33:14 +08:00
YiChin	15cde79313	take away BT config	2020-07-20 18:34:11 +08:00
YiChin	ac6767f082	720 version	2020-07-20 17:53:22 +08:00
YiChin	4f7c2205b0	Update BOARD_7A7A calibration data.	2020-07-20 14:35:19 +08:00
Benny Liu	f576158d38	Merge remote-tracking branch 'origin/Elite_OBJ_0.2mv' into Elite_OBJ_0.2mv # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h	2020-07-17 16:06:40 +08:00
Benny Liu	47fc620923	Update BOARD_C758 calibration data.	2020-07-17 16:04:55 +08:00
YiChin	897270dab4	Update BOARD_C758 calibration data.	2020-07-17 13:54:06 +08:00
YiChin	3becd44444	Update BOARD_C758 calibration data.	2020-07-17 12:20:24 +08:00
YiChin	4bfa35858d	BT config	2020-07-16 18:19:15 +08:00
YiChin	d6068f8e5c	BT config	2020-07-16 15:36:15 +08:00
YiChin	2ea33f0269	measure battery when recording	2020-07-16 12:45:45 +08:00
YiChin	f9da0bbad4	measure battery when recording	2020-07-16 12:25:12 +08:00
YiChin	46bd7e04cf	Merge branch 'Elite_OBJ_0.2mv_0702_eventBat4_F5' into Elite_OBJ_0.2mv_add_battery # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h	2020-07-16 12:12:52 +08:00
YiChin	e3a04ad8e5	measure battery when recording	2020-07-16 11:20:07 +08:00
YiChin	6cfde66c24	add BOARD_7C62&7C2E calibration data.	2020-07-16 09:32:36 +08:00
YiChin	f9f0aeaf87	measure battery when recording	2020-07-15 17:58:39 +08:00
YiChin	1856096cf3	fix Vout mode	2020-07-15 15:57:52 +08:00
YiChin	e960b0859a	measure battery when recording	2020-07-14 18:17:38 +08:00
YiChin	bcebfaa777	measure battery when recording	2020-07-14 17:53:18 +08:00
YiChin	5be3e2ec10	measure battery when recording	2020-07-14 17:37:36 +08:00
YiChin	49f2f6b1ea	update init code	2020-07-14 16:36:12 +08:00
YiChin	9afe79edfb	update init code	2020-07-14 15:56:23 +08:00
YiChin	fc67ea915e	update init code	2020-07-14 14:42:57 +08:00
YiChin	7b866d025a	update init code	2020-07-14 11:47:39 +08:00
YiChin	13864e766a	update init code	2020-07-13 18:14:47 +08:00
YiChin	ee0ff789f3	update init code	2020-07-13 15:51:15 +08:00
YiChin	7f6a871501	update workdata code	2020-07-13 13:26:41 +08:00
YiChin	d4681171b4	fix cc i = 0	2020-07-13 12:34:52 +08:00
YiChin	9b61eda6c2	take away something	2020-07-10 18:02:19 +08:00
YiChin	0bc5b8bfb8	update CV3 LSV CA code (ADC)	2020-07-10 16:07:13 +08:00
YiChin	4c88d96928	update CC code (ADC)	2020-07-10 14:59:16 +08:00
YiChin	ffeb980a39	update IT VT RT IV CV code (ADC)	2020-07-10 14:21:10 +08:00
YiChin	1876714222	update CA code (Chronoamperometry mode)	2020-07-10 10:37:13 +08:00
YiChin	075e65604b	update LSV code	2020-07-10 10:22:31 +08:00
YiChin	7dbc090909	update CV3 code	2020-07-10 09:31:13 +08:00
YiChin	c95e379cd1	update CV3 code	2020-07-09 18:32:11 +08:00
YiChin	9284cfacfc	update IV CV CC code	2020-07-09 17:30:10 +08:00
YiChin	dcced24976	update IV CV code	2020-07-09 16:29:16 +08:00
YiChin	286164a76d	update IV code	2020-07-09 14:57:39 +08:00
YiChin	51d2e88978	update IT VT RT code	2020-07-09 10:27:15 +08:00
YiChin	29b73a88ae	update workdata code	2020-07-09 09:51:23 +08:00
YiChin	99f2e53b34	update workdata code	2020-07-08 18:09:40 +08:00
YiChin	6d14af0e18	update workdata code	2020-07-08 17:11:46 +08:00
YiChin	43282ac881	update workdata code	2020-07-08 16:29:09 +08:00
YiChin	aec07f750b	update workdata code	2020-07-08 14:59:07 +08:00
YiChin	5c38dd785a	update header code	2020-07-08 14:31:44 +08:00
YiChin	46473fbae0	take away RVout mode	2020-07-08 14:13:12 +08:00