[cali] add BOARD_E69C calibration data.

update BOARD_7AA4 & BOARD_E731 & BOARD_7ABF calibration data.
add BOARD_E731 & E731 & E6BA & E7EF & 7ABF update BOARD_7A42 calibration data.
2021-06-07 16:21:23 +08:00 · 2021-04-16 14:47:31 +08:00 · 2021-03-29 10:58:23 +08:00 · 2021-03-05 10:38:38 +08:00 · 2021-02-24 17:51:01 +08:00 · 2021-02-24 13:55:06 +08:00
31 changed files with 3423 additions and 2653 deletions
@@ -1,246 +0,0 @@
-
-#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,6 +46,7 @@ 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);
 }

@@ -55,108 +56,34 @@ static void ADC_read(uint8_t *ADCdata){
        spi_ADC_rxbuf[i] = 0;
    }

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

-/* 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;
+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);
    }
-
-    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 == 1){
+        // ADC gain level = 1, using 10K resister
+        PIN_setOutputValue(pin_handle, Turnon10K, 1);
+        PIN_setOutputValue(pin_handle, Turnon200R, 0);
    }
-    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 == 2){
+        // ADC gain level = 2, 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 if(ADCLevel == 3){
+        // ADC gain level = 0, auto gain (using 200R resister)
+        PIN_setOutputValue(pin_handle, Turnon10K, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 1);
    }
    else{
-        // default using 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;
+        // default using 200R resister
+        PIN_setOutputValue(pin_handle, Turnon10K, 0);
+        PIN_setOutputValue(pin_handle, Turnon200R, 1);
    }
 }

@@ -197,20 +124,8 @@ static void ADCChannelSelect(uint8_t ADCChannel){
    }
 }

-static void ReadADCIin(uint8_t *buf){
+static void ReadVolt(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);

@@ -218,7 +133,7 @@ static void ReadADCVin(uint8_t *buf){
    ADC_read(buf);
 }

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

-static void ReadADCBat(uint8_t *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){
    // Read data twice since the first data we get is previous data
    ADCChannelSelect(ADC_CH_BAT);
    ADC_read(buf);
@@ -236,371 +160,133 @@ static void ReadADCBat(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

-// 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
+// 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

-static int32_t AutoGainReadIin(uint8_t *buf){
-     int32_t RealCurrent = 0;
+//#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

-     ReadADCIin(spi_ADC_rxbuf);
-     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+/* 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

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

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

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

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

-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;
+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;
                    record_flag = false;
                }
-            }
-            // switch to 2 level current
-            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
-                I_GAIN_100K_counter++;
-                if(I_GAIN_100K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_100K_counter = 0;
-                    record_flag = false;
-                }
-            }
-            // switch to 3 level current
-            else{
-                I_GAIN_3K_counter++;
-                if(I_GAIN_3K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_3K_counter = 0;
-                    record_flag = false;
-                }
-            }
-        }else{
-            if(I_GAIN_3K_counter > 0){
-                I_GAIN_3K_counter--;
-            }
-            if(I_GAIN_100K_counter > 0){
-                I_GAIN_100K_counter--;
-            }
-            if(I_GAIN_3M_counter > 0){
-                I_GAIN_3M_counter--;
-            }
-        }
-    }
-    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
-        // switch to 4 level current(large)
-        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-            I_GAIN_100R_counter++;
-            if(I_GAIN_100R_counter > 2){
-                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-                IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                I_GAIN_100R_counter = 0;
-                record_flag = false;
-            }
-        }
-        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
-            // switch to 1 level current(small)
-            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
-                I_GAIN_3M_counter++;
-                if(I_GAIN_3M_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_3M_counter = 0;
-                    record_flag = false;
-                }
-            }
-            // switch to 2 level current
-            else{
-                I_GAIN_100K_counter++;
-                if(I_GAIN_100K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_100K_counter = 0;
-                    record_flag = false;
-                }
-            }
-        }else{
-            if(I_GAIN_100R_counter > 0){
-                I_GAIN_100R_counter--;
-            }
-            if(I_GAIN_100K_counter > 0){
-                I_GAIN_100K_counter--;
-            }
-            if(I_GAIN_3M_counter > 0){
-                I_GAIN_3M_counter--;
-            }
-        }
-    }
-    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
-            // switch to 1 level current(small)
-            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
-                I_GAIN_3M_counter++;
-                if(I_GAIN_3M_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_3M_counter = 0;
-                    record_flag = false;
-                }
-            }
-            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
-                 // switch to 4 level current(large)
-                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-                    I_GAIN_100R_counter++;
-                    if(I_GAIN_100R_counter > 2){
-                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                        I_GAIN_100R_counter = 0;
-                        record_flag = false;
-                    }
-                }
-                 // switch to 3 level current
-                 else{
-                    I_GAIN_3K_counter++;
-                    if(I_GAIN_3K_counter > 2){
-                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                        I_GAIN_3K_counter = 0;
-                        record_flag = false;
-                    }
-                }
            }else{
-                if(I_GAIN_100R_counter > 0){
-                    I_GAIN_100R_counter--;
-                }
-                if(I_GAIN_3K_counter > 0){
-                    I_GAIN_3K_counter--;
-                }
-                if(I_GAIN_3M_counter > 0){
-                    I_GAIN_3M_counter--;
-                }
-            }
-        }
-    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
-        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
-            // switch to 4 level current(large)
-            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
-                I_GAIN_100R_counter++;
-                if(I_GAIN_100R_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_100R_counter = 0;
-                    record_flag = false;
-                }
-            }
-            // switch to 3 level current
-            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
-                I_GAIN_3K_counter++;
-                if(I_GAIN_3K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_3K_counter = 0;
-                    record_flag = false;
-                }
-            }
-            // switch to 2 level current
-            else{
-                I_GAIN_100K_counter++;
-                if(I_GAIN_100K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
-                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
-                    I_GAIN_100K_counter = 0;
-                    record_flag = false;
-                }
-
-            }
-        }else{
-            if(I_GAIN_100R_counter > 0){
-                I_GAIN_100R_counter--;
-            }
-            if(I_GAIN_3K_counter > 0){
-                I_GAIN_3K_counter--;
-            }
-            if(I_GAIN_100K_counter > 0){
-                I_GAIN_100K_counter--;
-            }
-        }
-    }
-}
-
-static void 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;
+                GAIN_10K_counter++;
+                if(GAIN_10K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = GAIN_10K;
+                    ADCGainControl(INSTRUCTION.ADCGainLevel);
+                    GAIN_10K_counter = 0;
                    record_flag = false;
                }
            }
        }else{
-            if(VIN_GAIN_1K_counter > 0){
-                VIN_GAIN_1K_counter--;
+            if(GAIN_200K_counter > 0){
+                GAIN_200K_counter--;
            }
-            if(VIN_GAIN_30K_counter > 0){
-                VIN_GAIN_30K_counter--;
+            if(GAIN_10K_counter > 0){
+                GAIN_10K_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;
+    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;
                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;
+
+        // 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;
                record_flag = false;
            }
        }else{
-            if(VIN_GAIN_1K_counter > 0){
-                VIN_GAIN_1K_counter--;
+            if(GAIN_200R_counter > 0){
+                GAIN_200R_counter--;
            }
-            if(VIN_GAIN_1M_counter > 0){
-                VIN_GAIN_1M_counter--;
+            if(GAIN_200K_counter > 0){
+                GAIN_200K_counter--;
            }
        }
    }
-    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
-        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
-            // switch to 1 level volt(small)
-            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
-                VIN_GAIN_1M_counter++;
-                if(VIN_GAIN_1M_counter > 2){
-                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
-                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
-                    VIN_GAIN_1M_counter = 0;
+    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;
                    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;
+
+            }else{
+                GAIN_10K_counter++;
+                if(GAIN_10K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = GAIN_10K;
+                    ADCGainControl(INSTRUCTION.ADCGainLevel);
+                    GAIN_10K_counter = 0;
                    record_flag = false;
                }
+
            }
-        }else{
-            if(VIN_GAIN_1M_counter > 0){
-                VIN_GAIN_1M_counter--;
+       }else{
+            if(GAIN_200R_counter > 0){
+                GAIN_200R_counter--;
            }
-            if(VIN_GAIN_30K_counter > 0){
-                VIN_GAIN_30K_counter--;
+            if(GAIN_10K_counter > 0){
+                GAIN_10K_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,8 +11,9 @@
 * Real current value : -15.00000 ~ 15.00000 mA
 *  => user code = 1500000 mapping to 0.00000 mA
 */
