[rel] elite/eis1.0 v.1.0.0

[copy] copy af79c7fcac2237f25f92478b61e78b30f073dece version from wtp_cc2650_simple_func project
2022-05-04 10:15:21 +08:00 · 2022-05-03 11:35:36 +08:00
29 changed files with 5363 additions and 5756 deletions
@@ -0,0 +1,226 @@
+
+#ifndef AD5940
+#define AD5940
+
+bool cali_flag = false;
+
+static void AD5940_init(){
+    select_REG(0x0908);//initiation
+    w16_REG(0x02C9);
+    select_REG(0x0C08);
+    w16_REG(0x206C);
+    select_REG(0x21F0);
+    w16_REG(0x0010);
+    select_REG(0x0410);
+    w16_REG(0x02C9);
+    select_REG(0x0A28);
+    w16_REG(0x0009);
+    select_REG(0x238C);
+    w16_REG(0x0104);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x0A04);
+    w16_REG(0xF27B);
+    select_REG(0x0A00);
+    w16_REG(0x8009);
+    select_REG(0x0A04);
+    w16_REG(0x4859);
+    select_REG(0x22F0);
+    w16_REG(0x0000);
+}
+
+static void AD5940_sftreset(){
+    select_REG(0x0424);
+    w16_REG(0xA158);
+    CPUdelay(200);
+}
+
+static void AD5940_HWReset(){
+    PIN_setOutputValue(pin_handle, AD_reset, 0);
+    CPUdelay(2000); // 200us
+    PIN_setOutputValue(pin_handle, AD_reset, 1);
+    CPUdelay(5000); // 500us
+}
+
+static void setEIS_EIS (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(HSRTIACON);
+    w32_REG(0x00000000); //200R //1pF
+    select_REG(HSTIACON);
+    w32_REG(0x00000001);    // Vzero
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+
+    if (instru.ADCGainLv != HSRTIA_GAIN_AUTO) {
+        instru.AutoGainEnable = 0;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    } else {
+        instru.AutoGainEnable = 1;
+        instru.ADCGainLv = HSRTIA_200R;
+        HSTIAGainCtrl(instru.ADCGainLv);
+    }
+
+    if (!cali_flag) {
+        DAC_outputV(instru.dcbias);
+        SetWGAmp(instru.acamp);
+    } else {
+        cali_DAC_outputV(instru.dcbias);
+        cali_SetWGAmp(instru.acamp);
+        cali_flag = false;
+    }
+
+    select_REG(AFECON);  //2000
+    w32_REG(0x0031CFC0);
+
+    //HIGH POWER MODE
+    select_REG(PMBW); //PWMB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(CLKSEL);
+    w16_REG(0x0000);
+    select_REG(CLKCON0KEY);
+    w16_REG(0xA815);
+    select_REG(CLKCON0); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(HSOSCCON); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(ADCFILTERCON);
+    w32_REG(0x00000311);
+    select_REG(HSDACCON); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(ADCBUFCON); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+    SetEISHIGHZ(0);
+}
+
+static void setEIS_CV (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(ADCFILTERCON); //ADCFILTERCON
+    w32_REG(0x00002011); // Sinc3 En | SINC3OSR2 | SINC2OSR22
+    select_REG(DFTCON); //DFTCON
+    w32_REG(0x00000001); // Sinc2 to DFT | DFTNUM4
+
+    //AFE and PWMB
+    select_REG(AFECON); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+static void HS_cali_config (void)
+{
+    select_REG(LPDACCON0);  //2128 //DC on
+    w32_REG(0x00000001); //LPDAC enabled
+    select_REG(LPDACSW0);  //2124  //operation
+    w32_REG(0b111111); //0b101011
+
+    select_REG(DE0RESCON);  //20F8 //DE0's gain
+    w32_REG(0x000000FF);
+    select_REG(HSRTIACON);
+    w32_REG(0x00000000); //200R //1pF
+    select_REG(HSTIACON);
+    w32_REG(0x00000001);    // Vzero
+
+    HSTIAGainCtrl(instru.ADCGainLv);
+
+    select_REG(ADCCON);  //21A8
+    w32_REG(0x00000101);
+    select_REG(DFTCON);  //20D0
+    w32_REG(0x00000091);
+    select_REG(SWCON);  //200C
+    w32_REG(0x00026355); //D5 | P5 | N3 | T6 | T9   0b010 0110 0011 0101 0101
+
+    select_REG(AFECON);  //2000
+    w32_REG(0x0030CFC0);
+
+    //HIGH POWER MODE
+    select_REG(PMBW); //PMWB
+    w32_REG(0x0000000D); //switch to active high power mode
+    select_REG(CLKSEL);
+    w16_REG(0x0000);
+    select_REG(CLKCON0KEY);
+    w16_REG(0xA815);
+    select_REG(CLKCON0); //16bit system clock divider
+    w16_REG(0x0442); //set divider = 2
+    select_REG(HSOSCCON); //HSOSCCON
+    w32_REG(0x00000000); //switch to 32MHz output
+    select_REG(ADCFILTERCON); //ADCFILTERCON
+    w32_REG(0x00000311); //ADC data rate = 1.6MHz // 2 samples to average
+    select_REG(HSDACCON); //HSDACCON
+    w32_REG(0x0000000E); //DAC gain = 2, > 80 kHz
+    select_REG(ADCBUFCON); //ADCBUFCON
+    w32_REG(0x005F3D0F); //recommended
+
+    SetEISHIGHZ(0);
+}
+static void LP_cali_config (void)
+{
+   //Clock and Ref
+    select_REG(0x0414); //CLKSEL
+    w16_REG(0x0);
+    select_REG(0x20BC); //HSOSCCON
+    w32_REG(0x00000004); //16 MHz output
+    select_REG(0x2180); //BUFSENCON
+    w32_REG(0x00000037); //0b110110
+
+    //Configure LPDAC LPTIA
+    select_REG(0x2050); //LPREFBUFCON
+    w32_REG(0x0); //enable lpref and lp 2.5V buffer
+    select_REG(0x2124); //LPDACSW0
+    w32_REG(0x0000003E);
+    select_REG(0x20E4); //LPTIASW0
+    w32_REG(0x00008034); // SW2 | SW4 | SW5
+    select_REG(0x20EC); //LPTIACON0
+    w32_REG(0x00000038); //RF 0 | RTIA 200R | Rload 0 | High Current Mode
+    select_REG(0x2128); //LPDACCON0
+    w32_REG(0x00000001);
+
+    //Configure ADC | ADCDAT (0x2074)
+    select_REG(0x21A8); //ADCCON
+    w32_REG(0x00001021); //PGA = 1 | VZERO | LPTIA_OUT
+    select_REG(ADCFILTERCON); //ADCFILTERCON
+    w32_REG(0x00006091); //AVR 4 | Sinc3 En | OSR 2
+//    w32_REG(0x00012011); //Disable avr | sinc3 enable | osr 2
+    select_REG(DFTCON); //DFTCON
+    w32_REG(0x001000C1); //sinc3 + average input for DFT | dftnum max
+
+    //AFE and PWMB
+    select_REG(AFECON); //AFECON
+    w32_REG(0x00098780); //ADC on //0b10011000011110000000
+    select_REG(0x22F0); //PWMB
+    w32_REG(0x00000005);//fc 50kHz, low power mode
+}
+
+#endif
@@ -1,229 +1,192 @@
-
-#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);
+//
+//#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
-
-    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();
-
+////    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, 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);
@@ -232,15 +195,52 @@ static void Init_Elite15_PIN () {
 //    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, 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();
-}
-
-
-
-
-#endif
+//
+////    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
@@ -0,0 +1,111 @@
+#ifndef ELITECV3
+#define ELITECV3
+
+#define Vset instru.Vset
+
+static void cv_vscan(void)
+{
+    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;
+
+    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
+
+    if (vscanReset) {
+        VmaxCounter = false;
+        VminCounter = false;
+
+        if (instru.directionInit == 1) {
+            cv->_direction_up         = true;
+            cv->_current_direction_up = true;
+        } else {
+            cv->_direction_up         = false;
+            cv->_current_direction_up = false;
+        }
+
+//        Vstep = x * 20 * N, x=xmV ; N=VscanRate   Vstep unit [5nV]/[0.1ms]
+        if (instru.step <= 10) {
+            cv->_Vstep = instru.step *  instru.VsetRate / 5;
+        } else {
+            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
+        }
+
+
+        if (cv->_Vmin == cv->_Vinit) {
+            VminCounter = true;
+        }
+        if (cv->_Vmax == cv->_Vinit) {
+            VmaxCounter = true;
+        }
+
+        Vset = cv->_Vinit;
+    }
+
+    if (!vscanReset) {
+        cv->bFirst = false;
+        if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
+        (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
+        ) {
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep; //* GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep; //* GPT.GptimerMultiple;
+            }
+
+            if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
+                if (Vset == cv->_Vmin) {
+                    VminCounter = true;
+                    instru.Vinit = instru.Vmin;
+                    cv->_Vinit = cv->_Vmin;
+                }
+            } else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
+                if (Vset == cv->_Vmax) {
+                    VmaxCounter = true;
+                    instru.Vinit = instru.Vmax;
+                    cv->_Vinit = cv->_Vmax;
+                }
+            }
+        } else {
+            if (Vset >= cv->_Vmax) {
+                VmaxCounter = true;
+            } else if (Vset <= cv->_Vmin) {
+                VminCounter = true;
+            }
+
+            if (cv->_current_direction_up) {
+                Vset = Vset + cv->_Vstep;// * GPT.GptimerMultiple;
+            } else {
+                Vset = Vset - cv->_Vstep;// * GPT.GptimerMultiple;
+            }
+
+            if (VmaxCounter && VminCounter) {
+                if (cv->_direction_up && cv->_current_direction_up) {
+                    if (Vset >= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
+                    }
+                }
+                if (!cv->_direction_up && !cv->_current_direction_up) {
+                    if (Vset <= cv->_Vinit) {
+                        cv->_cycleNumber--;
+                        VminCounter = false;
+                        VmaxCounter = false;
+                    }
+                }
+            }
+
+            if (Vset >= cv->_Vmax) {
+                cv->_current_direction_up = false;
+            } else if (Vset <= cv->_Vmin) {
+                cv->_current_direction_up = true;
+            }
+
+            /*stop condition*/
+            if (cv->_cycleNumber == 0) {
+                PeriodicEvent = false;
+            }
+        }
+    }
+}
+#endif
@@ -4,60 +4,132 @@

 static bool DACReset;

-#ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
-#define DACOUT 0x31
+#define VBIAS_LSB       107422          // 2200/4096 [mV] = 107422 [5nV]
+#define VZERO_LSB       6875008         // VBIAS_LSB * 64
+#define DAC12BIT_LSB    107422

-static uint16_t DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC CCCC = command
-    // DDDD DDDD = v1
-    // DDDD DDDD = v2
+/* user code: 0 ~ 35000; LPDAC bias value: -1.5V ~ +1.5V */
+static int32_t DAC_outputV(int32_t voltLVraw) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan, voltLV;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;

-    // command
-    // 0x02 = clear
-    // 0x31 = output voltage
+    voltLV = (Cali_LPDAC(voltLVraw) - 25000) * 4 * 4000;    // calibration conversion
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;

-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-    v2 = (uint8_t) (voltLV & 0x00FF);
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));

-    spi_DACtxbuf[0] = DACOUT;
-    spi_DACtxbuf[1] = v1;
-    spi_DACtxbuf[2] = v2;
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);

-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+    vscan = (int32_t)(vb - vz) / 200;
+    return vscan;
+}

