cali_count_max = 5000 for smallest Vin and Iin gain

Add calibration count from 1000 to 5000.
[update] align notify (match megafly ui)
2020-12-17 12:38:38 +08:00 · 2020-12-03 14:36:31 +08:00 · 2020-11-26 22:48:53 +08:00 · 2020-11-26 16:14:31 +08:00 · 2020-11-26 15:48:01 +08:00 · 2020-11-23 12:12:09 +08:00
31 changed files with 2649 additions and 3419 deletions
@@ -0,0 +1,246 @@
+
+#ifndef Elite15_PIN
+#define Elite_15PIN
+
+#include "Elite_PIN.h"
+
+static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
+    switch (latch_num) {
+        case LOAD0: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH0[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH0[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH0[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH0[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH0[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH0[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH0[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH0[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD1: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH1[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH1[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH1[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH1[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH1[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH1[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH1[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH1[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD2: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH2[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH2[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH2[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH2[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH2[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH2[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH2[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH2[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+             break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
+    ELITE15_SPI_CLOSE();
+    add_elite_pin();
+    update_latch_status (latch_num, pin_num, highlow);
+//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+
+    switch (latch_num) {
+        case LOAD0: {
+//            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
+//            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
+//            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
+//            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
+            break;
+        }
+        case LOAD1: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
+            break;
+        }
+        case LOAD2: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+    CPUdelay(10);
+    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+    remove_elite_pin();
+    ELITE15_SPI_HOLD();
+}
+
+static void Init_Elite15_PIN () {
+    InitLH();
+    add_elite_pin();
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 0);
+    PIN_setOutputValue(pin_handle, D5, 0);
+    PIN_setOutputValue(pin_handle, D6, 0);
+    PIN_setOutputValue(pin_handle, D7, 0);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 1);
+    PIN_setOutputValue(pin_handle, LOAD2, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 1);
+    PIN_setOutputValue(pin_handle, D5, 1);
+    PIN_setOutputValue(pin_handle, D6, 1);
+    PIN_setOutputValue(pin_handle, D7, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+
+    remove_elite_pin();
+
+//    InitLH();
+//    add_elite_pin();
+//
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD1, 1);
+//    PIN_setOutputValue(pin_handle, LOAD2, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 0);
+//    PIN_setOutputValue(pin_handle, D5, 0);
+//    PIN_setOutputValue(pin_handle, D6, 0);
+//    PIN_setOutputValue(pin_handle, D7, 0);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//
+//    remove_elite_pin();
+}
+
+
+
+
+#endif
@@ -46,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);
 }

@@ -56,34 +55,108 @@ 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);
+/* 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;
    }
-    else if(ADCLevel == 1){
-        // ADC gain level = 1, using 10K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}
+
+/* Gain Control for Vin & Iin */
+static void IinADCGainControl(uint8_t IinADCLevel){
+    if(IinADCLevel == 0){
+        // ADC gain level = 0, using 3M resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 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(IinADCLevel == 1){
+        // ADC gain level = 1, using 100K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 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 if(IinADCLevel == 2){
+        // ADC gain level = 2, using 3K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 1);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 3){
+        // ADC gain level = 3, using 100R resistor
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 4){
+        // ADC gain level = 3, auto gain (using 100R resister)
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
    }
    else{
-        // default using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
+        // default using 100R resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+
+    if(IinADCLevel == 0 || IinADCLevel == 1 || IinADCLevel == 2 || IinADCLevel == 3){
+        lastIinADCGainLevel = IinADCLevel;
+    }else{
+        lastIinADCGainLevel = 3;
+    }
+}
+
+static void VinADCGainControl(uint8_t VinADCLevel){
+    if(VinADCLevel == 0){
+        // Vin ADC gain level = 0, using 1M resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 1){
+        // Vin ADC gain level = 1, using 30K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 1);
+    }
+    else if(VinADCLevel == 2){
+        // Vin ADC gain level = 2, using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 3){
+        // Vin ADC gain level = 3, auto gain (using 1K resister)
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else{
+        // default using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+
+    if(VinADCLevel == 0 || VinADCLevel == 1 || VinADCLevel == 2){
+        lastVinADCGainLevel = VinADCLevel;
+    }else{
+        lastVinADCGainLevel = 2;
    }
 }

@@ -124,8 +197,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);

@@ -133,7 +218,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);
@@ -142,16 +227,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
-    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);
@@ -160,133 +236,371 @@ 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)
+/* Old boundary
+#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
+*/
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2500  // 2.5  uA =     2,500,000 pA
+#define I_GAIN_MID1_BOUNDARY2   100000  // 100  uA =   100,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    85000  // 85   uA =    85,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  2050000  // 2050 uA =     2,050,000 nA
+#define I_GAIN_LARGE_BOUNDARY  1800000  // 1800 uA =     1,800,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 35000  // 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;
-        ADCGainControl(INSTRUCTION.ADCGainLevel);
-    }
+    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 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 > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_200K_counter = 0;
+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;
                }
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_10K_counter = 0;
+            }
+            // 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(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
+            if(I_GAIN_3K_counter > 0){
+                I_GAIN_3K_counter--;
            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_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 == 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 > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200R;
-                ADCGainControl(INSTRUCTION.ADCGainLevel);
-                GAIN_200R_counter = 0;
+    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;
+                }

-        // 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 > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200K;
-                ADCGainControl(INSTRUCTION.ADCGainLevel);
-                GAIN_200K_counter = 0;
+            }
+        }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 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(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
+            if(VIN_GAIN_1K_counter > 0){
+                VIN_GAIN_1K_counter--;
            }
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
            }
        }
    }
-    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 > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200R;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_200R_counter = 0;
+    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;
                }
-
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    ADCGainControl(INSTRUCTION.ADCGainLevel);
-                    GAIN_10K_counter = 0;
+            }
+            // 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(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
+        }else{
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_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;
+    }
+
+    ADCValueAVG = ADCValueSUM / avgcount;
+    ADCValueAVG_RAW = (uint16_t) (ADCValueAVG & 0x0000FFFF);
+
+    // Blue light for data acquire done
+    Elite_led_color(COLOR_BLUE);
+
+    if (ADCValueAVG_RAW > 0x7FFF) {
+        ADCValueAVG_RAW = 0x0000;
+    }
+
+    // clean data
+    ADCValueAVG = 0;
+    ADCValueSUM = 0;
+    ADCValueTemp = 0;
+
+//    // Blue light for data acquire done
+//    Elite_led_color(COLOR_BLUE);
+
+
+
+    return ADCValueAVG_RAW;
+}
+
 #endif
@@ -11,9 +11,8 @@
 * Real current value : -15.00000 ~ 15.00000 mA
 *  => user code = 1500000 mapping to 0.00000 mA
 */
-static void CC_Vscan(WorkMode *WM){
+static void CC_Vscan(CCMode *CC){
    static int32_t Iin = 0;
-    static int32_t Vin = 0;
    static int32_t deltaI = 0;
    static int32_t deltaV = 0;
    uint16_t divisionRate;
@@ -21,13 +20,12 @@ static void CC_Vscan(WorkMode *WM){
    if(vscanReset){
        Vset = 0;

-        if(WM->CC->_charge == 0){
-            WM->CC->_Iset = INSTRUCTION.constantCurrent * 200 * (-1); //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
+        if(CC->_charge == 0){
+            CC->_Iset *= -1;
        }

-        Vin = WM->CC->_measureVin * 200;
-        Iin = WM->CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - WM->CC->_Iset;
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;

        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
            divisionRate = 1000;
@@ -45,24 +43,16 @@ static void CC_Vscan(WorkMode *WM){

        Vset = Vset + deltaV; //[5nV]

-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        if(Vset <= WM->CC->_Vmin){
-            Vset = WM->CC->_Vmin;
-        }else if(Vset >= WM->CC->_Vmax){
-            Vset = WM->CC->_Vmax;
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
        }
    }

    if(!vscanReset){
-        Iin = WM->CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        Vin = WM->CC->_measureVin * 200;
-
-        deltaI = Iin - WM->CC->_Iset;
+        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        deltaI = Iin - CC->_Iset;

        if(deltaI > 20000000 || deltaI < -20000000){ //1mA
            divisionRate = 1000;
@@ -80,43 +70,10 @@ static void CC_Vscan(WorkMode *WM){

        Vset = Vset + deltaV; //[5nV]

-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        static uint8_t cci0 = false;
-        if(Vin <= WM->CC->_Vmin){
-            cci0 = true;
-            if(cci0){
-                FreeWorkMode(WM);
-                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 = 0x01;//read Vscan = Vout - Vin
-                cci0 = false;
-            }
-        }else if(Vin >= WM->CC->_Vmax){
-            cci0 = true;
-            if(cci0){
-            FreeWorkMode(WM);
-            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 = 0x01;//read Vscan = Vout - Vin
-            cci0 = false;
-            }
+        if(Vset <= CC->_Vmin){
+            Vset = CC->_Vmin;
+        }else if(Vset >= CC->_Vmax){
+            Vset = CC->_Vmax;
        }
    }
 //    int32_t RealV;
@@ -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,12 +34,12 @@ static uint16_t CV3Curve(CV3Mode *CV3){
     return DACOutCode;
 }

-static void CV3_Vscan(WorkMode *WM){
+static void CV3_Vscan(CV3Mode *CV3){
    static int16_t VminCounter;
    static int16_t VmaxCounter;
    static uint16_t CycleCounter;

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

    if(vscanReset){
        VmaxCounter = 0;
@@ -47,96 +47,95 @@ static void CV3_Vscan(WorkMode *WM){
        CycleCounter = 0;

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

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

-        if(WM->CV3->_Vmin == WM->CV3->_Vinit){
+        if(CV3->_Vmin == CV3->_Vinit){
            VminCounter = -1;
        }
-        if(WM->CV3->_Vmax == WM->CV3->_Vinit){
+        if(CV3->_Vmax == CV3->_Vinit){
            VmaxCounter = -1;
        }

-        Vset = WM->CV3->_Vinit;
+        Vset = CV3->_Vinit;
    }

    if(!vscanReset){
        if((INSTRUCTION.Vinit < INSTRUCTION.Ve1 && INSTRUCTION.Vinit < INSTRUCTION.Ve2) ||
        (INSTRUCTION.Vinit > INSTRUCTION.Ve1 && INSTRUCTION.Vinit > INSTRUCTION.Ve2)
        ){
-            if (WM->CV3->_current_direction_up){
-                Vset = Vset + WM->CV3->_Vstep;
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep;
            }else{
-                Vset = Vset - WM->CV3->_Vstep;
+                Vset = Vset - CV3->_Vstep;
            }

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

-            if (WM->CV3->_current_direction_up){
-                Vset = Vset + WM->CV3->_Vstep;
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
            }else{
-                Vset = Vset - WM->CV3->_Vstep;
+                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
            }

            if(VmaxCounter != 0 && VminCounter != 0){
-                if(VmaxCounter == VminCounter && WM->CV3->_direction_up && WM->CV3->_current_direction_up){
+                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
                    if(CycleCounter != VmaxCounter){
-                        if(Vset >= WM->CV3->_Vinit){
-                            WM->CV3->_cycleNumber--;
+                        if(Vset >= CV3->_Vinit){
+                            CV3->_cycleNumber--;
                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                        }
                    }
                }
-                if(VmaxCounter == VminCounter && !WM->CV3->_direction_up && !WM->CV3->_current_direction_up){
+                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
                    if(CycleCounter != VmaxCounter){
-                        if(Vset <= WM->CV3->_Vinit){
-                            WM->CV3->_cycleNumber--;
+                        if(Vset <= CV3->_Vinit){
+                            CV3->_cycleNumber--;
                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
                        }
                    }
                }
            }

-            if (Vset >= WM->CV3->_Vmax){
-                WM->CV3->_current_direction_up = false;
-            }else if (Vset <= WM->CV3->_Vmin){
-                WM->CV3->_current_direction_up = true;
+            if (Vset >= CV3->_Vmax){
+                CV3->_current_direction_up = false;
+            }else if (Vset <= CV3->_Vmin){
+                CV3->_current_direction_up = true;
            }

            /*stop condition*/
-            if(WM->CV3->_cycleNumber == 0){
+            if(CV3->_cycleNumber == 0){
    //            PeriodicEvent = false;
-                FreeWorkMode(WM);
+                ModeLED(POST_WORK);
                InitEliteFlag();
                INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
                INSTRUCTION.sampleRate = 15;
@@ -177,9 +177,9 @@ static void CV_Vscan(CVMode *CV){
        }

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

        if(VmaxCounter != 0 && VminCounter != 0){
@@ -209,7 +209,8 @@ static void CV_Vscan(CVMode *CV){

        /*stop condition*/
        if(CV->_cycleNumber == 0){
-            reset();
+            PeriodicEvent = false;
+            ModeLED(NO_EVENT);
        }
    }
 }
@@ -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]
@@ -52,9 +52,29 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
    spi_DACtxbuf[2] = v2;

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

+static void VoutGainControl(uint8_t VOUTLevel){
+    if(VOUTLevel == 0){
+        // VOUT gain level = 0, using 240K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
+    }
+    else if(VOUTLevel == 1){
+        // VOUT gain level = 1, using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
+    else if(VOUTLevel == 2){
+        // VOUT gain level = 2, using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
+    else{
+        // default using 15K resister
+        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+    }
+}
+
 #endif

 static int32_t User2Real(uint16_t UserCode){
@@ -62,4 +82,40 @@ 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  // 25500(usercode) = 100 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY           300000  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE   26500  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE  23500  // 23500(usercode) = -300 mV
+
+static void AutoGainChangeVout(int32_t userCode){
+    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
+    // 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;
+        VoutGainControl(INSTRUCTION.VoutGainLevel);
+        record_flag = false;
+    }
+
+    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;
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
+            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;
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
+            record_flag = false;
+        }
+    }
+}
+
 #endif
@@ -21,6 +21,7 @@ struct _GPT{
    uint32_t LeadTimeCounter;
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
 }GPT = {0};

 static void InitCT(){
@@ -27,18 +27,20 @@ static void IV_Vscan(IVMode *IV){
    if(!vscanReset){
        if(IV->_current_direction_up){
            if(Vset >= IV->_Vmax){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
            }
        }else{
            if(Vset <= IV->_Vmin){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
            }
        }

        if (IV->_current_direction_up){
-            Vset = Vset + IV->_Vstep;
+            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
        }else{
-            Vset = Vset - IV->_Vstep;
+            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
        }
    }
 }
@@ -2,16 +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
+
+/** 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
+
+/** 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

 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -44,7 +60,12 @@ struct HEADSTAGE_INSTRUCTION {
    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;
@@ -54,9 +75,27 @@ struct HEADSTAGE_INSTRUCTION {
    uint8_t  charge;
    int32_t  constantCurrent;
    int32_t  Currentmax;
+    int32_t  t1;
+    int32_t  t2;
+    int32_t  t3;
+    int32_t  t4;
+    int32_t  t5;
+    int32_t  v1;
+    int32_t  v2;
+    int32_t  v3;
+    int32_t  v4;
+    int32_t  v5;
+    int32_t  t1Time;
+    int32_t  t2Time;
+    int32_t  t3Time;
+    int32_t  t4Time;
+    int32_t  t5Time;
+    uint16_t loop;

    uint16_t StepTime;

+    uint8_t AdcChannel;
+
 } INSTRUCTION = {0};

 /*********************************************************************
@@ -86,40 +125,33 @@ static void InitEliteInstruction(){
    INSTRUCTION.sampleRate      = 100;
    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
    INSTRUCTION.AutoGainEnable  = 1;
-    INSTRUCTION.ADCGainLevel    = GAIN_AUTO;
+    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;
+    INSTRUCTION.t1              = 0;
+    INSTRUCTION.t2              = 0;
+    INSTRUCTION.t3              = 0;
+    INSTRUCTION.t4              = 0;
+    INSTRUCTION.t5              = 0;
+    INSTRUCTION.t1Time          = 0;
+    INSTRUCTION.t2Time          = 0;
+    INSTRUCTION.t3Time          = 0;
+    INSTRUCTION.t4Time          = 0;
+    INSTRUCTION.t5Time          = 0;
+    INSTRUCTION.v1              = DAC_ZERO;
+    INSTRUCTION.v2              = DAC_ZERO;
+    INSTRUCTION.v3              = DAC_ZERO;
+    INSTRUCTION.v4              = DAC_ZERO;
+    INSTRUCTION.v5              = DAC_ZERO;
+    INSTRUCTION.loop            = 1;
 }
-
-/*********************************************************************
- * @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
@@ -12,12 +12,12 @@ static bool TurnOnElite(uint8_t key) {
            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);
+                PIN15_setOutputValue(enable_5v, 0);
                return false;
            }else{
-                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
+                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
                TurnOn10V();
-                LEDPowerON();
+                ModeLED(BT_WAIT);
                return true;
            }
        } else {
@@ -26,7 +26,7 @@ static bool TurnOnElite(uint8_t key) {
        }
    } else {
        TurnOnCounter = 0;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);
+        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -40,20 +40,20 @@ static void EliteKeyPress(uint8_t key) {
        // press key => bight LED

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

        // press 3~4 sec, shutdown 2650
        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
+            PIN15_setOutputValue(enable_5v, 0);  // disable 5V
        }
        ShutDownCounter ++;
    } else {
        if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
            if (ShutDownCounter != 0) {
                // dark LED
-                WorkModeLED();
+                checkFlafLED();
                ShutDownCounter = 0;
            }
        } else {  // old function != currunt instruction
@@ -61,15 +61,14 @@ 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);
+    PIN15_setOutputValue(enable_10v, 1);
    CPUdelay(8000);
 }

@@ -5,6 +5,8 @@
 #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;
    spi_LEDtxbuf[1] = 0x0000;
@@ -17,26 +19,31 @@ 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 Elite_led_color(uint16_t color){
    switch (color) {
        case COLOR_RED: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x00);
+            LED_color(DARKLED, 0x50, 0x00, 0x00);
            break;
        }
        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0xFF, 0x58, 0x09);
+            LED_color(DARKLED, 0x50, 0x58, 0x09);
            break;
        }
        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
+            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;
@@ -46,104 +53,58 @@ static void Elite_led_color(uint16_t color){
            break;
        }
        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x80);
+            LED_color(DARKLED, 0x50, 0x00, 0x80);
            break;
        }
        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+            LED_color(DARKLED, 0x50, 0x00, 0xFF);
            break;
        }
        case COLOR_WHITE: {
-            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
+            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
            break;
        }
        case COLOR_BLACK: {
            LED_color(0x00, 0x00, 0x00, 0x00);
            break;
        }
-        //dark LED
-        case COLOR_YELLOW_DARK: {
-            LED_color(DARKLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN_DARK: {
-            LED_color(DARKLED, 0x00, 0x33, 0x00);
-            break;
-        }
-        case COLOR_BLUE_DARK: {
-            LED_color(DARKLED, 0x00, 0x00, 0x33);
-            break;
-        }
-        case COLOR_CYAN_DARK: {
-            LED_color(DARKLED, 0x00, 0x10, 0x10);
-            break;
-        }
-        case COLOR_PURPLE_DARK: {
-            LED_color(DARKLED, 0x55, 0x00, 0x55);
-            break;
-        }
        default: {
            break;
        }
    }
 }

-static void WorkModeLED() {
-    switch (INSTRUCTION.eliteFxn) {
-    case IV_CURVE: {
-        WORKLED();
+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:{
-        Elite_led_color(COLOR_BLUE);
-        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();
-        break;
-    }
-    case CONSTANT_VSCAN: {
-        WORKLED();
+    case POST_WORK: {
+        postWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
        break;
    }
    default: {
@@ -153,58 +114,68 @@ 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 PULSE_MODE:{
+//        Elite_led_color(COLOR_YELLOW);
+        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
@@ -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,42 +34,42 @@ static uint16_t LSVCurve(LSVMode *LSV){
     return DACOutCode;
 }

-static void LSV_Vscan(WorkMode *WM){
+static void LSV_Vscan(LSVMode *LSV){

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

    if(vscanReset){
        if(INSTRUCTION.directionInit == 1){
-            WM->LSV->_direction_up         = true;
-            WM->LSV->_current_direction_up = true;
+            LSV->_direction_up         = true;
+            LSV->_current_direction_up = true;
        }else{
-            WM->LSV->_direction_up         = false;
-            WM->LSV->_current_direction_up = false;
+            LSV->_direction_up         = false;
+            LSV->_current_direction_up = false;
        }

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

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

    if(!vscanReset){

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

        /*stop condition*/
-        if (Vset >= WM->LSV->_Vmax){
+        if (Vset >= LSV->_Vmax){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
-            Vset = WM->LSV->_Vmin;
-            FreeWorkMode(WM);
+            Vset = LSV->_Vmin;
            InitEliteFlag();
            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate = 15;
@@ -79,10 +79,10 @@ static void LSV_Vscan(WorkMode *WM){
            INSTRUCTION.Vmin       = 0x0000;
            INSTRUCTION.notifyRate = 500;
            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
-        }else if (Vset <= WM->LSV->_Vmin){
+        }else if (Vset <= LSV->_Vmin){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
-            Vset = WM->LSV->_Vmax;
-            FreeWorkMode(WM);
+            Vset = LSV->_Vmax;
            InitEliteFlag();
            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate = 15;
@@ -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
+
@@ -10,11 +10,10 @@
 #include "headstage.h"

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

 #define NOT_BUF_OFFSET_INIT 8

@@ -25,11 +24,10 @@
 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 uint8_t  NotifyTemperature[4] = {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 ******************************** //
@@ -119,13 +117,13 @@ static void SendNotify() {

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

 static void initINSBuf(){
    for (int i = 0; i < BLE_INS_BUFF_SIZE; i++){
-            ins_buf[i] = 0;
+        ins_buf[i] = 0;
    }
 }

@@ -185,12 +183,6 @@ static void InputNotify(int NotifyType, int32_t Data){
            NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
            NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
            break;
-        case NOTIFY_TEMPERATURE :
-            NotifyTemperature[0] = (uint8_t)((Data & 0xFF000000) >> 24);
-            NotifyTemperature[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
-            NotifyTemperature[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
-            NotifyTemperature[3] = (uint8_t)(Data & 0x000000FF);
-            break;
    }
 }
 #endif
@@ -0,0 +1,345 @@
+#ifndef ELITEPULSE
+#define ELITEPULSE
+
+#define Vset INSTRUCTION.Vset
+
+//static uint16_t CV3Curve(CV3Mode *CV3){
+//    static uint16_t DACOutCode;
+//    static int32_t Vin;
+//    static int32_t Vout;
+//    static int32_t DeltaVout;
+//
+//    Vin = CV3->_measureVin * 200;//[5nV]
+//    if(DACReset){
+//        Vout = Vset + Vin;
+//        DACReset = false;
+//    }else{
+//        DeltaVout = Vset - (Vout - Vin);
+//        Vout = Vout + DeltaVout;
+//    }
+//
+//    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
+//    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.DacVoutAgcLevel, INSTRUCTION.VoltConstant);
+//
+//    int32_t RealV2;
+//    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
+//    InputNotify(NOTIFY_VOLT, RealV2);
+//
+//    int32_t RealV;
+//    RealV = (int32_t)(Vout / 200);//[1uV]
+//    InputNotify(NOTIFY_IMPEDANCE, RealV);
+//
+//    DAC_outputV(DACOutCode);
+//
+//     return DACOutCode;
+//}
+
+//static void PULSE_Vscan(PULSEMode *PULSE){
+//    static uint16_t lastVolt;
+//    if (vscanReset) {
+//        lastVolt = INSTRUCTION.VoltConstant;
+//        if (PULSE->_tflag == 0) {
+//            PULSE->_tflag = PULSE->_t2;
+//            PULSE->_vflag = PULSE->_v2;
+//        }
+//        else {
+//            PULSE->_tflag = PULSE->_t1;
+//            PULSE->_vflag = PULSE->_v1;
+//        }
+//        INSTRUCTION.VoltConstant = PULSE->_vflag;
+//        if(lastVolt != INSTRUCTION.VoltConstant){
+//            lastVolt = INSTRUCTION.VoltConstant;
+//            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+//        }
+//        vscanReset = false;
+//    }
+//
+//    if (!vscanReset) {
+//        //vscan counter
+//        if (GPT.VscanRateCounter >= PULSE->_tflag) {
+//           GPT.VscanRateCounter -= PULSE->_tflag; //To get right time
+//        }
+//
+//        if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
+//            if (PULSE->_tflag == PULSE->_t1) {
+//                    PULSE->_tflag = PULSE->_t2;
+//                    PULSE->_vflag = PULSE->_v2;
+//            }
+//            else if (PULSE->_tflag == PULSE->_t2) {
+//                    PULSE->_tflag = PULSE->_t3;
+//                    PULSE->_vflag = PULSE->_v3;
+//            }
+//            else if (PULSE->_tflag == PULSE->_t3) {
+//                PULSE->_cycleNumber -- ;
+//                if (PULSE->_cycleNumber == 0) {
+//                    PULSE->_tflag = PULSE->_t4;
+//                    PULSE->_vflag = PULSE->_v4;
+//                }
+//                else {
+//                    PULSE->_tflag = PULSE->_t2;
+//                    PULSE->_vflag = PULSE->_v2;
+//                }
+//            }
+//            INSTRUCTION.VoltConstant = PULSE->_vflag;
+//            if(lastVolt != INSTRUCTION.VoltConstant){
+//                lastVolt = INSTRUCTION.VoltConstant;
+//                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+//            }
+//        }
+//        else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
+//            if (PULSE->_tflag == PULSE->_t1) {
+//                PULSE->_tflag = PULSE->_t4;
+//                PULSE->_vflag = PULSE->_v4;
+//            }
+//            else if (PULSE->_tflag == PULSE->_t4) {
+//                PULSE->_loop -- ;
+//                if (PULSE->_loop > 0) {
+//                    PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
+//                    PULSE->_tflag = PULSE->_t2;
+//                    PULSE->_vflag = PULSE->_v2;
+//                }
+//                else {
+//                    PULSE->_tflag = PULSE->_t5;
+//                    PULSE->_vflag = PULSE->_v5;
+//                }
+//            }
+//            INSTRUCTION.VoltConstant = PULSE->_vflag;
+//            if(lastVolt != INSTRUCTION.VoltConstant){
+//                lastVolt = INSTRUCTION.VoltConstant;
+//                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+//            }
+//        }
+//        else if (PULSE->_loop <= 0) {
+//            if (PULSE->_tflag == PULSE->_t5) {
+//                PeriodicEvent = false;
+//                ELITE15_SPI_CLOSE();
+//                ModeLED(NO_EVENT);
+//            }
+//        }
+//        InputNotify(NOTIFY_IMPEDANCE, PULSE->_vflag);
+//    }
+////    int32_t RealV;
+////    RealV = (int32_t)(Vset / 500);//[1uV]
+////    InputNotify(NOTIFY_VOLT, RealV);
+//}
+
+static void PULSE_Vscan(PULSEMode *PULSE)
+{
+    static uint16_t lastVolt;
+
+    if (vscanReset) {
+        if (PULSE->_tflag == 0) {
+            PULSE->_tflag = PULSE->_t2;
+            PULSE->_vflag = PULSE->_v2;
+        }
+        else {
+            PULSE->_tflag = PULSE->_t1;
+            PULSE->_vflag = PULSE->_v1;
+        }
+
+        lastVolt = INSTRUCTION.VoltConstant;
+        INSTRUCTION.VoltConstant = PULSE->_vflag;
+
+        if (lastVolt != INSTRUCTION.VoltConstant) {
+            lastVolt = INSTRUCTION.VoltConstant;
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+        }
+
+        vscanReset = false;
+    }
+
+    if (!vscanReset) {
+        if (GPT.VscanRateCounter >= PULSE->_tflag) {
+           GPT.VscanRateCounter -= PULSE->_tflag; //To get right time
+        }
+
+        if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
+            if (PULSE->_tflag == PULSE->_t1) {
+                PULSE->_tflag = PULSE->_t2;
+                PULSE->_vflag = PULSE->_v2;
+            }
+            else if (PULSE->_tflag == PULSE->_t2) {
+                PULSE->_tflag = PULSE->_t3;
+                PULSE->_vflag = PULSE->_v3;
+            }
+            else if (PULSE->_tflag == PULSE->_t3) {
+                PULSE->_cycleNumber -- ;
+                if (PULSE->_cycleNumber == 0) {
+                    PULSE->_tflag = PULSE->_t4;
+                    PULSE->_vflag = PULSE->_v4;
+                }
+                else {
+                    PULSE->_tflag = PULSE->_t2;
+                    PULSE->_vflag = PULSE->_v2;
+                }
+            }
+
+            INSTRUCTION.VoltConstant = PULSE->_vflag;
+            if (lastVolt != INSTRUCTION.VoltConstant) {
+                lastVolt = INSTRUCTION.VoltConstant;
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+            }
+        }
+        else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
+            if (PULSE->_tflag == PULSE->_t1) {
+                PULSE->_tflag = PULSE->_t4;
+                PULSE->_vflag = PULSE->_v4;
+            }
+            else if (PULSE->_tflag == PULSE->_t4) {
+                PULSE->_loop -- ;
+                if (PULSE->_loop > 0) {
+                    PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
+                    PULSE->_tflag = PULSE->_t2;
+                    PULSE->_vflag = PULSE->_v2;
+                }
+                else {
+                    PULSE->_tflag = PULSE->_t5;
+                    PULSE->_vflag = PULSE->_v5;
+                }
+            }
+
+            INSTRUCTION.VoltConstant = PULSE->_vflag;
+            if (lastVolt != INSTRUCTION.VoltConstant) {
+                lastVolt = INSTRUCTION.VoltConstant;
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+            }
+        }
+        else if (PULSE->_loop <= 0) {
+            if (PULSE->_tflag == PULSE->_t5) {
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }
+        }
+
+        InputNotify(NOTIFY_IMPEDANCE, PULSE->_vflag);
+    }
+}
+
+static void test_Vscan(PULSEMode *PULSE){
+    static uint16_t lastVolt;
+    static uint8_t testV;
+    if(firstTimeReset){
+        firstTimeReset = false;
+        lastVolt = INSTRUCTION.VoltConstant;
+        if (PULSE->_tTime == 0) {
+            PULSE->_tflag = PULSE->_t2;
+            PULSE->_vflag = PULSE->_v2;
+            PULSE->_tTime = PULSE->_t2Time;
+            testV = 1;
+        }
+        else {
+            PULSE->_tflag = PULSE->_t1;
+            PULSE->_vflag = PULSE->_v1;
+            PULSE->_tTime = PULSE->_t1Time;
+            testV = 2;
+        }
+        INSTRUCTION.VoltConstant = PULSE->_vflag;
+        if(lastVolt != INSTRUCTION.VoltConstant){
+            lastVolt = INSTRUCTION.VoltConstant;
+            DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant));
+            DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant));
+        }
+        //InputNotify(NOTIFY_IMPEDANCE, testV);
+    }
+    else if(!firstTimeReset){
+        if(GPT.VscanRateCounter >= PULSE->_tTime){
+            GPT.VscanRateCounter -= PULSE->_tTime; //To get right time
+
+            vscan_flag = true;
+            if(vscan_flag){
+
+                if (PULSE->_loop > 0 && PULSE->_cycleNumber > 0) {
+                    if (PULSE->_tflag == PULSE->_t1) {
+                            PULSE->_tflag = PULSE->_t2;
+                            PULSE->_vflag = PULSE->_v2;
+                            PULSE->_tTime = PULSE->_t2Time;
+                            testV = 3;
+                    }
+                    else if (PULSE->_tflag == PULSE->_t2) {
+                            PULSE->_tflag = PULSE->_t3;
+                            PULSE->_vflag = PULSE->_v3;
+                            PULSE->_tTime = PULSE->_t3Time;
+                            testV = 4;
+                    }
+                    else if (PULSE->_tflag == PULSE->_t3) {
+                        PULSE->_cycleNumber -- ;
+                        if (PULSE->_cycleNumber == 0) {
+                            PULSE->_tflag = PULSE->_t4;
+                            PULSE->_vflag = PULSE->_v4;
+                            PULSE->_tTime = PULSE->_t4Time;
+                            if (PULSE->_t4Time == 0) {
+                                PULSE->_tflag = PULSE->_t2;
+                                PULSE->_vflag = PULSE->_v2;
+                                PULSE->_tTime = PULSE->_t2Time;
+                                PULSE->_loop--;
+                                PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
+                                if (PULSE->_loop == 0) {
+                                    PULSE->_tflag = PULSE->_t5;
+                                    PULSE->_vflag = PULSE->_v5;
+                                    PULSE->_tTime = PULSE->_t5Time;
+                                    if (PULSE->_t5Time == 0) {
+                                        PeriodicEvent = false;
+                                        ModeLED(NO_EVENT);
+                                    }
+                                }
+
+                            }
+                            testV = 5;
+                        }
+                        else {
+                            PULSE->_tflag = PULSE->_t2;
+                            PULSE->_vflag = PULSE->_v2;
+                            PULSE->_tTime = PULSE->_t2Time;
+                            testV = 6;
+                        }
+                    }
+                    INSTRUCTION.VoltConstant = PULSE->_vflag;
+                    if(lastVolt != INSTRUCTION.VoltConstant){
+                        lastVolt = INSTRUCTION.VoltConstant;
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                    }
+                }
+                else if (PULSE->_loop > 0 && PULSE->_cycleNumber <= 0) {
+                    if (PULSE->_tflag == PULSE->_t4) {
+                        PULSE->_loop -- ;
+                        if (PULSE->_loop > 0) {
+                            PULSE->_cycleNumber = INSTRUCTION.cycleNumber;
+                            PULSE->_tflag = PULSE->_t2;
+                            PULSE->_vflag = PULSE->_v2;
+                            PULSE->_tTime = PULSE->_t2Time;
+                            testV = 8;
+                        }
+                        else {
+                            PULSE->_tflag = PULSE->_t5;
+                            PULSE->_vflag = PULSE->_v5;
+                            PULSE->_tTime = PULSE->_t5Time;
+                            testV = 9;
+                        }
+                    }
+                    INSTRUCTION.VoltConstant = PULSE->_vflag;
+                    if(lastVolt != INSTRUCTION.VoltConstant){
+                        lastVolt = INSTRUCTION.VoltConstant;
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant));
+                    }
+                }
+                else if (PULSE->_loop <= 0) {
+                    if (PULSE->_tflag == PULSE->_t5) {
+                        testV = 10;
+                        PeriodicEvent = false;
+                        ModeLED(NO_EVENT);
+                    }
+                }
+                //InputNotify(NOTIFY_IMPEDANCE, testV);
+                vscan_flag = false;
+            }
+        }
+    }
+
+
+}
+#endif
@@ -3,14 +3,21 @@
 #define ELITERESET

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

-    ADCGainControl(INSTRUCTION.ADCGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-    LEDPowerON();
+    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 0 => open high_z mode
+
+    VinADCGainControl(VIN_GAIN_AUTO);
+    IinADCGainControl(I_GAIN_AUTO);
+
+    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    VoutGainControl(INSTRUCTION.VoutGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+
    initINSBuf();
    initDATBuf();

@@ -29,20 +36,22 @@ static void reset() {
        spi_ADC_rxbuf[i] = 0;
    }

-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
    CPUdelay(1600);
 }

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

-    ADCGainControl(GAIN_AUTO);
-    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-    LEDPowerON();
+    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 0 => open high_z mode
+
+    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    VoutGainControl(INSTRUCTION.VoutGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+
    initINSBuf();
    initDATBuf();

@@ -61,8 +70,6 @@ static void Eliteinterrupt() {
        spi_ADC_rxbuf[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
@@ -36,6 +36,8 @@ static SPI_Params      spiParams1;
 static SPI_Transaction LED_transaction;
 static SPI_Transaction ADC_DAC_transaction;

+static void ELITE15_SPI_HOLD();
+static void ELITE15_SPI_CLOSE();

 static void Elite_SPI_init(){
    SPI_init();
@@ -63,26 +65,68 @@ 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) {
+//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+
    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, D6, 1); // ADC_CS HOGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

 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;
+//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW

-   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
+    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, D7, 1); // DAC_CS HOGH
+    update_latch_status (DAC_CS, 1);
+//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
+}
+
+static void ELITE15_SPI_HOLD() {
+    Elite_SPI_init();
+
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+}
+static void ELITE15_SPI_CLOSE() {
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+    SPI_close(spiHandle0);
+    SPI_close(spiHandle1);
+}
+
+/* Elite1.5 Calibration SPI */
+static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+
+    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, D6, 1); // ADC_CS HOGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

 #endif // ELITE_SPI
@@ -327,6 +327,66 @@ CVSCANMode * InitCVSCANMode(){
 }
 /*End of CONSTANT_VSCAN Mode*/

+/* PULSE_MODE Mode(PULSE_MODE)*/
+typedef struct _PULSEMode{
+    MEASURE;
+//    int32_t  _Vinit;
+    int32_t  _Vset;
+    int32_t  _t1;
+    int32_t  _t2;
+    int32_t  _t3;
+    int32_t  _t4;
+    int32_t  _t5;
+    int32_t  _v1;
+    int32_t  _v2;
+    int32_t  _v3;
+    int32_t  _v4;
+    int32_t  _v5;
+    int32_t  _tflag;
+    int32_t  _vflag;
+    uint16_t _cycleNumber;
+    uint16_t _loop;
+    int32_t  _t1Time;
+    int32_t  _t2Time;
+    int32_t  _t3Time;
+    int32_t  _t4Time;
+    int32_t  _t5Time;
+    int32_t  _tTime;
+}PULSEMode;
+
+PULSEMode * InitPULSEMode(){
+    PULSEMode *ret = malloc(sizeof(PULSEMode));
+    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;
+    ret->_t1             = INSTRUCTION.t1;
+    ret->_t2             = INSTRUCTION.t2;
+    ret->_t3             = INSTRUCTION.t3;
+    ret->_t4             = INSTRUCTION.t4;
+    ret->_t5             = INSTRUCTION.t5;
+    ret->_v1             = INSTRUCTION.v1;
+    ret->_v2             = INSTRUCTION.v2;
+    ret->_v3             = INSTRUCTION.v3;
+    ret->_v4             = INSTRUCTION.v4;
+    ret->_v5             = INSTRUCTION.v5;
+    ret->_t1Time         = INSTRUCTION.t1Time;
+    ret->_t2Time         = INSTRUCTION.t2Time;
+    ret->_t3Time         = INSTRUCTION.t3Time;
+    ret->_t4Time         = INSTRUCTION.t4Time;
+    ret->_t5Time         = INSTRUCTION.t5Time;
+    ret->_tTime          = INSTRUCTION.t1Time;
+    ret->_tflag          = 1;
+    ret->_vflag          = INSTRUCTION.v1;
+    ret->_cycleNumber    = INSTRUCTION.cycleNumber;
+    ret->_loop           = INSTRUCTION.loop;
+    return ret;
+}
+/*End of PULSE_MODE Mode*/
+
 /* Cycle CC Mode */
 typedef struct _CCCMode{
    int32_t _measureCurrent;
@@ -423,6 +483,7 @@ typedef union _WorkMode{
    LSVMode *LSV;
    CVSCANMode *CVSCAN;
    PSMode *PS;
+    PULSEMode *PULSE;
 //    CCCMode *CCC;
 }WorkMode;

@@ -434,6 +495,7 @@ WorkMode *CreateWorkMode(){
 void InitWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
            WM->VO = InitVoltOutMode();
            break;
        case IT_CURVE:
@@ -463,6 +525,9 @@ void InitWorkMode(WorkMode *WM){
        case CONSTANT_VSCAN:
            WM->CVSCAN = InitCVSCANMode();
            break;
+        case PULSE_MODE:
+            WM->PULSE = InitPULSEMode();
+            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            WM->CCC = InitCCCMode();
 //            break;
@@ -475,6 +540,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;
@@ -534,6 +600,12 @@ void FreeWorkMode(WorkMode *WM){
                WM->CVSCAN = NULL;
            }
            break;
+        case PULSE_MODE:
+            if(WM->PULSE != NULL){
+                free(WM->PULSE);
+                WM->PULSE = NULL;
+            }
+            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            if(WM->CCC != NULL){
 //                free(WM->CCC);
@@ -8,50 +8,102 @@

 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_1
-#define Board_SPI0_CLK                  IOID_0
+#define Board_SPI0_MOSI                 D1
+#define Board_SPI0_CLK                  D0
 #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                 D3
+#define Board_SPI1_CLK                  D2
 #define Board_SPI1_CS                   PIN_UNASSIGNED

-#define ADC_CS                          IOID_8
-#define DAC_CS                          IOID_9
+#define D0                              IOID_3
+#define D1                              IOID_4
+#define D2                              IOID_5
+#define D3                              IOID_6
+#define D4                              IOID_7
+#define D5                              IOID_8
+#define D6                              IOID_9
+#define D7                              IOID_10

-#define Turnon200R                      IOID_5
-#define Turnon10K                       IOID_6
+#define LOAD0                           IOID_13
+#define LOAD1                           IOID_12
+#define LOAD2                           IOID_11
+
+#define ADC_CS                          LOAD0, D6
+#define DAC_CS                          LOAD0, D7
+#define ADC_DAC_SPI_MOSI                LOAD0, D3
+#define ADC_DAC_SPI_CLK                 LOAD0, D2
+#define LED_MOSI                        LOAD0, D1
+#define LED_CLK                         LOAD0, D0
+#define MEM_HOLD                        LOAD0, D4
+#define MEM_CS                          LOAD0, D5
+
+#define Turnon_I_MID                    LOAD2, D0
+#define Turnon_I_SMALL                  LOAD2, D4
+#define Turnon_I_LARGE                  LOAD2, D1
+#define Turnon_V_SMALL                  LOAD2, D2
+#define Turnon_V_MID                    LOAD2, D3
+#define Turon_VOUT_SMALL                LOAD2, D7
+
+//#define Turnon10K                       Turnon_I_MID
+//#define Turnon200R                      Turnon_I_LARGE

 /* I2C */
 #ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 IOID_7
-#define Board_I2C0_SDA0                 IOID_1
+#define Board_I2C0_SCL0                 PIN_UNASSIGNED
+#define Board_I2C0_SDA0                 PIN_UNASSIGNED
 #endif

-#define shutdown_6994                   IOID_10
-#define switch_on                       IOID_11
-#define enable_10v                      IOID_12
-#define enable_5v                       IOID_13
+#define shutdown_6994                   LOAD2, D6
+#define switch_on                       IOID_14
+#define HIGH_Z_MODE                     LOAD2, D5
+#define enable_10v                      LOAD1, D5
+#define enable_5v                       LOAD1, D6

 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
+//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,

-    enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // 10V_enable
-    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // 5V_enable
-    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,
-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
+    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch

    PIN_TERMINATE
 };

+static void add_elite_pin() {
+//    PIN_Status elite15_status;
+    PIN_add(pin_handle,
+    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+
+//    if(elite15_status != PIN_SUCCESS) {
+//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
+//    }
+}
+
+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
@@ -2,7 +2,7 @@
 ***********************************************************
    Read battery's method
 ***********************************************************
-1.ReadBatVolt(spi_ADC_rxbuf)
+1.ReadADCBat(spi_ADC_rxbuf)
  let "spi_ADC_rxbuf" be 8000
  8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,7 +34,7 @@ static uint8_t headstage_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);
@@ -42,30 +42,51 @@ 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();
-        batteryCheck_flag = 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 int32_t headstage_temperature() {
-    int32_t curTemp;
-    curTemp = AONBatMonTemperatureGetDegC();
-    InputNotify(NOTIFY_TEMPERATURE,curTemp);
-    if(INSTRUCTION.eliteFxn == IT_CURVE){
-        InputNotify(NOTIFY_IMPEDANCE,curTemp);
+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){
+        PIN15_setOutputValue(enable_5v, 0);
    }
-    return curTemp;
 }

 #endif  // HEADSTAGE_BATT_H
@@ -27,7 +27,7 @@
 #define VT_CURVE                        0x50
 #define IT_CURVE                        0x60
 #define SET_SAMPLE_RATE                 0x70
-#define SET_ADC_GAIN                    0x80
+#define SET_ADC_DAC_GAIN                    0x80
 #define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
 #define SQUARE_WAVE_VOLTAMMETRY         0xB0
 #define CYCLIC_VOLTAMMETRY              0xC0
@@ -36,13 +36,15 @@
 #define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
 #define LINEAR_SWEEP_VOLTAMMETRY        0x02
 #define CONSTANT_VSCAN                  0x03
-#define ADC_TEST                        0x90
+#define ADC_TEST                        0x91
+#define CALI_DAC_MODE                   0x93
+#define CALI_ADC_MODE                   0x92
+#define PULSE_MODE                      0x94

 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
 #define CIS_LED_TEST                    0x70
-#define CIS_TEMPERATURE                 0x80

 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
@@ -51,7 +53,7 @@
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
+#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
 #define PARA_1                   0x01
 #define PARA_2                   0x02

@@ -67,16 +69,17 @@
 #define COLOR_PURPLE             0x08
 #define COLOR_WHITE              0x09
 #define COLOR_YELLOWGREEN        0x0A
-#define COLOR_YELLOW_DARK        0xF3
-#define COLOR_GREEN_DARK         0xF4
-#define COLOR_BLUE_DARK          0xF5
-#define COLOR_CYAN_DARK          0xF6
-#define COLOR_PURPLE_DARK        0xF8
-
 #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
@@ -19,15 +19,8 @@ static uint16_t OneWayVoltScan() {
        Vout = Vout + DeltaVout;
    }

-
-    if (Vout >= 1100000000) { //1100000000 = 5.5V
-        Vout = 1100000000;
-    } else if (Vout <= -1000000000) {  //-1000000000 = -5V
-        Vout = -1000000000;
-    }
-
    INSTRUCTION.VoltConstant = Vout / 40000 + 25000; //5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
+    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)){
@@ -58,7 +51,7 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
    if(afterRead == AFTER_READ_I){
        switch (INSTRUCTION.eliteFxn) {
            case CONSTANT_CURRENT:{
-//                CC_Vscan(WorkModeData->CC);
+                CC_Vscan(WorkModeData->CC);
                OneWayVoltScan();
                break;
            }
@@ -69,7 +62,8 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
            case VT_CURVE:
            case CYCLIC_VOLTAMMETRY:
            case LINEAR_SWEEP_VOLTAMMETRY:
-            case CONSTANT_VSCAN:{
+            case CONSTANT_VSCAN:
+            case PULSE_MODE:{
                break;
            }
            default:{
@@ -89,7 +83,8 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
            }
            case IT_CURVE:
            case VT_CURVE:
-            case CONSTANT_CURRENT:{
+            case CONSTANT_CURRENT:
+            case PULSE_MODE:{
                break;
            }
            case CYCLIC_VOLTAMMETRY:{
@@ -149,6 +144,10 @@ static void CC_Plot(WorkMode *WorkModeData){
            #define CURRENT_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
@@ -163,21 +162,21 @@ static void CC_Plot(WorkMode *WorkModeData){
            if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
                readIin(WorkModeData);
                if(record_flag == false){
-                    static int count = 0;
-                    count++;
-                    if(count == 2){
+                    static int recordCount = 0;
+                    recordCount++;
+                    if(recordCount == 2){
                        record_flag = true;
-                        count = 0;
+                        recordCount = 0;
                    }
                }else{
                    InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
                }
                DACenable(WorkModeData, VoltData, AFTER_READ_I);

-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
            }else if(ADCSwitch == 1 || ADCSwitch == 3){ /**read Bat**/
-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
            }else if(ADCSwitch == 2){ /**read V(buffer),read bat**/
                VoltData = readVinVout(WorkModeData);
@@ -190,15 +189,15 @@ static void CC_Plot(WorkMode *WorkModeData){
                }
                DACenable(WorkModeData, VoltData, AFTER_READ_V);

-                ReadBatVolt(spi_ADC_rxbuf);
+                ReadADCBat(spi_ADC_rxbuf);
                BatSwitch++;
            }
        }else if(BatSwitch == 1){
-            ReadBatVolt(spi_ADC_rxbuf);
+            ReadADCBat(spi_ADC_rxbuf);
            BatSwitch++;
        }else if(BatSwitch == 2){
            headstage_battery_volt();
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            batteryCheck_flag = false;
            BatSwitch = 0;
            ADCSwitch = 3;
@@ -208,11 +207,11 @@ static void CC_Plot(WorkMode *WorkModeData){
        if(ADCSwitch == 0){ /**read Iin(buffer),read V**/
            readIin(WorkModeData);
            if(record_flag == false){
-                static int count = 0;
-                count++;
-                if(count == 2){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
                    record_flag = true;
-                    count = 0;
+                    recordCount = 0;
                }
            }else{
                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
@@ -237,11 +236,11 @@ static void CC_Plot(WorkMode *WorkModeData){
            }
            DACenable(WorkModeData, VoltData, AFTER_READ_V);

-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch++;
        }
        else if(ADCSwitch == 3){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 0;
        }
    }
@@ -286,6 +285,10 @@ static void IT_Plot(WorkMode *WorkModeData) {
            #define CURRENT_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
@@ -296,18 +299,18 @@ static void IT_Plot(WorkMode *WorkModeData) {
    if(batteryCheck_flag){
        EliteADCBattery();
        if(!batteryCheck_flag){
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 2;
        }
    }else{
        if(ADCSwitch == 0){ /**read Iin(buffer)**/
            readIin(WorkModeData);
            if(record_flag == false){
-                static int count = 0;
-                count++;
-                if(count == 2){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
                    record_flag = true;
-                    count = 0;
+                    recordCount = 0;
                }
            }else{
                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
@@ -315,11 +318,11 @@ static void IT_Plot(WorkMode *WorkModeData) {
            ADCSwitch++;
        }
        else if(ADCSwitch == 1){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch++;
        }
        else if(ADCSwitch == 2){ /**read Iin**/
-            ReadCurrent(spi_ADC_rxbuf);
+            ReadADCIin(spi_ADC_rxbuf);
            ADCSwitch = 0;
        }
    }
@@ -364,14 +367,18 @@ static void VT_Plot(WorkMode *WorkModeData) {
            #define CURRENT_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
    }

    // ADC gain is don't care when measuring voltage
-    INSTRUCTION.ADCGainLevel = GAIN_200R;
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
+//    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);

    static uint8_t ADCSwitch = 0;
    static int32_t VoltData;
@@ -385,7 +392,16 @@ static void VT_Plot(WorkMode *WorkModeData) {
    }else{
        if(ADCSwitch == 0){ /**read V(buffer)**/
            VoltData = readVinVout(WorkModeData);
-            InputNotify(NOTIFY_VOLT, VoltData);
+            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**/
@@ -438,18 +454,25 @@ static void readIin(WorkMode *WorkModeData){
            #define TEMP_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define TEMP_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
    }

    if(INSTRUCTION.AutoGainEnable){
-        TEMP_MODE->_measureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
-        AutoGainChange(TEMP_MODE->_measureCurrent);
+        TEMP_MODE->_measureCurrent = AutoGainReadIin(spi_ADC_rxbuf);
+        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
    }else{
-        ADCGainControl(INSTRUCTION.ADCGainLevel);
-        ReadCurrent(spi_ADC_rxbuf);
+        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
 }
@@ -492,17 +515,33 @@ static int32_t readVinVout(WorkMode *WorkModeData){
            #define TEMP_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define TEMP_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
    }

    static int32_t VoltData;
-    ReadADCVolt(TEMP_MODE->_VoViSwitch);
+
    if(TEMP_MODE->_VoViSwitch == 0x01 || TEMP_MODE->_VoViSwitch == 0x02){
-        TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+        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;
    }
@@ -510,4 +549,247 @@ static int32_t readVinVout(WorkMode *WorkModeData){
    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;
+        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    int32_t ADCValueTemp           = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+    int16_t ADCValueAVG_RAW        = 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 >= 5000){
+                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;
+        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t VoltData;
+    int32_t ADCValueTemp           = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+    int16_t ADCValueAVG_RAW        = 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
@@ -2,11 +2,11 @@
 #ifndef VERSION_DATE
 #define VERSION_DATE

-#define VERSION_DATE_YEAR      21
-#define VERSION_DATE_MONTH     1
-#define VERSION_DATE_DAY       22
-#define VERSION_DATE_HOUR      11
-#define VERSION_DATE_MINUTE    10
+#define VERSION_DATE_YEAR      20
+#define VERSION_DATE_MONTH     11
+#define VERSION_DATE_DAY       26
+#define VERSION_DATE_HOUR      22
+#define VERSION_DATE_MINUTE    48

 // this is NOT the version hash !!
 // it's the last version hash
@@ -430,12 +430,18 @@ characteristic change event
 #define SBP_KEY_CHANGE_EVT   0x0010
 #endif

+/**************************
+ controller version
+ EliteZM02         0,2,1,5
+ EliteZM15         0,2,1,6
+ EliteZM_pulsefly  0,2,1,7
+ **************************/
 // product information
 #define DEVICE_NAME "Elite"
 #define MAJOR_PRODUCT_NUMBER 0 //0:Elite ,1:Neulive
 #define MINOR_PRODUCT_NUMBER 2 //1:Elite_legacy(Ori_Neulive)  2:Elite_zm  3:Elite_bat
 #define MAJOR_VERSION_NUMBER 1
-#define MINOR_VERSION_NUMBER 5
+#define MINOR_VERSION_NUMBER 7
 #define ELITE_VERSION_1_4
 //#define ELITE_VERSION_1_3

@@ -470,6 +476,20 @@ static uint8_t ins_buf[BLE_INS_BUFF_SIZE] = {0};
 static uint8_t not_buf[BLE_DAT_BUFF_SIZE] = {0};
 static uint8_t cis_buf[BLE_CIS_BUFF_SIZE] = {0};

+/**
+ *  Latch initialize
+ */
+#define LATCH_BUFF_SIZE  8      // define latch
+struct _LH{
+    bool LATCH0[LATCH_BUFF_SIZE];
+    bool LATCH1[LATCH_BUFF_SIZE];
+    bool LATCH2[LATCH_BUFF_SIZE];
+    uint8_t LoadState;
+} LH= {0};
+static void InitLH();
+static void Init_Elite15_PIN();
+
+
 static Clock_Struct    periodicClock;
 static bool            PeriodicEvent     = false;
 static bool            InitPeriodicEvent = true;
@@ -528,7 +548,6 @@ static uint32_t SampleRateTable[6] = {100, 1000, 10000, 50000, 100000, 1000000};
 static uint32_t VsetRateTable[5]  = {2, 10, 100, 1000, 10000};
 static bool     batteryCheck_flag;
 static bool     batteryADC_flag;
-static bool     tempCheck_flag;
 static bool     ADC_flag;
 static bool     vscan_flag;
 static bool     notify_flag;
@@ -537,17 +556,37 @@ static bool     record_flag;
 static bool     vscanReset;
 static bool     EliteWorkReset;
 static bool     leadTimeReset;
-static int16_t  GAIN_200R_counter;
-static int16_t  GAIN_200K_counter;
-static int16_t  GAIN_10K_counter;
+static bool     firstTimeReset;
+static int16_t  I_GAIN_100R_counter;
+static int16_t  I_GAIN_3K_counter;
+static int16_t  I_GAIN_100K_counter;
+static int16_t  I_GAIN_3M_counter;
+static int16_t  VIN_GAIN_1M_counter;
+static int16_t  VIN_GAIN_30K_counter;
+static int16_t  VIN_GAIN_1K_counter;
+static int16_t  VOUT_GAIN_240K_counter;
+static int16_t  VOUT_GAIN_15K_counter;
+static uint8_t  lastVinADCGainLevel;
+static uint8_t  lastIinADCGainLevel;
+static bool     btWaitLedFlag   = 0;
+static bool     noEventLedFlag  = 0;
+static bool     preWorkLedFlag  = 0;
+static bool     workingLedFlag  = 0;
+static bool     postWorkLedFlag = 0;
+
+static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow);

 // ADC function
 static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw);
 static void    headstage_battery_volt();
 static void    EliteADCBattery();
+static void    VinADCGainControl(uint8_t VinADCLevel);
+static void    VoutGainControl(uint8_t VOUTLevel);
+static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow);

 // Elite key detection & turn on/ shutdown function (peripheral hardware control)
 static void Elite_led_color(uint16_t color);
+static void ModeLED(uint16_t modeStatus);
 //static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
 static bool If10Von = false;
 static void TurnOn10V();
@@ -558,10 +597,10 @@ static void EliteVscanControl();
 static void EliteDone();

 //mode (Vset)
-static void    LSV_Vscan(WorkMode *WM);
+static void    LSV_Vscan(LSVMode *LSV);
 static void    CVSCAN_Vscan(CVSCANMode *CVSCAN);
-static void    CV3_Vscan(WorkMode *WM);
-static void    CC_Vscan(WorkMode *WM);
+static void    CV3_Vscan(CV3Mode *CV3);
+static void    CC_Vscan(CCMode *CC);

 //mode (DAC)
 static void     DACenable(WorkMode *WorkModeData, int32_t VoltData, uint8_t afterRead);
@@ -570,8 +609,8 @@ static void     CalcuResistance(RTMode *RT, int32_t VoltData);
 static uint16_t CV3Curve(CV3Mode *CV3);
 static uint16_t LSVCurve(LSVMode *LSV);
 static uint16_t CVSCANCurve(CVSCANMode *CVSCAN);
-
-static int32_t headstage_temperature();
+static void     PULSE_Vscan(PULSEMode *PULSE);
+static void test_Vscan(PULSEMode *PULSE);

 //mode (notify)
 static void initDATBuf();
@@ -586,6 +625,7 @@ static void InitEliteFlag();
 #include "EliteDAC.h"
 #include "EliteSPI.h"
 #include "Elite_PIN.h"
+#include "Elite15_PIN.h"

 #ifdef ELITE_VERSION_1_4
 #include "EliteI2C.h"
@@ -594,6 +634,7 @@ static void InitEliteFlag();
 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
 #include "EliteFlagCTInit.h"
+#include "EliteLatchInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
 #include "EliteKeyDetect.h"
@@ -608,6 +649,7 @@ static void InitEliteFlag();
 #include "EliteCV3Mode.h"
 #include "EliteLSVMode.h"
 #include "EliteCVSCANMode.h"
+#include "ElitePulseMode.h"
 #include "Elite_batt.h"
 #include "Elite_power.h"

@@ -615,20 +657,16 @@ static void InitEliteFlag();
 static void update_ZM_instruction(uint8 *ins) {
    uint8_t ins_type    = ins[0] & 0b11110000;
    uint8_t chip_ID     = ins[0] & 0b00001111;
-    INSTRUCTION.chip_id = chip_ID;
-
    uint8_t oper        = ins[1] & 0xF0;  // this is don't care in RIS
-//    uint8_t data_length = ins[1] & 0x0F;
-
-    if (!If10Von) {
-        // TurnOn10V();
-    }
+    INSTRUCTION.chip_id = chip_ID;

    switch (ins_type) {

    case INS_TYPE_RIS: {
        switch (ins[2]) {
        case IV_CURVE: {
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn      = IV_CURVE;
            INSTRUCTION.sampleRate    = 15;
            INSTRUCTION.Ve1           = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -645,10 +683,19 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.VsetRate      = VsetRateTable[INSTRUCTION.VsetRateIndex];//N
            INSTRUCTION.VoViSwitch    = 0x01;
            INSTRUCTION.cycleNumber   = 1;
+
+            if((INSTRUCTION.Ve1 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.Ve1 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE)
+                && (INSTRUCTION.Ve2 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.Ve2 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE)){
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            }else{
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            }
            break;
        }

        case CV_CURVE: {
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn      = CV_CURVE;
            INSTRUCTION.sampleRate    = 15;
            INSTRUCTION.Ve1           = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -665,26 +712,52 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.VsetRate      = VsetRateTable[INSTRUCTION.VsetRateIndex];//N
            INSTRUCTION.VoViSwitch    = 0x01;
            INSTRUCTION.cycleNumber   = ins[10];
+
+            if((INSTRUCTION.Ve1 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.Ve1 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE)
+                && (INSTRUCTION.Ve2 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.Ve2 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE)){
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            }else{
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            }
            break;
        }

        case VOLT_OUTPUT: {
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn      = VOLT_OUTPUT;
            INSTRUCTION.VoltConstant  = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
+
+            if(INSTRUCTION.VoltConstant < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.VoltConstant > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            }else{
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            }
            break;
        }

        case ZT_CURVE: {
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn      = ZT_CURVE;
            INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
            INSTRUCTION.sampleRate    = 15;
            INSTRUCTION.VsetRate      = 100;
            INSTRUCTION.VoltConstant  = 25000 + 5000;
            INSTRUCTION.VoViSwitch    = 0x01;
+            INSTRUCTION.ADCGainLevel  = I_GAIN_AUTO;
+            INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
+
+            if(INSTRUCTION.VoltConstant < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && INSTRUCTION.VoltConstant > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            }else{
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            }
            break;
        }

        case VT_CURVE: {
+            ModeLED(WORKING);
            INSTRUCTION.eliteFxn      = VT_CURVE;
            INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
            INSTRUCTION.sampleRate    = 15;
@@ -693,6 +766,7 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case IT_CURVE: {
+            ModeLED(WORKING);
            INSTRUCTION.eliteFxn      = IT_CURVE;
            INSTRUCTION.notifyRate    = (uint32_t)INSTRUCTION.sampleRate;
            INSTRUCTION.sampleRate    = 15;
@@ -701,6 +775,8 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case CONSTANT_CURRENT:{
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn      = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate    = 15;
            INSTRUCTION.charge        = ins[3]; //0:discharge 1:charge
@@ -709,6 +785,8 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.Vmin            = (uint32_t)(ins[10]) << 8  | (uint32_t)(ins[11]);
            INSTRUCTION.notifyRate      = 500;
            INSTRUCTION.VoViSwitch      = 0x01;
+
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            /*******************************************************
            controller instruction
            ins[3]   -> Charge, 0:discharge 1:charge
@@ -718,6 +796,7 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case CYCLIC_VOLTAMMETRY: {
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            if(ins[3] == PARA_1){
                INSTRUCTION.sampleRate  = 15;
                INSTRUCTION.Vinit       = ((int32_t)(ins[4]) << 8) | (int32_t)(ins[5]);
@@ -731,6 +810,7 @@ static void update_ZM_instruction(uint8 *ins) {
                    INSTRUCTION.directionInit = 1;
                }
            }else if(ins[3] == PARA_2){
+                ModeLED(WORKING);
                INSTRUCTION.eliteFxn    = CYCLIC_VOLTAMMETRY;
                INSTRUCTION.Currentmax  = (int32_t)(ins[10]) << 24 | (int32_t)(ins[11]) << 16 | (int32_t)(ins[12]) << 8 | (int32_t)(ins[13]);
                INSTRUCTION.notifyRate  = (uint32_t)(ins[8]) << 8 | (uint32_t)(ins[9]);
@@ -741,11 +821,15 @@ static void update_ZM_instruction(uint8 *ins) {
                INSTRUCTION.VsetRate    = VsetRateTable[INSTRUCTION.VsetRateIndex];//N
                INSTRUCTION.VoViSwitch  = 0x01;
                INSTRUCTION.cycleNumber = ins[14];
+
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            }
            break;
        }

        case HIGH_CYCLE_CYCLIC_VOLTAMMETRY: {
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn    = CYCLIC_VOLTAMMETRY;
            INSTRUCTION.sampleRate  = 15;
            INSTRUCTION.Vinit       = ((int32_t)(ins[3]) << 8) | (int32_t)(ins[4]);
@@ -767,10 +851,14 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.VsetRate    = VsetRateTable[INSTRUCTION.VsetRateIndex];//N
            INSTRUCTION.VoViSwitch  = 0x01;
            INSTRUCTION.cycleNumber = ins[19] * 100;
+
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            break;
        }

        case LINEAR_SWEEP_VOLTAMMETRY:{
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn    = LINEAR_SWEEP_VOLTAMMETRY;
            INSTRUCTION.sampleRate  = 15;
            INSTRUCTION.Ve1         = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
@@ -788,10 +876,14 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.VsetRate    = VsetRateTable[INSTRUCTION.VsetRateIndex];//N
            INSTRUCTION.VoViSwitch  = 0x01;
            INSTRUCTION.cycleNumber = 1;//ins[17];
+
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            break;
        }

        case CONSTANT_VSCAN:{
+            ModeLED(WORKING);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn    = CONSTANT_VSCAN;
            INSTRUCTION.sampleRate  = 15;
            INSTRUCTION.Vinit       = ((int32_t)(ins[3]) << 8) | (int32_t)(ins[4]);
@@ -799,6 +891,8 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.notifyRate  = 10000 / INSTRUCTION.notifyRate * 10;
            INSTRUCTION.VsetRate    = VsetRateTable[0];
            INSTRUCTION.VoViSwitch  = 0x01;
+
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            break;
        }

@@ -808,16 +902,17 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
+            ModeLED(WORKING);
            INSTRUCTION.eliteFxn = DIFFERENTIAL_PULSE_VOLTAMMETRY;
            DACReset             = true;

            if (ins[3] | ins[4]) {
                INSTRUCTION.Ve1 = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
-                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1);
            }
            if (ins[5] | ins[6]) {
                INSTRUCTION.Ve2 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
-                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve2);
            }

            if (ins[7] | ins[8]) {
@@ -829,7 +924,7 @@ static void update_ZM_instruction(uint8 *ins) {
            }
            if (ins[10] | ins[11]) {
                Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
-                Amplitude = Usercode_Correction_to_DAC(Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, Amplitude);
            }
            if (ins[12]) {
                PulsePeriod = ins[12];
@@ -844,16 +939,17 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case SQUARE_WAVE_VOLTAMMETRY: {
+            ModeLED(WORKING);
            INSTRUCTION.eliteFxn = SQUARE_WAVE_VOLTAMMETRY;
            DACReset             = true;

            if (ins[3] | ins[4]) {
                INSTRUCTION.Ve1 = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
-                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1);
            }
            if (ins[5] | ins[6]) {
                INSTRUCTION.Ve2 = ((uint16_t)(ins[5]) << 8) | (uint16_t)(ins[6]);
-                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve2);
            }
            if (ins[7] | ins[8]) {
                INSTRUCTION.step = ((uint32_t)(ins[7]) << 8) | (uint32_t)(ins[8]);
@@ -864,7 +960,7 @@ static void update_ZM_instruction(uint8 *ins) {
            }
            if (ins[10] | ins[11]) {
                Amplitude = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
-                Amplitude = Usercode_Correction_to_DAC(Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, Amplitude);
            }
            if (ins[12]) {
                PulseWidth = ins[12];
@@ -881,79 +977,278 @@ static void update_ZM_instruction(uint8 *ins) {
            break;
        }

-        case SET_ADC_GAIN: {
-            INSTRUCTION.ADCGainLevel = ins[3];
-            if(INSTRUCTION.ADCGainLevel != GAIN_AUTO){
-                INSTRUCTION.AutoGainEnable = 0;
+        case SET_ADC_DAC_GAIN: {
+            switch(ins[3]){
+                case IIN_ADC :{
+                    INSTRUCTION.ADCGainLevel = ins[4];
+                    if(INSTRUCTION.ADCGainLevel != I_GAIN_AUTO){
+                        INSTRUCTION.AutoGainEnable = 0;
+                    }
+                    else{
+                        INSTRUCTION.AutoGainEnable = 1;
+                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+                    }
+                    break;
+                }
+                case VIN_ADC :{
+                    INSTRUCTION.VinADCGainLevel = ins[4];
+                    if(INSTRUCTION.VinADCGainLevel != VIN_GAIN_AUTO){
+                        INSTRUCTION.VinAutoGainEnable = 0;
+                    }
+                    else{
+                        INSTRUCTION.VinAutoGainEnable = 1;
+                        INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+                    }
+                    break;
+                }
+                case VOUT_DAC :{
+//                    INSTRUCTION.VoutGainLevel = ins[4];
+//                    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+//                        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+//                    }
+                    INSTRUCTION.VoutGainLevel = ins[4];
+                    VoutGainControl(INSTRUCTION.VoutGainLevel);
+                    break;
+                }
+                case HIGH_Z :{
+                    switch(ins[4]) {
+                        case 0x00 :{
+                            PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 0 => open high_z mode
+                            break;
+                        }
+                        case 0x01 :{
+                            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+                            break;
+                        }
+                        default :{
+                            break;
+                        }
+                    }
+                    break;
+                }
+                default :{
+                    break;
+                }
            }
-            else{
-                INSTRUCTION.AutoGainEnable = 1;
-            }
-//            if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-//                LED_color(DARKLED, 0x0F, 0x00, 0x00);
-//            }
-//            else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-//                LED_color(DARKLED, 0x0F, 0x00, 0x0F);
-//            }
-//            else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-//                LED_color(DARKLED, 0x0F, 0x02, 0xFF);
-//            }
            break;
        }

        case ADC_TEST: {
            INSTRUCTION.eliteFxn = ADC_TEST;
-            int32_t ADCRealValue = 0;
+//            int32_t ADCRealValue = 0;
            uint8_t CIS_buf[9]   = {0};
+            uint16_t ADCValueAVG_RAW = 0;
+            uint8_t ADC_input = 0;
+            bool AVG_done = 0;

-//            for(int i=0 ; i<10 ; i++){
-                ADCGainControl(ins[3]);
-                ADCChannelSelect(ins[4]);
-                CPUdelay(10);
-                ADC_read(spi_ADC_rxbuf);
-//                CPUdelay(10);
-//
-//                ADCValueTemp = ( uint16_t) (spi_ADC_rxbuf[0]) << 8 | (uint16_t) (spi_ADC_rxbuf[1]);
-//                ADCValueAVG = ADCValueAVG + ADCValueTemp;
-//            }
-//            ADCValueAVG = ADCValueAVG / 10;
-//            ADCValueTemp = (uint16_t) (ADCValueAVG);
-
-            CIS_buf[0] = chip_ID;
-            for(int i=0; i<4 ; i++){
-                CIS_buf[i+1] = spi_ADC_rxbuf[i];
-            }
-//            CIS_buf[1] = (uint8_t) ((ADCValueTemp & 0xFF00) >> 8);
-//            CIS_buf[2] = (uint8_t) (ADCValueTemp & 0x00FF);
-//            CIS_buf[3] = spi_ADC_rxbuf[2];
-//            CIS_buf[4] = spi_ADC_rxbuf[3];
-
-            // decode ADC measure value
-            ADCRealValue = DecodeADCValue(ins[3], ins[4], spi_ADC_rxbuf);
-
-            // test ADC output through CIS
-            if (ins[4] == ADC_CH_VOLT) {
-                // return ADC volt measure
-                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
-                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
-                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
-                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
-            } else if (ins[4] == ADC_CH_CURRENT) {
-                // return ADC current measure
-                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
-                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
-                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
-                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
-            } else {
-                // CIS = 0xFF...FF using as an error report
-                for (int i = 1; i < 9; i++) {
-                    CIS_buf[i + 1] = 0xFF;
+            switch(ins[3]) {
+                case IIN_ADC :{             // 0x00
+                    IinADCGainControl(ins[4]);
+                    AVG_done = 1;
+                    ADC_input = CMD_CURRENT_MEASURE;
+                    break;
+                }
+                case VIN_ADC :{             // 0x01
+                    VinADCGainControl(ins[4]);
+                    AVG_done = 1;
+                    ADC_input = CMD_VOLT_MEASURE;
+                    break;
+                }
+                case VOUT_DAC :{            // 0x02
+                    VoutGainControl(ins[4]);
+                    AVG_done = 0;
+                    break;
+                }
+                case HIGH_Z :{              // 0x03
+                    switch(ins[4]) {
+                        case 0x00 :{
+                            PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 0 => open high_z mode
+                            break;
+                        }
+                        case 0x01 :{
+                            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+                            break;
+                        }
+                        default :{
+                            break;
+                        }
+                    }
+                    AVG_done = 0;
+                    break;
+                }
+                default :{
+                    AVG_done = 0;
+                    break;
                }
            }

+            if (AVG_done) {
+                CPUdelay(100);
+                ADCValueAVG_RAW = ADC_CURRENT_AVG_calibration(ADC_input);
+            } else {
+                AVG_done = 0;
+                for (int i = 1; i < 9; i++) {
+                    CIS_buf[i + 1] = 0x00;
+                }
+            }
+
+                CIS_buf[0] = chip_ID;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG_RAW & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG_RAW & 0x00FF);
+                CIS_buf[3] = spi_ADC_rxbuf[2];
+                CIS_buf[4] = spi_ADC_rxbuf[3];
+
+            // decode ADC measure value
+//            ADCRealValue = DecodeADCValue(ins[4], ins[3], spi_ADC_rxbuf);
+
+            // test ADC output through CIS
+//            if (ins[3] == ADC_CH_VOLT) {
+//                // return ADC volt measure
+//                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
+//                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
+//                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
+//                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
+//            } else if (ins[3] == ADC_CH_CURRENT) {
+//                // return ADC current measure
+//                CIS_buf[5] = (uint8_t)(ADCRealValue >> 24);
+//                CIS_buf[6] = (uint8_t)((ADCRealValue & 0x00FF0000) >> 16);
+//                CIS_buf[7] = (uint8_t)((ADCRealValue & 0x0000FF00) >> 8);
+//                CIS_buf[8] = (uint8_t)(ADCRealValue & 0x000000FF);
+//            } else {
+//                // CIS = 0xFF...FF using as an error report
+//                for (int i = 1; i < 9; i++) {
+//                    CIS_buf[i + 1] = 0xFF;
+//                }
+//            }
+
            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);

-            //                    SendNotify();
+            break;
+        }
+
+        case CALI_DAC_MODE: {
+            ModeLED(WORKING);
+            INSTRUCTION.eliteFxn      = CALI_DAC_MODE;
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+            INSTRUCTION.VoltConstant  = ( ((uint16_t)(ins[3])) << 8) | (uint16_t)(ins[4]);
+            break;
+        }
+
+        case CALI_ADC_MODE: {
+            switch(ins[3]) {
+                case IIN_ADC :{             // 0x00
+                    INSTRUCTION.eliteFxn      = CALI_ADC_MODE;
+                    INSTRUCTION.AdcChannel    = IIN_ADC;
+                    INSTRUCTION.notifyRate    = 1000;
+                    INSTRUCTION.sampleRate    = 15;
+                    INSTRUCTION.VoViSwitch    = 0x01;
+                    ModeLED(WORKING);
+                    break;
+                }
+                case VIN_ADC :{             // 0x01
+                    INSTRUCTION.eliteFxn      = CALI_ADC_MODE;
+                    INSTRUCTION.AdcChannel    = VIN_ADC;
+                    INSTRUCTION.notifyRate    = 1000;
+                    INSTRUCTION.sampleRate    = 15;
+                    INSTRUCTION.VoViSwitch    = 0x01;
+                    ModeLED(WORKING);
+                    break;
+                }
+                default :{
+                    break;
+                }
+            }
+            break;
+        }
+
+        case PULSE_MODE:{
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+            if(ins[3] == PARA_1){
+                INSTRUCTION.sampleRate  = 15;
+                INSTRUCTION.notifyRate  = 100;
+                INSTRUCTION.VoViSwitch  = 0x01;
+                INSTRUCTION.t1          = 1;
+                INSTRUCTION.t2          = 2;
+                INSTRUCTION.t3          = 3;
+                INSTRUCTION.t4          = 4;
+                INSTRUCTION.t5          = 5;
+                INSTRUCTION.t1Time      = (int32_t)(ins[4]) << 24 | (int32_t)(ins[5]) << 16 | (int32_t)(ins[6]) << 8 | (int32_t)(ins[7]);
+                INSTRUCTION.t2Time      = (int32_t)(ins[8]) << 24 | (int32_t)(ins[9]) << 16 | (int32_t)(ins[10]) << 8 | (int32_t)(ins[11]);
+                INSTRUCTION.t3Time      = (int32_t)(ins[12]) << 24 | (int32_t)(ins[13]) << 16 | (int32_t)(ins[14]) << 8 | (int32_t)(ins[15]);
+                INSTRUCTION.t4Time      = (int32_t)(ins[16]) << 24 | (int32_t)(ins[17]) << 16 | (int32_t)(ins[18]) << 8 | (int32_t)(ins[19]);
+            }else if(ins[3] == PARA_2){
+                INSTRUCTION.eliteFxn    = PULSE_MODE;
+                ModeLED(WORKING);
+                INSTRUCTION.v1          = 25000;
+                INSTRUCTION.v2          = 50000;
+                INSTRUCTION.v3          = 25000;
+                INSTRUCTION.v4          = 25000;
+                INSTRUCTION.v5          = 25000;
+                INSTRUCTION.t5Time      = (int32_t)(ins[4]) << 24 | (int32_t)(ins[5]) << 16 | (int32_t)(ins[6]) << 8 | (int32_t)(ins[7]);
+                INSTRUCTION.cycleNumber = (uint16_t)(ins[8]);
+                INSTRUCTION.loop        = (uint16_t)(ins[9]);
+                INSTRUCTION.VsetRate    = 2;
+                INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+
+            }
+
+
+//            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+//            INSTRUCTION.eliteFxn    = PULSE_MODE;
+//            ModeLED(WORKING);
+//
+//            INSTRUCTION.sampleRate  = 15;
+//            INSTRUCTION.notifyRate  = 1000;
+//            INSTRUCTION.VoViSwitch  = 0x01;
+//            INSTRUCTION.t1          = 1;
+//            INSTRUCTION.t2          = 2;
+//            INSTRUCTION.t3          = 3;
+//            INSTRUCTION.t4          = 4;
+//            INSTRUCTION.t5          = 5;
+//            INSTRUCTION.t1Time      = ((int32_t)(ins[3]) << 8) | (int32_t)(ins[4]);
+//            INSTRUCTION.t2Time      = ((int32_t)(ins[5]) << 8) | (int32_t)(ins[6]);
+//            INSTRUCTION.t3Time      = ((int32_t)(ins[7]) << 8) | (int32_t)(ins[8]);
+//            INSTRUCTION.t4Time      = ((int32_t)(ins[9]) << 8) | (int32_t)(ins[10]);
+//            INSTRUCTION.t5Time      = ((int32_t)(ins[11]) << 8) | (int32_t)(ins[12]);
+//            INSTRUCTION.v1          = 25000;
+//            INSTRUCTION.v2          = 50000;
+//            INSTRUCTION.v3          = 25000;
+//            INSTRUCTION.v4          = 25000;
+//            INSTRUCTION.v5          = 25000;
+//            INSTRUCTION.cycleNumber = (uint16_t)(ins[13]);
+//            INSTRUCTION.loop        = (uint16_t)(ins[14]);
+//            INSTRUCTION.VsetRate    = 2;
+//
+//            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+
+//------------------------------------------------------------------------------------------
+//            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+//            INSTRUCTION.eliteFxn    = PULSE_MODE;
+//            ModeLED(WORKING);
+//
+//            INSTRUCTION.sampleRate  = 15;
+//            INSTRUCTION.notifyRate  = 1000;
+//            INSTRUCTION.VoViSwitch  = 0x01;
+//            INSTRUCTION.t1          = 1;
+//            INSTRUCTION.t1Time      = 20000;
+//            INSTRUCTION.t2          = 2;
+//            INSTRUCTION.t2Time      = 20000;
+//            INSTRUCTION.t3          = 3;
+//            INSTRUCTION.t3Time      = 20000;
+//            INSTRUCTION.t4          = 4;
+//            INSTRUCTION.t4Time      = 20000;
+//            INSTRUCTION.t5          = 5;
+//            INSTRUCTION.t5Time      = 20000;
+//            INSTRUCTION.v1          = 25000; //1V
+//            INSTRUCTION.v2          = 50000; //2V
+//            INSTRUCTION.v3          = 25000; //3V
+//            INSTRUCTION.v4          = 25000;
+//            INSTRUCTION.v5          = 25000;
+//            INSTRUCTION.cycleNumber = 5;
+//            INSTRUCTION.loop        = 2;
+//            INSTRUCTION.VsetRate    = 2;
+//
+//            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            break;
        }

@@ -975,14 +1270,10 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case VIS_ASK: {
-            //                    uint16_t volt = 0;
-            //                    volt = ( ((uint16_t) (ins[2])) <<8 ) | (uint16_t) (ins[3]);
-            //                    DAC_outputV(DACOUT, volt);
            for (int i = 0; i < BLE_DAT_BUFF_SIZE; i++) {
                not_buf[i] = i;
            }
            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
-
            break;
        }

@@ -1008,27 +1299,6 @@ static void update_ZM_instruction(uint8 *ins) {
            break;
        }

-        case VIS_SHIFT_200K: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon200R, 0);
-            LED_color(DARKLED, 0xFF, 0xB4, 0x00);
-            break;
-        }
-
-        case VIS_SHIFT_10K: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 1);
-            PIN_setOutputValue(pin_handle, Turnon200R, 0);
-            LED_color(DARKLED, 0x14, 0xC8, 0xFF);
-            break;
-        }
-
-        case VIS_SHIFT_200R: {
-            PIN_setOutputValue(pin_handle, Turnon10K, 0);
-            PIN_setOutputValue(pin_handle, Turnon200R, 1);
-            LED_color(DARKLED, 0xFF, 0xFF, 0xFF);
-            break;
-        }
-
        case VIS_DEVICE_SHINY:{
            Elite_led_color(COLOR_PURPLE);
 //            uint8_t deviceShinySwitch = (ins[2] & 0b11110000) >> 4;//1:open 0:close
@@ -1054,6 +1324,8 @@ static void update_ZM_instruction(uint8 *ins) {
        }

        case VIS_CC_ZERO:{
+            ModeLED(PRE_WORK);
+            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
            INSTRUCTION.eliteFxn = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate = 15;
            INSTRUCTION.charge = 0x01;
@@ -1062,6 +1334,7 @@ static void update_ZM_instruction(uint8 *ins) {
            INSTRUCTION.Vmin = 0x0000;
            INSTRUCTION.notifyRate = 500;
            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
            break;
        }

@@ -1109,17 +1382,6 @@ static void update_ZM_instruction(uint8 *ins) {
            }
            break;
        }
-
-        case CIS_TEMPERATURE: { //0x7080
-            initCISBuf();
-            cis_buf[0] = CIS_TEMPERATURE;
-            cis_buf[1] = NotifyTemperature[0];
-            cis_buf[2] = NotifyTemperature[1];
-            cis_buf[3] = NotifyTemperature[2];
-            cis_buf[4] = NotifyTemperature[3];
-            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, BLE_CIS_BUFF_SIZE, cis_buf);
-            break;
-        }
        }
        break;
    }
@@ -1136,6 +1398,18 @@ static void update_ZM_instruction(uint8 *ins) {
    }
 }

+static void ZM_instruction_update_handle(uint8_t characteristic) {
+    switch (characteristic) {
+    case BLE_INS_BUFF_CHAR:
+        //            LED_color(0xf8, 0x00, 0xFF, 0xFF);
+        SimpleProfile_GetParameter(SIMPLEPROFILE_CHAR3, ins_buf);
+        update_ZM_instruction(ins_buf);
+        break;
+    default:
+        break;
+    }
+}
+
 // static void update_clock_period() {
 //    uint32_t clock_rate = INSTRUCTION.adc_clock_rate;
 //
@@ -1158,18 +1432,6 @@ static void update_ZM_instruction(uint8 *ins) {
 //    }
 //}

-static void ZM_instruction_update_handle(uint8_t characteristic) {
-    switch (characteristic) {
-    case BLE_INS_BUFF_CHAR:
-        //            LED_color(0xf8, 0x00, 0xFF, 0xFF);
-        SimpleProfile_GetParameter(SIMPLEPROFILE_CHAR3, ins_buf);
-        update_ZM_instruction(ins_buf);
-        break;
-    default:
-        break;
-    }
-}
-
 /*===================================
 ==== system function implements ====
 ==================================*/
@@ -46,15 +46,17 @@ static void ZM_init() {

    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+    Init_Elite15_PIN();
+    ELITE15_SPI_HOLD();

-    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
+    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
+    PIN15_setOutputValue(enable_10v, 0);        // enable 10V
+    PIN15_setOutputValue(HIGH_Z_MODE, 1);       // HIGH Z MODE // 1 => close high_z mode

    InitEliteInstruction();
-    ADCGainControl(GAIN_AUTO);
+    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+    VoutGainControl(INSTRUCTION.VoutGainLevel);
    elite_gptimer_open();

    //    PIN_registerIntCb(pin_handle, switch_on_callback);
@@ -66,7 +68,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);
@@ -83,7 +85,8 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (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() (                           \
@@ -116,10 +119,15 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            EliteWorkReset  = false;
            batteryADC_flag = false;
            record_flag     = true;
+            firstTimeReset  = true;
+            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
            if( Ve1MatchVe2Mode() ){
                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
-                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.Ve1));
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
                    PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
                }
            }
        }
@@ -140,7 +148,12 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        //vscan counter
        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
        if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
-            GPT.VscanRateCounter -= INSTRUCTION.VsetRate; //To get right time
+            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);
@@ -154,12 +167,11 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        if(GPT.BatteryCheckCounter >= 50000){
            GPT.BatteryCheckCounter -= 50000; //To get right time
            batteryCheck_flag = true;
-            tempCheck_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);
+            PIN15_setOutputValue(enable_5v, 0);
        }

        //ADC counter
@@ -171,9 +183,6 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
                EliteADCControl(WorkModeData);
                ADC_flag = false;
            }
-        }else if(GPT.SampleRateCounter == 12 && tempCheck_flag){
-            headstage_temperature();
-            tempCheck_flag = false;
        }

        //Notify counter(Notify control, check if we need to send notify)
@@ -191,14 +200,127 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            }
        }

-        EliteDone();
-    }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+//        EliteDone();
+    }
+    else if (INSTRUCTION.eliteFxn == PULSE_MODE){
+         /** Periodic Event **/
+         // 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;
+             batteryADC_flag = false;
+             record_flag     = true;
+             firstTimeReset  = true;
+             VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+             IinADCGainControl(INSTRUCTION.ADCGainLevel);
+             VoutGainControl(INSTRUCTION.VoutGainLevel);
+             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;
+         }else{
+             if(notifyFirst_flag){
+                 GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
+                 notifyFirst_flag = false;
+             }
+             vscanReset = false;
+             leadTimeReset = false;
+         }
+
+         //vscan counter
+         GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+
+        if (vscanReset) {
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+            //vscanReset = false;
+        }else{
+            test_Vscan(WorkModeData->PULSE);
+        }
+
+//         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;
+//             }
+//         }
+
+         //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){
+             PIN15_setOutputValue(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);
+                 ADC_flag = false;
+             }
+         }
+
+         //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 right time
+             notify_flag = true;
+             if(vscanReset){
+                 notify_flag = false;
+             }
+             if(notify_flag){
+                 SendNotify();
+                 notify_flag = false;
+             }
+         }
+
+ //        EliteDone();
+     }
+    else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+        VoutGainControl(INSTRUCTION.VoutGainLevel);
        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;
-    }else{
-        InitFlag();
+    }
+    else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
+        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
+    }
+    else{
+//        InitFlag();
    }
 }

@@ -240,6 +362,19 @@ static void EliteADCControl(WorkMode *WorkModeData) {
            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);
+            }
+
+            break;
+        }
+        case PULSE_MODE:{
+            CC_Plot(WorkModeData);
+            break;
+        }
        default:{
            break;
        }
@@ -250,7 +385,7 @@ static void EliteDone() {
    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
        if (!PeriodicEvent) {
            SendNotify();
-            reset();
+            Eliteinterrupt();
        }
    }
 }
@@ -270,21 +405,25 @@ static void EliteVscanControl(WorkMode *WorkModeData) {
            break;
        }
        case CYCLIC_VOLTAMMETRY:{
-            CV3_Vscan(WorkModeData);
+            CV3_Vscan(WorkModeData->CV3);
            break;
        }
        case CONSTANT_CURRENT:{
-            CC_Vscan(WorkModeData);
+            CC_Vscan(WorkModeData->CC);
            break;
        }
        case LINEAR_SWEEP_VOLTAMMETRY:{
-            LSV_Vscan(WorkModeData);
+            LSV_Vscan(WorkModeData->LSV);
            break;
        }
        case CONSTANT_VSCAN:{
            CVSCAN_Vscan(WorkModeData->CVSCAN);
            break;
        }
+        case PULSE_MODE:{
+            PULSE_Vscan(WorkModeData->PULSE);
+            break;
+        }
        default:{
            break;
        }
@@ -348,8 +487,9 @@ static void InitEliteFlag() {
    vscanReset        = true;
    EliteWorkReset    = true;
    leadTimeReset     = true;
-    GAIN_200R_counter = 0;
-    GAIN_200K_counter = 0;
-    GAIN_10K_counter  = 0;
+    I_GAIN_100R_counter = 0;
+    I_GAIN_3K_counter   = 0;
+    I_GAIN_100K_counter = 0;
+    I_GAIN_3M_counter   = 0;
 }
 #endif /* IMPEDANCE_METER_H_ */
@@ -546,17 +546,18 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {

    // Initialize application
    SimpleBLEPeripheral_init();
-
    ZM_init();
-    Elite_SPI_init();
    WorkMode *WorkModeData = CreateWorkMode();

+    // init DAC, set output ~= 0 V
+    INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+    VoutGainControl(INSTRUCTION.VoutGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+
    uint8_t  key         = 0;
    uint16_t counter6994 = 0;
    bool     EliteOn     = 0;

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

    // Application main loops
@@ -620,46 +621,19 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                    if (counter6994 < CLOCK_ONE_SECOND*5) {  // counter6994 enable a IC after 35 counts
                        counter6994++;
                    } else if (counter6994 == CLOCK_ONE_SECOND*5) {
-                        PIN_setOutputValue(pin_handle, shutdown_6994, 0);  // OFF = 1 => turn off 6994
+                        PIN15_setOutputValue(shutdown_6994, 0);  // OFF = 1 => turn off 6994
                        counter6994++;
                    } else if (counter6994 > CLOCK_ONE_SECOND*5) {
                        counter6994 = 0;
                    }
                    EliteKeyPress(key);
+
                    if(key != 0){  //detect Elite battery power when no periodic event
-                        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);
-                        }
-
+                        measureBat();
                    }
                    if(Free_Work_Mode){
                        FreeWorkMode(WorkModeData);
                        InitEliteInstruction();
-                        ADCGainControl(INSTRUCTION.ADCGainLevel);
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
                        Free_Work_Mode = false;
                    }
                } else {
@@ -952,7 +926,6 @@ 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
@@ -998,7 +971,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
Benny Liu	63310bdd03	cali_count_max = 5000 for smallest Vin and Iin gain	2020-12-17 12:38:38 +08:00
Benny Liu	1954ff8d9e	Add calibration count from 1000 to 5000.	2020-12-03 14:36:31 +08:00
Roy	c656eebcbc	[update] align notify (match megafly ui)	2020-11-26 22:48:53 +08:00
Roy	e17e78bc18	[update] add Vout boundary (usc)	2020-11-26 16:14:31 +08:00
Benny Liu	c3235e985f	Change 1.5 Iin measurement range.	2020-11-26 15:48:01 +08:00
Roy	656e0fb485	[cali] update BOARD_C7A1 calibration data.	2020-11-23 12:12:09 +08:00
Roy	d3dd5270dd	[update] tag controller version	2020-11-23 10:18:46 +08:00
Roy	e588b30c8b	[update] monitor bat	2020-11-20 14:45:21 +08:00
Roy	d3f9aec31c	add BOARD_C604 calibration data.	2020-11-20 11:50:17 +08:00
Roy	ed617c88c9	[update] remove megafly pin	2020-11-20 11:14:01 +08:00
Roy	0b8f4c2414	Merge branch 'Elite1.5_developement_magafly_1119_1' into Elite1.5_developement	2020-11-20 11:08:51 +08:00
Roy	b5449b7404	[update]update pulsefly INSTRUCTION.notifyRate	2020-11-20 11:06:12 +08:00
Roy	a3c1241f38	Merge branch 'Elite1.5_calibration' into Elite1.5_developement	2020-11-20 11:01:45 +08:00
Roy	bbf60ebfed	test periodicEvent	2020-11-19 16:00:51 +08:00
Roy	0e9f40bdd5	Megafly trigger yes yes.	2020-11-19 15:47:07 +08:00
Roy	e32897f6b5	[update] Megafly notify check. & Megafly trigger.	2020-11-19 15:40:12 +08:00
Roy	6ee4b47d90	[update]update pulsefly INSTRUCTION.notifyRate	2020-11-18 11:57:53 +08:00
YiChin	dac19f62b2	test ok,but T2~T3=0 can't handle	2020-11-16 14:43:50 +08:00
YiChin	8e6d112729	test ok,but T2~T3=0 can't handle	2020-11-16 14:30:27 +08:00
YiChin	9e1dc1e3f4	test ok,but T1~T5=0 can't handle	2020-11-13 18:28:48 +08:00
YiChin	49fb3afc01	test ok,but T1~T5=0 can't handle	2020-11-13 13:30:47 +08:00
YiChin	f3b402fce9	test ok	2020-11-12 18:01:32 +08:00
YiChin	ef9a38d7fc	test not ok(RT not ok)	2020-11-12 17:24:04 +08:00
YiChin	67275a7921	test not ok(RT not ok)	2020-11-12 16:17:15 +08:00
YiChin	0ddaa02414	test not ok	2020-11-12 15:39:44 +08:00
YiChin	96d5735164	test not ok	2020-11-12 14:55:28 +08:00
YiChin	ac32fb9c73	test not ok	2020-11-12 12:23:14 +08:00
Benny Liu	9acc242ff6	Add Megafly pin.	2020-11-12 10:22:31 +08:00
YiChin	d8a403c410	add BOARD_C771 calibration data.	2020-11-12 10:18:12 +08:00
YiChin	f1d0acef23	update pulse mode	2020-11-12 10:16:40 +08:00
YiChin	9811572f47	add pulse mode	2020-11-11 16:44:49 +08:00
YiChin	8753e2ddc6	dont send battery information	2020-10-22 10:38:09 +08:00
YiChin	f6167c25ca	update SPI hold & take away AutoGainChangeVout()	2020-10-20 18:41:00 +08:00
YiChin	cb3894712e	take away AutoGainChangeVout()	2020-10-20 18:23:13 +08:00
YiChin	995a47e200	update SPI hold	2020-10-20 17:11:36 +08:00
YiChin	cde9096018	update SPI hold	2020-10-20 12:18:29 +08:00
YiChin	6c1bd24b92	update SPI hold	2020-10-19 18:40:35 +08:00
YiChin	0c129bc99b	take away bat()	2020-09-25 09:43:39 +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