-static void CC_Vscan(CCMode *CC){
+static void CC_Vscan(WorkMode *WM){
    static int32_t Iin = 0;
+    static int32_t Vin = 0;
    static int32_t deltaI = 0;
    static int32_t deltaV = 0;
    uint16_t divisionRate;
@@ -20,12 +21,13 @@ static void CC_Vscan(CCMode *CC){
    if(vscanReset){
        Vset = 0;

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

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

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

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

-        if(Vset <= CC->_Vmin){
-            Vset = CC->_Vmin;
-        }else if(Vset >= CC->_Vmax){
-            Vset = CC->_Vmax;
+        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(!vscanReset){
-        Iin = CC->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - CC->_Iset;
+        Iin = WM->CC->_measureCurrent * 20; //[50pA]   nA => 50pA
+        Vin = WM->CC->_measureVin * 200;
+
+        deltaI = Iin - WM->CC->_Iset;

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

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

-        if(Vset <= CC->_Vmin){
-            Vset = CC->_Vmin;
-        }else if(Vset >= CC->_Vmax){
-            Vset = CC->_Vmax;
+        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;
+            }
        }
    }
 //    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.VoutGainLevel, INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(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(CV3Mode *CV3){
+static void CV3_Vscan(WorkMode *WM){
    static int16_t VminCounter;
    static int16_t VmaxCounter;
    static uint16_t CycleCounter;

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

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

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

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

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

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

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

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

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

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

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

            /*stop condition*/
-            if(CV3->_cycleNumber == 0){
+            if(WM->CV3->_cycleNumber == 0){
    //            PeriodicEvent = false;
-                ModeLED(POST_WORK);
+                FreeWorkMode(WM);
                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 * GPT.GptimerMultiple;
+            Vset = Vset + CV->_Vstep;
        }else{
-            Vset = Vset - CV->_Vstep * GPT.GptimerMultiple;
+            Vset = Vset - CV->_Vstep;
        }

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

        /*stop condition*/
        if(CV->_cycleNumber == 0){
-            PeriodicEvent = false;
-            ModeLED(NO_EVENT);
+            reset();
        }
    }
 }
@@ -19,7 +19,7 @@ static uint16_t CVSCANCurve(CVSCANMode *CVSCAN){
    }

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

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -52,29 +52,9 @@ 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){
@@ -82,40 +62,4 @@ 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,7 +21,6 @@ struct _GPT{
    uint32_t LeadTimeCounter;
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
-    uint32_t GptimerMultiple;
 }GPT = {0};

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

        if (IV->_current_direction_up){
-            Vset = Vset + IV->_Vstep * GPT.GptimerMultiple;
+            Vset = Vset + IV->_Vstep;
        }else{
-            Vset = Vset - IV->_Vstep * GPT.GptimerMultiple;
+            Vset = Vset - IV->_Vstep;
        }
    }
 }
@@ -2,32 +2,16 @@
 #ifndef ELITEINSTRUCTION
 #define ELITEINSTRUCTION

-/** 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
+/** ADC gain level **/
+#define GAIN_200K   0x00 // largest gain
+#define GAIN_10K    0x01
+#define GAIN_200R   0x02 // the least gain
+#define GAIN_AUTO   0x03

 /* 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
@@ -60,12 +44,7 @@ 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;
@@ -75,27 +54,9 @@ 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};

 /*********************************************************************
@@ -125,33 +86,40 @@ static void InitEliteInstruction(){
    INSTRUCTION.sampleRate      = 100;
    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
    INSTRUCTION.AutoGainEnable  = 1;
-    INSTRUCTION.VinAutoGainEnable = 1;
-    INSTRUCTION.VoutAutoGainEnable = 1;
-    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
-    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
-    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
+    INSTRUCTION.ADCGainLevel    = 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){
-                PIN15_setOutputValue(enable_5v, 0);
+                PIN_setOutputValue(pin_handle, enable_5v, 0);
                return false;
            }else{
-                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
+                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
                TurnOn10V();
-                ModeLED(BT_WAIT);
+                LEDPowerON();
                return true;
            }
        } else {
@@ -26,7 +26,7 @@ static bool TurnOnElite(uint8_t key) {
        }
    } else {
        TurnOnCounter = 0;
-        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+        PIN_setOutputValue(pin_handle, enable_5v, 0);
        return false;
    }
 }
@@ -40,20 +40,20 @@ static void EliteKeyPress(uint8_t key) {
        // press key => bight LED

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

        // press 3~4 sec, shutdown 2650
        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+            PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
        }
        ShutDownCounter ++;
    } else {
        if (OriginEliteFxn == INSTRUCTION.eliteFxn) {  // old function == currunt instruction
            if (ShutDownCounter != 0) {
                // dark LED
-                checkFlafLED();
+                WorkModeLED();
                ShutDownCounter = 0;
            }
        } else {  // old function != currunt instruction
@@ -61,14 +61,15 @@ static void EliteKeyPress(uint8_t key) {
            if (ShutDownCounter != 0) {
                ShutDownCounter = 0;
            }
-            checkFlafLED();
+            // dark mode LED
+            WorkModeLED();
        }
    }
 }

 static void TurnOn10V() {
    If10Von = true;
-    PIN15_setOutputValue(enable_10v, 1);
+    PIN_setOutputValue(pin_handle, enable_10v, 1);
    CPUdelay(8000);
 }

@@ -5,8 +5,6 @@
 #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;
@@ -19,31 +17,26 @@ 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, 0x50, 0x00, 0x00);
+            LED_color(DARKLED, 0xFF, 0x00, 0x00);
            break;
        }
        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0x50, 0x58, 0x09);
+            LED_color(DARKLED, 0xFF, 0x58, 0x09);
            break;
        }
        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0x50, 0x80, 0x00);
+            LED_color(LIGHTLED, 0xFF, 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;
@@ -53,129 +46,165 @@ static void Elite_led_color(uint16_t color){
            break;
        }
        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0x50, 0x00, 0x80);
+            LED_color(DARKLED, 0xFF, 0x00, 0x80);
            break;
        }
        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0x50, 0x00, 0xFF);
+            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
            break;
        }
        case COLOR_WHITE: {
-            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
+            LED_color(DARKLED, 0xCA, 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 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 NO_EVENT: {
-        noEventLedFlag = 1;
-        LEDPowerON();
-        break;
-    }
-    case PRE_WORK: {
-        preWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    case WORKING: {
-        workingLedFlag = 1;
-        WorkModeLED();
-        break;
-    }
-    case POST_WORK: {
-        postWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    default: {
-        LEDPowerON();
-        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:{
+    case IV_CURVE: {
        WORKLED();
        break;
    }
-    case PULSE_MODE:{
-//        Elite_led_color(COLOR_YELLOW);
+    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: {
+        LEDPowerON();
+        break;
+    }
+    case ADC_TEST: {
        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);
-        }
-
+    case CYCLIC_VOLTAMMETRY: {
+        WORKLED();
+        break;
+    }
+    case LINEAR_SWEEP_VOLTAMMETRY: {
+        WORKLED();
+        break;
+    }
+    case CONSTANT_VSCAN: {
+        WORKLED();
        break;
    }
-//    case VIS_RST: {
-//        LEDPowerON();
-//        break;
-//    }
    default: {
-        WORKLED();
+        LEDPowerON();
        break;
    }
    }
 }

+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;
+        }
+    }
+    */
+}
+
 #endif
@@ -19,7 +19,7 @@ static uint16_t LSVCurve(LSVMode *LSV){
    }

    INSTRUCTION.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(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(LSVMode *LSV){
+static void LSV_Vscan(WorkMode *WM){

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

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

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

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

    if(!vscanReset){

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

        /*stop condition*/
-        if (Vset >= LSV->_Vmax){
-            ModeLED(POST_WORK);
+        if (Vset >= WM->LSV->_Vmax){
 //            PeriodicEvent = false;
-            Vset = LSV->_Vmin;
+            Vset = WM->LSV->_Vmin;
+            FreeWorkMode(WM);
            InitEliteFlag();
            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate = 15;
@@ -79,10 +79,10 @@ static void LSV_Vscan(LSVMode *LSV){
            INSTRUCTION.Vmin       = 0x0000;
            INSTRUCTION.notifyRate = 500;
            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
-        }else if (Vset <= LSV->_Vmin){
-            ModeLED(POST_WORK);
+        }else if (Vset <= WM->LSV->_Vmin){
 //            PeriodicEvent = false;
-            Vset = LSV->_Vmax;
+            Vset = WM->LSV->_Vmax;
+            FreeWorkMode(WM);
            InitEliteFlag();
            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
            INSTRUCTION.sampleRate = 15;
@@ -1,16 +0,0 @@
-
-#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,10 +10,11 @@
 #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_CURRENT      0
+#define NOTIFY_VOLT         1
+#define NOTIFY_IMPEDANCE    2
+#define NOTIFY_VOLT_BAT     3
+#define NOTIFY_TEMPERATURE  4

 #define NOT_BUF_OFFSET_INIT 8

@@ -24,10 +25,11 @@
 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  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 uint16_t NotifyCycleNumber  = 0;

 // ****************** New Notify Format ******************************** //
@@ -117,13 +119,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;
    }
 }

@@ -183,6 +185,12 @@ 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
@@ -1,345 +0,0 @@
-#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,21 +3,14 @@
 #define ELITERESET

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

-    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));
-
+    ADCGainControl(INSTRUCTION.ADCGainLevel);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+    LEDPowerON();
    initINSBuf();
    initDATBuf();

@@ -36,22 +29,20 @@ 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() {
-    ModeLED(NO_EVENT);
-    InitFlag();
    InitEliteFlag();
+    InitFlag();
    InitCT();
    InitGPT();

-    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));
-
+    ADCGainControl(GAIN_AUTO);
+    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+    LEDPowerON();
    initINSBuf();
    initDATBuf();

@@ -70,6 +61,8 @@ 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,8 +36,6 @@ 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();
@@ -65,68 +63,26 @@ 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) {
-//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW
+   ADC_DAC_transaction.count = length;
+   ADC_DAC_transaction.txBuf = spi_txbuf;
+   ADC_DAC_transaction.rxBuf = spi_rxbuf;

-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    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
+   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
 }

 #endif // ELITE_SPI
@@ -327,66 +327,6 @@ 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;
@@ -483,7 +423,6 @@ typedef union _WorkMode{
    LSVMode *LSV;
    CVSCANMode *CVSCAN;
    PSMode *PS;
-    PULSEMode *PULSE;
 //    CCCMode *CCC;
 }WorkMode;

@@ -495,7 +434,6 @@ WorkMode *CreateWorkMode(){
 void InitWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
-        case CALI_DAC_MODE:
            WM->VO = InitVoltOutMode();
            break;
        case IT_CURVE:
@@ -525,9 +463,6 @@ 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;
@@ -540,7 +475,6 @@ 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;
@@ -600,12 +534,6 @@ 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,102 +8,50 @@

 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 D1
-#define Board_SPI0_CLK                  D0
+#define Board_SPI0_MOSI                 IOID_1
+#define Board_SPI0_CLK                  IOID_0
 #define Board_SPI0_CS                   PIN_UNASSIGNED

-#define Board_SPI1_MISO                 IOID_1
-#define Board_SPI1_MOSI                 D3
-#define Board_SPI1_CLK                  D2
+#define Board_SPI1_MISO                 IOID_3
+#define Board_SPI1_MOSI                 IOID_2
+#define Board_SPI1_CLK                  IOID_4
 #define Board_SPI1_CS                   PIN_UNASSIGNED

-#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 ADC_CS                          IOID_8
+#define DAC_CS                          IOID_9

-#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
+#define Turnon200R                      IOID_5
+#define Turnon10K                       IOID_6

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

-#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
+#define shutdown_6994                   IOID_10
+#define switch_on                       IOID_11
+#define enable_10v                      IOID_12
+#define enable_5v                       IOID_13

 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;

 const PIN_Config BLE_IO[] = {
-//    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,
+    //
+    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

-    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
+    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,

    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.ReadADCBat(spi_ADC_rxbuf)
+1.ReadBatVolt(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;

-    ReadADCBat(spi_ADC_rxbuf);
+    ReadBatVolt(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,51 +42,30 @@ static void headstage_battery_volt(){

 static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-    if(INSTRUCTION.eliteFxn == ADC_TEST){
+
+    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;
        ADCSwitch = 0;
-    }else{
-        if(ADCSwitch == 0){ /**read V**/
-            ReadADCBat(spi_ADC_rxbuf);
-            ADCSwitch++;
-        }
-        else if(ADCSwitch == 1){ /**read V**/
-            ReadADCBat(spi_ADC_rxbuf);
-            ADCSwitch++;
-        }
-        else if(ADCSwitch == 2){ /**read V(buffer)**/
-            headstage_battery_volt();
-            batteryCheck_flag = false;
-            ADCSwitch = 0;
-        }
    }
 }

-static void measureBat(){
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
-        GPT.BatteryCheckCounter = 0;
-        batteryCheck_flag = true;
-    }
-
-    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
-        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
-        batteryADC_flag = true;
-        if(batteryADC_flag){
-            EliteADCBattery();
-            batteryADC_flag = false;
-        }
-    }
-
-    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){
-        PIN15_setOutputValue(enable_5v, 0);
+static int32_t headstage_temperature() {
+    int32_t curTemp;
+    curTemp = AONBatMonTemperatureGetDegC();
+    InputNotify(NOTIFY_TEMPERATURE,curTemp);
+    if(INSTRUCTION.eliteFxn == IT_CURVE){
+        InputNotify(NOTIFY_IMPEDANCE,curTemp);
    }
+    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_DAC_GAIN                    0x80
+#define SET_ADC_GAIN                    0x80
 #define DIFFERENTIAL_PULSE_VOLTAMMETRY  0xA0
 #define SQUARE_WAVE_VOLTAMMETRY         0xB0
 #define CYCLIC_VOLTAMMETRY              0xC0
@@ -36,15 +36,13 @@
 #define HIGH_CYCLE_CYCLIC_VOLTAMMETRY   0x01
 #define LINEAR_SWEEP_VOLTAMMETRY        0x02
 #define CONSTANT_VSCAN                  0x03
-#define ADC_TEST                        0x91
-#define CALI_DAC_MODE                   0x93
-#define CALI_ADC_MODE                   0x92
-#define PULSE_MODE                      0x94
+#define ADC_TEST                        0x90

 // 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)
@@ -53,7 +51,7 @@
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
+#define ReadADCVolt(x)           ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
 #define PARA_1                   0x01
 #define PARA_2                   0x02

@@ -69,17 +67,16 @@
 #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,8 +19,15 @@ 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.VoutGainLevel, INSTRUCTION.VoltConstant);
+    DACOutCode = Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant);
    DAC_outputV(DACOutCode);

    if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
@@ -51,7 +58,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;
            }
@@ -62,8 +69,7 @@ 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 PULSE_MODE:{
+            case CONSTANT_VSCAN:{
                break;
            }
            default:{
@@ -83,8 +89,7 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
            }
            case IT_CURVE:
            case VT_CURVE:
-            case CONSTANT_CURRENT:
-            case PULSE_MODE:{
+            case CONSTANT_CURRENT:{
                break;
            }
            case CYCLIC_VOLTAMMETRY:{
@@ -144,10 +149,6 @@ static void CC_Plot(WorkMode *WorkModeData){
            #define CURRENT_MODE WorkModeData->CVSCAN
            break;
        }
-        case PULSE_MODE:{
-            #define CURRENT_MODE WorkModeData->PULSE
-            break;
-        }
        default: {
            break;
        }
@@ -162,21 +163,21 @@ static void CC_Plot(WorkMode *WorkModeData){
            if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
                readIin(WorkModeData);
                if(record_flag == false){
-                    static int recordCount = 0;
-                    recordCount++;
-                    if(recordCount == 2){
+                    static int count = 0;
+                    count++;
+                    if(count == 2){
                        record_flag = true;
-                        recordCount = 0;
+                        count = 0;
                    }
                }else{
                    InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
                }
                DACenable(WorkModeData, VoltData, AFTER_READ_I);

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

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

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

    static uint8_t ADCSwitch = 0;
    static int32_t VoltData;
@@ -392,16 +385,7 @@ static void VT_Plot(WorkMode *WorkModeData) {
    }else{
        if(ADCSwitch == 0){ /**read V(buffer)**/
            VoltData = readVinVout(WorkModeData);
-            if(record_flag == false){
-                static int recordCount = 0;
-                recordCount++;
-                if(recordCount == 2){
-                    record_flag = true;
-                    recordCount = 0;
-                }
-            }else{
-                InputNotify(NOTIFY_VOLT, VoltData);
-            }
+            InputNotify(NOTIFY_VOLT, VoltData);
            ADCSwitch++;
        }
        else if(ADCSwitch == 1){ /**read V**/
@@ -454,25 +438,18 @@ 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 = AutoGainReadIin(spi_ADC_rxbuf);
-        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
+        TEMP_MODE->_measureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
+        AutoGainChange(TEMP_MODE->_measureCurrent);
    }else{
-        ReadADCIin(spi_ADC_rxbuf);
+        ADCGainControl(INSTRUCTION.ADCGainLevel);
+        ReadCurrent(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
 }
@@ -515,33 +492,17 @@ 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){
-        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;
-            }
-
-        }
+        TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
        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;
    }
@@ -549,247 +510,4 @@ 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      20
-#define VERSION_DATE_MONTH     11
-#define VERSION_DATE_DAY       26
-#define VERSION_DATE_HOUR      22
-#define VERSION_DATE_MINUTE    48
+#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

 // this is NOT the version hash !!
 // it's the last version hash
@@ -430,18 +430,12 @@ 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 7
+#define MINOR_VERSION_NUMBER 5
 #define ELITE_VERSION_1_4
 //#define ELITE_VERSION_1_3

@@ -476,20 +470,6 @@ 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;
@@ -548,6 +528,7 @@ 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;
@@ -556,37 +537,17 @@ static bool     record_flag;
 static bool     vscanReset;
 static bool     EliteWorkReset;
 static bool     leadTimeReset;
-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);
+static int16_t  GAIN_200R_counter;
+static int16_t  GAIN_200K_counter;
+static int16_t  GAIN_10K_counter;

 // 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();
@@ -597,10 +558,10 @@ static void EliteVscanControl();
 static void EliteDone();

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

 //mode (DAC)
 static void     DACenable(WorkMode *WorkModeData, int32_t VoltData, uint8_t afterRead);
@@ -609,8 +570,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 void     PULSE_Vscan(PULSEMode *PULSE);
-static void test_Vscan(PULSEMode *PULSE);
+
+static int32_t headstage_temperature();

 //mode (notify)
 static void initDATBuf();
@@ -625,7 +586,6 @@ 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"
@@ -634,7 +594,6 @@ static void InitEliteFlag();
 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
 #include "EliteFlagCTInit.h"
-#include "EliteLatchInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
 #include "EliteKeyDetect.h"
@@ -649,7 +608,6 @@ static void InitEliteFlag();
 #include "EliteCV3Mode.h"
 #include "EliteLSVMode.h"
 #include "EliteCVSCANMode.h"
-#include "ElitePulseMode.h"
 #include "Elite_batt.h"
 #include "Elite_power.h"

@@ -657,16 +615,20 @@ static void InitEliteFlag();
 static void update_ZM_instruction(uint8 *ins) {
    uint8_t ins_type    = ins[0] & 0b11110000;
    uint8_t chip_ID     = ins[0] & 0b00001111;
-    uint8_t oper        = ins[1] & 0xF0;  // this is don't care in RIS
    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();
+    }
+
    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]);
@@ -683,19 +645,10 @@ 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]);
@@ -712,52 +665,26 @@ 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;
@@ -766,7 +693,6 @@ 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;
@@ -775,8 +701,6 @@ 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
@@ -785,8 +709,6 @@ 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
@@ -796,7 +718,6 @@ 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]);
@@ -810,7 +731,6 @@ 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]);
@@ -821,15 +741,11 @@ 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]);
@@ -851,14 +767,10 @@ 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]);
@@ -876,14 +788,10 @@ 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]);
@@ -891,8 +799,6 @@ 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;
        }