-    return voltLV;
+static uint32_t DAC_outputF(uint32_t freq) {
+    select_REG(WGFCW);
+    w32_REG(freq);
+    return freq;
 }

 static void VoutGainControl(uint8_t VOUTLevel){
    if(VOUTLevel == 0){
        // VOUT gain level = 0, using 240K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 0);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 0);
    }
    else if(VOUTLevel == 1){
        // VOUT gain level = 1, using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
    else if(VOUTLevel == 2){
        // VOUT gain level = 2, using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
    else{
        // default using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        PIN_setOutputValue(pin_handle, Turon_VOUT_SMALL, 1);
    }
-    volt_rec_en = false;
+    record_flag = false;
 }

-#endif
+static uint32_t CalcPeriod(uint32_t freq){ //One Second = 10000

-static int32_t User2Real(uint16_t UserCode){
-    /* transfer usercode to real voltage value (mV) */
-    return (int32_t)((UserCode - 25000) / 5);
+    uint32_t period;
+
+    if (freq == 1) {
+        period = 666667;
+    } else {
+        period = (1000000 + freq / 2) / freq; // [sec]
+    }
+
+    if (period < 20){
+        period = 20;
+    }
+
+    return period;
 }

+static uint32_t CalcDelayTime(uint32_t freq){
+    uint32_t delayTime, decadeSamplingTime;
+    delayTime = CalcPeriod(freq) * instru.delay;    //get delay time
+    if (delayTime < 20) {
+        delayTime = 20;
+    } else {
+        delayTime = (delayTime + 5) / 10;
+    }
+
+    // 1000Hz
+    if (freq >= 100000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 100Hz
+    else if (freq >= 10000) {
+        decadeSamplingTime = 1025;
+    }
+
+    // 10Hz
+    else if (freq >= 1000) {
+        decadeSamplingTime = 11393;
+    }
+
+    // 1Hz
+    else if (freq >= 100) {
+        decadeSamplingTime = 91034;
+    }
+
+    //0.1Hz
+    else if (freq >= 10) {
+        decadeSamplingTime = 550000;
+    }
+
+    // 0.015Hz | 136s
+    else if (freq >= 1) {
+        decadeSamplingTime = 1360000;
+    }
+
+    delayTime += decadeSamplingTime; //delay+reading time
+
+    return delayTime;
+}
+
+static uint32_t User2Freq(uint32_t UserCode){
+    uint32_t freq;
+    freq = (UserCode * 149 + 50)/ 100;
+    return freq; //[100mHz]
+}
+
+static uint32_t Freq2DAC(uint32_t freq){
+    uint32_t code;
+    code = (freq * 100 + 75) / 149;
+    return code; //return code
+}

 // DAC Vout theoretical boundary <300, 100~ (mV)
 #define DAC_VOUT_GAIN_SMALL_BOUNDARY           100000  // 25500(usercode) = 100 mV
@@ -70,25 +142,182 @@ static void AutoGainChangeVout(int32_t userCode){
    // switch to 1 level volt(small)   15K
    // switch to 2 level volt(large)   240K

-    if(instru.VoutGainLv == VOUT_GAIN_AUTO){
-        instru.VoutGainLv = VOUT_GAIN_15K;
-        VoutGainControl(instru.VoutGainLv);
+    if(instru.VoutGainLevel == VOUT_GAIN_AUTO){
+        instru.VoutGainLevel = VOUT_GAIN_15K;
+        VoutGainControl(instru.VoutGainLevel);
    }

-    if(instru.VoutGainLv == VOUT_GAIN_15K){
+    if(instru.VoutGainLevel == VOUT_GAIN_15K){
        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
            // switch to 2 level volt(large)
-            instru.VoutGainLv = VOUT_GAIN_240K;
-            VoutGainControl(instru.VoutGainLv);
+            instru.VoutGainLevel = VOUT_GAIN_240K;
+            VoutGainControl(instru.VoutGainLevel);
        }
    }
-    else if(instru.VoutGainLv == VOUT_GAIN_240K){
+    else if(instru.VoutGainLevel == VOUT_GAIN_240K){
        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
            // switch to 1 level volt(small)
-            instru.VoutGainLv = VOUT_GAIN_15K;
-            VoutGainControl(instru.VoutGainLv);
+            instru.VoutGainLevel = VOUT_GAIN_15K;
+            VoutGainControl(instru.VoutGainLevel);
        }
    }
 }

+static void SetWGAmp(uint16_t ampcode){
+    uint32_t amplitude = 0;
+    amplitude = Cali_HSAMP(ampcode);
+
+//    static uint64_t amp_cutoff = 40000000;
+//    uint32_t corrected_amp;
+//
+//    corrected_amp = ((uint64_t)ampcode * 800 * 1000 / 2047) * (1 + ((uint64_t)instru.fset * (uint64_t)instru.fset) / (amp_cutoff * amp_cutoff)); //[uV]
+//
+//    ampcode = corrected_amp * 2047 / 800000;
+
+    select_REG(WGCON);
+    w32_REG(0x0); // 0x0: DC disable ac first
+    select_REG(WGAMPLITUDE);
+    w32_REG(amplitude);
+    select_REG(WGCON);
+    w32_REG(0x00000004); //0x4: Sinusoid
+}
+
+static void SetEISHIGHZ(uint8_t ret){
+    uint32_t code;
+
+    select_REG(LPTIASW0); //LPTIASW0
+    code = r32_REG();
+    code = (code & (~(1 << 2))) | (ret << 2); //ret = 0 HighZ on | ret = 1 HighZ off
+    w32_REG(code);
+}
+
+static void HSDAC_GainControl(uint8_t G_EXA_PGA) {
+/* Set the Gain value of PGA and Excitation amp */
+    uint32_t reg = 0;
+    uint8_t DACUpdateRate = 0x07;
+
+    switch (G_EXA_PGA) {
+        case 0x00:{
+            reg = 0x00000000;
+            break;
+        }
+        case 0x01:{
+            reg = 0x00000001;
+            break;
+        }
+        case 0x10:{
+            reg = 0x00001000;
+            break;
+        }
+        case 0x11:{
+            reg = 0x00001001;
+            break;
+        }
+        default:{
+            reg = 0x0000000E;       // Default update rate = 7
+            break;
+        }
+    }
+
+    reg = reg | ((uint32_t)(DACUpdateRate) << 1);
+    select_REG(HSDACCON);                 // HSDACCON address
+    w32_REG(reg);
+}
+
+static void HSDAC_output(uint16_t amp) {
+/* Set and write the amplitude of HSDAC. Full scale: 0x0200 ~ 0x0E00, 0x0800 = 0V */
+/* Set and write the amplitude of HSDAC. Full scale: 512 ~ 3584, 2048 = 0V */
+    uint32_t amplitude = 0;
+
+    if (amp > 0x0E00) {
+        amplitude = 0x00000E00;
+    } else if (amp < 0x0200) {
+        amplitude = 0x00000200;
+    } else {
+        amplitude = (uint32_t) (amp & 0x0FFF);
+    }
+
+    select_REG(HSDACDAT);                 // HSDACDAT address
+    w32_REG(amplitude);
+}
+
+static void PowerMode_CutoffFrequencyControl (uint8_t bandwidth, uint8_t PowerMode) {
+    uint32_t reg = 0;
+
+    switch (bandwidth) {
+        case cutoff_auto :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_50k :{
+            reg = (((uint32_t)(cutoff_50k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_100k :{
+            reg = (((uint32_t)(cutoff_100k)) & 0x0000000F) << 2;
+            break;
+        }
+        case cutoff_250k :{
+            reg = (((uint32_t)(cutoff_250k)) & 0x0000000F) << 2;
+            break;
+        }
+        default :{
+            reg = (((uint32_t)(cutoff_auto)) & 0x0000000F) << 2;
+            break;
+        }
+    }
+
+    switch (PowerMode) {
+        case LOW_PW_MODE :{
+            reg = reg | ((uint32_t)(LOW_PW_MODE) & 0x00000000F);
+            break;
+        }
+        case HIGH_PW_MODE :{
+            reg = reg | ((uint32_t)(HIGH_PW_MODE) & 0x00000000F);
+            break;
+        }
+        default :{
+            break;
+        }
+    }
+
+    select_REG(PMBW);
+    w32_REG(reg);
+}
+
+static int32_t cali_DAC_outputV(int32_t voltLV) {   // LPDAC output, voltLV = Vbias-Vzero
+    static int32_t vztemp, vscan;
+    static uint32_t vb, vz, vbcode, vzcode, DACOutCode = 0;
+
+    voltLV = (voltLV - 25000) * 4 * 4000;
+    vztemp = (-0.45 * voltLV) + 249000000;
+    if (voltLV < 0) {
+        vztemp -= DAC12BIT_LSB;
+    }
+    vzcode = (vztemp - 40000000 + VZERO_LSB / 2) / VZERO_LSB;
+    vz = vzcode * VZERO_LSB + 40000000;
+
+    vb = voltLV + vz;
+    vbcode = ((vb - 40000000 + VBIAS_LSB / 2) / VBIAS_LSB);
+    DACOutCode = (0x0003FFFF & ((vzcode << 12) + vbcode));
+
+    select_REG(LPDACDAT0);
+    w32_REG(DACOutCode);
+
+    vscan = (int32_t)(vb - vz) / 200;
+//    InputNotify(NOTIFY_VOLT, voltLV);
+//    InputNotify(NOTIFY_CURRENT, vztemp);
+    return vscan;
+}
+
+static void cali_SetWGAmp(uint16_t ampcode){
+
+    select_REG(WGCON);
+    w32_REG(0x0); // 0x0: DC disable ac first
+    select_REG(WGAMPLITUDE);
+    w32_REG(ampcode);
+    select_REG(WGCON);
+    w32_REG(0x00000004); //0x4: Sinusoid
+}
+
 #endif
@@ -0,0 +1,150 @@
+
+#ifndef ELITEEIS
+#define ELITEEIS
+
+static void eis_fscan(void)
+{
+    struct wm_eis_ctx_t *eis = (struct wm_eis_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        eis->_in_reset_flag = true;
+
+        eis->_f1 = User2Freq(eis->_f1);
+        eis->_f2 = User2Freq(eis->_f2);
+        eis->_fmax = User2Freq(eis->_fmax);
+        eis->_fmin = User2Freq(eis->_fmin);
+
+        if (instru.directionInit == 1) {
+            eis->_direction_up         = true;
+        } else if (instru.directionInit == 0) {
+            eis->_direction_up         = false;
+        }
+
+        eis->_decades = CalcDecade(instru.fmin, instru.fmax);
+
+        instru.fset = eis->_f1;
+
+        vscanReset = false;
+    }
+
+    if (!vscanReset) {
+        if(eis->_direction_up) {
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades) {
+                    eis->_fd1 = eis->_f1 * TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 * TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades) {
+                    eis->_fd1 = eis->_fd2;//eis->_f1 * TenPowerTable[decadeIndex];
+                    eis->_fd2 = eis->_fmax;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 9){
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[eis->_sweepIndex] + 500)/ 1000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[eis->_sweepIndex] + 500)/ 1000;
+                }
+            }
+            else if (instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 + eis->_sweepIndex * ((eis->_fd2 - eis->_fd1) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset > eis->_fmax){
+                instru.fset = eis->_fmax;
+            }
+
+        } else { //reverse
+            if(eis->_sweepIndex == 0){
+                if(eis->_decadeIndex < eis->_decades){
+                    eis->_fd1 = eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_f1 / TenPowerTable[eis->_decadeIndex + 1];
+                } else if (eis->_decadeIndex == eis->_decades){
+                    eis->_fd1 = eis->_fd2; //eis->_f1 / TenPowerTable[eis->_decadeIndex];
+                    eis->_fd2 = eis->_fmin;
+                }
+            }
+
+            if(eis->_decadeIndex != 0 && eis->_sweepIndex == 0){
+                eis->_sweepIndex++;
+            }
+
+            if(instru.scale == 0) { // logarithm
+                if (eis->_ppd == 10) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable10[9 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 9) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable9[8 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 8) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable8[7 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 7) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable7[6 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 6) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable6[5 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 5) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable5[4 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 4) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable4[3 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 3) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable3[2 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+                else if (eis->_ppd == 2) {
+                    instru.fset = ((uint64_t)eis->_fd1 * LogSpacingTable2[1 - eis->_sweepIndex] + 5000)/ 10000;
+                }
+            }
+            else if(instru.scale == 1) { // linear
+                instru.fset = eis->_fd1 - eis->_sweepIndex * ((eis->_fd1 - eis->_fd2) / (eis->_ppd - 1));
+            }
+
+            if(instru.fset < eis->_fmin){
+                instru.fset = eis->_fmin;
+            }
+        }
+        if (!gainChange_flag) {
+            if (++eis->_sweepIndex == eis->_ppd) {
+                eis->_sweepIndex = 0;
+                eis->_decadeIndex ++;
+            }
+        }
+    }
+
+
+    SetSamplingTime(instru.fset);
+
+    instru.sampleRate = 2000;
+}
+
+#endif
+
@@ -2,6 +2,13 @@
 #ifndef ELITE_FLAG_CT_INIT
 #define ELITE_FLAG_CT_INIT

+// CT counter
+struct _CT{
+    uint32_t SampleRate_counter;
+    uint16_t StepTimeCounter;
+    uint16_t NotifyCounter;
+}CT = {0};
+
 // GPT counter
 struct _GPT{
    uint32_t GptimerCounter;
@@ -11,6 +18,7 @@ struct _GPT{
    uint32_t NotifyCounter;
    uint32_t VscanRateCounter;
    uint32_t LeadTimeCounter;
+    uint32_t DelayTimeCounter;
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
    uint32_t GptimerMultiple;
@@ -25,6 +33,7 @@ static void InitGPT(){
    GPT.NotifyCounter       = 0;
    GPT.VscanRateCounter    = 0;
    GPT.LeadTimeCounter     = 0;
+    GPT.DelayTimeCounter    = 0;
    GPT.BatteryADCCounter   = 0;
    GPT.BatteryCheckCounter = 0;
    GPT.StiCounter          = 0;
@@ -24,7 +24,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
        GPTimerCC26XX_Params params;                                                                  \
        GPTimerCC26XX_Params_init(&params);                                                           \
        params.width          = GPT_CONFIG_16BIT;                                                     \
-        params.mode           = GPT_MODE_PERIODIC_DOWN;                                               \
+        params.mode           = GPT_MODE_PERIODIC_UP;                                               \
        params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                        \
        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                         \
        Types_FreqHz  freq;                                                                           \
@@ -0,0 +1,20 @@
+
+#ifndef ELITEIV
+#define ELITEIV
+
+#define Vset instru.Vset
+
+static void vo_vscan(void)
+{
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = vo->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = vo->_Vinit;
+    }
+}
+
+#endif
@@ -1,8 +1,5 @@
-/*=============================================================================
- =                          instr.h                                              =
- =============================================================================*/
-#ifndef ELITE_INSTR_H
-#define ELITE_INSTR_H
+#ifndef __INSTR_H__
+#define __INSTR_H__

 #ifdef __cpulsplus
 extern "C" {
@@ -15,13 +12,9 @@ struct HEADSTAGE_INSTRUCTION {
    uint8_t  chip_id;
    uint8_t  eliteFxn;

-    // time relation
+    /** DAC parameter **/
    uint8_t  VsetRateIndex;
    uint32_t VsetRate;
-    uint32_t sampleRate;
-    uint32_t notifyRate;
-    uint32_t period;
-
    int32_t  Vset;
    uint16_t VoltConstant;
    uint8_t  directionInit;
@@ -32,40 +25,47 @@ struct HEADSTAGE_INSTRUCTION {
    int32_t  Vmax;
    int32_t  Vmin;

-    uint32_t steptime;
+    /** EIS **/
+    uint32_t f1;
+    uint32_t f2;
+    uint32_t fmax;
+    uint32_t fmin;
+    uint32_t fset;
+    uint16_t dcbias;
+    uint16_t delay;
+    uint16_t acamp;
+    uint8_t  avgnum;
+    uint8_t  rtia;
+    uint16_t ppd;
+    uint8_t  scale;
+    int32_t  real;
+    int32_t  imag;
+    uint8_t  periodIndex;
+    uint32_t delayTime;
+    uint8_t  settingIndex;

-    uint8_t  IinADCAutoGainEn;
-    uint8_t  VinADCAutoGainEn;
-    uint8_t  VoutAutoGainEn;
-    uint8_t  IinADCGainLv;
+
+    /** ADC parameter **/
+    uint8_t  notifyRateIndex;
+    uint32_t sampleRate;
+    uint8_t  VoViSwitch;
+    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
+    uint8_t  ADCGainLv;
+
+     // voltage output gain
+    uint16_t VoutGainLevel;
    uint8_t  VinADCGainLv;
-    uint16_t VoutGainLv;
-    uint8_t  gain_switch_on;
-    uint8_t  AdcChannel;
-    bool     hign_z_en;

+    /** Notify parameter **/
+    uint32_t notifyRate;
+
+    /** mode parameter **/
    uint16_t cycleNumber;
    uint8_t  charge;
    int32_t  constantCurrent;
-
-    // uni pulse mode
-    int32_t  v0;
-    uint32_t t_pulse[4];
-    int32_t  v_initial[4];
-    int32_t  v_slope[4];
-    int32_t  v_step[4];
-    uint32_t t_pulse_min[4];
-    uint32_t t_pulse_max[4];
-    int32_t  v_stop;
-    int32_t  v_up;
-    int32_t  v_low;
-    bool     v_invert_option;
-    bool     v_stop_direction;
-    int32_t  v_1;
-    int32_t  v_2;
-
-
-    // pulse mode
+    int32_t  Currentmax;
    int32_t  sti_v1;
    int32_t  sti_v2;
    int32_t  sti_v3;
@@ -83,52 +83,133 @@ struct HEADSTAGE_INSTRUCTION {
    uint16_t sti_cy;
    uint16_t sti_loop;

-    int32_t Vout;
-
-    // not use
-    int32_t  Currentmax;
-    uint8_t  VoViSwitch;
-
-
+    uint16_t StepTime;

+    uint8_t AdcChannel;

+    /* EIS DAC parameter */
+    uint8_t DAC_type;
+    uint16_t VAmpSet;          // DAC Voltage Amplitude

+    /* EIS ADC parameter */
+    uint8_t  HSTIAGainLv;
+    uint8_t  HSTIAAutoGainEnable;
+    uint8_t  LPTIAGainLv;
+    uint8_t  LPTIAAutoGainEnable;
 } instru = {0};

 /** Iin, Vin, Vout **/
-#define RIS_ADC_IIN         0x00
-#define RIS_ADC_VIN         0x01
-#define RIS_DAC_VOUT        0x02
-#define RIS_HIGH_Z          0x03
-#define RIS_ADC_VOUT        0x04
-#define RIS_ADC_BAT         0x05
+#define EIS_HSTIA           0x00
+#define EIS_LPTIA           0x01
+#define EIS_HSDAC           0x02
+#define EIS_LPDAC           0x03
+#define VOUT_DAC            0x04
+#define IIN_ADC             0x05
+#define VIN_ADC             0x06
+#define HIGH_Z              0x07

-// ADC Iin gain level !!! move to ADC.h in future
-#define I_GAIN_3M       0x00    // lv0,largest gain
-#define I_GAIN_100K     0x01    // lv1
-#define I_GAIN_3K       0x02    // lv2
-#define I_GAIN_100R     0x03    // lv3,the least gain
-#define I_GAIN_AUTO     0x04
+/** ADC Iin gain level **/
+#define I_GAIN_3M           0x07    // largest gain
+#define I_GAIN_100K         0x08
+#define I_GAIN_3K           0x09
+#define I_GAIN_100R         0x0A    // the least gain
+#define I_GAIN_AUTO         0x04

-// ADC Vin gain level !!! move to ADC.h in future
-#define VIN_GAIN_1M     0x00
-#define VIN_GAIN_30K    0x01
-#define VIN_GAIN_1K     0x02
-#define VIN_GAIN_AUTO   0x03
+// EIS LPTIA Iin Gain Level //
+#define LPRTIA_512K         0x00
+#define LPRTIA_12K          0x01
+#define LPRTIA_4K           0x02
+#define LPRTIA_200R         0x03
+#define LPRTIA_GAIN_AUTO    0x04

-// DAC Vout gain level !!! move to DAC.h in future
-#define VOUT_GAIN_240K  0x00
-#define VOUT_GAIN_15K   0x01
-#define VOUT_GAIN_AUTO  0x02
+// EIS HSTIA Iin Gain Level
+#define HSRTIA_160K         0x00
+#define HSRTIA_20K          0x01
+#define HSRTIA_5K           0x02
+#define HSRTIA_200R         0x03
+#define HSRTIA_GAIN_AUTO    0x04
+
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M         0x00
+#define VIN_GAIN_30K        0x01
+#define VIN_GAIN_1K         0x02
+#define VIN_GAIN_AUTO       0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K      0x00
+#define VOUT_GAIN_15K       0x01
+#define VOUT_GAIN_AUTO      0x02

 /* DAC reset parameter */
-#define DAC_ZERO    25000 // DAC_ZERO is about 0V
+#define DAC_ZERO            25000
+#define EIS_HSDAC_ZERO      0x0800

 // Step time macro
-#define STEPTIME_HALF_SEC 5000
-#define STEPTIME_ONE_SEC 10000
-#define STEPTIME_TWO_SEC 20000
+#define STEPTIME_HALF_SEC   5000
+#define STEPTIME_ONE_SEC    10000
+#define STEPTIME_TWO_SEC    20000

+/* AVG Number */
+#define AVG2               0
+#define AVG4               1
+#define AVG8               2
+#define AVG16              3
+
+#define ADC1M6sps          0
+#define ADC800Ksps         1
+
+#define Sinc3OSR5          0
+#define Sinc3OSR4          1
+#define Sinc3OSR2          2
+
+#define Sinc2OSR22         0
+#define Sinc2OSR44         1
+#define Sinc2OSR89         2
+#define Sinc2OSR178        3
+#define Sinc2OSR267        4
+#define Sinc2OSR533        5
+#define Sinc2OSR640        6
+#define Sinc2OSR667        7
+#define Sinc2OSR800        8
+#define Sinc2OSR889        9
+#define Sinc2OSR1067      10
+#define Sinc2OSR1333      11
+
+#define DFTNUM4            0
+#define DFTNUM8            1
+#define DFTNUM16           2
+#define DFTNUM32           3
+#define DFTNUM64           4
+#define DFTNUM128          5
+#define DFTNUM256          6
+#define DFTNUM512          7
+#define DFTNUM1024         8
+#define DFTNUM2048         9
+#define DFTNUM4096        10
+#define DFTNUM8192        11
+#define DFTNUM16384       12
+
+#define AD5940_SYS_CLOCK    16000000
+#define Cutoff_Freq         37000000  // 210kHz
+
+///* LPTIA gain Level */
+//#define LPRTIA200R         1        //Max 3mA
+//#define LPRTIA4K           5        //Max 220uA
+//#define LPRTIA12K          9        //Max 74uA
+//#define LPRTIA512K        26        //Max 1.76uA
+
+static uint32_t HSRTIATable[4] = {160000, 20000, 5000, 200};
+
+/* HSTIA gain level (feedback R value) */
+#define RTIA200R            0x00        // 200R
+#define RTIA1k              0x01        // 1k
+#define RTIA5k              0x02        // 5k
+#define RTIA10k             0x03        // 10k
+#define RTIA20k             0x04        // 20k
+#define RTIA40k             0x05        // 40k
+#define RTIA80k             0x06        // 80k
+#define RTIA160k            0x07        // 160k
+#define RTIAopen            0x08        // RTIA is open
 /*********************************************************************
 * @fn      InitEliteInstruction
 *
@@ -138,72 +219,54 @@ struct HEADSTAGE_INSTRUCTION {
 *
 * @return  None.
 */
-static void InitEliteInstruction(void)
-{
-    instru.chip_id         = 0;
-    instru.eliteFxn        = 0;         //default is a null event
+static void InitEliteInstruction(){
+    instru.chip_id              = 0;
+    instru.eliteFxn             = 0;         //default is a null event
+    instru.VsetRateIndex        = 0;
+    instru.VsetRate             = 2;
+    instru.Vset                 = 0;
+    instru.VoltConstant         = DAC_ZERO; //DAC_ZERO is about 0V
+    instru.directionInit        = 1;        //0:reverse        1:forward
+    instru.step                 = 0;
+    instru.Ve1                  = DAC_ZERO;
+    instru.Ve2                  = DAC_ZERO;
+    instru.Vinit                = 0;
+    instru.Vmax                 = 0;
+    instru.Vmin                 = 0;
+    instru.notifyRateIndex      = 100;
+    instru.sampleRate           = 15;
+    instru.VoViSwitch           = 0x01;    //0:user see Vo     1: user see Vi
+    instru.AutoGainEnable       = 1;
+    instru.VinAutoGainEnable    = 1;
+    instru.VoutAutoGainEnable   = 1;
+    instru.ADCGainLv            = I_GAIN_AUTO;
+    instru.VoutGainLevel        = VOUT_GAIN_AUTO;
+    instru.VinADCGainLv         = VIN_GAIN_AUTO;
+    instru.notifyRate           = STEPTIME_ONE_SEC;
+    instru.cycleNumber          = 1;
+    instru.charge               = 1;      //0:discharge        1:charge
+    instru.constantCurrent      = 0;
+    instru.Currentmax           = 0;
+    instru.StepTime             = STEPTIME_ONE_SEC;
+    instru.AdcChannel           = 0;

-    instru.VsetRateIndex   = 0;         // vscan rate
-    instru.VsetRate        = 2;
-    instru.sampleRate      = 20;        // ADC's sample rate
-    instru.notifyRate      = CLOCK_ONE_SECOND;   // send data's rate
-    instru.period          = CLOCK_ONE_SECOND;
+    //EIS
+    instru.f1                   = 0;
+    instru.f2                   = 0;
+    instru.fset                 = 0;
+    instru.fmax                 = 0;
+    instru.fmin                 = 0;
+    instru.delay                = 0;
+    instru.scale                = 0;
+    instru.avgnum               = 0;
+    instru.dcbias               = 0;
+    instru.acamp                = 0;
+    instru.rtia                 = 0;
+    instru.ppd                  = 1;
+    instru.periodIndex          = 0;
+    instru.delayTime            = 0;
+    instru.settingIndex         = 0;

-    instru.Vset            = 0;         // vscan's volt[5nv]
-    instru.VoltConstant    = DAC_ZERO;  // DAC's volt[UC]
-    instru.directionInit   = 1;         // 0:reverse, 1:forward
-    instru.step            = 0;
-    instru.Ve1             = DAC_ZERO;  // user set volt[UC]
-    instru.Ve2             = DAC_ZERO;  // user set volt[UC]
-    instru.Vinit           = 0;         // user set init volt[5nv]
-    instru.Vmax            = 0;         // user set max volt[5nv]
-    instru.Vmin            = 0;         // user set min voit[5nv]
-
-    instru.IinADCAutoGainEn = 1;
-    instru.VinADCAutoGainEn = 1;
-    instru.VoutAutoGainEn   = 1;
-    instru.IinADCGainLv     = I_GAIN_AUTO;
-    instru.VinADCGainLv     = VIN_GAIN_AUTO;
-    instru.VoutGainLv       = VOUT_GAIN_AUTO;
-    instru.gain_switch_on   = 0b11110000;   // cur auto gain switch, |lv0|lv1|lv2|lv3|none|none|none|none|
-    instru.AdcChannel       = 0;         // RIS_ADC_IIN: 0x00, RIS_ADC_VIN: 0x01, RIS_DAC_VOUT: 0x02, RIS_HIGH_Z: 0x03
-    instru.hign_z_en        = 1;
-
-    instru.cycleNumber     = 1;
-    instru.charge          = 1;         // 0:discharge, 1:charge
-    instru.constantCurrent = 0;
-
-    // uni pulse mode
-    instru.v0              = DAC_ZERO;  // t < 0, volt is 0v
-    instru.v_stop          = 0;
-    instru.t_pulse[0]      = 0;
-    instru.t_pulse[1]      = 0;
-    instru.t_pulse[2]      = 0;
-    instru.t_pulse[3]      = 0;
-    instru.v_initial[0]    = 0;
-    instru.v_initial[1]    = 0;
-    instru.v_initial[2]    = 0;
-    instru.v_initial[3]    = 0;
-    instru.v_slope[0]      = 0;
-    instru.v_slope[1]      = 0;
-    instru.v_slope[2]      = 0;
-    instru.v_slope[3]      = 0;
-    instru.v_step[0]       = 0;
-    instru.v_step[1]       = 0;
-    instru.v_step[2]       = 0;
-    instru.v_step[3]       = 0;
-    instru.t_pulse_min[0]  = 0;
-    instru.t_pulse_min[1]  = 0;
-    instru.t_pulse_min[2]  = 0;
-    instru.t_pulse_min[3]  = 0;
-    instru.t_pulse_max[0]  = 0;
-    instru.t_pulse_max[1]  = 0;
-    instru.t_pulse_max[2]  = 0;
-    instru.t_pulse_max[3]  = 0;
-    instru.v_invert_option = false;
-    instru.v_stop_direction = true;
-    instru.v_1              = 0;
-    instru.v_2              = 0;

    //pulse mode
    instru.sti_t1          = 0;
@@ -223,13 +286,15 @@ static void InitEliteInstruction(void)
    instru.sti_loop        = 1;
    instru.sti_cy          = 0;

-    instru.Vout            = 0;
+    // EIS DAC
+    instru.VAmpSet              = EIS_HSDAC_ZERO;
+    instru.DAC_type             = EIS_HSDAC;

-    // not use
-    instru.Currentmax      = 0;
-    instru.VoViSwitch      = 0x01;
-
-    return;
+    // EIS ADC
+    instru.HSTIAGainLv            = 0;
+    instru.HSTIAAutoGainEnable    = 1;
+    instru.LPTIAGainLv            = 0;
+    instru.LPTIAAutoGainEnable    = 1;
 }

 #ifdef __cpulsplus
@@ -8,24 +8,27 @@ static bool TurnOnElite(uint8_t key) {
    if (key == 0) {
        // press 1 sec, power on LED, read bat power
        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-            headstage_battery_volt();
-            uint16_t bat = NotifyVoltBat;
-            if( bat < 768 && bat > 20){
-                PIN15_setOutputValue(enable_5v, 0);
-                return false;
-            }else{
-                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
-                TurnOn10V();
+//            headstage_battery_volt();
+//            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+//                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+//            if( bat < 768 && bat > 20){
+//                PIN_setOutputValue(pin_handle, enable_5v, 0);
+//                return false;
+//            }else{
+                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
+                Elite_SPI_init();
+                // TurnOn10V();
                ModeLED(BT_WAIT);
+                AD5940_init();
                return true;
-            }
+//            }
        } else {
            TurnOnCounter++;
            return false;
        }
    } else {
        TurnOnCounter = 0;
-        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
+        PIN_setOutputValue(pin_handle, enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -45,7 +48,7 @@ static void EliteKeyPress(uint8_t key) {
        // 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 {
@@ -67,7 +70,7 @@ static void EliteKeyPress(uint8_t key) {

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

@@ -5,12 +5,6 @@
 #define DARKLED                  0xE1
 #define LIGHTLED                 0xE8

-static bool     btWaitLedFlag   = 0;
-static bool     noEventLedFlag  = 0;
-static bool     preWorkLedFlag  = 0;
-static bool     workingLedFlag  = 0;
-static bool     postWorkLedFlag = 0;
-
 static void WorkModeLED();

 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
@@ -162,32 +156,25 @@ static void checkFlafLED()
 static void WorkModeLED()
 {
    switch (instru.eliteFxn) {
-        case CURVE_IV:
-        case CURVE_VO:
-        case CURVE_RT:
-        case CURVE_VT:
-        case CURVE_IT:
-        case CURVE_CV:
-        case CURVE_CA:
-        case CURVE_CC:
-        case CURVE_OCP:
-        case CURVE_LSV:
-        case CURVE_IV_CY:
-        case CURVE_PULSE:
-        case CURVE_UNI_PULSE:
-        case CURVE_DPV:
-        case CURVE_DPV_SMPRATE:
-        case CURVE_DPV_ADVANCE:
-        case CURVE_DPV_ADVANCE_SMPRATE:
+        case CURVE_EIS:
+        case CURVE_EIS_CV:
            WORKLED();
            break;

        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == RIS_ADC_IIN) {
+            if (instru.AdcChannel == IIN_ADC) {
                Elite_led_color(COLOR_RED);
-            } else if (instru.AdcChannel == RIS_ADC_VIN) {
+            } else if (instru.AdcChannel == VIN_ADC) {
                Elite_led_color(COLOR_ORANGE);
-            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
+            } else if (instru.AdcChannel == VOUT_DAC) {
+                Elite_led_color(COLOR_BLUE);
+            }else if (instru.AdcChannel == EIS_HSDAC) {
+                Elite_led_color(COLOR_PURPLE_DARK);
+            } else if (instru.AdcChannel == EIS_HSTIA) {
+                Elite_led_color(COLOR_WHITE);
+            } else if (instru.AdcChannel == EIS_LPTIA) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == EIS_LPDAC) {
                Elite_led_color(COLOR_BLUE);
            }
            break;
@@ -8,25 +8,60 @@
 #define ELITENOTIFY

 #include "headstage.h"
-#include <string.h>

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

-#define FINISH_MODE_INS 0b10100000
+#define NOT_BUF_OFFSET_INIT 8

+/**
+ * the index where to start insert data into buffer.
+ * start from 6.
+ */
+static size_t   not_buf_offset = NOT_BUF_OFFSET_INIT;
 static uint32_t not_time_stamp;
+
 static uint8_t  NotifyCurrent[4]   = {0};
 static uint8_t  NotifyVolt[4]      = {0};
 static uint8_t  NotifyImpedance[4] = {0};
-static uint16_t NotifyVoltBat      = 0;
-static uint16_t NotifyTemperature  = 0;
+static uint8_t  NotifyVoltBat[4]   = {0};
 static uint16_t NotifyCycleNumber  = 0;
-static bool  finishMode         = false;
+static uint8_t  finishMode         = 0;
+
+// ****************** New Notify Format ******************************** //
+/*
+ * Notify format
+ *
+ *
+         |               |   1           |       2       |           3   |
+         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
+         -----------------------------------------------------------------
+         |    header     |
+         |    current                                                    |
+         | voltage or impedance                                          |
+         |  mode & gain  |
+         |    time stamp                                                 |
+         |  cycle number |
+
+
+    mode & gain
+        this byte include Elite working mode and ADC gain level
+        we use "(mode & 0xF0) | (gain & 0x0F)" to encode these two information
+
+     cycle number
+         for cyclic voltammetry use, we save it as channel number.
+         0xFF
+
+  * header = device ID
+  * I = current (0.001nA), V = voltage (mV),
+  * Z = impedance (k ohm), T = time (ms)
+  *
+  *
+*/
+// ********* End New Format Notify ***************************************** //

 /*
 * Notify format
@@ -53,37 +88,34 @@ static bool  finishMode         = false;
  *
 */
 static void SendNotify() {
-    static uint8_t notify_times = 0;
-    uint32_t bat = NotifyVoltBat;
-
    initDATBuf();

+    not_buf[0] = instru.chip_id;
+
+    for (int i = 0; i < 4; i++) {
+        not_buf[i + 1] = NotifyCurrent[i]; // 1 2 3 4
+        not_buf[i + 5] = NotifyVolt[i]; // 5 6 7 8
+        not_buf[i + 9] = NotifyImpedance[i]; //9 10 11 12
+    }
+
    // 1 Timestamp = 32 usec;  31 Timestamp ~= 1 msec
    not_time_stamp = (Timestamp_get32()) / 31;  // msec

-    not_buf[0] = instru.chip_id;
+    not_buf[13] = not_time_stamp & 0xff;
+    not_buf[14] = (not_time_stamp >> 8) & 0xff;
+    not_buf[15] = (not_time_stamp >> 16) & 0xff;
+    not_buf[16] = (not_time_stamp >> 24) & 0xff;

-    memcpy(not_buf+1, (uint8_t *)&not_time_stamp, sizeof(not_time_stamp));
-    memcpy(not_buf+5, NotifyCurrent, sizeof(NotifyCurrent));
-    memcpy(not_buf+9, NotifyVolt, sizeof(NotifyVolt));
-    memcpy(not_buf+13, NotifyImpedance, sizeof(NotifyImpedance));
-    memcpy(not_buf+17, (uint8_t *)&NotifyCycleNumber, sizeof(NotifyCycleNumber));
+    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
+    not_buf[18] = NotifyCycleNumber & 0xff;

-    if (finishMode) {
-        not_buf[19] = (FINISH_MODE_INS) & 0b11110000;
-    } else {
-        not_buf[19] = 0 & 0b11110000;
-    }
+    not_buf[19] = (finishMode << 7) & 0x80 | instru.ADCGainLv & 0x0F;

-    memcpy(not_buf+20, (uint8_t *)&bat, sizeof(bat));
-    memcpy(not_buf+24, &notify_times, sizeof(notify_times));
-
-    for (int i = 25; i < BLE_DAT_BUFF_SIZE; i++){
+    for (int i = 20; i < BLE_DAT_BUFF_SIZE; i++){
        not_buf[i] = 0;
    }

    SimpleProfile_SetParameter(BLE_DAT_BUFF_CHAR, BLE_DAT_BUFF_SIZE, not_buf);
-    notify_times++;
 }

 static void initDATBuf(){
@@ -107,7 +139,7 @@ static void initCISBuf(){
 static void initRawDataBuf(){
    not_time_stamp    = 0;
    NotifyCycleNumber = 0;
-    finishMode        = false;
+    finishMode        = 0;

    for (int i = 0; i < 4; i++){
        NotifyCurrent[i]   = 0;
@@ -129,22 +161,31 @@ static void InputNotify(int NotifyType, int32_t Data){

    switch (NotifyType) {
        case NOTIFY_CURRENT:
-            memcpy(NotifyCurrent, (uint8_t *)&Data, sizeof(Data));
+            NotifyCurrent[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyCurrent[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyCurrent[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyCurrent[3] = (uint8_t)(Data & 0x000000FF);
            break;

        case NOTIFY_IMPEDANCE:
-            memcpy(NotifyImpedance, (uint8_t *)&Data, sizeof(Data));
+            NotifyImpedance[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyImpedance[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyImpedance[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyImpedance[3] = (uint8_t)(Data & 0x000000FF);
            break;

        case NOTIFY_VOLT :
-            memcpy(NotifyVolt, (uint8_t *)&Data, sizeof(Data));
+            NotifyVolt[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyVolt[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyVolt[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyVolt[3] = (uint8_t)(Data & 0x000000FF);
            break;

        case NOTIFY_VOLT_BAT :
-            NotifyVoltBat = (uint16_t)Data;
-            break;
-        case NOTIFY_TEMPERATURE :
-            NotifyTemperature = (uint16_t)Data;
+            NotifyVoltBat[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyVoltBat[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
            break;
    }
 }
@@ -3,21 +3,26 @@
 #define ELITERESET

 static void reset() {
+    mode_init = true;
    megaStiEnable = false;
    PeriodicEvent = false;     // is there an PeriodicEvent?
    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?

+    InitGPT();
    initINSBuf();
    initDATBuf();

-    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+    AD5940_HWReset();
+    AD5940_init();
+//    AD5940_sftreset();

-    VinADCGainCtrl(VIN_GAIN_AUTO);
-    IinADCGainCtrl(I_GAIN_AUTO);
+//    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;

-    instru.VoutGainLv = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+    HSTIAGainCtrl(HSRTIA_200R);
+    LPTIAGainCtrl(LPRTIA_200R);
+    HSDAC_GainControl(0x00);
+    HSDAC_output(0x0800);

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -34,23 +39,28 @@ static void reset() {
        spi_ADC_rxbuf[i] = 0;
    }

+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
    ModeLED(NO_EVENT);
    CPUdelay(1600);
 }

 static void Eliteinterrupt() {
+    mode_init = true;
    megaStiEnable = false;
    PeriodicEvent = false;     // is there an PeriodicEvent?
    Free_Work_Mode = true;      // Free(WorkModeData)
+    InitPeriodicEvent = true;      // need to create a WorkModeData?

+    InitGPT();
    initINSBuf();
    initDATBuf();
+    AD5940_HWReset();
+    AD5940_init();

-    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
-
-    instru.VoutGainLv = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+//    HSTIAGainCtrl(HSRTIA_200R);
+//    LPTIAGainCtrl(LPRTIA_200R);
+//    HSDAC_GainControl(0x00);
+//    HSDAC_output(0x0800);

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

+    PIN_setOutputValue(pin_handle, AD_CS, 1);  // AD_CS HIGH
    ModeLED(NO_EVENT);
    CPUdelay(8000);
 }
@@ -16,7 +16,7 @@

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

 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
@@ -27,6 +27,8 @@ static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};

 static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
 static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
+//
+//static uint32_t SeqCmdBuff;

 /* system use SPI parameters */
 static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
@@ -42,17 +44,18 @@ static void ELITE15_SPI_CLOSE();
 static void Elite_SPI_init(){
    SPI_init();
    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 10000000;  // 10M
+    spiParams0.bitRate     = 2000;  // 2k
    spiParams0.mode        = SPI_MASTER;
    spiParams0.dataSize    = 16;
    spiParams0.frameFormat = SPI_POL0_PHA1;
    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // LED SPI

    SPI_Params_init(&spiParams1);
-    spiParams1.bitRate     = 10000000;  // 10M
+    spiParams1.bitRate     = 1000000;  // 1M
    spiParams1.mode        = SPI_MASTER;
    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA1;
+    spiParams1.frameFormat = SPI_POL0_PHA0;
+
    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
 }

@@ -65,9 +68,7 @@ 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
+    PIN_setOutputValue(pin_handle, AD_CS, 0);      // CS_ADC

    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
@@ -75,43 +76,33 @@ static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {

    SPI_transfer(spiHandle1, &ADC_DAC_transaction);

-    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HIGH
-    update_latch_status (ADC_CS, 1);
-//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
+    PIN_setOutputValue(pin_handle, AD_CS, 1);      // CS_ADC
 }

 static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    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;

    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HIGH
-    update_latch_status (DAC_CS, 1);
-//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
 }

 static void ELITE15_SPI_HOLD() {
    Elite_SPI_init();
-    #ifdef ELITE_PIN_1_5_RE
-    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
-    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
-    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
-    #endif
-
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//    #ifdef ELITE_PIN_1_5_RE
+//    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
+//    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
+//    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
+//    #endif
+//
+//    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);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);

    SPI_close(spiHandle0);
    SPI_close(spiHandle1);
@@ -119,19 +110,163 @@ static void ELITE15_SPI_CLOSE() {

 /* 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, AD_CS, 1);      // CS_ADC
 }

+static void CAL_LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    LED_transaction.count = length;
+    LED_transaction.txBuf = spi_txbuf;
+    LED_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle0, &LED_transaction);
+}
+
+
+
+#ifdef ELITE_VERSION_EIS
+/* define SPI command */
+// datasheet page 98
+#define SPICMD_SETADDR  0x20
+#define SPICMD_WRITEREG 0x2D
+#define SPICMD_READREG  0x6D
+
+//define REG
+#define LPDACCON0       0x2128
+#define LPDACSW0        0x2124
+#define LPDACDAT0       0x2120
+#define LPREFBUFCON     0x2050
+#define SWMUX           0x235C
+#define LPTIASW0        0x20E4
+#define SWCON           0x200C
+#define HSDACCON        0x2010
+#define HSDACDAT        0x2048
+#define LPTIACON0       0x20EC
+#define HSTIACON        0x20FC
+#define AFECON          0x2000
+#define DSWFULLCON      0x2150
+#define NSWFULLCON      0x2154
+#define PSWFULLCON      0x2158
+#define TSWFULLCON      0x215C
+#define WGFCW           0x2030
+#define WGPHASE         0x2034
+#define WGOFFSET        0x2038
+#define WGAMPLITUDE     0x203C
+#define WGCON           0x2014
+#define DE0RESCON       0x20F8
+#define ADCCON          0x21A8
+#define DFTCON          0x20D0
+#define ADCFILTERCON    0x2044
+#define PMBW            0x22F0
+#define CLKSEL          0x0414
+#define CLKCON0         0x0408
+#define CLKCON0KEY      0x0420
+#define HSOSCCON        0x20BC
+#define ADCBUFCON       0x238C
+#define HSRTIACON       0x20F0
+#define ADCDAT          0x2074
+#define DFTREAL         0x2078
+#define DFTIMAG         0x207C
+
+static void select_REG(uint16_t addr){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+//    CPUdelay(16000);
+
+    spi_DACtxbuf[0] = SPICMD_SETADDR;
+    spi_DACtxbuf[1] = (uint8_t)((addr & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(addr & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+//    CPUdelay(16000);
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static void w16_REG(uint16_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF00) >> 8);
+    spi_DACtxbuf[2] = (uint8_t)(data & 0x00FF);
+
+    ADC_DAC_transaction.count = 3;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int16_t r16_REG(){
+    int16_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+
+    ADC_DAC_transaction.count = 4;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int16_t)spi_rxbuf[2] << 8 |    \
+          (int16_t)spi_rxbuf[3];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+static void w32_REG(uint32_t data){
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_WRITEREG;
+    spi_DACtxbuf[1] = (uint8_t)((data & 0xFF000000) >> 24);
+    spi_DACtxbuf[2] = (uint8_t)((data & 0x00FF0000) >> 16);
+    spi_DACtxbuf[3] = (uint8_t)((data & 0x0000FF00) >> 8);
+    spi_DACtxbuf[4] = (uint8_t)(data & 0x000000FF);
+
+    ADC_DAC_transaction.count = 5;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+}
+
+static int32_t r32_REG(){
+    int32_t ret;
+
+    PIN_setOutputValue(pin_handle, AD_CS, 0);
+    spi_DACtxbuf[0] = SPICMD_READREG;
+    spi_DACtxbuf[1] = 0x00;
+    spi_DACtxbuf[2] = 0x00;
+    spi_DACtxbuf[3] = 0x00;
+    spi_DACtxbuf[4] = 0x00;
+    spi_DACtxbuf[5] = 0x00;
+
+    ADC_DAC_transaction.count = 6;
+    ADC_DAC_transaction.txBuf = spi_DACtxbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    ret = (int32_t)spi_rxbuf[2] << 24 |    \
+          (int32_t)spi_rxbuf[3] << 16 |    \
+          (int32_t)spi_rxbuf[4] << 8 |     \
+          (int32_t)spi_rxbuf[5];
+
+    PIN_setOutputValue(pin_handle, AD_CS, 1);
+
+    return ret;
+}
+
+#endif // ELITE_EIS
+
 #endif // ELITE_SPI
@@ -1,12 +1,10 @@
 /*=============================================================================
 =                          wm.h                                              =
 =============================================================================*/
-#ifndef ELITE_WORK_DATA_H
-#define ELITE_WORK_DATA_H
+#ifndef ELITE_WORK_DATA
+#define ELITE_WORK_DATA

-#ifdef  __cplusplus
-extern "C" {
-#endif
+#define CLOCK_ONE_SECOND 10000 // 1s

 #include "EliteInstruction.h"

@@ -21,6 +19,20 @@ extern "C" {
    bool     _current_direction_up;  \
    uint16_t _cycleNumber

+//#define FOUT_PARA                     \
+//    uint32_t _f1;                     \
+//    uint32_t _f2;                     \
+//    uint32_t _fd1;                    \
+//    uint32_t _fd2;                    \
+//    uint32_t _fmax;                   \
+//    uint32_t _fmin;                   \
+//    uint32_t _fset;                   \
+//    uint8_t  _decades;                \ //num of decades in whole
+//    uint16_t _ppd;                    \
+//    uint8_t  _decadeIndex;            \ //index of decade max is 8
+//    uint16_t _sweepIndex;             \ //index of smaller decade max is 10
+//    bool     _direction_up
+
 #define MEAS_CURR(_m)      (((struct wm_meas_t *)(_m))->_measureCurrent)
 #define MEAS_VIN(_m)       (((struct wm_meas_t *)(_m))->_measureVin)
 #define MEAS_VOUT(_m)      (((struct wm_meas_t *)(_m))->_measureVout)
@@ -36,6 +48,31 @@ struct wm_meas_t {
 };

 /* member of mode */
+struct wm_eis_ctx_t {
+    struct wm_meas_t measure;
+    int16_t  _phase;
+    int32_t  _mag;
+    int32_t  _real;
+    int32_t  _imag;
+    uint32_t _f1;
+    uint32_t _f2;
+    uint32_t _fd1;
+    uint32_t _fd2;
+    uint32_t _fmax;
+    uint32_t _fmin;
+    uint32_t _fset;
+    uint8_t  _decades;                 //num of decades in whole
+    uint16_t _ppd;
+    uint8_t  _cnt;
+    int8_t   _decadeIndex;             //index of decade max is 8
+    int16_t  _sweepIndex;              //index of smaller decade max is 10
+    bool     _direction_up;
+    bool     _switchNeg;
+    bool     _switchPos;
+    bool     _firstSwitch;
+    bool     _in_reset_flag;
+};
+
 struct wm_vo_ctx_t {
    /* WARNING: please keep MEASURE at first!! */
    struct wm_meas_t measure;
@@ -46,8 +83,6 @@ struct wm_vo_ctx_t {
 struct wm_it_ctx_t {
    /* WARNING: please keep MEASURE at first!! */
    struct wm_meas_t measure;
-    int32_t _Vset;
-    int32_t _Vinit;
 };

 struct wm_vt_ctx_t {
@@ -88,6 +123,8 @@ struct wm_cv_ctx_t {
    /* WARNING: please keep MEASURE at first!! */
    struct wm_meas_t measure;
    VOUT_PARA;
+    int32_t _LPRtia;
+    bool bFirst;
 };

 struct wm_lsv_ctx_t {
@@ -128,84 +165,12 @@ struct wm_pulse_ctx_t {
    uint16_t _sti_lp;
 };

-struct wm_uni_pulse_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t  _Vset;
-
-    int32_t _v0;
-    uint32_t _t_pulse[4];
-    int32_t _v_initial[4];
-    int32_t _v_slope[4];
-    int32_t _v_step[4];
-
-    uint32_t _t_period;
-    uint32_t _t_pa[4];
-
-    uint32_t _t_pulse_min[4];
-    uint32_t _t_pulse_max[4];
-};
-
-struct wm_dpv_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t  _Vset;
-
-    int32_t _v0;
-    uint32_t _t_pulse[4];
-    int32_t _v_initial[4];
-    int32_t _v_slope[4];
-    int32_t _v_step[4];
-
-    uint32_t _t_period;
-    uint32_t _t_pa[4];
-    int32_t _v_stop;
-    bool _v_curr_direc;
-    int32_t _v_amp;
-
-    uint32_t _t_pulse_min[4];
-    uint32_t _t_pulse_max[4];
-
-    bool _v_direc_init;
-};
-
-struct wm_dpv_advance_ctx_t {
-    /* WARNING: please keep MEASURE at first!! */
-    struct wm_meas_t measure;
-    int32_t  _Vset;
-
-    int32_t _v0;
-    uint32_t _t_pulse[4];
-    int32_t _v_initial[4];
-    int32_t _v_slope[4];
-    int32_t _v_step[4];
-
-    uint32_t _t_period;
-    uint32_t _t_pa[4];
-    int32_t _v_stop;
-    int32_t _v_up;
-    int32_t _v_low;
-    int32_t _v_amp;
-    int32_t _v_1;
-    int32_t _v_2;
-
-    uint32_t _t_pulse_min[4];
-    uint32_t _t_pulse_max[4];
-
-    uint16_t _cycleNumber;
-
-    bool _v_curr_direc;
-    bool _v_direc_init;
-    bool _v_invert_option;
-    bool _v_stop_direction;
-};
-
 struct wm_ocp_ctx_t {
    /* WARNING: please keep MEASURE at first!! */
    struct wm_meas_t measure;
 };

-int wm_init(void);
+int wm_init(void); //(void *instr_ctx);
 int wm_deinit(void);
 void *wm_get(void);

@@ -217,6 +182,49 @@ static void *workMode_p = NULL;
 static bool Free_Work_Mode = false;

 /* init mode func */
+static int __eis_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_eis_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_eis_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_phase          = 0;
+    p->_mag            = 0;
+    p->_real           = 0;
+    p->_imag           = 0;
+    p->_f1             = instru.f1;
+    p->_f2             = instru.f2;
+    p->_fmax           = instru.fmax;
+    p->_fmin           = instru.fmin;
+    p->_fd1            = 0; //decade freq 1
+    p->_fd2            = 0; //decade freq 2
+    p->_fset           = 0;
+    p->_cnt            = 0;
+    p->_ppd            = instru.ppd; //points per decade
+    p->_decades        = 0;
+    p->_sweepIndex     = 0;
+    p->_decadeIndex    = 0;
+    p->_direction_up   = true;
+    p->_switchPos      = false;
+    p->_switchNeg      = false;
+    p->_firstSwitch    = true;
+    p->_in_reset_flag  = false;
+
+    *wm = p;
+
+    return 0;
+}
+
 static int __vo_create(void)
 {
    struct wm_meas_t *m;
@@ -257,9 +265,6 @@ static int __it_create(void)
    m->_measureBat     = 0;
    m->_VoViSwitch     = instru.VoViSwitch;

-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vset           = 0;
-
    *wm = p;

    return 0;
@@ -326,9 +331,9 @@ static int __iv_create(void)
    m->_measureBat     = 0;
    m->_VoViSwitch     = instru.VoViSwitch;

-    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vinit          = instru.Vinit; //(instru.Vinit - 25000) * 4 * 10000; //[5nV]
+    p->_Vmax           = instru.Vmax; //(instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+    p->_Vmin           = instru.Vmin; //(instru.Vmin  - 25000) * 4 * 10000; //[5nV]
    p->_Vset           = 0;
    p->_Vstep          = 0;
    p->_direction_up   = true;
@@ -414,11 +419,15 @@ static int __cv_create(void)
    m->_measureBat     = 0;
    m->_VoViSwitch     = instru.VoViSwitch;

-	p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
-    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
-    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
+    p->_Vinit          = (instru.Vinit - 25000) * 4 * 4000; //[5nV]
+    p->_Vmax           = (instru.Vmax - 25000) * 4 * 4000; //[5nV]
+    p->_Vmin           = (instru.Vmin - 25000) * 4 * 4000; //[5nV]
+//    p->_Vinit          = (instru.Vinit - 25000) * 4 * 10000; //[5nV]
+//    p->_Vmax           = (instru.Vmax  - 25000) * 4 * 10000; //[5nV]
+//    p->_Vmin           = (instru.Vmin  - 25000) * 4 * 10000; //[5nV]
    p->_Vset           = 0;
    p->_Vstep          = 0;
+    p->bFirst          = true;
    p->_direction_up   = true;
    p->_current_direction_up = true;
    p->_cycleNumber    = instru.cycleNumber;
@@ -524,201 +533,6 @@ static int __pulse_create(void)
    return 0;
 }

-static int __uni_pulse_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_uni_pulse_ctx_t *p;
-    void **wm = &workMode_p;
-    uint32_t pul_acc = 0;
-    int i;
-
-    p = malloc(sizeof(struct wm_uni_pulse_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vset           = 0;
-
-    p->_v0             = UC_TO_5NV(instru.v0); //[5nV]
-
-    p->_t_pulse[0]     = instru.t_pulse[0];
-    p->_t_pulse[1]     = instru.t_pulse[1];
-    p->_t_pulse[2]     = instru.t_pulse[2];
-    p->_t_pulse[3]     = instru.t_pulse[3];
-
-    p->_v_initial[0]   = UC_TO_5NV(instru.v_initial[0]); //[5nv]
-    p->_v_initial[1]   = UC_TO_5NV(instru.v_initial[1]); //[5nv]
-    p->_v_initial[2]   = UC_TO_5NV(instru.v_initial[2]); //[5nv]
-    p->_v_initial[3]   = UC_TO_5NV(instru.v_initial[3]); //[5nv]
-
-    p->_v_slope[0]     = instru.v_slope[0];
-    p->_v_slope[1]     = instru.v_slope[1];
-    p->_v_slope[2]     = instru.v_slope[2];
-    p->_v_slope[3]     = instru.v_slope[3];
-
-    p->_v_step[0]      = UC_TO_5NV(instru.v_step[0]); //[5nv]
-    p->_v_step[1]      = UC_TO_5NV(instru.v_step[1]); //[5nv]
-    p->_v_step[2]      = UC_TO_5NV(instru.v_step[2]); //[5nv]
-    p->_v_step[3]      = UC_TO_5NV(instru.v_step[3]); //[5nv]
-
-    p->_t_period = 0;
-
-    for (i=0; i<4; i++) {
-        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
-        pul_acc = p->_t_pa[i];
-        p->_t_period += p->_t_pulse[i];
-    }
-
-    instru.period = p->_t_period;
-
-    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
-    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
-    p->_t_pulse_min[2]     = (instru.t_pulse[2] - 100) * instru.t_pulse_min[2] / 100 + 50;
-    p->_t_pulse_min[3]     = (instru.t_pulse[3] - 100) * instru.t_pulse_min[3] / 100 + 50;
-
-    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
-    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
-    p->_t_pulse_max[2]     = (instru.t_pulse[2] - 100) * instru.t_pulse_max[2] / 100 + 50;
-    p->_t_pulse_max[3]     = (instru.t_pulse[3] - 100) * instru.t_pulse_max[3] / 100 + 50;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __dpv_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_dpv_ctx_t *p;
-    void **wm = &workMode_p;
-    uint32_t pul_acc = 0;
-    int i;
-
-    p = malloc(sizeof(struct wm_dpv_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vset           = 0;
-
-    p->_v0             = instru.v0; //[5nV]
-    p->_v_stop         = instru.v_stop; //[5nV]
-
-    p->_t_pulse[0]     = instru.t_pulse[0];
-    p->_t_pulse[1]     = instru.t_pulse[1];
-
-    p->_v_initial[0]   = instru.v_initial[0]; //[5nv]
-    p->_v_initial[1]   = instru.v_initial[1]; //[5nv]
-
-    p->_v_slope[0]     = instru.v_slope[0];
-    p->_v_slope[1]     = instru.v_slope[1];
-
-    p->_v_step[0]      = instru.v_step[0]; //[5nv]
-    p->_v_step[1]      = instru.v_step[1]; //[5nv]
-
-    p->_t_period = 0;
-
-    for (i=0; i<4; i++) {
-        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
-        pul_acc = p->_t_pa[i];
-        p->_t_period += p->_t_pulse[i];
-    }
-
-    instru.period = p->_t_period;
-
-    p->_v_direc_init   = instru.directionInit;
-    p->_v_curr_direc = instru.directionInit;
-    p->_v_amp = instru.v_initial[1] - instru.v_initial[0];
-
-    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
-    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
-
-    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
-    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
-
-    *wm = p;
-
-    return 0;
-}
-
-static int __dpv_advance_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_dpv_advance_ctx_t *p;
-    void **wm = &workMode_p;
-    uint32_t pul_acc = 0;
-    int i;
-
-    p = malloc(sizeof(struct wm_dpv_advance_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vset           = 0;
-
-    p->_v0             = instru.v0; //[5nV]
-    p->_v_stop         = instru.v_stop; //[5nV]
-
-    p->_t_pulse[0]     = instru.t_pulse[0];
-    p->_t_pulse[1]     = instru.t_pulse[1];
-
-    p->_v_initial[0]   = instru.v_initial[0]; //[5nv]
-    p->_v_initial[1]   = instru.v_initial[1]; //[5nv]
-
-    p->_v_slope[0]     = instru.v_slope[0];
-    p->_v_slope[1]     = instru.v_slope[1];
-
-    p->_v_step[0]      = instru.v_step[0]; //[5nv]
-    p->_v_step[1]      = instru.v_step[1]; //[5nv]
-
-    p->_t_period = 0;
-
-    for (i=0; i<4; i++) {
-        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
-        pul_acc = p->_t_pa[i];
-        p->_t_period += p->_t_pulse[i];
-    }
-
-    instru.period = p->_t_period;
-
-    p->_v_direc_init   = instru.directionInit;
-    p->_v_curr_direc = instru.directionInit;
-    p->_v_stop_direction = instru.v_stop_direction;
-    p->_v_up = instru.v_up;
-    p->_v_low = instru.v_low;
-    p->_v_amp = instru.v_initial[1] - instru.v_initial[0];
-    p->_v_1 = instru.v_1;
-    p->_v_2 = instru.v_2;
-
-    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
-    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
-
-    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
-    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
-
-    p->_cycleNumber = instru.cycleNumber;
-    p->_v_invert_option = instru.v_invert_option;
-
-    *wm = p;
-
-    return 0;
-}
-
 static int __ocp_create(void)
 {
    struct wm_meas_t *m;
@@ -748,71 +562,18 @@ int wm_init(void)
    if (*wm) return -1;

    switch (mode) {
-        case CURVE_VO:
-            if (__vo_create()) return -2;
+        case CURVE_EIS:
+            if (__eis_create()) return -2;
            break;

-        case CURVE_IT:
-            if (__it_create()) return -2;
-            break;
-
-        case CURVE_VT:
-            if (__vt_create()) return -2;
-            break;
-
-        case CURVE_RT:
-            if (__rt_create()) return -2;
-            break;
-
-        case CURVE_IV:
-            if (__iv_create()) return -2;
-            break;
-
-        case CURVE_IV_CY:
-            if (__iv_cy_create()) return -2;
-            break;
-
-        case CURVE_CC:
-            if (__cc_create()) return -2;
-            break;
-
-        case CURVE_CV:
+        case CURVE_EIS_CV:
            if (__cv_create()) return -2;
            break;

-        case CURVE_LSV:
-            if (__lsv_create()) return -2;
-            break;
-
-        case CURVE_CA:
-            if (__ca_create()) return -2;
-            break;
-
-        case CURVE_PULSE:
-            if (__pulse_create()) return -2;
-            break;
-
-        case CURVE_UNI_PULSE:
-            if (__uni_pulse_create()) return -2;
-            break;
-
-        case CURVE_OCP:
-            if (__ocp_create()) return -2;
-            break;
-
-        case CURVE_DPV:
-        case CURVE_DPV_SMPRATE:
-            if (__dpv_create()) return -2;
-            break;
-        case CURVE_DPV_ADVANCE:
-        case CURVE_DPV_ADVANCE_SMPRATE:
-            if (__dpv_advance_create()) return -2;
-            break;
-
        default:
            // printf("DO NOT support!!");
            return -3;
-    }
+    };

    return 0;
 }
@@ -838,7 +599,20 @@ void *wm_get(void)
    return wm;
 }

-#ifdef  __cplusplus
-}
-#endif
+/*  CC Mode parameter
+*   @ Measure : measure current value (nA)
+*   @ Charge : Charge or Discharge
+*   @ BatteryV : Vin measure battery voltage (mV)
+*   @ value : constant current setting.
+*             Current value divide current level into 3,000,001 pieces
+*             1,500,000 is zero point; 3,000,000 is 15mA
+*             Current = (value - 1,500,000)/100,000 mA
+*   @ Done : Done = false => Ignore Vmin condition;
+*            Done will be true, if BatteryV <= Vmin last for about 12sec in discharge mode
+*   @ VMax : voltage upper bound in charge mode
+*            CC->value will set to zero if BatteryV >= VMax in charge mode
+*   @ VMin : voltage lower bound in charge mode
+*            CC->value will set to zero if BatteryV <=> VMin in charge mode
+*            Note that VMax and VMin are always larger or equal to zero
+*/
 #endif
@@ -7,8 +7,64 @@
 #include <ti/drivers/PIN.h>

 //#define ELITE_PIN_1_5
-#define ELITE_PIN_1_5_RE
+//#define ELITE_PIN_1_5_RE
+#define ELITE_PIN_EIS

+#ifdef ELITE_PIN_EIS
+/* SPI Board */
+#define Board_SPI0_MISO                 PIN_UNASSIGNED
+#define Board_SPI0_MOSI                 IOID_4
+#define Board_SPI0_CLK                  IOID_3
+#define Board_SPI0_CS                   PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                 IOID_1
+#define Board_SPI1_MOSI                 IOID_6
+#define Board_SPI1_CLK                  IOID_5
+#define Board_SPI1_CS                   PIN_UNASSIGNED
+
+#define AD_CS                           IOID_10
+
+//#define SD_MISO                         IOID_11
+//#define SD_CS                           IOID_8
+//#define SD_CLK                          IOID_7
+//#define SD_MOSI                         IOID_13
+
+#define switch_on                       IOID_14
+#define enable_5v                       IOID_9
+#define AD_reset                        IOID_13
+#define enable_10v                      PIN_UNASSIGNED
+#define HIGH_Z_MODE                     PIN_UNASSIGNED
+#define shutdown_6994                   PIN_UNASSIGNED
+
+#define Turnon_I_LARGE                  PIN_UNASSIGNED
+#define Turnon_I_MID                    PIN_UNASSIGNED
+#define Turnon_I_SMALL                  PIN_UNASSIGNED
+
+#define Turnon_V_MID                    PIN_UNASSIGNED
+#define Turnon_V_SMALL                  PIN_UNASSIGNED
+
+#define Turon_VOUT_SMALL                PIN_UNASSIGNED
+
+
+PIN_Handle       pin_handle;
+static PIN_State ZM_rst;
+
+const PIN_Config BLE_IO[] = {
+    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,// 5V_enable
+    AD_reset | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
+    AD_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_TERMINATE
+};
+
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+}
+#endif
+
+
+#ifdef ELITE_PIN_1_5_RE
 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
 #define Board_SPI0_MOSI                 D1
@@ -55,7 +111,7 @@
 #define Turnon_I_LARGE                  LOAD2, D1
 #define Turnon_V_SMALL                  LOAD2, D2
 #define Turnon_V_MID                    LOAD2, D3
-#define Turnon_VOUT_SMALL                LOAD2, D7
+#define Turon_VOUT_SMALL                LOAD2, D7
 #define shutdown_6994                   LOAD2, D6

 //#define Turnon10K                       Turnon_I_MID
@@ -113,6 +169,7 @@ static void remove_elite_pin() {
    PIN_close(pin_handle);
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
 }
+#endif

 /*!
 *  @def    BOOSTXL_CC2650MA_SPIName
@@ -2,7 +2,7 @@
 ***********************************************************
    Read battery's method
 ***********************************************************
-1.read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+1.ReadADCBat(spi_ADC_rxbuf)
  let "spi_ADC_rxbuf" be 8000
  8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,48 +34,36 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
    uint32_t bat_volt = 0;

-    read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+    ReadADCBat(spi_ADC_rxbuf);
    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
    bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
-//    bat_volt = (bat_volt - 1) * 187.5 * 2;
-
    InputNotify(NOTIFY_VOLT_BAT, bat_volt);
 }

-static void headstage_temperature(void) {
-    int32_t curTemp = 0;
-
-    curTemp = AONBatMonTemperatureGetDegC();
-    InputNotify(NOTIFY_TEMPERATURE,curTemp);
-}
-
-static bool EliteADCBattery(){
+static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-    bool read_adc_flag = false;
    if(ADCSwitch == 0){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ReadADCBat(spi_ADC_rxbuf);
        ADCSwitch++;
    }
    else if(ADCSwitch == 1){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ReadADCBat(spi_ADC_rxbuf);
        ADCSwitch++;
    }
    else if(ADCSwitch == 2){ /**read V(buffer)**/
        headstage_battery_volt();
-        headstage_temperature();
-        ADCSwitch++;
-        read_adc_flag = true;
-
-    }else if(ADCSwitch == 3){
        batteryCheck_flag = false;
-        tempCheck_flag = false;
        ADCSwitch = 0;
    }
-
-    return read_adc_flag;
 }

 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;
@@ -90,9 +78,10 @@ static void measureBat(){
        }
    }

-    uint16_t bat = NotifyVoltBat;
+    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);
    }
 }

@@ -12,57 +12,40 @@
 #define VIS_STI                         0xC0
 #define VIS_FUH                         0x90
 #define VIS_INT                         0x60
-#define VIS_SHIFT_200K                  0xA0
-#define VIS_SHIFT_10K                   0xE0
-#define VIS_SHIFT_200R                  0x80
 #define VIS_DEVICE_SHINY                0x10
 #define VIS_SHINY_DIS                   0x20
-#define VIS_CC_ZERO                     0x40

 // RIS (real instruction)
 enum all_mode_e {
-    CURVE_IV                       =  0x01, // I-V Curve                       //0x10,
-    CURVE_IV_CY                    =  0x02, // Cycle I-V                       //0x20,
-    CURVE_VO                       =  0x03, // Function Generator              //0x30,
-    CURVE_RT                       =  0x04, // R-T Graph                       //0x40,
-    CURVE_VT                       =  0x05, // V-T Graph                       //0x50,
-    CURVE_IT                       =  0x06, // I-T Graph                       //0x60,
-    CURVE_CC                       =  0x07, // Constant Current (CC)           //0xD0,
-    CURVE_OCP                      =  0x08, // Open Circuit Potential (OCP)
-    CURVE_CV                       =  0x09, // Cyclic Voltammetry (CV)         //0xC0,
-    CURVE_LSV                      =  0x0A, // Linear Sweep Voltammetry (LSV)  //0x02,
-    CURVE_CA                       =  0x0B, // Chronoamperometric Graph (CA)   //0x03,
-    CURVE_PULSE                    =  0x0C,                                    //0x94,
-    CURVE_UNI_PULSE                =  0x0D, // universal pulse
-    CURVE_DPV                      =  0x0E,
-    CURVE_DPV_SMPRATE              =  0x0F,
-    CURVE_DPV_ADVANCE              =  0x10,
-    CURVE_DPV_ADVANCE_SMPRATE      =  0x11,
+
+    CURVE_EIS                      =  0xD1, //Should Change to 0xD1
+    CURVE_EIS_CV                   =  0xD2,

    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
-
+//    CURVE_CALI_ADC                 =  0x92, // Cali ADC - test                 //0x92,

    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
+//    SET_SAMPLE_RATE                =  0x70,                                    //0x70,
    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
-    SET_PARA                       =  0xE2
+//    SET_ADC_DAC_GAIN               =  0x80,                                    //0x80,
 };

-enum set_para_e {
-    DAC_VOLT                        = 0x01,
-};
-
-enum dev_para_e {
-    VERSION_DEV_TEST                = 0x01,
-    BAT_DEV_TEST                    = 0x02,
-    TEMP_DEV_TEST                   = 0x03,
-    LED_DEV_TEST                    = 0x04,
-};
-
-
 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
-#define CIS_TEMPERATURE                 0x80
+#define CIS_LED_TEST                    0x70
+#define CIS_CALI                        0x30
+#define CIS_CALI2                       0x90
+
+#define CTL_WRT                         0x20
+#define CTL_RD                          0x21
+#define CTL_RD_DFTR                     0x78
+#define CTL_RD_DFTI                     0x7C
+#define CTL_RESET                       0x11
+#define CTL_IMPEDANCE                   0x12
+#define CTL_CV3                         0x13
+#define cali_HSDAC_amp                  0x49
+#define cali_DCbias                     0x79

 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
@@ -71,6 +54,23 @@ enum dev_para_e {
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
+#define PARA_1                   0x01
+#define PARA_2                   0x02
+#define PARA_3                   0x03
+#define PARA_4                   0x04
+#define PARA_5                   0x05
+#define PARA_6                   0x06
+#define PARA_7                   0x07
+#define PARA_8                   0x08
+#define PARA_9                   0x09
+#define PARA_10                  0x0A
+#define PARA_11                  0x0B
+#define PARA_12                  0x0C
+#define PARA_13                  0x0D
+#define PARA_14                  0x0E
+#define PARA_15                  0x0F
+#define PARA_16                  0x10
+#define PARA_17                  0x11

 //Elite LED
 #define COLOR_BLACK              0x00
@@ -102,15 +102,16 @@ enum dev_para_e {
 #define WORKING                  0x04
 #define POST_WORK                0x05

+/* EIS define */
+// cutoff frequency of the filter in AD5940
+#define cutoff_auto     0x00
+#define cutoff_50k      0x01
+#define cutoff_100k     0x02
+#define cutoff_250k     0x03
+
+#define LOW_PW_MODE     0x00
+#define HIGH_PW_MODE    0x01
+
+
 #define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
-
-//plot_type
-#define IT_PLOT             1
-#define VT_PLOT             2
-#define VOUT_PLOT           3
-#define IIN_VIN_PLOT        4
-#define IIN_VIN_VOUT_PLOT   5
-
-#define CLOCK_ONE_SECOND 10000
-
 #endif
@@ -3,10 +3,10 @@
 #define VERSION_DATE

 #define VERSION_DATE_YEAR      22
-#define VERSION_DATE_MONTH     4
-#define VERSION_DATE_DAY       13
-#define VERSION_DATE_HOUR      14
-#define VERSION_DATE_MINUTE    16
+#define VERSION_DATE_MONTH     5
+#define VERSION_DATE_DAY       4
+#define VERSION_DATE_HOUR      10
+#define VERSION_DATE_MINUTE    15

 // this is NOT the version hash !!
 // it's the last version hash
@@ -0,0 +1,197 @@
+#include "eis_cali_table.h"
+
+/* SendCaliValue
+*  2~ : cutoff frequency
+*  4~5 : voltage amplitude
+*  2 : phase parameter a
+*  3 : phase parameter b
+*  4 : HSRTIA200R
+*  5 : HSRTIA5K
+*  6 : HSRTIA20K
+*  7 : HSRTIA160K
+*/
+
+static void SendCaliValue0(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 24) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.CutoffFreq >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.CutoffFreq & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) CaliTable.Temp & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA200R & 0xFF;
+//
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA5K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA5K & 0xFF;
+
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA20K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA20K & 0xFF;
+//
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 24) & 0xFF;
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 16) & 0xFF;
+//    cali_buf[index++] = (uint8_t) (CaliTable.HSRTIA160K >> 8) & 0xFF;
+//    cali_buf[index++] = (uint8_t) CaliTable.HSRTIA160K & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
+}
+
+static void SendCaliValue1(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t filter_number1 = 2, index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    for (int i = 0; i < filter_number1 ; i++) {
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 8)& 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i][0].PhaseParaA & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i][0].PhaseParaB & 0xFF;
+    }
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 20, cali_buf);
+}
+
+static void SendCaliValue2(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t filter_number1 = 2, filter_number2 = 4, index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    for (int i = filter_number1; i < filter_number2 ; i++) {
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaA >> 8)& 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i][0].PhaseParaA & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 24)& 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 16) & 0xFF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ft[i][0].PhaseParaB >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ft[i][0].PhaseParaB & 0xFF;
+    }
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue3(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][0].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][0].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue4(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][1].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][1].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue5(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][2].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][2].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
+
+static void SendCaliValue6(void) {
+    uint8_t cali_buf[BLE_CIS_BUFF_SIZE];
+
+    uint8_t index = 2;
+
+    cali_buf[1] = instru.chip_id;
+
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_a >> 8)& 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_a & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_b >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_b & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_c >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_c & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_d >> 24)& 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_d >> 16) & 0xFF;
+    cali_buf[index++] = (uint8_t) (CaliTable.Lv[0][3].HSRTIA_d >> 8) & 0xFF;
+    cali_buf[index++] = (uint8_t) CaliTable.Lv[0][3].HSRTIA_d & 0xFF;
+
+    cali_buf[0] = index - 1;
+
+    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, index, cali_buf);
+}
@@ -0,0 +1,826 @@
+#ifndef EIS_CALI_TABLE
+#define EIS_CALI_TABLE
+
+#define BOARD_FIRST_STEP_CALI
+
+typedef struct _SingleFilterCali{
+    uint32_t  PhaseParaA;
+    int32_t   PhaseParaB;
+}SingleFilterCali;
+
+typedef struct _SingleGainLvCali{
+    int64_t     HSRTIA_a;
+    int64_t     HSRTIA_b;
+    int64_t     HSRTIA_c;
+    int64_t     HSRTIA_d;
+}SingleGainLvCali;
+
+struct _CaliTable{
+    //CIS to Controller
+    char DeviceName[25];
+    uint32_t CutoffFreq;
+    int32_t OffsetZero;
+    SingleFilterCali Ft[4][4];
+
+    //EIS
+    long long HSDAC_coeff_a;
+    long long HSDAC_coeff_b;
+    long long HSDAC_coeff_c;
+
+    long long LPDAC_coeff_a;
+    long long LPDAC_coeff_b;
+    long long LPDAC_coeff_c;
+
+    long long HSAMP_coeff;
+    long long HSAMP_offset;
+    SingleGainLvCali Lv[4][4];
+
+}CaliTable =
+
+/*
+     only write these parameter for EIS1.1 first cali
+    .OffsetZero
+    .HSDAC_coeff_a  //HSDAC_coeff_a = excel: DAC_AMP
+    .HSDAC_coeff_b
+    .HSDAC_coeff_c
+    .LPDAC_coeff_a  //LPDAC_coeff_a = excel: DACoffset
+    .LPDAC_coeff_b
+    .LPDAC_coeff_c
+*/
+
+#ifdef BOARD_FIRST_STEP_CALI
+{
+
+    .DeviceName = "BOARD_FIRST_STEP_CALI",
+    .CutoffFreq = 271200,
+    .OffsetZero = 0x6504,
+
+    // hsrtia160k
+    .Lv[0][0].HSRTIA_a = 0, // 1e8
+    .Lv[0][0].HSRTIA_b = 5665868, // 1e8
+    .Lv[0][0].HSRTIA_c = 1612, // 1e4
+    .Lv[0][0].HSRTIA_d = 0, // 1e4
+    .Lv[1][0].HSRTIA_a = 0, // 1e8
+    .Lv[1][0].HSRTIA_b = 0, // 1e8
+    .Lv[1][0].HSRTIA_c = 0, // 1e4
+    .Lv[2][0].HSRTIA_a = 0, // 1e8
+    .Lv[2][0].HSRTIA_b = 0, // 1e8
+    .Lv[2][0].HSRTIA_c = 0, // 1e4
+    .Lv[3][0].HSRTIA_a = 0, // 1e8
+    .Lv[3][0].HSRTIA_b = 0, // 1e8
+    .Lv[3][0].HSRTIA_c = 0, // 1e4
+
+    // hsrtia20k
+    .Lv[0][1].HSRTIA_a = 3, // 1e8
+    .Lv[0][1].HSRTIA_b = 44242940, // 1e8
+    .Lv[0][1].HSRTIA_c = 148206, // 1e4
+    .Lv[0][1].HSRTIA_d = 0, // 1e4
+    .Lv[1][1].HSRTIA_a = 0, // 1e8
+    .Lv[1][1].HSRTIA_b = 0, // 1e8
+    .Lv[1][1].HSRTIA_c = 0, // 1e4
+    .Lv[2][1].HSRTIA_a = 0, // 1e8
+    .Lv[2][1].HSRTIA_b = 0, // 1e8
+    .Lv[2][1].HSRTIA_c = 0, // 1e4
+    .Lv[3][1].HSRTIA_a = 0, // 1e8
+    .Lv[3][1].HSRTIA_b = 0, // 1e8
+    .Lv[3][1].HSRTIA_c = 0, // 1e4
+
+    // hsrtia5k
+    .Lv[0][2].HSRTIA_a = 2, // 1e8
+    .Lv[0][2].HSRTIA_b = 178641591, // 1e8
+    .Lv[0][2].HSRTIA_c = 386005, // 1e4
+    .Lv[0][2].HSRTIA_d = 0, // 1e4
+    .Lv[1][2].HSRTIA_a = 0, // 1e8
+    .Lv[1][2].HSRTIA_b = 0, // 1e8
+    .Lv[1][2].HSRTIA_c = 0, // 1e4
+    .Lv[2][2].HSRTIA_a = 0, // 1e8
+    .Lv[2][2].HSRTIA_b = 0, // 1e8
+    .Lv[2][2].HSRTIA_c = 0, // 1e4
+    .Lv[3][2].HSRTIA_a = 0, // 1e8
+    .Lv[3][2].HSRTIA_b = 0, // 1e8
+    .Lv[3][2].HSRTIA_c = 0, // 1e4
+
+    // hsrtia200r
+    .Lv[0][3].HSRTIA_a = 9404, // 1e8
+    .Lv[0][3].HSRTIA_b = 4309654444, // 1e8
+    .Lv[0][3].HSRTIA_c = 15315713, // 1e4
+    .Lv[0][3].HSRTIA_d = 0, // 1e4
+    .Lv[1][3].HSRTIA_a = 0, // 1e8
+    .Lv[1][3].HSRTIA_b = 0, // 1e8
+    .Lv[1][3].HSRTIA_c = 0, // 1e4
+    .Lv[2][3].HSRTIA_a = 0, // 1e8
+    .Lv[2][3].HSRTIA_b = 0, // 1e8
+    .Lv[2][3].HSRTIA_c = 0, // 1e4
+    .Lv[3][3].HSRTIA_a = 0, // 1e8
+    .Lv[3][3].HSRTIA_b = 0, // 1e8
+    .Lv[3][3].HSRTIA_c = 0, // 1e4
+
+    .Ft[0][0].PhaseParaA = 148031,
+    .Ft[0][0].PhaseParaB = -89728680,
+    .Ft[0][1].PhaseParaA = 0,
+    .Ft[0][1].PhaseParaB = 0,
+    .Ft[0][2].PhaseParaA = 0,
+    .Ft[0][2].PhaseParaB = 0,
+    .Ft[0][3].PhaseParaA = 0,
+    .Ft[0][3].PhaseParaB = 0,
+
+    .Ft[1][0].PhaseParaA = 341117,
+    .Ft[1][0].PhaseParaB = -89913235,
+    .Ft[1][1].PhaseParaA = 0,
+    .Ft[1][1].PhaseParaB = 0,
+    .Ft[1][2].PhaseParaA = 0,
+    .Ft[1][2].PhaseParaB = 0,
+    .Ft[1][3].PhaseParaA = 0,
+    .Ft[1][3].PhaseParaB = 0,
+
+    .Ft[2][0].PhaseParaA = 20622054,
+    .Ft[2][0].PhaseParaB = -90005211,
+    .Ft[2][1].PhaseParaA = 0,
+    .Ft[2][1].PhaseParaB = 0,
+    .Ft[2][2].PhaseParaA = 0,
+    .Ft[2][2].PhaseParaB = 0,
+    .Ft[2][3].PhaseParaA = 0,
+    .Ft[2][3].PhaseParaB = 0,
+
+    .Ft[3][0].PhaseParaA = 99823148,
+    .Ft[3][0].PhaseParaB = -89960369,
+    .Ft[3][1].PhaseParaA = 0,
+    .Ft[3][1].PhaseParaB = 0,
+    .Ft[3][2].PhaseParaA = 0,
+    .Ft[3][2].PhaseParaB = 0,
+    .Ft[3][3].PhaseParaA = 0,
+    .Ft[3][3].PhaseParaB = 0,
+
+    //only for EIS 1e10
+    //HSDAC_coeff_a = excel: DAC_AMP
+    .HSDAC_coeff_a = -166,
+    .HSDAC_coeff_b = 9781419,
+    .HSDAC_coeff_c = 181161946,
+
+    //LPDAC_coeff_a = excel: DACoffset
+    .LPDAC_coeff_a = 8,
+    .LPDAC_coeff_b = 8360236,
+    .LPDAC_coeff_c = 131934447554,
+
+//    .HSDAC_coeff = 1,
+//    .HSDAC_offset = 0,
+};
+
+#elif defined BOARD_TEST
+{
+    //CIS to Controller
+    .DeviceName = "BOARD_TEST",
+    .CutoffFreq = 0xFFFFFFFF,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 0, // 1e8
+    .Lv[0].HSRTIA_c = 0, // 1e8
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 0, // 1e8
+    .Lv[1].HSRTIA_b = 0, // 1e8
+    .Lv[1].HSRTIA_c = 0, // 1e8
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 0, // 1e8
+    .Lv[2].HSRTIA_b = 0, // 1e8
+    .Lv[2].HSRTIA_c = 0, // 1e8
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r
+    .Lv[3].HSRTIA_a = 0,
+    .Lv[3].HSRTIA_b = 0, // 1e8
+    .Lv[3].HSRTIA_c = 0, // 1e8
+    .Lv[3].HSRTIA_d = 0, // 1e8
+
+    .Ft[0].PhaseParaA = 0,
+    .Ft[0].PhaseParaB = 0,
+    .Ft[1].PhaseParaA = 0,
+    .Ft[1].PhaseParaB = 0,
+    .Ft[2].PhaseParaA = 0,
+    .Ft[2].PhaseParaB = 0,
+    .Ft[3].PhaseParaA = 0,
+    .Ft[3].PhaseParaB = 0,
+
+    //only for EIS 1e10
+    .HSDAC_coeff_a = 1,
+    .HSDAC_coeff_b = 1,
+    .HSDAC_coeff_c = 0,
+
+    .LPDAC_coeff_a = 1,
+    .LPDAC_coeff_b = 1,
+    .LPDAC_coeff_c = 0,
+
+    .HSDAC_coeff = 1,
+    .HSDAC_offset = 0,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EF_CF)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_EF_CF",
+    .CutoffFreq = 271000,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 8005810, // 1e8
+    .Lv[0].HSRTIA_c = -171109, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 357, // 1e8
+    .Lv[1].HSRTIA_b = 57813915, // 1e8
+    .Lv[1].HSRTIA_c = 1543941, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 15417, //1e8
+    .Lv[2].HSRTIA_b = -62720427, // 1e8
+    .Lv[2].HSRTIA_c = 225612029, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 20450,
+    .Lv[3].HSRTIA_b = 1611, // 1e6
+    .Lv[3].HSRTIA_c = 4069, // 1e5
+    .Lv[3].HSRTIA_d = 7499, // 1e6
+
+    .Ft[0].PhaseParaA = 141808, //1e10
+    .Ft[0].PhaseParaB = -88304901, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 338333,
+    .Ft[1].PhaseParaB = -89912194, // 100 Hz
+    .Ft[2].PhaseParaA = 20541858,
+    .Ft[2].PhaseParaB = -90000573, // 10 Hz
+    .Ft[3].PhaseParaA = 100923290,
+    .Ft[3].PhaseParaB = -90023337, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_ED_BF)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_ED_BF",
+    .CutoffFreq = 262000,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 8053030, // 1e8
+    .Lv[0].HSRTIA_c = -217364, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 350, // 1e8
+    .Lv[1].HSRTIA_b = 58929847, // 1e8
+    .Lv[1].HSRTIA_c = 1111691, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14842, //1e8
+    .Lv[2].HSRTIA_b = -38831335, // 1e8
+    .Lv[2].HSRTIA_c = 207680613, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 20160,
+    .Lv[3].HSRTIA_b = 1609, // 1e6
+    .Lv[3].HSRTIA_c = 1085, // 1e5
+    .Lv[3].HSRTIA_d = 7883, // 1e6
+
+    .Ft[0].PhaseParaA = 144194, //1e10
+    .Ft[0].PhaseParaB = -88614855, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342333,
+    .Ft[1].PhaseParaB = -89906917, // 100 Hz
+    .Ft[2].PhaseParaA = 20561112,
+    .Ft[2].PhaseParaB = -90006375, // 10 Hz
+    .Ft[3].PhaseParaA = 100878445,
+    .Ft[3].PhaseParaB = -90013670, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_F0_59)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_F0_59",
+    .CutoffFreq = 265000,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 7982677, // 1e8
+    .Lv[0].HSRTIA_c = -220834, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 386, // 1e8
+    .Lv[1].HSRTIA_b = 56887373, // 1e8
+    .Lv[1].HSRTIA_c = 2369927, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14859, //1e8
+    .Lv[2].HSRTIA_b = -43698725, // 1e8
+    .Lv[2].HSRTIA_c = 210542432, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 19600,
+    .Lv[3].HSRTIA_b = 1637, // 1e6
+    .Lv[3].HSRTIA_c = 659, // 1e5
+    .Lv[3].HSRTIA_d = 8167, // 1e6
+
+    .Ft[0].PhaseParaA = 146177, //1e10
+    .Ft[0].PhaseParaB = -88604805, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342195,
+    .Ft[1].PhaseParaB = -89912214, // 100 Hz
+    .Ft[2].PhaseParaA = 20559398,
+    .Ft[2].PhaseParaB = -90006634, // 10 Hz
+    .Ft[3].PhaseParaA = 100415851,
+    .Ft[3].PhaseParaB = -89982615, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_ED_91)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_ED_91",
+    .CutoffFreq = 265550,
+
+    // hsrtia160k
+    .Lv[0].HSRTIA_a = 0, // 1e8
+    .Lv[0].HSRTIA_b = 7983901, // 1e8
+    .Lv[0].HSRTIA_c = -217990, // 1e4
+    .Lv[0].HSRTIA_d = 0,
+
+    // hsrtia20k
+    .Lv[1].HSRTIA_a = 338, // 1e8
+    .Lv[1].HSRTIA_b = 58576686, // 1e8
+    .Lv[1].HSRTIA_c = 1238326, // 1e4
+    .Lv[1].HSRTIA_d = 0,
+
+    // hsrtia5k
+    .Lv[2].HSRTIA_a = 14554, //1e8
+    .Lv[2].HSRTIA_b = -36919197, // 1e8
+    .Lv[2].HSRTIA_c = 205602111, // 1e4
+    .Lv[2].HSRTIA_d = 0,
+
+    // hsrtia200r a*exp(bx) + c*exp(dx)
+    .Lv[3].HSRTIA_a = 19890,
+    .Lv[3].HSRTIA_b = 1620, // 1e6
+    .Lv[3].HSRTIA_c = 893, // 1e5
+    .Lv[3].HSRTIA_d = 7970, // 1e6
+
+    .Ft[0].PhaseParaA = 146478, //1e10
+    .Ft[0].PhaseParaB = -88583908, // 10000 Hz //1e6
+    .Ft[1].PhaseParaA = 342341,
+    .Ft[1].PhaseParaB = -89891632, // 100 Hz
+    .Ft[2].PhaseParaA = 20576527,
+    .Ft[2].PhaseParaB = -90009194, // 10 Hz
+    .Ft[3].PhaseParaA = 100884331,
+    .Ft[3].PhaseParaB = -90024204, // 0.01 Hz
+
+    //only for EIS 1e10
+    .HSAMP_coeff = 9703610267,
+    .HSAMP_offset = -12815281473,
+
+    .LPDAC_coeff = 10000464997,
+    .LPDAC_offset = -75871559054,
+
+    .HSDAC_coeff = 25196655311242,
+    .HSDAC_offset = 19932276246516,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_D2)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_E7_D2",
+    .CutoffFreq = 275000,
+
+    .Ft[0].PhaseParaA = 155530, //1e10
+    .Ft[0].PhaseParaB = -87720229, // 1e6
+    .Ft[1].PhaseParaA = 341776,
+    .Ft[1].PhaseParaB = -89919625,
+    .Ft[2].PhaseParaA = 20542303,
+    .Ft[2].PhaseParaB = -89997668,
+    .Ft[3].PhaseParaA = 100310791,
+    .Ft[3].PhaseParaB = -89988818,
+
+
+    //only for EIS 1e8
+    .HSAMP_coeff = 9745467306673,
+    .HSAMP_offset = -11243183077,
+
+    .LPDAC_coeff = 1001472547,
+    .LPDAC_offset = -395332002445,
+
+    .HSDAC_coeff = 2532582201433,
+    .HSDAC_offset = 19873740865949,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E8_A3)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_E8_A3",
+    .CutoffFreq = 270000,
+    .OffsetZero = 0x6559,
+
+    // hsrtia160k
+    .Lv[0][0].HSRTIA_a = -1, // 1e8
+    .Lv[0][0].HSRTIA_b = 5635619, // 1e8
+    .Lv[0][0].HSRTIA_c = 65097, // 1e4
+    .Lv[0][0].HSRTIA_d = 0, // 1e4
+    .Lv[1][0].HSRTIA_a = 0, // 1e8
+    .Lv[1][0].HSRTIA_b = 0, // 1e8
+    .Lv[1][0].HSRTIA_c = 0, // 1e4
+    .Lv[2][0].HSRTIA_a = 0, // 1e8
+    .Lv[2][0].HSRTIA_b = 0, // 1e8
+    .Lv[2][0].HSRTIA_c = 0, // 1e4
+    .Lv[3][0].HSRTIA_a = 0, // 1e8
+    .Lv[3][0].HSRTIA_b = 0, // 1e8
+    .Lv[3][0].HSRTIA_c = 0, // 1e4
+
+    // hsrtia20k
+    .Lv[0][1].HSRTIA_a = -2, // 1e8
+    .Lv[0][1].HSRTIA_b = 44612386, // 1e8
+    .Lv[0][1].HSRTIA_c = 567047, // 1e4
+    .Lv[0][1].HSRTIA_d = 0, // 1e4
+    .Lv[1][1].HSRTIA_a = 0, // 1e8
+    .Lv[1][1].HSRTIA_b = 0, // 1e8
+    .Lv[1][1].HSRTIA_c = 0, // 1e4
+    .Lv[2][1].HSRTIA_a = 0, // 1e8
+    .Lv[2][1].HSRTIA_b = 0, // 1e8
+    .Lv[2][1].HSRTIA_c = 0, // 1e4
+    .Lv[3][1].HSRTIA_a = 0, // 1e8
+    .Lv[3][1].HSRTIA_b = 0, // 1e8
+    .Lv[3][1].HSRTIA_c = 0, // 1e4
+
+    // hsrtia5k
+    .Lv[0][2].HSRTIA_a = 2, // 1e8
+    .Lv[0][2].HSRTIA_b = 178931430, // 1e8
+    .Lv[0][2].HSRTIA_c = 424244, // 1e4
+    .Lv[0][2].HSRTIA_d = 0, // 1e4
+    .Lv[1][2].HSRTIA_a = 0, // 1e8
+    .Lv[1][2].HSRTIA_b = 0, // 1e8
+    .Lv[1][2].HSRTIA_c = 0, // 1e4
+    .Lv[2][2].HSRTIA_a = 0, // 1e8
+    .Lv[2][2].HSRTIA_b = 0, // 1e8
+    .Lv[2][2].HSRTIA_c = 0, // 1e4
+    .Lv[3][2].HSRTIA_a = 0, // 1e8
+    .Lv[3][2].HSRTIA_b = 0, // 1e8
+    .Lv[3][2].HSRTIA_c = 0, // 1e4
+
+    // hsrtia200r
+    .Lv[0][3].HSRTIA_a = -3029, // 1e8
+    .Lv[0][3].HSRTIA_b = 4475407734, // 1e8
+    .Lv[0][3].HSRTIA_c = -3774339, // 1e4
+    .Lv[0][3].HSRTIA_d = 0, // 1e4
+    .Lv[1][3].HSRTIA_a = 0, // 1e8
+    .Lv[1][3].HSRTIA_b = 0, // 1e8
+    .Lv[1][3].HSRTIA_c = 0, // 1e4
+    .Lv[2][3].HSRTIA_a = 0, // 1e8
+    .Lv[2][3].HSRTIA_b = 0, // 1e8
+    .Lv[2][3].HSRTIA_c = 0, // 1e4
+    .Lv[3][3].HSRTIA_a = 0, // 1e8
+    .Lv[3][3].HSRTIA_b = 0, // 1e8
+    .Lv[3][3].HSRTIA_c = 0, // 1e4
+
+    .Ft[0][0].PhaseParaA = 147787,
+    .Ft[0][0].PhaseParaB = -89729823,
+    .Ft[0][1].PhaseParaA = 0,
+    .Ft[0][1].PhaseParaB = 0,
+    .Ft[0][2].PhaseParaA = 0,
+    .Ft[0][2].PhaseParaB = 0,
+    .Ft[0][3].PhaseParaA = 0,
+    .Ft[0][3].PhaseParaB = 0,
+
+    .Ft[1][0].PhaseParaA = 340850,
+    .Ft[1][0].PhaseParaB = -89915402,
+    .Ft[1][1].PhaseParaA = 0,
+    .Ft[1][1].PhaseParaB = 0,
+    .Ft[1][2].PhaseParaA = 0,
+    .Ft[1][2].PhaseParaB = 0,
+    .Ft[1][3].PhaseParaA = 0,
+    .Ft[1][3].PhaseParaB = 0,
+
+    .Ft[2][0].PhaseParaA = 20550223,
+    .Ft[2][0].PhaseParaB = -89988097,
+    .Ft[2][1].PhaseParaA = 0,
+    .Ft[2][1].PhaseParaB = 0,
+    .Ft[2][2].PhaseParaA = 0,
+    .Ft[2][2].PhaseParaB = 0,
+    .Ft[2][3].PhaseParaA = 0,
+    .Ft[2][3].PhaseParaB = 0,
+
+    .Ft[3][0].PhaseParaA = 95942830,
+    .Ft[3][0].PhaseParaB = -89747739,
+    .Ft[3][1].PhaseParaA = 0,
+    .Ft[3][1].PhaseParaB = 0,
+    .Ft[3][2].PhaseParaA = 0,
+    .Ft[3][2].PhaseParaB = 0,
+    .Ft[3][3].PhaseParaA = 0,
+    .Ft[3][3].PhaseParaB = 0,
+
+    //only for EIS 1e10
+    .HSDAC_coeff_a = 7,
+    .HSDAC_coeff_b = 9683968,
+    .HSDAC_coeff_c = 29545179,
+
+    .LPDAC_coeff_a = 9,
+    .LPDAC_coeff_b = 8411421,
+    .LPDAC_coeff_c = 132057078391,
+
+//    .HSDAC_coeff = 1,
+//    .HSDAC_offset = 0,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_A3)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_E7_A3",
+    .CutoffFreq = 270000,
+    .OffsetZero = 0x6510,
+
+    // hsrtia160k
+    .Lv[0][0].HSRTIA_a = 0, // 1e8
+    .Lv[0][0].HSRTIA_b = 5666516, // 1e8
+    .Lv[0][0].HSRTIA_c = -6155, // 1e4
+    .Lv[0][0].HSRTIA_d = 0, // 1e4
+    .Lv[1][0].HSRTIA_a = 0, // 1e8
+    .Lv[1][0].HSRTIA_b = 0, // 1e8
+    .Lv[1][0].HSRTIA_c = 0, // 1e4
+    .Lv[2][0].HSRTIA_a = 0, // 1e8
+    .Lv[2][0].HSRTIA_b = 0, // 1e8
+    .Lv[2][0].HSRTIA_c = 0, // 1e4
+    .Lv[3][0].HSRTIA_a = 0, // 1e8
+    .Lv[3][0].HSRTIA_b = 0, // 1e8
+    .Lv[3][0].HSRTIA_c = 0, // 1e4
+
+    // hsrtia20k
+    .Lv[0][1].HSRTIA_a = 2, // 1e8
+    .Lv[0][1].HSRTIA_b = 44485944, // 1e8
+    .Lv[0][1].HSRTIA_c = 41653, // 1e4
+    .Lv[0][1].HSRTIA_d = 0, // 1e4
+    .Lv[1][1].HSRTIA_a = 0, // 1e8
+    .Lv[1][1].HSRTIA_b = 0, // 1e8
+    .Lv[1][1].HSRTIA_c = 0, // 1e4
+    .Lv[2][1].HSRTIA_a = 0, // 1e8
+    .Lv[2][1].HSRTIA_b = 0, // 1e8
+    .Lv[2][1].HSRTIA_c = 0, // 1e4
+    .Lv[3][1].HSRTIA_a = 0, // 1e8
+    .Lv[3][1].HSRTIA_b = 0, // 1e8
+    .Lv[3][1].HSRTIA_c = 0, // 1e4
+
+    // hsrtia5k
+    .Lv[0][2].HSRTIA_a = 3, // 1e8
+    .Lv[0][2].HSRTIA_b = 178978153, // 1e8
+    .Lv[0][2].HSRTIA_c = 333146, // 1e4
+    .Lv[0][2].HSRTIA_d = 0, // 1e4
+    .Lv[1][2].HSRTIA_a = 0, // 1e8
+    .Lv[1][2].HSRTIA_b = 0, // 1e8
+    .Lv[1][2].HSRTIA_c = 0, // 1e4
+    .Lv[2][2].HSRTIA_a = 0, // 1e8
+    .Lv[2][2].HSRTIA_b = 0, // 1e8
+    .Lv[2][2].HSRTIA_c = 0, // 1e4
+    .Lv[3][2].HSRTIA_a = 0, // 1e8
+    .Lv[3][2].HSRTIA_b = 0, // 1e8
+    .Lv[3][2].HSRTIA_c = 0, // 1e4
+
+    // hsrtia200r
+    .Lv[0][3].HSRTIA_a = -311, // 1e8
+    .Lv[0][3].HSRTIA_b = 4450116956, // 1e8
+    .Lv[0][3].HSRTIA_c = -2772179, // 1e4
+    .Lv[0][3].HSRTIA_d = 0, // 1e4
+    .Lv[1][3].HSRTIA_a = 0, // 1e8
+    .Lv[1][3].HSRTIA_b = 0, // 1e8
+    .Lv[1][3].HSRTIA_c = 0, // 1e4
+    .Lv[2][3].HSRTIA_a = 0, // 1e8
+    .Lv[2][3].HSRTIA_b = 0, // 1e8
+    .Lv[2][3].HSRTIA_c = 0, // 1e4
+    .Lv[3][3].HSRTIA_a = 0, // 1e8
+    .Lv[3][3].HSRTIA_b = 0, // 1e8
+    .Lv[3][3].HSRTIA_c = 0, // 1e4
+
+    .Ft[0][0].PhaseParaA = 148864,
+    .Ft[0][0].PhaseParaB = -89720344,
+    .Ft[0][1].PhaseParaA = 0,
+    .Ft[0][1].PhaseParaB = 0,
+    .Ft[0][2].PhaseParaA = 0,
+    .Ft[0][2].PhaseParaB = 0,
+    .Ft[0][3].PhaseParaA = 0,
+    .Ft[0][3].PhaseParaB = 0,
+
+    .Ft[1][0].PhaseParaA = 342243,
+    .Ft[1][0].PhaseParaB = -89930692,
+    .Ft[1][1].PhaseParaA = 0,
+    .Ft[1][1].PhaseParaB = 0,
+    .Ft[1][2].PhaseParaA = 0,
+    .Ft[1][2].PhaseParaB = 0,
+    .Ft[1][3].PhaseParaA = 0,
+    .Ft[1][3].PhaseParaB = 0,
+
+    .Ft[2][0].PhaseParaA = 20589354,
+    .Ft[2][0].PhaseParaB = -89985257,
+    .Ft[2][1].PhaseParaA = 0,
+    .Ft[2][1].PhaseParaB = 0,
+    .Ft[2][2].PhaseParaA = 0,
+    .Ft[2][2].PhaseParaB = 0,
+    .Ft[2][3].PhaseParaA = 0,
+    .Ft[2][3].PhaseParaB = 0,
+
+    .Ft[3][0].PhaseParaA = 99082245,
+    .Ft[3][0].PhaseParaB = -89922600,
+    .Ft[3][1].PhaseParaA = 0,
+    .Ft[3][1].PhaseParaB = 0,
+    .Ft[3][2].PhaseParaA = 0,
+    .Ft[3][2].PhaseParaB = 0,
+    .Ft[3][3].PhaseParaA = 0,
+    .Ft[3][3].PhaseParaB = 0,
+
+    //only for EIS 1e10
+    .HSDAC_coeff_a = 8,
+    .HSDAC_coeff_b = 9697491,
+    .HSDAC_coeff_c = 11744742,
+
+    .LPDAC_coeff_a = 9,
+    .LPDAC_coeff_b = 8395013,
+    .LPDAC_coeff_c = 131916453993,
+
+//    .HSDAC_coeff = 1,
+//    .HSDAC_offset = 0,
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_96)
+{
+    .DeviceName = "BOARD_A4_DA_32_D4_E7_96",
+    .CutoffFreq = 271200,
+    .OffsetZero = 0x6504,
+
+    // hsrtia160k
+    .Lv[0][0].HSRTIA_a = 0, // 1e8
+    .Lv[0][0].HSRTIA_b = 5665868, // 1e8
+    .Lv[0][0].HSRTIA_c = 1612, // 1e4
+    .Lv[0][0].HSRTIA_d = 0, // 1e4
+    .Lv[1][0].HSRTIA_a = 0, // 1e8
+    .Lv[1][0].HSRTIA_b = 0, // 1e8
+    .Lv[1][0].HSRTIA_c = 0, // 1e4
+    .Lv[2][0].HSRTIA_a = 0, // 1e8
+    .Lv[2][0].HSRTIA_b = 0, // 1e8
+    .Lv[2][0].HSRTIA_c = 0, // 1e4
+    .Lv[3][0].HSRTIA_a = 0, // 1e8
+    .Lv[3][0].HSRTIA_b = 0, // 1e8
+    .Lv[3][0].HSRTIA_c = 0, // 1e4
+
+    // hsrtia20k
+    .Lv[0][1].HSRTIA_a = 3, // 1e8
+    .Lv[0][1].HSRTIA_b = 44242940, // 1e8
+    .Lv[0][1].HSRTIA_c = 148206, // 1e4
+    .Lv[0][1].HSRTIA_d = 0, // 1e4
+    .Lv[1][1].HSRTIA_a = 0, // 1e8
+    .Lv[1][1].HSRTIA_b = 0, // 1e8
+    .Lv[1][1].HSRTIA_c = 0, // 1e4
+    .Lv[2][1].HSRTIA_a = 0, // 1e8
+    .Lv[2][1].HSRTIA_b = 0, // 1e8
+    .Lv[2][1].HSRTIA_c = 0, // 1e4
+    .Lv[3][1].HSRTIA_a = 0, // 1e8
+    .Lv[3][1].HSRTIA_b = 0, // 1e8
+    .Lv[3][1].HSRTIA_c = 0, // 1e4
+
+    // hsrtia5k
+    .Lv[0][2].HSRTIA_a = 2, // 1e8
+    .Lv[0][2].HSRTIA_b = 178641591, // 1e8
+    .Lv[0][2].HSRTIA_c = 386005, // 1e4
+    .Lv[0][2].HSRTIA_d = 0, // 1e4
+    .Lv[1][2].HSRTIA_a = 0, // 1e8
+    .Lv[1][2].HSRTIA_b = 0, // 1e8
+    .Lv[1][2].HSRTIA_c = 0, // 1e4
+    .Lv[2][2].HSRTIA_a = 0, // 1e8
+    .Lv[2][2].HSRTIA_b = 0, // 1e8
+    .Lv[2][2].HSRTIA_c = 0, // 1e4
+    .Lv[3][2].HSRTIA_a = 0, // 1e8
+    .Lv[3][2].HSRTIA_b = 0, // 1e8
+    .Lv[3][2].HSRTIA_c = 0, // 1e4
+
+    // hsrtia200r
+    .Lv[0][3].HSRTIA_a = 9404, // 1e8
+    .Lv[0][3].HSRTIA_b = 4309654444, // 1e8
+    .Lv[0][3].HSRTIA_c = 15315713, // 1e4
+    .Lv[0][3].HSRTIA_d = 0, // 1e4
+    .Lv[1][3].HSRTIA_a = 0, // 1e8
+    .Lv[1][3].HSRTIA_b = 0, // 1e8
+    .Lv[1][3].HSRTIA_c = 0, // 1e4
+    .Lv[2][3].HSRTIA_a = 0, // 1e8
+    .Lv[2][3].HSRTIA_b = 0, // 1e8
+    .Lv[2][3].HSRTIA_c = 0, // 1e4
+    .Lv[3][3].HSRTIA_a = 0, // 1e8
+    .Lv[3][3].HSRTIA_b = 0, // 1e8
+    .Lv[3][3].HSRTIA_c = 0, // 1e4
+
+    .Ft[0][0].PhaseParaA = 148031,
+    .Ft[0][0].PhaseParaB = -89728680,
+    .Ft[0][1].PhaseParaA = 0,
+    .Ft[0][1].PhaseParaB = 0,
+    .Ft[0][2].PhaseParaA = 0,
+    .Ft[0][2].PhaseParaB = 0,
+    .Ft[0][3].PhaseParaA = 0,
+    .Ft[0][3].PhaseParaB = 0,
+
+    .Ft[1][0].PhaseParaA = 341117,
+    .Ft[1][0].PhaseParaB = -89913235,
+    .Ft[1][1].PhaseParaA = 0,
+    .Ft[1][1].PhaseParaB = 0,
+    .Ft[1][2].PhaseParaA = 0,
+    .Ft[1][2].PhaseParaB = 0,
+    .Ft[1][3].PhaseParaA = 0,
+    .Ft[1][3].PhaseParaB = 0,
+
+    .Ft[2][0].PhaseParaA = 20622054,
+    .Ft[2][0].PhaseParaB = -90005211,
+    .Ft[2][1].PhaseParaA = 0,
+    .Ft[2][1].PhaseParaB = 0,
+    .Ft[2][2].PhaseParaA = 0,
+    .Ft[2][2].PhaseParaB = 0,
+    .Ft[2][3].PhaseParaA = 0,
+    .Ft[2][3].PhaseParaB = 0,
+
+    .Ft[3][0].PhaseParaA = 99823148,
+    .Ft[3][0].PhaseParaB = -89960369,
+    .Ft[3][1].PhaseParaA = 0,
+    .Ft[3][1].PhaseParaB = 0,
+    .Ft[3][2].PhaseParaA = 0,
+    .Ft[3][2].PhaseParaB = 0,
+    .Ft[3][3].PhaseParaA = 0,
+    .Ft[3][3].PhaseParaB = 0,
+
+    //only for EIS 1e10
+    .HSDAC_coeff_a = 8,
+    .HSDAC_coeff_b = 9710866,
+    .HSDAC_coeff_c = 10667080,
+
+    .LPDAC_coeff_a = 9,
+    .LPDAC_coeff_b = 8394985,
+    .LPDAC_coeff_c = 131178634002,
+
+//    .HSDAC_coeff = 1,
+//    .HSDAC_offset = 0,
+};
+
+#endif
+
+/* Ft[4][4]; Lv[4][4]   */
+/* [Phase][HSTIA]       */
+
+static int32_t Cali_LPDAC (int32_t value) {
+/* res = a*x + b */
+    int32_t res;
+    if (value == 15000) {       // if DC offset = 0V; force DC bias to OffsetZero
+        res = (int32_t)(CaliTable.OffsetZero);
+    } else {
+        res = (int32_t)(((int64_t)CaliTable.LPDAC_coeff_a * value * value +
+                         (int64_t)CaliTable.LPDAC_coeff_b * value +
+                         (int64_t)CaliTable.LPDAC_coeff_c) / 1e7);
+    }
+    return res;
+}
+
+static uint32_t Cali_HSAMP (uint16_t value) {
+/* res = (coeff * value + offset) / (1 + (w/w0)^2) */
+    uint32_t res;
+    res = (uint32_t)(((int64_t)CaliTable.HSDAC_coeff_a * value * value +
+                      (int64_t)CaliTable.HSDAC_coeff_b * value +
+                      (int64_t)CaliTable.HSDAC_coeff_c) / 1e7);
+
+    return res;
+}
+
+static int64_t Cali_HSTIA (uint64_t value, uint8_t gain_level) {
+/* res = a*x^2 + b*x + c */
+    uint64_t res;
+    res = (((int64_t)CaliTable.Lv[0][gain_level].HSRTIA_a * value * value +
+            (int64_t)CaliTable.Lv[0][gain_level].HSRTIA_b * value +
+            (int64_t)CaliTable.Lv[0][gain_level].HSRTIA_c * 1e4) / 1e8);
+
+    return res;
+}
+
+#endif
@@ -30,12 +30,6 @@

 #define SPI_BUFFER_SIZE 16

-/**
-* the pointer to point which channel is used currently.
-* -1 for not beginning.
-*/
-static int8    channel_pointer            = -1;
-
 static uint8_t spi_txbuf[SPI_BUFFER_SIZE] = {0};
 static uint8_t spi_rxbuf[SPI_BUFFER_SIZE] = {0};

@@ -46,23 +46,11 @@ 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, 0);       // HIGH Z MODE // 1: close; 0: open;
+    PIN_setOutputValue(pin_handle, AD_CS, 1);            // AD_CS HIGH

    InitEliteInstruction();

-    // init DAC, set output ~= 0 V
-    instru.VoutGainLv = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-
-    /* when elite open, must change vin level,
-    measure battery value will be right */
-    VinADCGainCtrl(VIN_GAIN_AUTO);
+    // DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));

    elite_gptimer_open();
    elite_gptimer_start();
@@ -73,417 +61,28 @@ static void ZM_init() {

 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}

+
+static void DACCode2Real2Notify(uint16_t DACcode) {
+    int32_t RealV;
+    RealV = DAC_to_realV(instru.VoutGainLevel, DACcode);
+
+    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
+    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
+    NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
+    NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
+}
+
 #define IsPeriodicMode() (                       \
-(instru.eliteFxn == CURVE_IV)                 || \
-(instru.eliteFxn == CURVE_IV_CY)              || \
-(instru.eliteFxn == CURVE_IT)                 || \
-(instru.eliteFxn == CURVE_VT)                 || \
-(instru.eliteFxn == CURVE_RT)                 || \
-(instru.eliteFxn == CURVE_CC)                 || \
-(instru.eliteFxn == CURVE_CV)                 || \
-(instru.eliteFxn == CURVE_LSV)                || \
-(instru.eliteFxn == CURVE_CA)                 || \
-(instru.eliteFxn == CURVE_VO)                 || \
-(instru.eliteFxn == CURVE_OCP)                || \
+(instru.eliteFxn == CURVE_EIS)                || \
+(instru.eliteFxn == CURVE_EIS_CV)             || \
 (instru.eliteFxn == CURVE_CALI_ADC)              \
 )

 #define Ve1MatchVe2Mode() (                      \
-(instru.eliteFxn == CURVE_IV)                 || \
-(instru.eliteFxn == CURVE_IV_CY)              || \
-(instru.eliteFxn == CURVE_CV)                 || \
-(instru.eliteFxn == CURVE_LSV)                   \
+(instru.eliteFxn == CURVE_EIS)                || \
+(instru.eliteFxn == CURVE_EIS_CV)                \
 )

-static void pulse_mode(void)
-{
-     // Default working flow is vscan -> ADC read -> send notify
-     // We will need a flag to control vscan, ADC and notify
-
-     if(mode_init){
-        GPT.SampleRateCounter = instru.sampleRate - 10;
-        GPT.VscanRateCounter  = instru.VsetRate - 1;
-         mode_init       = false;
-         batteryADC_flag = false;
-         volt_rec_en     = true;
-         curr_rec_en     = true;
-         firstTimeReset  = true;
-         notifyFirst_flag = true;
-         //pulsemode variable
-         stiFirstTime  = true;
-         VinADCGainCtrl(instru.VinADCGainLv);
-         IinADCGainCtrl(instru.IinADCGainLv);
-         VoutGainControl(instru.VoutGainLv);
-         if (Ve1MatchVe2Mode()) {
-             if (instru.Ve1 == instru.Ve2) {
-                 DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
-                 PeriodicEvent = false;
-                 PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                 ModeLED(NO_EVENT);
-             }
-         } else if (instru.eliteFxn == CURVE_PULSE) {
-             if(!megaStiEnable){
-                  PeriodicEvent = false;
-                  PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                  ModeLED(NO_EVENT);
-             }
-         }
-     }
-
-
-     GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-     if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
-         vscanReset = true;
-     }else{
-         if(notifyFirst_flag){
-             GPT.NotifyCounter = instru.notifyRate - 20;
-             notifyFirst_flag = false;
-         }
-         vscanReset = false;
-         leadTimeReset = false;
-     }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    //pulse mode counter
-    GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
-    if (vscanReset) {
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        //vscanReset = false;
-    }else{
-        if (megaStiEnable) {
-            pulse_vscan();
-        }
-    }
-
-     //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;
-         tempCheck_flag = true;
-
-        if ((instru.eliteFxn == CURVE_IV) ||
-                (instru.eliteFxn == CURVE_IV_CY) ||
-                (instru.eliteFxn == CURVE_CC) ||
-                (instru.eliteFxn == CURVE_CV) ||
-                (instru.eliteFxn == CURVE_LSV) ||
-                (instru.eliteFxn == CURVE_CA) ||
-                (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
-                (instru.eliteFxn == CURVE_UNI_PULSE) ||
-                (instru.eliteFxn == CURVE_DPV) ||
-                (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
-            batteryCheck_flag = false;
-            tempCheck_flag = false;
-
-        }
-     }
-
-     uint16_t bat = NotifyVoltBat;
-     if( bat < 768 && bat > 20){
-         PIN15_setOutputValue(enable_5v, 0);
-     }
-
-     //ADC counter
-     GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-     if(GPT.SampleRateCounter >= instru.sampleRate){
-         GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-         EliteADCControl(0);
-     }
-
-     //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 >= instru.notifyRate){
-         GPT.NotifyCounter -= instru.notifyRate; //To get right time
-         notify_flag = true;
-         if(vscanReset){
-             notify_flag = false;
-         }
-         if(notify_flag){
-             SendNotify();
-             notify_flag = false;
-         }
-     }
-
-     mode_done();
-
-}
-
-static void peri_mode(void)
-{
-
-
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
-        vscanReset = true;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-            if (instru.eliteFxn == CURVE_OCP) {
-                PIN15_setOutputValue(HIGH_Z_MODE, 0);
-            } else {
-                PIN15_setOutputValue(HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
-            }
-            first_highz_flag = false;
-        }
-    } else {
-        if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
-            notifyFirst_flag = false;
-        }
-        vscanReset = false;
-        leadTimeReset = false;
-    }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.VsetRate) {
-        if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
-            GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
-        } else {
-            GPT.GptimerMultiple = 1;
-        }
-        GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
-        vscan_ctrl(0);
-    }
-
-    //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;
-        tempCheck_flag = true;
-        if ((instru.eliteFxn == CURVE_IV) ||
-                (instru.eliteFxn == CURVE_IV_CY) ||
-                (instru.eliteFxn == CURVE_CC) ||
-                (instru.eliteFxn == CURVE_CV) ||
-                (instru.eliteFxn == CURVE_LSV) ||
-                (instru.eliteFxn == CURVE_CA) ||
-                (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
-                (instru.eliteFxn == CURVE_UNI_PULSE) ||
-                (instru.eliteFxn == CURVE_DPV) ||
-                (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
-            batteryCheck_flag = false;
-            tempCheck_flag = false;
-
-        }
-    }
-
-    uint16_t bat = NotifyVoltBat;
-    if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-        EliteADCControl(0);
-    }
-
-    // Over temperature protection
-    uint16_t CC2650temp = NotifyTemperature;
-    if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    //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 >= instru.notifyRate){
-        GPT.NotifyCounter -= instru.notifyRate; //To get right time
-        notify_flag = true;
-        if(vscanReset){
-            notify_flag = false;
-        }
-
-        if (!volt_rec_en || !curr_rec_en) {
-            notify_flag = false;
-        }
-
-        if(notify_flag){
-            SendNotify();
-            notify_flag = false;
-        }
-    }
-
-    mode_done();
-
-}
-
-static void uni_pulse_mode(void)
-{
-    // Default working flow is vscan -> ADC read -> send notify
-    // We will need a flag to control vscan, ADC and notify
-
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
-        vscanReset = true;
-        GPT.VscanRateCounter = 0xFFFFFFFF;
-        dpv_step_cnt = 0;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-            PIN15_setOutputValue(HIGH_Z_MODE, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
-            first_highz_flag = false;
-        }
-    } else {
-        if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
-            notifyFirst_flag = false;
-        }
-        if (vscanReset) {
-            GPT.VscanRateCounter = 0xFFFFFFFF;
-            dpv_step_cnt = 0;
-        }
-        vscanReset = false;
-        leadTimeReset = false;
-    }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.period) {
-        GPT.VscanRateCounter -= instru.period; //To get right time
-        dpv_step_cnt +=1;
-    }
-    vscan_ctrl(GPT.VscanRateCounter);
-
-    //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;
-        tempCheck_flag = true;
-
-        if ((instru.eliteFxn == CURVE_IV) ||
-                (instru.eliteFxn == CURVE_IV_CY) ||
-                (instru.eliteFxn == CURVE_CC) ||
-                (instru.eliteFxn == CURVE_CV) ||
-                (instru.eliteFxn == CURVE_LSV) ||
-                (instru.eliteFxn == CURVE_CA) ||
-                (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
-                (instru.eliteFxn == CURVE_UNI_PULSE) ||
-                (instru.eliteFxn == CURVE_DPV) ||
-                (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
-            batteryCheck_flag = false;
-            tempCheck_flag = false;
-
-        }
-    }
-
-    //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-        EliteADCControl(GPT.VscanRateCounter);
-    }
-
-    uint16_t bat = NotifyVoltBat;
-    if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    // Over temperature protection
-    uint16_t CC2650temp = NotifyTemperature;
-    if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
-    }
-
-    if (instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
-
-    } else {
-        //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 >= instru.notifyRate){
-            GPT.NotifyCounter -= instru.notifyRate; //To get right time
-            notify_flag = true;
-            if (instru.eliteFxn == CURVE_UNI_PULSE) {
-                notify_flag = false;
-            }
-            if(vscanReset){
-                notify_flag = false;
-            }
-
-            if (!volt_rec_en || !curr_rec_en) {
-                notify_flag = false;
-            }
-
-            if(notify_flag){
-                SendNotify();
-                notify_flag = false;
-            }
-        }
-    }
-
-
-    mode_done();
-
-}
-
-static void mode_init_set(void)
-{
-    batteryADC_flag = false;
-    volt_rec_en     = true;
-    curr_rec_en     = true;
-    firstTimeReset  = true;
-    notifyFirst_flag = true;
-    first_highz_flag = true;
-    DACReset          = true;
-    vscanReset        = true;
-    leadTimeReset     = true;
-
-    if (instru.notifyRate > 1000) {
-    // slow notify rate, < 10sps, auto gain changer only use ADC gain level = 1.2.3.4
-    // gain_switch_on: [1:4]: none
-    //                 [5]: ADC gain level = 4, if value = 1, gain 4 switch on
-    //                 [6]: ADC gain level = 3, if value = 1, gain 3 switch on
-    //                 [7]: ADC gain level = 2, if value = 1, gain 2 switch on
-    //                 [8]: ADC gain level = 1, if value = 1, gain 1 switch on
-        instru.gain_switch_on = 0b11110000;
-
-    } else {
-    // fast notify rate, >= 10sps, auto gain changer only use ADC gain level = 1.2.3
-        instru.gain_switch_on = 0b01110000;
-    }
-
-    if (instru.IinADCGainLv == I_GAIN_AUTO) {
-        instru.IinADCGainLv = I_GAIN_100R;
-    }
-
-    if (instru.VinADCAutoGainEn == VIN_GAIN_AUTO) {
-        instru.VinADCGainLv = VIN_GAIN_1K;
-    }
-
-    VinADCGainCtrl(instru.VinADCGainLv);
-    IinADCGainCtrl(instru.IinADCGainLv);
-    VoutGainControl(instru.VoutGainLv);
-
-    if (Ve1MatchVe2Mode()) {
-        if (instru.Ve1 == instru.Ve2) {
-            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
-            PeriodicEvent = false;
-            PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-            ModeLED(NO_EVENT);
-        }
-    }
-
-    return;
-}
-
 /*********************************************************************
 * @fn      SimpleBLEPeripheral_performPeriodicTask
 *
@@ -493,239 +92,207 @@ static void mode_init_set(void)
 *
 * @return  None.
 */
-static void SimpleBLEPeripheral_performPeriodicTask(void)
-{
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
+static void SimpleBLEPeripheral_performPeriodicTask(void) {
    if (IsPeriodicMode()) {
-        if (mode_init) {
-            GPT.SampleRateCounter = instru.sampleRate - 10;
-            GPT.VscanRateCounter  = instru.VsetRate - 1;
-            mode_init  = false;
-            mode_init_set();
+        if(instru.eliteFxn == CURVE_EIS){
+
+            GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+            GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+            if (mode_init){
+                GPT.SampleRateCounter = 0;
+                mode_init  = false;
+                gainChange_flag = false;
+                firstFreq_flag = true;
+                fset_flag       = true;
+                fout_flag       = true;
+                firstTimeReset  = true;
+                notifyFirst_flag = true;
+                DACReset          = true;
+                vscanReset        = true;
+                leadTimeReset     = true;
+
+                if (instru.f1 == instru.f2) {
+                    DAC_outputF(instru.f1);
+                    PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
+                }
+
+                SetEISHIGHZ(1);
+            }
+
+            //vscan counter  //fset counter
+            if (fset_flag) {
+                vscan_ctrl(); //set
+                fset_flag = false;
+                fout_flag = true;
+            }
+
+            //ADC counter
+            GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+            if(GPT.SampleRateCounter >= instru.sampleRate){
+                GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+                ADC_flag = true;
+                if(ADC_flag){
+                    EliteADCControl(); //read data
+                    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
+            if(vscanReset){
+                notify_flag = false;
+            }
+            if(notify_flag){
+                SendNotify(); //send
+                notify_flag = false;
+                fset_flag = true;
+                time0 = (Timestamp_get32()) / 31;
+                time1 = 0;
+                delta_time = 0;
+            }
+
+            mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
+        } else {
+            /** Periodic Event **/
+            // Default working flow is vscan -> ADC read -> send notify
+            // We will need a flag to control vscan, ADC and notify
+
+            static bool first_highz_flag = false;
+
+            GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+            GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+            if (mode_init) {
+                GPT.SampleRateCounter = instru.sampleRate - 10;
+                GPT.VscanRateCounter  = instru.VsetRate - 1;
+                mode_init  = false;
+                batteryADC_flag = false;
+                record_flag     = true;
+                fset_flag       = true;
+                firstTimeReset  = true;
+                notifyFirst_flag = true;
+                first_highz_flag = true;
+                I_GAIN_100R_counter = 0;
+                I_GAIN_3K_counter   = 0;
+                I_GAIN_100K_counter = 0;
+                I_GAIN_3M_counter   = 0;
+                VIN_GAIN_1M_counter = 0;
+                VIN_GAIN_30K_counter = 0;
+                VIN_GAIN_1K_counter = 0;
+                VOUT_GAIN_240K_counter = 0;
+                VOUT_GAIN_15K_counter = 0;
+                DACReset          = true;
+                vscanReset        = true;
+                leadTimeReset     = true;
+
+                /*
+                VinADCGainCtrl(instru.VinADCGainLv);
+                IinADCGainControl(instru.ADCGainLv);
+                VoutGainControl(instru.VoutGainLevel);
+                */
+
+                if (Ve1MatchVe2Mode()) {
+                    if (instru.Ve1 == instru.Ve2) {
+                        DAC_outputV(instru.Ve1);
+                        PeriodicEvent = false;
+                        SetEISHIGHZ(1);
+                        // PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 0); // 0: open highz;
+                        ModeLED(NO_EVENT);
+                    }
+                }
+            }
+
+            GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
+            if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
+                vscanReset = true;
+                if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
+                        SetEISHIGHZ(1); // // High Z | 1 off | 0 on
+    //                    PIN_setOutputValue(pin_handle, HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
+                    first_highz_flag = false;
+                }
+            } else {
+                if (notifyFirst_flag) {
+                    GPT.NotifyCounter = instru.notifyRate - 20;
+                    notifyFirst_flag = false;
+                }
+                vscanReset = false;
+                leadTimeReset = false;
+            }
+
+            //vscan counter  //fset counter
+            GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+            if (GPT.VscanRateCounter >= instru.VsetRate) {
+                if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
+                    GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
+                } else {
+                    GPT.GptimerMultiple = 1;
+                }
+                GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
+                vscan_flag = true;
+                if (vscan_flag) {
+                    vscan_ctrl(); //set
+                    vscan_flag = false;
+                }
+            }
+
+            //ADC counter
+            GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+            if(GPT.SampleRateCounter >= instru.sampleRate){
+                GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+                ADC_flag = true;
+                if(ADC_flag){
+                    EliteADCControl(); //read data
+                    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 >= instru.notifyRate){
+                GPT.NotifyCounter -= instru.notifyRate; //To get right time
+                notify_flag = true;
+                if(vscanReset){
+                    notify_flag = false;
+                }
+                if(notify_flag){
+                    SendNotify(); //send
+                    notify_flag = false;
+                }
+            }
+
+            mode_done(); //finishMode = 1, SendNotify(), Eliteinterrupt()
+
        }
-
-        peri_mode();
-
-        return;
    }
-
-    if (instru.eliteFxn == CURVE_UNI_PULSE) {
-        if (mode_init) {
-            mode_init = false;
-            mode_init_set();
-            calc_avg_en = false;
-        }
-
-        uni_pulse_mode();
-
-        return;
-    }
-
-    if (instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
-        if (mode_init) {
-            mode_init = false;
-            mode_init_set();
-            calc_avg_en = false;
-        }
-
-        uni_pulse_mode();
-
-        return;
-    }
-
-    if (instru.eliteFxn == CURVE_DPV_SMPRATE || instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) {
-        if (mode_init) {
-            mode_init = false;
-            mode_init_set();
-        }
-
-        uni_pulse_mode();
-
-        return;
-    }
-
-
-    return;
 }

-
-
-/*
- * EliteADCControl(): use ADC plot, and send what data to controller
- * +-----------------+-----------+-----------+-----------+
- * |      MODE       |    ch1    |    ch2    |    ch3    |
- * +-----------------+-----------+-----------+-----------+
- * | CURVE_IV        |    Iin    |    Vout   |    Vin    |
- * | CURVE_IV_CY     |    Iin    |    Vout   |    Vin    |
- * | CURVE_VO        |    Iin    |    Vout   |    Vin    |
- * | CURVE_RT        |    Iin    |    Vout   |     R     |
- * | CURVE_VT        |    Iin    |    Vin    |           |
- * | CURVE_IT        |    Iin    |    Vin    |    Vout   |
- * | CURVE_CC        |    Iin    |    Vin    |    Vout   |
- * | CURVE_CV        |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_LSV       |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_CA        |    Iin    | Vout-Vin  |    Vout   |
- * | CURVE_OCP       |    Iin    | Vmon-Vin  |    Vin    |
- * | CURVE_UNI_PULSE |  pul1_Iin | pul2_Iin  |           |
- * +-----------------+-----------+-----------+-----------+
- */
-
-static void EliteADCControl(uint32_t time)
+static void EliteADCControl(void) //CURVE_IV => CC_Plot() | CURVE_CV => Iin_Vin_Vout_Plot
 {
    void *wm = wm_get();
-    uint32_t t = time;

    switch (instru.eliteFxn) {
-        case CURVE_IV:
-        case CURVE_IV_CY:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
+        case CURVE_EIS:
+            EIS_Plot();
            break;

-        case CURVE_RT:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_CC:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_CV:
-        case CURVE_CA:
-        case CURVE_LSV:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_PULSE:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
-            }
-            break;
-
-        case CURVE_IT:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if(volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_VT:
-            Iin_Vin_Plot();
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_VO:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200);
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
-            break;
-
-        case CURVE_OCP:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm) - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
-            }
+        case CURVE_EIS_CV:
+            CV_Plot();
            break;

        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == RIS_ADC_IIN) {
+            if (instru.AdcChannel == IIN_ADC) {
                cali_IT_plot();
-            } else if (instru.AdcChannel == RIS_ADC_VIN) {
+            } else if (instru.AdcChannel == VIN_ADC) {
+                cali_VT_plot();
+            } else if (instru.AdcChannel == VOUT_DAC) {
+                cali_VT_plot();
+            } else if (instru.AdcChannel == EIS_HSTIA) {
+                cali_IT_plot();
+            } else if (instru.AdcChannel == EIS_LPTIA) {
                cali_VT_plot();
-            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
-                cali_Vout_plot();
-            }
-            break;
-
-        case CURVE_UNI_PULSE:
-            IT_Plot(t);
-            break;
-
-        case CURVE_DPV:
-            Iin_Vin_Vout_Plot(t);
-            break;
-
-        case CURVE_DPV_SMPRATE:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
-            }
-            break;
-
-        case CURVE_DPV_ADVANCE:
-            Iin_Vin_Vout_Plot(t);
-            break;
-
-        case CURVE_DPV_ADVANCE_SMPRATE:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
            }
            break;