@@ -902,17 +808,16 @@ 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.VoutGainLevel, INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(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.VoutGainLevel, INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
            }

            if (ins[7] | ins[8]) {
@@ -924,7 +829,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(INSTRUCTION.VoutGainLevel, Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(Amplitude);
            }
            if (ins[12]) {
                PulsePeriod = ins[12];
@@ -939,17 +844,16 @@ 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.VoutGainLevel, INSTRUCTION.Ve1);
+                INSTRUCTION.Ve1 = Usercode_Correction_to_DAC(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.VoutGainLevel, INSTRUCTION.Ve2);
+                INSTRUCTION.Ve2 = Usercode_Correction_to_DAC(INSTRUCTION.Ve2);
            }
            if (ins[7] | ins[8]) {
                INSTRUCTION.step = ((uint32_t)(ins[7]) << 8) | (uint32_t)(ins[8]);
@@ -960,7 +864,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(INSTRUCTION.VoutGainLevel, Amplitude);
+                Amplitude = Usercode_Correction_to_DAC(Amplitude);
            }
            if (ins[12]) {
                PulseWidth = ins[12];
@@ -977,278 +881,79 @@ static void update_ZM_instruction(uint8 *ins) {
            break;
        }

-        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;
-                }
+        case SET_ADC_GAIN: {
+            INSTRUCTION.ADCGainLevel = ins[3];
+            if(INSTRUCTION.ADCGainLevel != GAIN_AUTO){
+                INSTRUCTION.AutoGainEnable = 0;
            }
+            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;

-            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;
-                }
+//            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];
            }
-
-            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];
+//            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[4], ins[3], spi_ADC_rxbuf);
+            ADCRealValue = DecodeADCValue(ins[3], ins[4], 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;
-//                }
-//            }
+            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;
+                }
+            }

            SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);

-            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;
+            //                    SendNotify();
            break;
        }

@@ -1270,10 +975,14 @@ 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;
        }

@@ -1299,6 +1008,27 @@ 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
@@ -1324,8 +1054,6 @@ 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;
@@ -1334,7 +1062,6 @@ 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;
        }

@@ -1382,6 +1109,17 @@ 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;
    }
@@ -1398,18 +1136,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;
-    }
-}
-
 // static void update_clock_period() {
 //    uint32_t clock_rate = INSTRUCTION.adc_clock_rate;
 //
@@ -1432,6 +1158,18 @@ static void ZM_instruction_update_handle(uint8_t characteristic) {
 //    }
 //}

+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,17 +46,15 @@ static void ZM_init() {

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

-    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
+    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

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

    //    PIN_registerIntCb(pin_handle, switch_on_callback);
@@ -68,7 +66,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(INSTRUCTION.VoutGainLevel, DACcode);
+    RealV = DAC_to_realV(DACcode);

    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -85,8 +83,7 @@ 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 == CALI_ADC_MODE)               \
+(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)              \
 )

 #define Ve1MatchVe2Mode() (                           \