@@ -734,76 +301,32 @@ static void EliteADCControl(uint32_t time)
    }
 }

-static void mode_done(void)
+static void mode_done(void) //finishMode = 1, SendNotify(), Eliteinterrupt()
 {
-    if ((instru.eliteFxn == CURVE_IV)  ||
-        (instru.eliteFxn == CURVE_CV)  ||
-        (instru.eliteFxn == CURVE_LSV) ||
-        (instru.eliteFxn == CURVE_IV_CY) ||
-        (instru.eliteFxn == CURVE_DPV) ||
-        (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
-        (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE)) {
+    if (instru.eliteFxn == CURVE_EIS_CV)       {
        if (!PeriodicEvent) {
-            finishMode = true;
+            finishMode = 1;
            SendNotify();
            Eliteinterrupt();
        }
+    } else if (instru.eliteFxn == CURVE_EIS){
+        if (!PeriodicEvent) {
+            Eliteinterrupt();
+        }
    }
 }

-static void vscan_ctrl(uint32_t time)
+static void vscan_ctrl(void)
 {
-    uint32_t t = time;
-
    switch (instru.eliteFxn) {
-        case CURVE_IV:
-            iv_vscan();
+        case CURVE_EIS:
+            eis_fscan();
            break;

-        case CURVE_IV_CY:
-            iv_cy_vscan();
-            break;
-
-        case CURVE_VO:
-            vo_vscan();
-            break;
-
-        case CURVE_RT:
-            rt_vscan();
-            break;
-
-        case CURVE_IT:
-            it_vscan();
-            break;
-
-        case CURVE_CV:
+        case CURVE_EIS_CV:
            cv_vscan();
            break;

-        case CURVE_LSV:
-            lsv_vscan();
-            break;
-
-        case CURVE_CA:
-            ca_vscan();
-            break;
-
-        case CURVE_UNI_PULSE:
-            uni_pulse_vscan(t);
-            break;
-
-        case CURVE_DPV:
-        case CURVE_DPV_SMPRATE:
-            dpv_vscan(t);
-            break;
-
-        case CURVE_DPV_ADVANCE:
-        case CURVE_DPV_ADVANCE_SMPRATE:
-            dpv_advance_vscan(t);
-            break;
-
-
        default:{
            break;
        }
@@ -7,162 +7,6 @@ extern "C" {

 #define Vset instru.Vset

-static void iv_vscan(void)
-{
-    struct wm_iv_ctx_t *iv = (struct wm_iv_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        if (instru.directionInit == 1) {
-            iv->_direction_up         = true;
-            iv->_current_direction_up = true;
-        } else if (instru.directionInit == 0) {
-            iv->_direction_up         = false;
-            iv->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if (instru.step <= 10) {
-            iv->_Vstep = instru.step * instru.VsetRate / 5;
-        } else {
-            iv->_Vstep = instru.step / 5 * instru.VsetRate;
-        }
-
-        Vset = iv->_Vinit;
-    }
-
-    if (!vscanReset) {
-        if (iv->_current_direction_up) {
-            if (Vset >= iv->_Vmax) {
-                PeriodicEvent = false;
-            }
-        } else {
-            if (Vset <= iv->_Vmin) {
-                PeriodicEvent = false;
-            }
-        }
-
-        if (iv->_current_direction_up) {
-            Vset = Vset + iv->_Vstep * GPT.GptimerMultiple;
-        } else {
-            Vset = Vset - iv->_Vstep * GPT.GptimerMultiple;
-        }
-    }
-
-    return;
-}
-
-static void iv_cy_vscan(void)
-{
-    struct wm_iv_cy_ctx_t *iv_cy = (struct wm_iv_cy_ctx_t *)wm_get();
-    static bool VminCounter;
-    static bool VmaxCounter;
-
-    NotifyCycleNumber = (instru.cycleNumber - iv_cy->_cycleNumber + 1);
-
-    if(vscanReset){
-        VmaxCounter = false;
-        VminCounter = false;
-
-        if(instru.directionInit == 1){
-            iv_cy->_direction_up         = true;
-            iv_cy->_current_direction_up = true;
-        }else if(instru.directionInit == 0){
-            iv_cy->_direction_up         = false;
-            iv_cy->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if(instru.step <= 10){
-            iv_cy->_Vstep = instru.step * instru.VsetRate / 5;
-        }else{
-            iv_cy->_Vstep = instru.step / 5 * instru.VsetRate;
-        }
-
-        if(iv_cy->_Vmin == iv_cy->_Vinit){
-            VminCounter = true;
-        }
-        if(iv_cy->_Vmax == iv_cy->_Vinit){
-            VmaxCounter = true;
-        }
-
-        Vset = iv_cy->_Vinit;
-    }
-
-    if(!vscanReset){
-        if (Vset >= iv_cy->_Vmax){
-            VmaxCounter = true;
-        }else if (Vset <= iv_cy->_Vmin){
-            VminCounter = true;
-        }
-
-        if (iv_cy->_current_direction_up){
-            Vset = Vset + iv_cy->_Vstep * GPT.GptimerMultiple;
-        }else{
-            Vset = Vset - iv_cy->_Vstep * GPT.GptimerMultiple;
-        }
-
-        if(VmaxCounter && VminCounter){
-            if(iv_cy->_direction_up && iv_cy->_current_direction_up){
-                if(Vset >= iv_cy->_Vinit){
-                    iv_cy->_cycleNumber--;
-                    VminCounter = false;
-                    VmaxCounter = false;
-                }
-            }
-            if(!iv_cy->_direction_up && !iv_cy->_current_direction_up){
-                if(Vset <= iv_cy->_Vinit){
-                    iv_cy->_cycleNumber--;
-                    VminCounter = false;
-                    VmaxCounter = false;
-                }
-            }
-        }
-
-        if (Vset >= iv_cy->_Vmax){
-            iv_cy->_current_direction_up = false;
-        }else if (Vset <= iv_cy->_Vmin){
-            iv_cy->_current_direction_up = true;
-        }
-
-        /*stop condition*/
-        if(iv_cy->_cycleNumber == 0){
-            PeriodicEvent = false;
-        }
-    }
-
-    return;
-}
-
-static void it_vscan(void)
-{
-    struct wm_it_ctx_t *it = (struct wm_it_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        Vset = it->_Vinit;
-    }
-
-    if(!vscanReset) {
-        Vset = it->_Vinit;
-    }
-
-    return;
-}
-
-static void rt_vscan(void)
-{
-    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
-
-    if (vscanReset) {
-        Vset = rt->_Vinit;
-    }
-
-    if(!vscanReset) {
-        Vset = rt->_Vinit;
-    }
-
-    return;
-}
-
 static void vo_vscan(void)
 {
    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
@@ -178,638 +22,6 @@ static void vo_vscan(void)
    return;
 }

-#define DELTAVOLTMAX 2000000 //2000000 = 10mV
-static void cc_vscan(void)
-{
-    /* Transform setting CC into IUC
-     *
-     * User code in CC mode : 0 ~ 3000000
-     * Real current value : -15.00000 ~ 15.00000 mA
-     *  => user code = 1500000 mapping to 0.00000 mA
-     */
-
-    struct wm_cc_ctx_t *cc = (struct wm_cc_ctx_t *)wm_get();
-    struct wm_meas_t *m = &cc->measure;
-    uint16_t divisionRate;
-    int32_t deltaI;
-    int32_t deltaV;
-    int32_t Iin;
-    int32_t Vin;
-
-    if (vscanReset) {
-        Vset = 0;
-
-        if (cc->_charge == 0) {
-            cc->_Iset = instru.constantCurrent * 200 * (-1);
-            //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
-        }
-
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        Vin = m->_measureVin * 200; //[5nV]
-
-        Vset = Vin + cc->_Iset; //[5nV]
-
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-    }
-
-    if (!vscanReset) {
-        Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - cc->_Iset;
-
-        if (deltaI > 2000000 || deltaI < -2000000) { //100uA
-            divisionRate = 1;
-        } else {
-            divisionRate = 20;
-        }
-
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if (deltaV > DELTAVOLTMAX) { //2000000 = 10mV
-            deltaV = DELTAVOLTMAX;
-        } else if (deltaV < (-DELTAVOLTMAX)) {
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
-
-        if (Vset >= 1100000000) { // 5.5V
-            Vset = 1100000000;
-        } else if (Vset <= -1000000000) { //-5V
-            Vset = -1000000000;
-        }
-
-        if (Vset <= cc->_Vmin) {
-            Vset = cc->_Vmin;
-        } else if (Vset >= cc->_Vmax) {
-            Vset = cc->_Vmax;
-        }
-    }
-
-    return;
-}
-
-static void cv_vscan(void)
-{
-    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
-    static bool VminCounter;
-    static bool VmaxCounter;
-
-    NotifyCycleNumber = (instru.cycleNumber - cv->_cycleNumber + 1);
-
-
-    if (vscanReset) {
-        VmaxCounter = false;
-        VminCounter = false;
-
-        if (instru.directionInit == 1) {
-            cv->_direction_up         = true;
-            cv->_current_direction_up = true;
-        } else {
-            cv->_direction_up         = false;
-            cv->_current_direction_up = false;
-        }
-
-        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if (instru.step <= 10) {
-            cv->_Vstep = instru.step *  instru.VsetRate / 5;
-        } else {
-            cv->_Vstep = instru.step / 5 *  instru.VsetRate;
-        }
-
-        if (cv->_Vmin == cv->_Vinit) {
-            VminCounter = true;
-        }
-        if (cv->_Vmax == cv->_Vinit) {
-            VmaxCounter = true;
-        }
-
-        Vset = cv->_Vinit;
-    }
-
-    if (!vscanReset) {
-        if ((instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) ||
-        (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2)
-        ) {
-            if (cv->_current_direction_up) {
-                Vset = Vset + cv->_Vstep * GPT.GptimerMultiple;
-            } else {
-                Vset = Vset - cv->_Vstep * GPT.GptimerMultiple;
-            }
-
-            if (instru.Vinit < instru.Ve1 && instru.Vinit < instru.Ve2) {
-                if (Vset == cv->_Vmin) {
-                    VminCounter = true;
-                    instru.Vinit = instru.Vmin;
-                    cv->_Vinit = cv->_Vmin;
-                }
-            } else if (instru.Vinit > instru.Ve1 && instru.Vinit > instru.Ve2) {
-                if (Vset == cv->_Vmax) {
-                    VmaxCounter = true;
-                    instru.Vinit = instru.Vmax;
-                    cv->_Vinit = cv->_Vmax;
-                }
-            }
-        } else {
-            if (Vset >= cv->_Vmax) {
-                VmaxCounter = true;
-            } else if (Vset <= cv->_Vmin) {
-                VminCounter = true;
-            }
-
-            if (cv->_current_direction_up) {
-                Vset = Vset + cv->_Vstep * GPT.GptimerMultiple;
-            } else {
-                Vset = Vset - cv->_Vstep * GPT.GptimerMultiple;
-            }
-
-            if (VmaxCounter && VminCounter) {
-                if (cv->_direction_up && cv->_current_direction_up) {
-                    if (Vset >= cv->_Vinit) {
-                        cv->_cycleNumber--;
-                        VminCounter = false;
-                        VmaxCounter = false;
-                    }
-                }
-                if (!cv->_direction_up && !cv->_current_direction_up) {
-                    if (Vset <= cv->_Vinit) {
-                        cv->_cycleNumber--;
-                        VminCounter = false;
-                        VmaxCounter = false;
-                    }
-                }
-            }
-
-            if (Vset >= cv->_Vmax) {
-                cv->_current_direction_up = false;
-            } else if (Vset <= cv->_Vmin) {
-                cv->_current_direction_up = true;
-            }
-
-            /*stop condition*/
-            if (cv->_cycleNumber == 0) {
-                PeriodicEvent = false;
-            }
-        }
-    }
-
-    return;
-}
-
-static void lsv_vscan(void)
-{
-    struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();
-
-    NotifyCycleNumber = (instru.cycleNumber - lsv->_cycleNumber + 1);
-
-    if (vscanReset) {
-        if (instru.directionInit == 1) {
-            lsv->_direction_up         = true;
-            lsv->_current_direction_up = true;
-        } else {
-            lsv->_direction_up         = false;
-            lsv->_current_direction_up = false;
-        }
-
-         //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
-        if (instru.step <= 10) {
-            lsv->_Vstep = instru.step *  instru.VsetRate / 5;
-        } else {
-            lsv->_Vstep = instru.step / 5 *  instru.VsetRate;
-        }
-
-        Vset = lsv->_Vinit;
-    }
-
-    if (!vscanReset) {
-
-        if (lsv->_current_direction_up) {
-            Vset = Vset + lsv->_Vstep * GPT.GptimerMultiple;
-        } else {
-            Vset = Vset - lsv->_Vstep * GPT.GptimerMultiple;
-        }
-
-        /*stop condition*/
-        if (Vset >= lsv->_Vmax) {
-            PeriodicEvent = false;
-        } else if (Vset <= lsv->_Vmin) {
-            PeriodicEvent = false;
-        }
-    }
-
-    return;
-}
-
-static void ca_vscan(void)
-{
-    struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();
-
-    if(vscanReset){
-        Vset = ca->_Vinit;
-    }
-
-    if(!vscanReset){
-        Vset = ca->_Vinit;
-    }
-
-    return;
-}
-
-
-static void uni_pulse_vscan(uint32_t time)
-{
-    uint32_t t = time;
-    struct wm_uni_pulse_ctx_t *p = (struct wm_uni_pulse_ctx_t *)wm_get();
-    uint32_t m;
-    uint32_t t_min;
-    uint32_t t_max;
-
-    if(vscanReset){
-        Vset = p->_v0;
-
-        return;
-    }
-
-    if(!vscanReset){
-
-        if (t == 0) {
-            m = 0;
-        } else {
-           m = t % p->_t_period;
-        }
-
-        if (m < p->_t_pa[0]) {
-            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t + p->_v_step[0] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pulse_min[0];
-            t_max = p->_t_pulse_max[0];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[1]) {
-            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t + p->_v_step[1] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
-            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[2]) {
-            p->_Vset = p->_v_initial[2] + p->_v_slope[2] * t + p->_v_step[2] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[1] + p->_t_pulse_min[2];
-            t_max = p->_t_pa[1] + p->_t_pulse_max[2];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[3]) {
-            p->_Vset = p->_v_initial[3] + p->_v_slope[3] * t + p->_v_step[3] * (int32_t)(t / p->_t_period);
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[2] + p->_t_pulse_min[3];
-            t_max = p->_t_pa[2] + p->_t_pulse_max[3];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        return;
-    }
-
-    return;
-}
-
-static void dpv_vscan(uint32_t time)
-{
-    uint32_t t = time;
-    struct wm_dpv_ctx_t *p = (struct wm_dpv_ctx_t *)wm_get();
-    uint32_t m;
-    uint32_t t_min;
-    uint32_t t_max;
-
-    if(vscanReset){
-        Vset = p->_v0;
-
-        return;
-    }
-
-    if(!vscanReset){
-
-        if (t == 0) {
-            m = 0;
-        } else {
-           m = t % p->_t_period;
-        }
-
-        if (m < p->_t_pa[0]) {
-            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 + p->_v_step[0] * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
-            Vset = p->_Vset;
-
-            t_min = p->_t_pulse_min[0];
-            t_max = p->_t_pulse_max[0];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            if ((p->_v_curr_direc && Vset >= p->_v_stop) ||
-               (!p->_v_curr_direc && Vset <= p->_v_stop)) {
-                PeriodicEvent = false;
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[1]) {
-            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t / 1000 + p->_v_step[1] * (int32_t)dpv_step_cnt;
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
-            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        return;
-    }
-
-    return;
-}
-
-static void dpv_advance_vscan(uint32_t time)
-{
-    uint32_t t = time;
-    struct wm_dpv_advance_ctx_t *p = (struct wm_dpv_advance_ctx_t *)wm_get();
-    uint32_t m;
-    uint32_t t_min;
-    uint32_t t_max;
-    static bool VminCounter;
-    static bool VmaxCounter;
-
-    if(vscanReset){
-        if (p->_v_direc_init) {
-            if (p->_v0 <= p->_v_up && p->_v0 <= p->_v_low && p->_v_2 > p->_v_1) {
-                VminCounter = true;
-            }
-
-        } else {
-            if (p->_v0 >= p->_v_up && p->_v0 >= p->_v_low && p->_v_1 > p->_v_2) {
-                VmaxCounter = true;
-            }
-        }
-
-
-
-        p->_Vset = p->_v0;
-        Vset = p->_Vset;
-
-        return;
-    }
-
-    if(!vscanReset){
-
-        if (t == 0) {
-            m = 0;
-        } else {
-           m = t % p->_t_period;
-        }
-
-        if (m < p->_t_pa[0]) {
-
-            t_min = p->_t_pulse_min[0];
-            t_max = p->_t_pulse_max[0];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 + p->_v_step[0] * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
-            Vset = p->_Vset;
-
-            if (VminCounter == true && VmaxCounter == true) {
-                p->_cycleNumber--;
-                VminCounter = false;
-                VmaxCounter = false;
-
-            }
-
-            if (p->_cycleNumber <= 0) {
-                if (p->_v_stop_direction == true && p->_Vset >= p->_v_stop - p->_v_amp + p->_v_step[0]) {
-                    PeriodicEvent = false;
-                } else if (p->_v_stop_direction == false && p->_Vset <= p->_v_stop - p->_v_amp + p->_v_step[0]) {
-                    PeriodicEvent = false;
-                }
-            }
-
-            if (p->_v_curr_direc && p->_Vset >= p->_v_up - p->_v_amp + p->_v_step[0]) {
-                if (p->_v_invert_option) {
-                    p->_v_amp = p->_v_amp * (-1);
-                }
-                p->_v_initial[0] = p->_Vset;
-                p->_v_initial[1] = p->_v_initial[0] + p->_v_amp;
-                dpv_step_cnt = 0;
-                p->_v_step[0] = (-1) * p->_v_step[0];
-                p->_v_step[1] = (-1) * p->_v_step[1];
-                p->_v_curr_direc = false;
-                VmaxCounter = true;
-                p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
-                Vset = p->_Vset;
-
-            } else if (!p->_v_curr_direc && p->_Vset <= p->_v_low - p->_v_amp + p->_v_step[0]) {
-                if (p->_v_invert_option) {
-                    p->_v_amp = p->_v_amp * (-1);
-                }
-                p->_v_initial[0] = p->_Vset;
-                p->_v_initial[1] = p->_v_initial[0] + p->_v_amp;
-                dpv_step_cnt = 0;
-                p->_v_step[0] = (-1) * p->_v_step[0];
-                p->_v_step[1] = (-1) * p->_v_step[1];
-                p->_v_curr_direc = true;
-                VminCounter = true;
-                p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
-                Vset = p->_Vset;
-
-            }
-
-            return;
-        }
-
-        if (m < p->_t_pa[1]) {
-            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t / 1000 + p->_v_step[1] * (int32_t)dpv_step_cnt;
-            Vset = p->_Vset;
-
-            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
-            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
-
-            if (m > t_min && m < t_max) {
-                calc_avg_en = true;
-            } else {
-                calc_avg_en = false;
-            }
-
-            return;
-        }
-
-        return;
-    }
-
-    return;
-}
-
-static void pulse_vscan(void)
-{
-    struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
-    static uint16_t lastVolt;
-
-    if (stiFirstTime) {
-        stiFirstTime = false;
-        lastVolt = 25000;
-        pulse->_sti_t_flag = 1;
-        pulse->_sti_v = pulse->_sti_v1;
-        pulse->_sti_t = pulse->_sti_t1;
-        if (pulse->_sti_t == 1) {
-            pulse->_sti_v = lastVolt;
-        }
-    } else if(!stiFirstTime) {
-        if (GPT.StiCounter >= pulse->_sti_t) {
-            GPT.StiCounter -= pulse->_sti_t; //to get right time
-
-            if (pulse->_sti_lp > 0) {
-                if (pulse->_sti_cy > 0) {
-                    if (pulse->_sti_t_flag == 1) {
-                        pulse->_sti_t_flag = 2;
-                        pulse->_sti_v = pulse->_sti_v2;
-                        pulse->_sti_t = pulse->_sti_t2;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 2) {
-                        pulse->_sti_t_flag = 3;
-                        pulse->_sti_v = pulse->_sti_v3;
-                        pulse->_sti_t = pulse->_sti_t3;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 3) {
-                        pulse->_sti_cy -- ;
-                        if (pulse->_sti_cy == 0) {
-                            pulse->_sti_t_flag = 4;
-                            pulse->_sti_v = pulse->_sti_v4;
-                            pulse->_sti_t = pulse->_sti_t4;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                } else if (pulse->_sti_cy <= 0){
-                    if (pulse->_sti_t_flag == 4) {
-                        pulse->_sti_lp -- ;
-                        if (pulse->_sti_lp > 0) {
-                            pulse->_sti_cy = instru.sti_cy;
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 5;
-                            pulse->_sti_v = pulse->_sti_v5;
-                            pulse->_sti_t = pulse->_sti_t5;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                }
-            } else if (pulse->_sti_lp <= 0) {
-                if (pulse->_sti_t_flag == 5) {
-                    pulse->_sti_t_flag = 6;
-                    pulse->_sti_v = pulse->_sti_v6;
-                    pulse->_sti_t = pulse->_sti_t6;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 6) {
-                    pulse->_sti_t_flag = 7;
-                    pulse->_sti_v = pulse->_sti_v7;
-                    pulse->_sti_t = pulse->_sti_t7;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 7) {
-                    pulse->_sti_v = 25000;
-                    PeriodicEvent  = false;
-                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                    ModeLED(NO_EVENT);
-                }
-            }
-        }
-    }
-
-    if (lastVolt != pulse->_sti_v) {
-        lastVolt = pulse->_sti_v;
-        //if (pulse->_sti_v == 25000) {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 1 => close high_z mode
-        //} else {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
-        //}
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-    }
-
-    return;
-}
-
 static void chg_vo_para(uint16_t parameter, int32_t value)
 {
    uint16_t pa = parameter;
@@ -849,31 +61,4 @@ static void chg_rt_para(uint16_t parameter, int32_t value)
    return;
 }

-static void set_para(uint8_t eliteFxn, uint16_t parameter, int32_t value)
-{
-    uint8_t mode = eliteFxn;
-    uint16_t pa = parameter;
-    int32_t val = value;
-
-    if (mode == CURVE_VO) {
-        chg_vo_para(pa, val);
-
-        return;
-    }
-
-    if (mode == CURVE_IT) {
-        chg_it_para(pa, val);
-
-        return;
-    }
-
-    if (mode == CURVE_RT) {
-        chg_rt_para(pa, val);
-
-        return;
-    }
-
-    return;
-}
-
 #endif
@@ -555,10 +555,10 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
    // Application main loops
    GPT.GptimerCounter0 = GPT.GptimerCounter;

-    headstage_battery_volt();
+    //headstage_battery_volt();
    headstage_init_device_info();

-    for (;;) {
+    for (;;) { //keeps going until Periodic Event != True
        // Waits for a signal to the semaphore associated with the calling thread.
        // Note that the semaphore associated with a thread is signaled when a
        // message is queued to the message receive queue of the thread or when
@@ -614,22 +614,16 @@ 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);

-                    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-                    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-                    if(key != 0){  //detect Elite battery power when no periodic event
-                        measureBat();
-                    }
+//                    if(key != 0){  //detect Elite battery power when no periodic event
+//                        measureBat();
+//                    }
                    if(Free_Work_Mode){
                        wm_deinit();
                        InitEliteInstruction();
@@ -637,6 +631,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                    }
                } else {
                    EliteOn = TurnOnElite(key);
+//                    AD5940_init();
                }
            }
            else {                               // if there is periodic event
@@ -925,16 +920,16 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

        numActive = linkDB_NumActive();

-        uint16_t cxnHandle;
-
-        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
-        uint16_t requestedPDUSize = 251; //251 roy
-        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
-        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
-
-        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
-//            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
-        }
+//        uint16_t cxnHandle;
+//
+//        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
+//        uint16_t requestedPDUSize = 251; //251 roy
+//        uint16_t requestTxTime    = 2120; // (LL payload + 14) * 8   //2120 roy
+//        GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
+//
+//        if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
+////            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+//        }

        // Use numActive to determine the connection handle of the last
        // connection
Author	SHA1	Message	Date
Roy	f3ddef1a3d	[rel] elite/eis1.0 v.1.0.0	2022-05-04 10:15:21 +08:00
Roy	fd966a503b	[copy] copy af79c7fcac2237f25f92478b61e78b30f073dece version from wtp_cc2650_simple_func project	2022-05-03 11:35:36 +08:00