@@ -119,15 +116,10 @@ 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.VoutGainLevel, INSTRUCTION.Ve1));
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.Ve1));
                    PeriodicEvent = false;
-                    ModeLED(NO_EVENT);
                }
            }
        }
@@ -148,12 +140,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        //vscan counter
        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
        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
+            GPT.VscanRateCounter -= INSTRUCTION.VsetRate; //To get right time
            vscan_flag = true;
            if(vscan_flag){
                EliteVscanControl(WorkModeData);
@@ -167,11 +154,12 @@ 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){
-            PIN15_setOutputValue(enable_5v, 0);
+            PIN_setOutputValue(pin_handle, enable_5v, 0);
        }

        //ADC counter
@@ -183,6 +171,9 @@ 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)
@@ -200,127 +191,14 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            }
        }

-//        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);
+        EliteDone();
+    }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
        WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
-        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
+        DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
        FreeWorkMode(WorkModeData);
        PeriodicEvent = false;
-    }
-    else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
-        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
-        FreeWorkMode(WorkModeData);
-        PeriodicEvent = false;
-    }
-    else{
-//        InitFlag();
+    }else{
+        InitFlag();
    }
 }

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

    // Initialize application
    SimpleBLEPeripheral_init();
-    ZM_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));
+    ZM_init();
+    Elite_SPI_init();
+    WorkMode *WorkModeData = CreateWorkMode();

    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
@@ -621,19 +620,46 @@ 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) {
-                        PIN15_setOutputValue(shutdown_6994, 0);  // OFF = 1 => turn off 6994
+                        PIN_setOutputValue(pin_handle, 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
-                        measureBat();
+                        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+                        GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+                        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+                        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+
+                        if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
+                            GPT.BatteryCheckCounter = 0;
+                            batteryCheck_flag = true;
+                        }
+
+                        if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
+                            GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
+                            batteryADC_flag = true;
+                            if(batteryADC_flag){
+                                EliteADCBattery();
+                                batteryADC_flag = false;
+                            }
+                        }
+
+                        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                                       ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+                        if( bat < 768 && bat > 20){
+                            PIN_setOutputValue(pin_handle, enable_5v, 0);
+                        }
+
                    }
                    if(Free_Work_Mode){
                        FreeWorkMode(WorkModeData);
                        InitEliteInstruction();
+                        ADCGainControl(INSTRUCTION.ADCGainLevel);
+                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
+
                        Free_Work_Mode = false;
                    }
                } else {
@@ -926,6 +952,7 @@ 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
@@ -971,7 +998,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
Roy	44325afb10	[cali] add BOARD_E69C calibration data.	2021-06-07 16:21:23 +08:00
Roy	d41189ad68	update BOARD_7AA4 & BOARD_E731 & BOARD_7ABF calibration data.	2021-04-16 14:47:31 +08:00
Roy	b588747906	add BOARD_E731 & E731 & E6BA & E7EF & 7ABF update BOARD_7A42 calibration data.	2021-03-29 10:58:23 +08:00
Roy	ba9f58b3fe	add BOARD_7CFB & update BOARD_7A6B calibration data.	2021-03-05 10:38:38 +08:00
Roy	e3624e2db4	add BOARD_7CD2 calibration data.	2021-02-24 17:51:01 +08:00
Roy	431ed33a32	add BOARD_C685 & update BOARD_C5DA calibration data.	2021-02-24 13:55:06 +08:00
Roy	06b897094d	add BOARD_924E calibration data.	2021-02-24 12:15:03 +08:00
Roy	447bd3874c	add BOARD_7C9D calibration data.	2021-02-05 18:46:24 +08:00
Roy	c7d1288778	[update] fix CC mode	2021-01-22 11:10:07 +08:00
Roy	6f5da7d7c7	[update] fix CC mode discharge	2021-01-15 17:22:07 +08:00
Roy	a157c1cc6e	[update] update def.h	2020-12-29 11:48:12 +08:00
Benny Liu	585ee3fca2	turn on 6994 shutdown	2020-12-24 14:28:43 +08:00
Roy	32fb145969	add BOARD_7A87 and update BOARD_7CE0 & BOARD_C5F3 & BOARD_7C7E calibration data.	2020-12-04 10:06:31 +08:00
Roy	02f1110a50	update BOARD_CHAO_I & BOARD_C5F3 & BOARD_7ADE calibration data.	2020-11-18 14:04:56 +08:00
YiChin	a3b011c924	update BOARD_C6F1 calibration data.	2020-11-17 09:30:43 +08:00
YiChin	f7c6ea3036	update BOARD_7A96 calibration data.	2020-11-16 15:12:32 +08:00
YiChin	13fd8489ec	update BOARD_7A4F & BOARD_7A27 calibration data.	2020-11-13 10:12:00 +08:00
YiChin	8b605bb37a	add CC i = 0 when Vin reach Vmax or Vmin on CC mode	2020-11-10 09:29:11 +08:00
YiChin	c3d255d426	update BOARD_7ACD & BOARD_C72C calibration data.	2020-11-09 16:26:56 +08:00
YiChin	dad7e86f2d	update BOARD_C6D5 calibration data.	2020-11-09 13:25:53 +08:00
YiChin	e62dfd9078	add BOARD_7C1C calibration data.	2020-11-06 14:58:37 +08:00
YiChin	7cbded7ad5	send data of temperature when start I-T mode	2020-11-03 15:29:09 +08:00
YiChin	49c73f9b8f	delete BOARD_C673 calibration data.(because BOARD_C673 as same as BOARD_MARS)	2020-11-03 11:10:37 +08:00
YiChin	ac9b1107a0	update BOARD_MARS calibration data.	2020-11-03 10:55:42 +08:00
YiChin	8d111243ba	add BOARD_7A6B & BOARD_C5B4 calibration data.	2020-10-28 10:54:50 +08:00
YiChin	1e53cc80ed	add dark led fun()	2020-10-22 15:16:09 +08:00
YiChin	272440c563	add BOARD_C5A5 & BOARD_C679 calibration data.	2020-10-20 11:00:54 +08:00
YiChin	ed697667b4	take away CIS data content & cali R	2020-10-20 09:53:04 +08:00
YiChin	8ab6f27c1a	modify CIS data content	2020-10-15 15:03:25 +08:00
YiChin	32a8296958	modify CIS data content	2020-10-15 10:43:12 +08:00
YiChin	2866988d92	cali Ri & Ro on IV mode (update Vout)	2020-10-05 18:22:04 +08:00
YiChin	3a29138d4e	update CaliR_Iin & CaliR_Vout value	2020-10-05 18:14:06 +08:00
YiChin	b7f43ea145	cali Ri & Ro on CV3 mode	2020-09-30 18:16:12 +08:00
YiChin	6c52f65246	cali Ri & Ro on IV mode	2020-09-30 15:07:52 +08:00
YiChin	830bae68b5	cali Ri & Ro on IV mode	2020-09-30 14:38:44 +08:00
YiChin	e18a05e35e	cali Ri & Ro on IV mode	2020-09-30 10:53:57 +08:00
YiChin	b28bbbc12c	cali Ri & Ro on RT mode	2020-09-29 15:57:15 +08:00
Benny Liu	f63e75d4ea	update BOARD_7A27 calibration data.	2020-09-26 13:59:26 +08:00
Benny Liu	a646f4730b	update BOARD_C64C calibration data.	2020-09-26 13:55:51 +08:00
Benny Liu	2318056e8f	update BOARD_7A27 calibration data.	2020-09-26 13:52:30 +08:00
Benny Liu	47016783a7	update BOARD_C673 calibration data.	2020-09-26 13:50:20 +08:00
Benny Liu	a2f49d7489	update BOARD_7C45 calibration data.	2020-09-26 13:50:17 +08:00
YiChin	74bcd3e338	update BOARD_C666 calibration data.	2020-09-17 18:03:40 +08:00
YiChin	5e50811534	update BOARD_7C1C & BOARD_7AA3 calibration data.	2020-09-11 18:47:33 +08:00
YiChin	0f5ffb0504	CV mode foolproof	2020-09-07 16:58:08 +08:00
YiChin	d243229005	update BOARD_URANUS & BOARD_C673 calibration data.	2020-09-07 11:00:19 +08:00
YiChin	0c7a2b12ee	update BOARD_C5A7 & BOARD_C6D5 calibration data.	2020-08-31 17:10:56 +08:00
YiChin	b648c556c6	add BOARD_C5A7 & BOARD_C6D5 and update BOARD_7C4F calibration data.	2020-08-31 16:58:04 +08:00
YiChin	abf102fd1e	update BOARD_7ACD & BOARD_C754 calibration data.	2020-08-25 17:03:27 +08:00
YiChin	f6e5963950	update ANGUS & C635 & 7C8C & 81DD & 8041 calibration data.	2020-08-24 17:27:18 +08:00
YiChin	3978f5176f	update BOARD_7C13 & BOARD_EARTH calibration data.	2020-08-24 09:46:49 +08:00
YiChin	c08ab8689a	update BOARD_C77F calibration data.	2020-08-20 18:19:54 +08:00
YiChin	36fde14062	update BOARD_MILKY & BOARD_7C4F calibration data.	2020-08-20 17:27:52 +08:00
YiChin	dc2e53dca6	add BOARD_NEPTUNE & MERCURY calibration data.	2020-08-19 14:08:01 +08:00
YiChin	dc50da83a8	fix change level	2020-08-05 16:53:32 +08:00
YiChin	d8ccffdf52	fix change level 2	2020-08-05 16:15:04 +08:00
YiChin	a04d5f2ae5	fix change level	2020-08-05 16:05:21 +08:00