Modify calibration function. Update trigger board calibration data.

Device name = Trigger
Add channel enable set para function.
2021-11-16 17:08:15 +08:00 · 2021-11-15 18:32:31 +08:00 · 2021-11-15 16:13:20 +08:00 · 2021-11-09 17:52:22 +08:00 · 2021-11-05 18:16:05 +08:00 · 2021-10-29 18:18:06 +08:00
40 changed files with 5303 additions and 2837 deletions
@@ -5,4 +5,5 @@ xdctools_*/
 ccsv8/

 # CSS build files
-FlashROM/
+FlashROM/
+/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.xdchelp
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+inEditor=false
+onBuild=false
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker
@@ -0,0 +1,32 @@
+eclipse.preferences.version=1
+encoding//FlashROM/Application/subdir_rules.mk=UTF-8
+encoding//FlashROM/Application/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/Display/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/Display/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/ECC/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/ECC/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/PIN/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/PIN/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/RF/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/RF/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/SPI/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/SPI/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/TRNG/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/TRNG/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/UART/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/UART/subdir_vars.mk=UTF-8
+encoding//FlashROM/Drivers/UDMA/subdir_rules.mk=UTF-8
+encoding//FlashROM/Drivers/UDMA/subdir_vars.mk=UTF-8
+encoding//FlashROM/ICall/subdir_rules.mk=UTF-8
+encoding//FlashROM/ICall/subdir_vars.mk=UTF-8
+encoding//FlashROM/ICallBLE/subdir_rules.mk=UTF-8
+encoding//FlashROM/ICallBLE/subdir_vars.mk=UTF-8
+encoding//FlashROM/PROFILES/subdir_rules.mk=UTF-8
+encoding//FlashROM/PROFILES/subdir_vars.mk=UTF-8
+encoding//FlashROM/Startup/subdir_rules.mk=UTF-8
+encoding//FlashROM/Startup/subdir_vars.mk=UTF-8
+encoding//FlashROM/TOOLS/subdir_rules.mk=UTF-8
+encoding//FlashROM/TOOLS/subdir_vars.mk=UTF-8
+encoding//FlashROM/makefile=UTF-8
+encoding//FlashROM/objects.mk=UTF-8
+encoding//FlashROM/sources.mk=UTF-8
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+inEditor=false
+onBuild=false
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker
@@ -3,16 +3,20 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="simple_peripheral_cc2650em_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650em_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_app"/>
 </listAttribute>
@@ -144,10 +144,10 @@ static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool hig
 //            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]);
+//            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: {
@@ -176,9 +176,9 @@ static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool hig
            break;
        }
    }
-    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+    PIN_setOutputValue(pin_handle, latch_num, 1);               // Turn on latch
 //    CPUdelay(10);
-    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+    PIN_setOutputValue(pin_handle, latch_num, 0);               // Turn off latch
    remove_elite_pin();
    ELITE15_SPI_HOLD();
 }
@@ -195,52 +195,57 @@ static void Init_Elite15_PIN () {
    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, LOAD0, 1);
    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);
+    PIN_setPortOutputValue(pin_handle, 0);      // all 2650 pin set LOW

    remove_elite_pin();
-
-//    InitLH();
-//    add_elite_pin();
-//
-//    PIN_setOutputValue(pin_handle, LOAD0, 1);
-//    PIN_setOutputValue(pin_handle, LOAD1, 1);
-//    PIN_setOutputValue(pin_handle, LOAD2, 1);
-//    CPUdelay(10);
-//    PIN_setOutputValue(pin_handle, D0, 0);
-//    PIN_setOutputValue(pin_handle, D1, 0);
-//    PIN_setOutputValue(pin_handle, D2, 0);
-//    PIN_setOutputValue(pin_handle, D3, 0);
-//    PIN_setOutputValue(pin_handle, D4, 0);
-//    PIN_setOutputValue(pin_handle, D5, 0);
-//    PIN_setOutputValue(pin_handle, D6, 0);
-//    PIN_setOutputValue(pin_handle, D7, 0);
-//    CPUdelay(10);
-//    PIN_setOutputValue(pin_handle, LOAD0, 0);
-//    PIN_setOutputValue(pin_handle, LOAD1, 0);
-//    PIN_setOutputValue(pin_handle, LOAD2, 0);
-//
-//    remove_elite_pin();
 }

+static void PIN15_setOutputValue_refresh() {
+    ELITE15_SPI_CLOSE();
+    add_elite_pin();

+    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]);
+    PIN_setOutputValue(pin_handle, LOAD1, 1);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);

+    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]);
+    PIN_setOutputValue(pin_handle, LOAD2, 1);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+    remove_elite_pin();
+    ELITE15_SPI_HOLD();
+}
+static void disable_trig_output() {
+    update_latch_status(DO_PR_0    , 0);
+    update_latch_status(DO_MOS_0   , 0);
+    update_latch_status(AO_MOS_0   , 0);
+    update_latch_status(AO_MOS_2   , 0);
+    update_latch_status(AO_MOS_3   , 0);
+    update_latch_status(AO_MOS_1   , 0);
+    update_latch_status(DO_MOS_1   , 0);
+    update_latch_status(DO_PR_1    , 0);
+    update_latch_status(OUT_5V_EN_0, 1);
+    update_latch_status(OUT_5V_EN_1, 1);
+
+    PIN15_setOutputValue_refresh();
+}

 #endif
@@ -1,77 +0,0 @@
-
-#ifndef ELITECCMODE
-#define ELITECCMODE
-
-#define Vset instru.Vset
-#define DELTAVOLTMAX 100000
-
-/* Transform setting CC into IUC
-*
-* User code in CC mode : 0 ~ 3000000
-* Real current value : -15.00000 ~ 15.00000 mA
-*  => user code = 1500000 mapping to 0.00000 mA
-*/
-static void cc_vscan(void)
-{
-    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 / 20 ; //[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 > 20000000 || deltaI < -20000000) { //1mA
-            divisionRate = 1000;
-        } else {
-            divisionRate = 10;
-        }
-
-        deltaV = -1 * (deltaI / divisionRate); //-5 * deltaI / 5000   //pV=> 5nV
-
-        if (deltaV > DELTAVOLTMAX) { //100000 = 500uV
-            deltaV = DELTAVOLTMAX;
-        } else if (deltaV < (-DELTAVOLTMAX)) {
-            deltaV = (-DELTAVOLTMAX);
-        }
-
-        Vset = Vset + deltaV; //[5nV]
-
-        if (Vset >= 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;
-        }
-    }
-}
-#endif
@@ -1,142 +0,0 @@
-#ifndef ELITECV3
-#define ELITECV3
-
-#define Vset instru.Vset
-
-static void cv_volt_out(void)
-{
-    struct wm_cv_ctx_t *cv = (struct wm_cv_ctx_t *)wm_get();
-    struct wm_meas_t *m = &cv->measure;
-    uint16_t DACOutCode;
-    int32_t Vin;
-    int32_t Vout;
-    int32_t DeltaVout;
-
-    Vin = m->_measureVin * 200;//[5nV]
-    if (DACReset) {
-        Vout = Vset + Vin;
-    } else {
-        DeltaVout = Vset - (Vout - Vin);
-        Vout = Vout + DeltaVout;
-    }
-
-    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);
-
-    int32_t RealV2;
-    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-    InputNotify(NOTIFY_VOLT, RealV2);
-
-    int32_t RealV;
-    RealV = (int32_t)(Vout / 200);//[1uV]
-    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-    DAC_outputV(DACOutCode);
-
-    return;
-}
-
-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;
-            }
-        }
-    }
-}
-#endif
@@ -1,84 +0,0 @@
-
-#ifndef ELITECV
-#define ELITECV
-
-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;
-        }
-    }
-}
-#endif
@@ -1,51 +0,0 @@
-#ifndef ELITECVSCAN
-#define ELITECVSCAN
-
-#define Vset instru.Vset
-
-static void ca_volt_out(void)
-{
-    struct wm_ca_ctx_t *ca = (struct wm_ca_ctx_t *)wm_get();
-    struct wm_meas_t *m = &ca->measure;
-    uint16_t DACOutCode;
-    int32_t Vin;
-    int32_t Vout;
-    int32_t DeltaVout;
-
-    Vin = m->_measureVin * 200;//[5nV]
-    if (DACReset) {
-        Vout = Vset + Vin;
-    } else {
-        DeltaVout = Vset - (Vout - Vin);
-        Vout = Vout + DeltaVout;
-    }
-
-    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);
-
-    int32_t RealV2;
-    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-    InputNotify(NOTIFY_VOLT, RealV2);
-
-    int32_t RealV;
-    RealV = (int32_t)(Vout / 200);//[1uV]
-    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-    DAC_outputV(DACOutCode);
-
-    return;
-}
-
-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;
-    }
-}
-#endif
@@ -4,31 +4,6 @@

 static bool DACReset;

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

-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
+//    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);

    return voltLV;
 }
@@ -59,20 +34,21 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
 static void VoutGainControl(uint8_t VOUTLevel){
    if(VOUTLevel == 0){
        // VOUT gain level = 0, using 240K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
+//        PIN15_setOutputValue(Turon_VOUT_SMALL, 0);
    }
    else if(VOUTLevel == 1){
        // VOUT gain level = 1, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
    }
    else if(VOUTLevel == 2){
        // VOUT gain level = 2, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
    }
    else{
        // default using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+//        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
    }
+    volt_rec_en = false;
 }

 #endif
@@ -94,26 +70,23 @@ static void AutoGainChangeVout(int32_t userCode){
    // switch to 1 level volt(small)   15K
    // switch to 2 level volt(large)   240K

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

-    if(instru.VoutGainLevel == VOUT_GAIN_15K){
+    if(instru.VoutGainLv == VOUT_GAIN_15K){
        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
            // switch to 2 level volt(large)
-            instru.VoutGainLevel = VOUT_GAIN_240K;
-            VoutGainControl(instru.VoutGainLevel);
-            record_flag = false;
+            instru.VoutGainLv = VOUT_GAIN_240K;
+            VoutGainControl(instru.VoutGainLv);
        }
    }
-    else if(instru.VoutGainLevel == VOUT_GAIN_240K){
+    else if(instru.VoutGainLv == VOUT_GAIN_240K){
        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
            // switch to 1 level volt(small)
-            instru.VoutGainLevel = VOUT_GAIN_15K;
-            VoutGainControl(instru.VoutGainLevel);
-            record_flag = false;
+            instru.VoutGainLv = VOUT_GAIN_15K;
+            VoutGainControl(instru.VoutGainLv);
        }
    }
 }
@@ -2,13 +2,6 @@
 #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;
@@ -17,7 +17,7 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
 #define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
 #define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
 #define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-#define CLOCK_FREQ 4800  // clock freq = 0.1 ms
+#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)

 #define elite_gptimer_open()                                                                          \
    do {                                                                                              \
@@ -1,62 +0,0 @@
-
-#ifndef ELITEIV
-#define ELITEIV
-
-#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;
-        }
-    }
-}
-
-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,5 +1,8 @@
-#ifndef __INSTR_H__
-#define __INSTR_H__
+/*=============================================================================
+ =                          instr.h                                              =
+ =============================================================================*/
+#ifndef ELITE_INSTR_H
+#define ELITE_INSTR_H

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

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

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

-    /** Notify parameter **/
-    uint32_t notifyRate;
+    uint8_t  IinADCAutoGainEn;
+    uint8_t  VinADCAutoGainEn;
+    uint8_t  VoutAutoGainEn;
+    uint8_t  IinADCGainLv;
+    uint8_t  VinADCGainLv;
+    uint16_t VoutGainLv;
+    uint8_t  gain_switch_on;
+    uint8_t  AdcChannel;
+    bool     hign_z_en;

-    /** mode parameter **/
    uint16_t cycleNumber;
    uint8_t  charge;
    int32_t  constantCurrent;
-    int32_t  Currentmax;
+
+    // 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];
+
+    // pulse mode
    int32_t  sti_v1;
    int32_t  sti_v2;
    int32_t  sti_v3;
@@ -62,38 +75,68 @@ struct HEADSTAGE_INSTRUCTION {
    uint16_t sti_cy;
    uint16_t sti_loop;

-    uint16_t StepTime;
+    int32_t Vout;

-    uint8_t AdcChannel;
+    // not use
+    int32_t  Currentmax;
+    uint8_t  VoViSwitch;
+
+    /** TRIG chan **/
+    bool tri_pr0_en;
+    bool tri_d0_en;
+    bool tri_a0_en;
+    bool tri_a2_en;
+    bool tri_a3_en;
+    bool tri_a1_en;
+    bool tri_d1_en;
+    bool tri_pr1_en;
+    bool output_5v_en0;
+    bool output_5v_en1;
+
+    /** trigger mode enable **/
+    bool trig0_en;
+    bool trig1_en;
+    uint8_t trig0_edge;
+    uint8_t trig1_edge;
+
+    uint16_t Trig_CurCon[4];

 } instru = {0};

 /** Iin, Vin, Vout **/
-#define IIN_ADC         0x00
-#define VIN_ADC         0x01
-#define VOUT_DAC        0x02
-#define HIGH_Z          0x03
+#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

-/** ADC Iin gain level **/
-#define I_GAIN_3M       0x00    // largest gain
-#define I_GAIN_100K     0x01
-#define I_GAIN_3K       0x02
-#define I_GAIN_100R     0x03    // the least gain
+// 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 Vin gain level **/
+// 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

-/** Vout gain level **/
+// 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

 /* DAC reset parameter */
-#define DAC_ZERO    25000
+#define DAC_ZERO    25000 // DAC_ZERO is about 0V
+
+/** TRIG01 trigger edge type **/
+#define TRIG_POSEDGE    0x00
+#define TRIG_NEGEDGE    0x01
+#define TRIG_BOTHEDGE   0x02
+#define TRIG_DIS        0x03

 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -109,36 +152,67 @@ struct HEADSTAGE_INSTRUCTION {
 *
 * @return  None.
 */
-static void InitEliteInstruction(){
+static void InitEliteInstruction(void)
+{
    instru.chip_id         = 0;
    instru.eliteFxn        = 0;         //default is a null event
-    instru.VsetRateIndex   = 0;
+
+    instru.VsetRateIndex   = 0;         // vscan rate
    instru.VsetRate        = 2;
-    instru.Vset            = 0;
-    instru.VoltConstant    = DAC_ZERO; //DAC_ZERO is about 0V
-    instru.directionInit   = 1;        //0:reverse        1:forward
+    instru.sampleRate      = 15;        // ADC's sample rate
+    instru.notifyRate      = CLOCK_ONE_SECOND;   // send data's rate
+    instru.period          = CLOCK_ONE_SECOND;
+
+    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;
-    instru.Ve2             = DAC_ZERO;
-    instru.Vinit           = 0;
-    instru.Vmax            = 0;
-    instru.Vmin            = 0;
-    instru.sampleRateIndex = 1;
-    instru.sampleRate      = 100;
-    instru.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
-    instru.AutoGainEnable  = 1;
-    instru.VinAutoGainEnable = 1;
-    instru.VoutAutoGainEnable = 1;
-    instru.ADCGainLevel    = I_GAIN_AUTO;
-    instru.VoutGainLevel   = VOUT_GAIN_AUTO;
-    instru.VinADCGainLevel = VIN_GAIN_AUTO;
-    instru.notifyRate      = STEPTIME_ONE_SEC;
+    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.charge          = 1;         // 0:discharge, 1:charge
    instru.constantCurrent = 0;
-    instru.Currentmax      = 0;
-    instru.StepTime        = STEPTIME_ONE_SEC;
-    instru.AdcChannel      = 0;
+
+    // uni pulse mode
+    instru.v0              = DAC_ZERO;  // t < 0, volt is 0v
+    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;

    //pulse mode
    instru.sti_t1          = 0;
@@ -157,6 +231,35 @@ static void InitEliteInstruction(){
    instru.sti_v7          = DAC_ZERO;
    instru.sti_loop        = 1;
    instru.sti_cy          = 0;
+
+    instru.tri_pr0_en         = 0;
+    instru.tri_pr1_en         = 0;
+    instru.tri_a0_en          = 0;
+    instru.tri_a1_en          = 0;
+    instru.tri_a2_en          = 0;
+    instru.tri_a3_en          = 0;
+    instru.tri_d0_en          = 0;
+    instru.tri_d1_en          = 0;
+    instru.output_5v_en0   = 1;    // 1 => disable
+    instru.output_5v_en1   = 1;    // 1 => disable
+
+    instru.Vout            = 0;
+
+    // not use
+    instru.Currentmax      = 0;
+    instru.VoViSwitch      = 0x01;
+
+    instru.Trig_CurCon[0] = 0;
+    instru.Trig_CurCon[1] = 0;
+    instru.Trig_CurCon[2] = 0;
+    instru.Trig_CurCon[3] = 0;
+
+    instru.trig0_en       = 0;
+    instru.trig1_en       = 0;
+    instru.trig0_edge     = TRIG_NEGEDGE;
+    instru.trig1_edge     = TRIG_NEGEDGE;
+
+    return;
 }

 #ifdef __cpulsplus
@@ -68,7 +68,7 @@ static void EliteKeyPress(uint8_t key) {

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

@@ -5,7 +5,26 @@
 #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;
+
+/* Channels for TRIG01 LED notation */
+#define LED_PR0                  0x00
+#define LED_D0                   0x01
+#define LED_A0                   0x02
+#define LED_A2                   0x03
+#define LED_A3                   0x04
+#define LED_A1                   0x05
+#define LED_D1                   0x06
+#define LED_PR1                  0x07
+
 static void WorkModeLED();
+static void update_LED_status (uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
+static void SET_LED_CHAN(bool *chan_en, uint16_t modeStatus);
+static void refresh_LED();

 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
    spi_LEDtxbuf[0] = 0x0000;
@@ -94,12 +113,87 @@ static void Elite_led_color(uint16_t color){
    }
 }

+static void Elite_chan_led_color(uint16_t color, uint8_t chan) {
+    switch (color) {
+        case COLOR_RED: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0x00);
+            break;
+        }
+        case COLOR_ORANGE: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x58, 0x09);
+            break;
+        }
+        case COLOR_YELLOW: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN: {
+            update_LED_status(chan, DARKLED, 0x00, 0xFA, 0x00);
+            break;
+        }
+        case COLOR_YELLOWGREEN: {
+            update_LED_status(chan, DARKLED, 0x64, 0xA6, 0x00);
+            break;
+        }
+        case COLOR_BLUE: {
+            update_LED_status(chan, DARKLED, 0x00, 0x00, 0xAA);
+            break;
+        }
+        case COLOR_CYAN: {
+            update_LED_status(chan, DARKLED, 0x00, 0x40, 0x40);
+            break;
+        }
+        case COLOR_MAGENTA: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0x80);
+            break;
+        }
+        case COLOR_PURPLE: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x00, 0xFF);
+            break;
+        }
+        case COLOR_WHITE: {
+            update_LED_status(chan, DARKLED, 0xCA, 0xFF, 0xFF);
+            break;
+        }
+        case COLOR_BLACK: {
+            update_LED_status(chan, 0x00, 0x00, 0x00, 0x00);
+            break;
+        }
+        //dark LED
+        case COLOR_YELLOW_DARK: {
+            update_LED_status(chan, DARKLED, 0xFF, 0x80, 0x00);
+            break;
+        }
+        case COLOR_GREEN_DARK: {
+            update_LED_status(chan, DARKLED, 0x00, 0x33, 0x00);
+            break;
+        }
+        case COLOR_BLUE_DARK: {
+            update_LED_status(chan, DARKLED, 0x00, 0x00, 0x33);
+            break;
+        }
+        case COLOR_CYAN_DARK: {
+            update_LED_status(chan, DARKLED, 0x00, 0x10, 0x10);
+            break;
+        }
+        case COLOR_PURPLE_DARK: {
+            update_LED_status(chan, DARKLED, 0x55, 0x00, 0x55);
+            break;
+        }
+        default: {
+            break;
+        }
+//        refresh_LED();
+    }
+}
+
 static void ModeLED(uint16_t modeStatus) {
    btWaitLedFlag   = 0;
    noEventLedFlag  = 0;
    preWorkLedFlag  = 0;
    workingLedFlag  = 0;
    postWorkLedFlag = 0;
+    TRIG01workFlag  = 0;

    switch (modeStatus) {
    case BT_WAIT: {
@@ -127,6 +221,12 @@ static void ModeLED(uint16_t modeStatus) {
        Elite_led_color(COLOR_BLUE);
        break;
    }
+    case TRIG01_WORK: {
+        TRIG01workFlag = 1;
+        WorkModeLED();
+        refresh_LED();
+        break;
+    }
    default: {
        LEDPowerON();
        break;
@@ -134,7 +234,8 @@ static void ModeLED(uint16_t modeStatus) {
    }
 }

-static void checkFlafLED() {
+static void checkFlafLED()
+{
    if(btWaitLedFlag == 1){
        ModeLED(BT_WAIT);
    }
@@ -150,52 +251,174 @@ static void checkFlafLED() {
    else if(postWorkLedFlag == 1){
        ModeLED(POST_WORK);
    }
+    else if(TRIG01workFlag == 1){
+        ModeLED(TRIG01_WORK);
+    }
 }

-static void WorkModeLED() {
+static void WorkModeLED()
+{
    switch (instru.eliteFxn) {
-    case CURVE_IV:
-    case CURVE_IV_CY:
-    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
-    case SQUARE_WAVE_VOLTAMMETRY:
-    case CURVE_VO:
-    case CURVE_RT:
-    case CURVE_VT:
-    case CURVE_IT:
-    case CURVE_CALI_ADCTEST:
-    case CURVE_CV:
-    case CURVE_LSV:
-    case CURVE_CA:{
-        WORKLED();
-        break;
+        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:
+            WORKLED();
+            break;
+
+        case CURVE_CALI_ADC:
+            if (instru.AdcChannel == RIS_ADC_IIN) {
+                Elite_led_color(COLOR_RED);
+            } else if (instru.AdcChannel == RIS_ADC_VIN) {
+                Elite_led_color(COLOR_ORANGE);
+            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
+                Elite_led_color(COLOR_BLUE);
+            }
+            break;
+
+        case CURVE_TRIG_CC:
+            SET_LED_CHAN(TRC.chan_en, WORKING);
+            break;
+
+        default:
+            break;
+
    }
-    case CURVE_PULSE:{
-//        Elite_led_color(COLOR_YELLOW);
-        WORKLED();
-        break;
-    }
-    case CURVE_CC:{
-        WORKLED();
-        break;
-    }
-    case CURVE_CALI_ADC:{
-        if(instru.AdcChannel == IIN_ADC){
-            Elite_led_color(COLOR_RED);
-        }else if(instru.AdcChannel == VIN_ADC){
-            Elite_led_color(COLOR_ORANGE);
+}
+
+static void LED_channel_write(uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
+    update_LED_status(chan, bright, red, green, blue);
+    refresh_LED();
+}
+
+static void update_LED_status (uint8_t chan, uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
+    switch(chan) {
+            case LED_PR0: {
+                LED.LED_buf[2]     = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[3]     = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_D0: {
+                LED.LED_buf[4]     = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[5]     = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_A0: {
+                LED.LED_buf[6]     = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[7]     = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_A2: {
+                LED.LED_buf[8]     = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[9]     = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_A3: {
+                LED.LED_buf[10]    = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[11]    = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_A1: {
+                LED.LED_buf[12]    = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[13]    = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_D1: {
+                LED.LED_buf[14]    = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[15]    = ((uint16_t)green << 8) | red;
+                break;
+            }
+            case LED_PR1: {
+                LED.LED_buf[16]    = 0xE000 | ((uint16_t)bright << 8) | blue;
+                LED.LED_buf[17]    = ((uint16_t)green << 8) | red;
+                break;
+            }
+            default: {
+                break;
+            }
        }

-        break;
+}
+static void refresh_LED() {
+    spi_LEDtxbuf[0] = 0x0000;
+    spi_LEDtxbuf[1] = 0x0000;
+
+    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
+        spi_LEDtxbuf[i]     = LED.LED_buf[i];
+        spi_LEDtxbuf[i+1]   = LED.LED_buf[i+1];
    }
-//    case VIS_RST: {
-//        LEDPowerON();
-//        break;
-//    }
-    default: {
-        WORKLED();
-        break;
+
+    spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
+    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
+
+    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
+}
+static void TRIG_LED_Init() {
+    spi_LEDtxbuf[0] = 0x0000;
+    spi_LEDtxbuf[1] = 0x0000;
+
+    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
+        spi_LEDtxbuf[i]     = 0xE000;
+        spi_LEDtxbuf[i+1]   = 0x0000;
    }
+
+    spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
+    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
+
+    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
+}
+
+static void SET_LED_CHAN(bool *chan_en, uint16_t modeStatus){
+    uint8_t ledcolor = 0;
+    switch(modeStatus) {
+        case NO_EVENT:{
+            ledcolor = COLOR_GREEN;
+            break;
+        }
+        case WORKING:{
+            ledcolor = COLOR_CYAN;
+            break;
+        }
+        default:{
+            ledcolor = COLOR_GREEN;
+            break;
+        }
    }
+
+    uint8_t trig_chan = 0;
+    for (int i=0; i<TRIG_CHAN_COUNT-2; i++) {
+        trig_chan = (uint8_t) (i);
+        if(TRC.chan_en[i]) {
+            Elite_chan_led_color(ledcolor, trig_chan);
+        } else {
+            Elite_chan_led_color(COLOR_BLACK, trig_chan);
+        }
+    }
+    if(!TRC.chan_en[8]) {
+        Elite_chan_led_color(COLOR_PURPLE_DARK, LED_D0);
+    } else if(TRC.chan_en[1]) {
+        Elite_chan_led_color(ledcolor, LED_D0);
+    } else {
+        Elite_chan_led_color(COLOR_BLACK, LED_D0);             // determine DOUT on or off
+    }
+    if(!TRC.chan_en[9]) {
+        Elite_chan_led_color(COLOR_PURPLE_DARK, LED_D1);
+    } else if(TRC.chan_en[6]) {
+        Elite_chan_led_color(ledcolor, LED_D1);
+    } else {
+        Elite_chan_led_color(COLOR_BLACK, LED_D1);
+    }
+    refresh_LED();
+
 }

 #endif
@@ -0,0 +1,14 @@
+
+#ifndef ELITE_LED_INIT
+#define ELITE_LED_INIT
+
+static void InitLED() {
+    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
+        LED.LED_buf[i]     = 0xE000;
+        LED.LED_buf[i+1]   = 0x0000;
+    }
+}
+
+
+#endif
+
@@ -1,80 +0,0 @@
-#ifndef ELITELSV
-#define ELITELSV
-
-#define Vset instru.Vset
-
-static void lsv_volt_out(void)
-{
-    struct wm_lsv_ctx_t *lsv = (struct wm_lsv_ctx_t *)wm_get();
-    struct wm_meas_t *m = &lsv->measure;
-    uint16_t DACOutCode;
-    int32_t Vin;
-    int32_t Vout;
-    int32_t DeltaVout;
-
-    Vin = m->_measureVin * 200;//[5nV]
-    if (DACReset) {
-        Vout = Vset + Vin;
-    } else {
-        DeltaVout = Vset - (Vout - Vin);
-        Vout = Vout + DeltaVout;
-    }
-
-    instru.VoltConstant = Vout / 40000 + 25000;//5nV=>usercode
-    DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.VoltConstant);
-
-    int32_t RealV2;
-    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
-    InputNotify(NOTIFY_VOLT, RealV2);
-
-//    int32_t RealV;
-//    RealV = (int32_t)(Vout / 200);//[1uV]
-//    InputNotify(NOTIFY_IMPEDANCE, RealV);
-
-    DAC_outputV(DACOutCode);
-
-    return;
-}
-
-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;
-        }
-    }
-}
-#endif
@@ -10,57 +10,20 @@
 #include "headstage.h"

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

-#define NOT_BUF_OFFSET_INIT 8
-
-/**
- * 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 uint8_t  NotifyVoltBat[4]   = {0};
+static uint8_t  NotifyTemperature[4] = {0};
 static uint16_t NotifyCycleNumber  = 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 ***************************************** //
+static uint8_t  finishMode         = 0;

 /*
 * Notify format
@@ -108,9 +71,11 @@ static void SendNotify() {
    not_buf[17] = (NotifyCycleNumber >> 8) & 0xff;
    not_buf[18] = NotifyCycleNumber & 0xff;

-    for (int i = 19; i < BLE_DAT_BUFF_SIZE; i++){
-        not_buf[i] = 0;
-    }
+    not_buf[19] = (finishMode << 7) & 0x80;
+
+//    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);
 }
@@ -136,6 +101,7 @@ static void initCISBuf(){
 static void initRawDataBuf(){
    not_time_stamp    = 0;
    NotifyCycleNumber = 0;
+    finishMode        = 0;

    for (int i = 0; i < 4; i++){
        NotifyCurrent[i]   = 0;
@@ -183,6 +149,12 @@ static void InputNotify(int NotifyType, int32_t Data){
            NotifyVoltBat[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
            NotifyVoltBat[3] = (uint8_t)(Data & 0x000000FF);
            break;
+        case NOTIFY_TEMPERATURE :
+            NotifyTemperature[0] = (uint8_t)((Data & 0xFF000000) >> 24);
+            NotifyTemperature[1] = (uint8_t)((Data & 0x00FF0000) >> 16);
+            NotifyTemperature[2] = (uint8_t)((Data & 0x0000FF00) >> 8);
+            NotifyTemperature[3] = (uint8_t)(Data & 0x000000FF);
+            break;
    }
 }
 #endif
@@ -1,115 +0,0 @@
-#ifndef ELITEPULSE
-#define ELITEPULSE
-
-#define Vset instru.Vset
-
-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));
-    }
-}
-#endif
@@ -3,24 +3,17 @@
 #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;
-
-    VinADCGainControl(VIN_GAIN_AUTO);
-    IinADCGainControl(I_GAIN_AUTO);
-
-    instru.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+    InitLED();
+    InitTrigChan();
+    disable_trig_output();
+    TW1508reset();

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -42,21 +35,14 @@ static void reset() {
 }

 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();
-
-    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
-
-    instru.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+    disable_trig_output();
+    TW1508reset();

    for (int i = 0; i < SPI_LED_SIZE; i++) {
        spi_LEDtxbuf[i] = 0;
@@ -15,9 +15,10 @@
 #include "Elite_PIN.h"

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

 static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
 static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
@@ -28,6 +29,9 @@ 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 uint16_t spi_GPIO_txbuf = 0;
+static uint16_t SPI_GPIO[SPI_GPIO_BUFF_SIZE] = {0};
+
 /* system use SPI parameters */
 static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
 static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
@@ -57,76 +61,97 @@ static void Elite_SPI_init(){
 }

 static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+
    LED_transaction.count = length;
    LED_transaction.txBuf = spi_txbuf;
    LED_transaction.rxBuf = spi_rxbuf;

    SPI_transfer(spiHandle0, &LED_transaction);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
 }

 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW

    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
    ADC_DAC_transaction.rxBuf = spi_rxbuf;

    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, LOAD0, 0);
 }

 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 HOGH
-    update_latch_status (DAC_CS, 1);
+//    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 HOGH
+//    update_latch_status (DAC_CS, 1);
 //    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
 }

-static void ELITE15_SPI_HOLD() {
+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);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);       // Turn off all LATCH
+//    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);       // Turn off all LATCH
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);

    SPI_close(spiHandle0);
    SPI_close(spiHandle1);
 }

-/* Elite1.5 Calibration SPI */
-static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
+static void GPIO_SPI_transfer(uint32_t *GPIO_CLK_CH, uint16_t spi_GPIO_txbuf) {
+
+    for (int i=0; i<SPI_GPIO_BUFF_SIZE; i++) {
+        SPI_GPIO[i] = 0;
+    }
+
+    SPI_GPIO[0] = (spi_GPIO_txbuf & 0b0000000000000001);    // MOSI
+    SPI_GPIO[1] = (spi_GPIO_txbuf & 0b0000000000000010);
+    SPI_GPIO[2] = (spi_GPIO_txbuf & 0b0000000000000100);
+    SPI_GPIO[3] = (spi_GPIO_txbuf & 0b0000000000001000);
+    SPI_GPIO[4] = (spi_GPIO_txbuf & 0b0000000000010000);
+    SPI_GPIO[5] = (spi_GPIO_txbuf & 0b0000000000100000);
+    SPI_GPIO[6] = (spi_GPIO_txbuf & 0b0000000001000000);
+    SPI_GPIO[7] = (spi_GPIO_txbuf & 0b0000000010000000);
+    SPI_GPIO[8] = (spi_GPIO_txbuf & 0b0000000100000000);
+    SPI_GPIO[9] = (spi_GPIO_txbuf & 0b0000001000000000);
+
+    ELITE15_SPI_CLOSE();
+    add_elite_pin();
+
    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+    for (int i=9; i>=0; i--) {
+        PIN_setOutputValue(pin_handle, GPIO_CLK_CH[1], 0);      // generate clk signal
+        PIN_setOutputValue(pin_handle, D3, SPI_GPIO[i]);        // data transfer at rising edge, MOSI = D3
+        PIN_setOutputValue(pin_handle, GPIO_CLK_CH[1], 1);      // generate clk signal
+    }

-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+    update_latch_status (GPIO_CLK_CH[0], GPIO_CLK_CH[1], 0);
+    update_latch_status (ADC_SPI_MOSI, 0);
+    PIN_setPortOutputValue(pin_handle, 0);      // turn off all pin

-    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
+    remove_elite_pin();
+    ELITE15_SPI_HOLD();
 }

 #endif // ELITE_SPI
@@ -1,10 +1,12 @@
 /*=============================================================================
 =                          wm.h                                              =
 =============================================================================*/
-#ifndef ELITE_WORK_DATA
-#define ELITE_WORK_DATA
+#ifndef ELITE_WORK_DATA_H
+#define ELITE_WORK_DATA_H

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

 #include "EliteInstruction.h"

@@ -44,6 +46,8 @@ 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 {
@@ -124,7 +128,41 @@ struct wm_pulse_ctx_t {
    uint16_t _sti_lp;
 };

-int wm_init(void); //(void *instr_ctx);
+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_ocp_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+};
+
+struct wm_aout_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t _Vset;
+    int32_t _Vinit;
+    int32_t _Curset0;
+    int32_t _Curset1;
+    int32_t _Curset2;
+    int32_t _Curset3;
+};
+
+int wm_init(void);
 int wm_deinit(void);
 void *wm_get(void);

@@ -176,6 +214,9 @@ 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;
@@ -440,6 +481,121 @@ 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]      = instru.v_step[0]; //[5nv]
+    p->_v_step[1]      = instru.v_step[1]; //[5nv]
+    p->_v_step[2]      = instru.v_step[2]; //[5nv]
+    p->_v_step[3]      = 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 __ocp_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_ocp_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_ocp_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;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __aout_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_aout_ctx_t *p;
+    void **wm = &workMode_p;
+
+    p = malloc(sizeof(struct wm_aout_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->_Vinit          = instru.Vinit * 4; //[5nV]
+    p->_Vset           = 0;
+    p->_Curset0        = instru.Trig_CurCon[0];
+    p->_Curset1        = instru.Trig_CurCon[1];
+    p->_Curset2        = instru.Trig_CurCon[2];
+    p->_Curset3        = instru.Trig_CurCon[3];
+    *wm = p;
+
+    return 0;
+}
+
 int wm_init(void)
 {
    int mode = instru.eliteFxn;
@@ -449,7 +605,6 @@ int wm_init(void)

    switch (mode) {
        case CURVE_VO:
-        case CURVE_CALI_DAC:
            if (__vo_create()) return -2;
            break;

@@ -493,10 +648,22 @@ int wm_init(void)
            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_TRIG_CC:
+            if (__aout_create()) return -2;
+        break;
+
        default:
            // printf("DO NOT support!!");
            return -3;
-    };
+    }

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

-/*  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
-*/
+#ifdef  __cplusplus
+}
+#endif
 #endif
@@ -1,23 +0,0 @@
-
-#ifndef ELITEZT
-#define ELITEZT
-
-// output a certain voltage e.g. 2v
-// and measure the input voltage
-// => calculate the resister
-// change the output voltage step
-// => get a R-T curve (with resolution = 1 sample/volt step )
-
-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;
-    }
-}
-#endif
@@ -6,6 +6,9 @@
 #include <Board.h>
 #include <ti/drivers/PIN.h>

+//#define ELITE_PIN_1_5
+#define ELITE_PIN_1_5_RE
+
 /* SPI Board */
 #define Board_SPI0_MISO                 PIN_UNASSIGNED
 #define Board_SPI0_MOSI                 D1
@@ -26,28 +29,46 @@
 #define D6                              IOID_9
 #define D7                              IOID_10

-#define LOAD0                           IOID_13
 #define LOAD1                           IOID_12
-#define LOAD2                           IOID_11
+#define LOAD0                           IOID_11
+#define LOAD2                           IOID_2

-#define ADC_CS                          LOAD0, D6
-#define DAC_CS                          LOAD0, D7
-#define ADC_DAC_SPI_MOSI                LOAD0, D3
-#define ADC_DAC_SPI_CLK                 LOAD0, D2
+#define TW_SCKI_2                       LOAD0, D6
+#define TW_SCKI_3                       LOAD0, D7
+#define ADC_SPI_MOSI                    LOAD0, D3
+#define ADC_SPI_CLK                     LOAD0, D2
 #define LED_MOSI                        LOAD0, D1
 #define LED_CLK                         LOAD0, D0
-#define MEM_HOLD                        LOAD0, D4
-#define MEM_CS                          LOAD0, D5
+#define TW_SCKI_0                       LOAD0, D4
+#define TW_SCKI_1                       LOAD0, D5
+//#define MEM_CS                          LOAD0, D5

-#define Turnon_I_MID                    LOAD2, D0
-#define Turnon_I_SMALL                  LOAD2, D4
-#define Turnon_I_LARGE                  LOAD2, D1
-#define Turnon_V_SMALL                  LOAD2, D2
-#define Turnon_V_MID                    LOAD2, D3
-#define Turon_VOUT_SMALL                LOAD2, D7
+#define BAT_CHAR                        LOAD1, D0
+#define BAT_OK                          LOAD1, D1
+#define PULLUP_3V_0                     LOAD1, D2
+#define PULLUP_3V_1                     LOAD1, D3
+#define shutdown_6994                   LOAD1, D4
+#define OUT_5V_EN_0                     LOAD1, D5
+#define enable_5v                       LOAD1, D6
+#define OUT_5V_EN_1                     LOAD1, D7

-//#define Turnon10K                       Turnon_I_MID
-//#define Turnon200R                      Turnon_I_LARGE
+//#ifdef ELITE_PIN_1_5
+//#define MEM_HOLD                        LOAD0, D4
+//#define HIGH_Z_MODE                     LOAD2, D5
+//#endif
+//#ifdef ELITE_PIN_1_5_RE
+//#define MEM_HOLD                        LOAD1, D0
+//#define HIGH_Z_MODE                     LOAD0, D4
+//#endif
+
+#define DO_MOS_0                        LOAD2, D0
+#define DO_MOS_1                        LOAD2, D1
+#define AO_MOS_0                        LOAD2, D2
+#define AO_MOS_1                        LOAD2, D3
+#define AO_MOS_2                        LOAD2, D4
+#define AO_MOS_3                        LOAD2, D5
+#define DO_PR_0                         LOAD2, D6
+#define DO_PR_1                         LOAD2, D7

 /* I2C */
 #ifdef ELITE_VERSION_1_4
@@ -55,11 +76,14 @@
 #define Board_I2C0_SDA0                 PIN_UNASSIGNED
 #endif

-#define shutdown_6994                   LOAD2, D6
 #define switch_on                       IOID_14
-#define HIGH_Z_MODE                     LOAD2, D5
-#define enable_10v                      LOAD1, D5
-#define enable_5v                       LOAD1, D6
+#define FLT                             IOID_13
+#define TRIG_0                          IOID_0
+//#define TRIG_1                          IOID_2
+
+//#define LOAD0   0x00000000
+//#define LOAD1   0x00000001
+//#define LOAD2   0x00000002

 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;
@@ -69,16 +93,20 @@ const PIN_Config BLE_IO[] = {
 //    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
 //    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
 //    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,

    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,

-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
+    switch_on | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
+
+    TRIG_0 | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,
+//    TRIG_1 | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,
+    FLT    | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,

    PIN_TERMINATE
 };
@@ -93,15 +121,29 @@ static void add_elite_pin() {
    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
    PIN_add(pin_handle,
    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-
+    PIN_add(pin_handle,
+    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
 //    if(elite15_status != PIN_SUCCESS) {
 //        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
 //    }
 }

+static void trig_callback(PIN_Handle handle, PIN_Id pinId);
+static void PIN_trig_edge_set(uint8_t trig0_edge, uint8_t trig1_edge);
+
 static void remove_elite_pin() {
    PIN_close(pin_handle);
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+
+    PIN_registerIntCb(pin_handle, trig_callback);
+    PIN_setInterrupt(pin_handle, FLT | PIN_IRQ_NEGEDGE);
+    PIN_trig_edge_set(instru.trig0_edge, instru.trig1_edge);
 }

 /*!
@@ -0,0 +1,207 @@
+#ifndef ELITETRIG
+#define ELITETRIG
+
+static bool trig0_event_wait    = false;
+static bool trig1_event_wait    = false;
+static bool dual_trig_mode      = false;
+static bool single_trig_mode    = false;
+
+static void TRC_chen_en_refresh();
+
+static void InitTrigChan () {
+    for(int i=0; i<TRIG_CHAN_COUNT; i++) {
+        TRC.chan_en[i] = 0;
+    }
+    TRC.chan_en[8]       = true;    // 5V default disable
+    TRC.chan_en[9]       = true;
+}
+
+static void trig_en_check( ) {
+    if (instru.trig0_en) {
+        trig0_event_wait        = true;
+    }
+    if (instru.trig1_en) {
+        trig1_event_wait        = true;
+    }
+
+    if (trig0_event_wait & trig1_event_wait) {
+        dual_trig_mode      = true;
+        single_trig_mode    = false;
+    } else if (trig0_event_wait ^ trig1_event_wait) {
+        dual_trig_mode      = false;
+        single_trig_mode    = true;
+    } else if (!(trig0_event_wait | trig1_event_wait)) {
+        dual_trig_mode      = false;
+        single_trig_mode    = false;
+    }
+
+}
+
+static void FLT_sense( ) {
+    bool FLT_value      = true;
+    FLT_value = PIN_getInputValue(FLT);
+
+    if(!FLT_value) {        // if FLT = LOW, disable all output
+//            PIN15_setOutputValue(OUT_5V_EN_0, 1);
+//            PIN15_setOutputValue(OUT_5V_EN_1, 1);
+//        set_output_enable(allDisable);
+    } else {
+        PIN15_setOutputValue_refresh();
+    }
+}
+
+static void trig_sense( ) {
+    if (Trig_receive) {
+        Trig_receive = false;
+
+        if (dual_trig_mode) {     // both channel are triggered
+            if(trig0_event & trig1_event & trig0_event_wait & trig1_event_wait) {
+                trig0_event         = false;
+                trig1_event         = false;
+                trig0_event_wait    = false;
+                trig1_event_wait    = false;
+                trig_PeriodicEvent  = true;
+                dual_trig_mode      = false;
+            }
+        } else if (single_trig_mode) {
+            if (trig0_event_wait & trig0_event) {
+                trig0_event         = false;
+                trig0_event_wait    = false;
+                trig_PeriodicEvent  = true;
+                single_trig_mode    = false;
+            } else if (trig1_event_wait & trig1_event) {
+                trig1_event         = false;
+                trig1_event_wait    = false;
+                trig_PeriodicEvent  = true;
+                single_trig_mode    = false;
+            }
+        }
+
+        if (FLT_event) {
+            FLT_event = false;
+            FLT_sense();
+        }
+    }
+}
+
+static void trig_callback(PIN_Handle handle, PIN_Id pinId) {
+    if(TRIG_TrigEnable) {
+        Trig_receive = true;
+        switch (pinId) {
+            case TRIG_0: {
+                trig0_event = true;
+                break;
+            }
+//            case TRIG_1: {
+//                trig1_event = true;
+//                break;
+//            }
+            case FLT:{
+                FLT_event   = true;
+                break;
+            }
+            default: {
+                break;
+            }
+        }
+    }
+}
+
+static void PIN_trig_edge_set(uint8_t trig0_edge, uint8_t trig1_edge) {
+/* Set trigger signal dge type:   0: NEG, 1: POS, 2: BOTH, 3: disable*/
+    switch (trig0_edge) {
+        case TRIG_POSEDGE: {
+            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_POSEDGE);
+            break;
+        }
+        case TRIG_NEGEDGE: {
+            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_NEGEDGE);
+            break;
+        }
+        case TRIG_BOTHEDGE: {
+            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_BOTHEDGES);
+            break;
+        }
+        case TRIG_DIS: {
+            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_DIS);
+            break;
+        }
+        default: {
+            PIN_setInterrupt(pin_handle, TRIG_0 | PIN_IRQ_DIS);
+            break;
+        }
+    }
+//    switch (trig1_edge) {
+//        case TRIG_POSEDGE: {
+//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_POSEDGE);
+//            break;
+//        }
+//        case TRIG_NEGEDGE: {
+//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_NEGEDGE);
+//            break;
+//        }
+//        case TRIG_BOTHEDGE: {
+//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_BOTHEDGES);
+//            break;
+//        }
+//        case TRIG_DIS: {
+//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_DIS);
+//            break;
+//        }
+//        default: {
+//            PIN_setInterrupt(pin_handle, TRIG_1 | PIN_IRQ_DIS);
+//            break;
+//        }
+//    }
+}
+
+static void set_output_enable(bool *out_chan) {
+    TRC_chen_en_refresh();
+
+    update_latch_status(DO_PR_0    , out_chan[0]);
+    update_latch_status(DO_MOS_0   , out_chan[1]);
+    update_latch_status(AO_MOS_0   , out_chan[2]);
+    update_latch_status(AO_MOS_2   , out_chan[3]);
+    update_latch_status(AO_MOS_3   , out_chan[4]);
+    update_latch_status(AO_MOS_1   , out_chan[5]);
+    update_latch_status(DO_MOS_1   , out_chan[6]);
+    update_latch_status(DO_PR_1    , out_chan[7]);
+    update_latch_status(OUT_5V_EN_0, out_chan[8]);
+    update_latch_status(OUT_5V_EN_1, out_chan[9]);
+
+    PIN15_setOutputValue_refresh();
+}
+
+static void trig_event_flush() {
+    trig_PeriodicEvent  = false;
+    TRIG_TrigEnable     = false;
+    Trig_receive        = false;
+    trig0_event         = false;
+    trig1_event         = false;
+    FLT_event           = false;
+    trig0_event_wait    = false;
+    trig1_event_wait    = false;
+    dual_trig_mode      = false;
+    single_trig_mode    = false;
+}
+
+static void TRC_chen_en_refresh() {
+    TRC.chan_en[0]      = instru.tri_pr0_en;
+    TRC.chan_en[7]      = instru.tri_pr1_en;
+
+    TRC.chan_en[1]      = instru.tri_d0_en;
+    TRC.chan_en[6]      = instru.tri_d1_en;
+
+    TRC.chan_en[2]      = instru.tri_a0_en;
+    TRC.chan_en[3]      = instru.tri_a2_en;
+    TRC.chan_en[4]      = instru.tri_a3_en;
+    TRC.chan_en[5]      = instru.tri_a1_en;
+
+    TRC.chan_en[8]      = instru.output_5v_en0;
+    TRC.chan_en[9]      = instru.output_5v_en1;
+
+}
+
+#endif
+
+
@@ -2,7 +2,7 @@
 ***********************************************************
    Read battery's method
 ***********************************************************
-1.ReadADCBat(spi_ADC_rxbuf)
+1.read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
  let "spi_ADC_rxbuf" be 8000
  8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,40 +34,41 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
    uint32_t bat_volt = 0;

-    ReadADCBat(spi_ADC_rxbuf);
+    read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
    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 void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-    if(instru.eliteFxn == CURVE_CALI_ADCTEST){
+    if(ADCSwitch == 0){ /**read V**/
+        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read V**/
+        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read V(buffer)**/
+        headstage_battery_volt();
+        batteryCheck_flag = false;
+        headstage_temperature();
+        tempCheck_flag = false;
        ADCSwitch = 0;
-    }else{
-        if(ADCSwitch == 0){ /**read V**/
-            ReadADCBat(spi_ADC_rxbuf);
-            ADCSwitch++;
-        }
-        else if(ADCSwitch == 1){ /**read V**/
-            ReadADCBat(spi_ADC_rxbuf);
-            ADCSwitch++;
-        }
-        else if(ADCSwitch == 2){ /**read V(buffer)**/
-            headstage_battery_volt();
-            batteryCheck_flag = false;
-            ADCSwitch = 0;
-        }
    }
 }

 static void measureBat(){
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
        GPT.BatteryCheckCounter = 0;
        batteryCheck_flag = true;
@@ -84,8 +85,14 @@ static void measureBat(){

    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-    if( bat < 768 && bat > 20){
+    if( bat < 768 && bat > 20){     // 768 = 3V
        PIN15_setOutputValue(enable_5v, 0);
+    } else if (bat < 1070){             // 1075 = 4.2V
+        PIN15_setOutputValue(BAT_CHAR, 1);
+        PIN15_setOutputValue(BAT_OK, 0);
+    } else if (bat >= 1075){
+        PIN15_setOutputValue(BAT_CHAR, 0);
+        PIN15_setOutputValue(BAT_OK, 1);
    }
 }

@@ -21,32 +21,55 @@

 // RIS (real instruction)
 enum all_mode_e {
-    CURVE_IV                       =  0x10,
-    CURVE_IV_CY                    =  0x20, // cycling iv
-    CURVE_VO                       =  0x30,
-    CURVE_RT                       =  0x40,
-    CURVE_VT                       =  0x50,
-    CURVE_IT                       =  0x60,
-    SET_SAMPLE_RATE                =  0x70,
-    SET_ADC_DAC_GAIN               =  0x80,
-    DIFFERENTIAL_PULSE_VOLTAMMETRY =  0xA0,
-    SQUARE_WAVE_VOLTAMMETRY        =  0xB0,
-    CURVE_CV                       =  0xC0, // cyclic voltammetry
-    CURVE_CC                       =  0xD0, // constant current
-    CURVE_CC_CY                    =  0xF0, // cycling constant current
-    CURVE_CV_HIGH_CY               =  0x01, // cyclic voltammetry(high cycle)
-    CURVE_LSV                      =  0x02, // linear sweep voltammetry
-    CURVE_CA                       =  0x03, // chronoamperometric graph(CA)
-    CURVE_CALI_ADCTEST             =  0x91,
-    CURVE_CALI_DAC                 =  0x93,
-    CURVE_CALI_ADC                 =  0x92,
-    CURVE_PULSE                    =  0x94,
+    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_TRIG_CC                  =  0x0E, // current control mode
+
+    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
+    DEV_TEST                       =  0xFF,
+
+    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
+    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
+    SET_EN_CHAN                    =  0x81,
+    SET_PARA                       =  0xE2,
+    SET_TRIG_EN                    =  0x41
 };

+enum set_para_e {
+    DAC_VOLT                        = 0x01,
+    AOUT_CURRENT                    = 0x02,
+};
+
+enum dev_para_e {
+    VERSION_DEV_TEST                = 0x01,
+    BAT_DEV_TEST                    = 0x02,
+    TEMP_DEV_TEST                   = 0x03,
+    LED_DEV_TEST                    = 0x04,
+    AOUT_DEV_TEST                   = 0x05,
+    DOUT_DEV_TEST                   = 0x06,
+    PR_DEV_TEST                     = 0x07,
+    OUT_5VEN_DEV_TEST               = 0x08,
+    SET_EN_CHAN_DEV_TEST            = 0x0F,
+    VIS_DEV_TRIG_EN                 = 0x09,
+    Init_DEV_Trig_flag              = 0x0A
+};
+
+
 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
-#define CIS_LED_TEST                    0x70
+#define CIS_TEMPERATURE                 0x80

 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
@@ -55,24 +78,6 @@ enum all_mode_e {
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
-#define PARA_1                   0x01
-#define PARA_2                   0x02
-#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
@@ -97,12 +102,30 @@ enum all_mode_e {
 #define KEYLED()                 Elite_led_color(COLOR_YELLOW)
 #define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)

+/* TRIG01 define */
+#define TRIG_PR                  0x00
+#define TRIG_MOS_DOUT            0x01
+#define TRIG_MOS_AOUT            0x02
+#define TRIG_5V_OUT              0x03
+#define TRIG_input               0x04
+#define TRIG_CHAN_COUNT          10     // channel count of TRIG01

 #define BT_WAIT                  0x01
 #define NO_EVENT                 0x02
 #define PRE_WORK                 0x03
 #define WORKING                  0x04
 #define POST_WORK                0x05
+#define TRIG01_WORK              0x06

 #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      21
-#define VERSION_DATE_MONTH     3
-#define VERSION_DATE_DAY       8
-#define VERSION_DATE_HOUR      10
-#define VERSION_DATE_MINUTE    5
+#define VERSION_DATE_MONTH     10
+#define VERSION_DATE_DAY       29
+#define VERSION_DATE_HOUR      18
+#define VERSION_DATE_MINUTE    18

 // this is NOT the version hash !!
 // it's the last version hash
@@ -30,6 +30,12 @@

 #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,45 +46,31 @@ static void ZM_init() {

    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+    InitLED();
+    InitTrigChan();
    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;
+    PIN15_setOutputValue(PULLUP_3V_0, 0);
+    PIN15_setOutputValue(PULLUP_3V_1, 0);
+
+    disable_trig_output();      // all output disable

    InitEliteInstruction();

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

+    TW1508reset();
+//    TRIG_LED_Init();
    //    PIN_registerIntCb(pin_handle, switch_on_callback);
    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
 }

 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() (                            \
+#define IsPeriodicMode() (                       \
 (instru.eliteFxn == CURVE_IV)                 || \
 (instru.eliteFxn == CURVE_IV_CY)              || \
 (instru.eliteFxn == CURVE_IT)                 || \
@@ -95,16 +81,320 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (instru.eliteFxn == CURVE_LSV)                || \
 (instru.eliteFxn == CURVE_CA)                 || \
 (instru.eliteFxn == CURVE_VO)                 || \
-(instru.eliteFxn == CURVE_CALI_ADC)              \
+(instru.eliteFxn == CURVE_OCP)                || \
+(instru.eliteFxn == CURVE_CALI_ADC)           || \
+(instru.eliteFxn == CURVE_TRIG_CC)               \
 )

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

+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;
+     }
+
+     uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+     if( bat < 768 && bat > 20){
+         PIN15_setOutputValue(enable_5v, 0);
+     }
+
+     //ADC counter
+     GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+     if(GPT.SampleRateCounter >= 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;
+    }
+
+    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+//            PIN15_setOutputValue(enable_5v, 0);
+    }
+
+    //ADC counter
+    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+    if(GPT.SampleRateCounter >= instru.sampleRate){
+        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+        EliteADCControl(0);
+    }
+
+    // Over temperature protection
+    uint16_t CC2650temp =  ((uint16_t)(NotifyTemperature[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyTemperature[3]) & 0x00FF);
+    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;
+        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;
+        }
+        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
+    }
+    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;
+    }
+
+    //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 = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+//            PIN15_setOutputValue(enable_5v, 0);
+    }
+
+    // Over temperature protection
+    uint16_t CC2650temp =  ((uint16_t)(NotifyTemperature[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyTemperature[3]) & 0x00FF);
+    if(CC2650temp > 40) {
+        PIN15_setOutputValue(enable_5v, 0);
+    }
+
+    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
 *
@@ -114,278 +404,192 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 *
 * @return  None.
 */
-static void SimpleBLEPeripheral_performPeriodicTask(void) {
+static void SimpleBLEPeripheral_performPeriodicTask(void)
+{
+    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+    GPT.GptimerCounter0 = GPT.GptimerCounter;
+
    if (IsPeriodicMode()) {
-        /** 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;
-            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;
-
-            VinADCGainControl(instru.VinADCGainLevel);
-            IinADCGainControl(instru.ADCGainLevel);
-            VoutGainControl(instru.VoutGainLevel);
-            if (Ve1MatchVe2Mode()) {
-                if (instru.Ve1 == instru.Ve2) {
-                    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, instru.Ve1));
-                    PeriodicEvent = false;
-                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                    ModeLED(NO_EVENT);
-                }
-            }
+            mode_init_set();
        }

-        GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-        if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
-            vscanReset = true;
-            if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-                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;
-        }
+        peri_mode();

-        //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_flag = true;
-            if (vscan_flag) {
-                vscan_ctrl();
-                vscan_flag = false;
-            }
-        }
-
-        //battery counter
-//        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-//        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-//        if(GPT.BatteryCheckCounter >= 50000){
-//            GPT.BatteryCheckCounter -= 50000; //To get right time
-//            batteryCheck_flag = true;
-//        }
-//
-//        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-//        if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
-//        }
-
-        //ADC counter
-        GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-        if(GPT.SampleRateCounter >= instru.sampleRate){
-            GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-            ADC_flag = true;
-            if(ADC_flag){
-                EliteADCControl();
-                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();
-                notify_flag = false;
-            }
-        }
-
-        mode_done();
+        return;
    }
-    else if (instru.eliteFxn == CURVE_PULSE) {
-         /** Periodic Event **/
-         // Default working flow is vscan -> ADC read -> send notify
-         // We will need a flag to control vscan, ADC and notify

-         GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-         GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-         if(mode_init){
-            GPT.SampleRateCounter = instru.sampleRate - 10;
-            GPT.VscanRateCounter  = instru.VsetRate - 1;
-             mode_init       = false;
-             batteryADC_flag = false;
-             record_flag     = true;
-             firstTimeReset  = true;
-             notifyFirst_flag = true;
-             //pulsemode variable
-             stiFirstTime  = true;
-             VinADCGainControl(instru.VinADCGainLevel);
-             IinADCGainControl(instru.ADCGainLevel);
-             VoutGainControl(instru.VoutGainLevel);
-             if (Ve1MatchVe2Mode()) {
-                 if (instru.Ve1 == instru.Ve2) {
-                     DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 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.VoutGainLevel, 25000));
-            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
-            //vscanReset = false;
-        }else{
-            if (megaStiEnable) {
-                pulse_vscan();
-            }
+    if (instru.eliteFxn == CURVE_UNI_PULSE) {
+        if (mode_init) {
+            mode_init = false;
+            mode_init_set();
+            calc_avg_en = false;
        }

-//         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();
-//                 vscan_flag = false;
-//             }
-//         }
-
-         //battery counter
-         GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-         GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-         if(GPT.BatteryCheckCounter >= 50000){
-             GPT.BatteryCheckCounter -= 50000; //To get right time
-             batteryCheck_flag = true;
-         }
-
-         uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-         if( bat < 768 && bat > 20){
-             PIN15_setOutputValue(enable_5v, 0);
-         }
-
-         //ADC counter
-         GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-         if(GPT.SampleRateCounter >= instru.sampleRate){
-             GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-             ADC_flag = true;
-             if(ADC_flag){
-                 EliteADCControl();
-                 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();
-                 notify_flag = false;
-             }
-         }
-
-         mode_done();
-     }
-    else if (instru.eliteFxn == CURVE_CALI_DAC) {
-        DAC_outputV(instru.VoltConstant); //UserCode -> DAC code -> DAC out
-        wm_deinit();
-        PeriodicEvent = false;
-    } else {
+        uni_pulse_mode();

+        return;
    }
+
+    return;
 }

-static void EliteADCControl(void)
+
+
+/*
+ * 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)
 {
+    void *wm = wm_get();
+    uint32_t t = time;
+
    switch (instru.eliteFxn) {
        case CURVE_IV:
+        case CURVE_IV_CY:
+            Iin_Vin_Vout_Plot();
+            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_RT:
+            Iin_Vin_Vout_Plot();
+            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();
+            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_VO:
        case CURVE_LSV:
-        case CURVE_IV_CY:
+            Iin_Vin_Vout_Plot();
+            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:
-            CC_Plot();
+            Iin_Vin_Vout_Plot();
+            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:
-            IT_Plot();
+            Iin_Vin_Vout_Plot();
+            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:
-            VT_Plot();
+            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();
+            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();
+            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));
+            }
            break;

        case CURVE_CALI_ADC:
-            if (instru.AdcChannel == IIN_ADC) cali_IT_plot();
-            else if (instru.AdcChannel == VIN_ADC) cali_VT_plot();
+            if (instru.AdcChannel == RIS_ADC_IIN) {
+                cali_IT_plot();
+            } else if (instru.AdcChannel == RIS_ADC_VIN) {
+                cali_VT_plot();
+            } else if (instru.AdcChannel == RIS_DAC_VOUT) {
+                cali_Vout_plot();
+            }
+            break;
+
+        case CURVE_UNI_PULSE:
+            IT_Plot(t);
+            break;
+
+        case CURVE_TRIG_CC:
+            Iin_Vin_Vout_Plot();
+            set_output_enable(TRC.chan_en);
+//            ModeLED(TRIG01_WORK);
            break;

        default:
@@ -400,14 +604,17 @@ static void mode_done(void)
        (instru.eliteFxn == CURVE_LSV) ||
        (instru.eliteFxn == CURVE_IV_CY)) {
        if (!PeriodicEvent) {
+            finishMode = 1;
            SendNotify();
            Eliteinterrupt();
        }
    }
 }

-static void vscan_ctrl(void)
+static void vscan_ctrl(uint32_t time)
 {
+    uint32_t t = time;
+
    switch (instru.eliteFxn) {
        case CURVE_IV:
            iv_vscan();
@@ -425,6 +632,10 @@ static void vscan_ctrl(void)
            rt_vscan();
            break;

+        case CURVE_IT:
+            it_vscan();
+            break;
+
        case CURVE_CV:
            cv_vscan();
            break;
@@ -437,6 +648,14 @@ static void vscan_ctrl(void)
            ca_vscan();
            break;

+        case CURVE_UNI_PULSE:
+            uni_pulse_vscan(t);
+            break;
+
+        case CURVE_TRIG_CC:
+            aout_Curscan();
+            break;
+
        default:{
            break;
        }
@@ -0,0 +1,744 @@
+#ifndef SCAN_VOLT_H
+#define SCAN_VOLT_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define Vset    instru.Vset
+#define Aset0   instru.Trig_CurCon[0]
+#define Aset1   instru.Trig_CurCon[1]
+#define Aset2   instru.Trig_CurCon[2]
+#define Aset3   instru.Trig_CurCon[3]
+
+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();
+
+    if (vscanReset) {
+        Vset = vo->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = vo->_Vinit;
+    }
+
+    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 / 20 ; //[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 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 aout_Curscan(void)
+{
+    struct wm_aout_ctx_t *aout = (struct wm_aout_ctx_t *)wm_get();
+
+    if(vscanReset){
+        Aset0 = aout->_Curset0;
+        Aset1 = aout->_Curset1;
+        Aset2 = aout->_Curset2;
+        Aset3 = aout->_Curset3;
+    }
+
+    if(!vscanReset){
+        Aset0 = aout->_Curset0;
+        Aset1 = aout->_Curset1;
+        Aset2 = aout->_Curset2;
+        Aset3 = aout->_Curset3;
+    }
+
+    return;
+}
+
+static void chg_vo_para(uint16_t parameter, int32_t value)
+{
+    uint16_t pa = parameter;
+    int32_t val = value;
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
+
+    if (pa == DAC_VOLT) {
+        vo->_Vinit = val;
+    }
+
+    return;
+}
+
+static void chg_it_para(uint16_t parameter, int32_t value)
+{
+    uint16_t pa = parameter;
+    int32_t val = value;
+    struct wm_it_ctx_t *it = (struct wm_it_ctx_t *)wm_get();
+
+    if (pa == DAC_VOLT) {
+        it->_Vinit = val;
+    }
+
+    return;
+}
+
+static void chg_rt_para(uint16_t parameter, int32_t value)
+{
+    uint16_t pa = parameter;
+    int32_t val = value;
+    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
+
+    if (pa == DAC_VOLT) {
+        rt->_Vinit = val;
+    }
+
+    return;
+}
+
+static void chg_aout_para(uint16_t parameter, int32_t value)
+{
+    uint16_t pa = parameter;
+    int32_t val = value;
+    struct wm_aout_ctx_t *aout = (struct wm_aout_ctx_t *)wm_get();
+
+    if (pa == Aout_CH_0) {
+        aout->_Curset0 = val;
+    }
+    else if (pa == Aout_CH_1) {
+        aout->_Curset1 = val;
+    }
+    else if (pa == Aout_CH_2) {
+        aout->_Curset2 = val;
+    }
+    else if (pa == Aout_CH_3) {
+        aout->_Curset3 = val;
+    }
+
+    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;
+    }
+
+    if (mode == CURVE_TRIG_CC) {
+        chg_aout_para(pa, val);
+
+        return;
+    }
+    return;
+}
+
+#endif
@@ -621,6 +621,12 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                    }
                    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();
                    }
@@ -632,6 +638,18 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                } else {
                    EliteOn = TurnOnElite(key);
                }
+
+                if (TRIG_TrigEnable) {
+                    trig_sense();
+                    if (trig_PeriodicEvent) {
+                        trig_PeriodicEvent  = false;
+                        PeriodicEvent     = true;
+                        InitPeriodicEvent = true;      // need to create a WorkModeData?
+                        mode_init         = true;
+                        InitGPT();
+                    }
+                }
+
            }
            else {                               // if there is periodic event
                if(InitPeriodicEvent){
@@ -919,16 +937,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
Benny Liu	37157110ff	Modify calibration function. Update trigger board calibration data.	2021-11-16 17:08:15 +08:00
Benny Liu	9a97db7812	Device name = Trigger	2021-11-15 18:32:31 +08:00
Benny Liu	7e6362e2d4	Add channel enable set para function.	2021-11-15 16:13:20 +08:00
Benny Liu	86a1443dc8	set_para function test okay.	2021-11-09 17:52:22 +08:00
Benny Liu	20c17f477f	Modify hardware, change back to 3 pin + 3 latch. UI okay.	2021-11-05 18:16:05 +08:00
Benny Liu	38b4bf39c6	TRIG01 V.1	2021-10-29 18:18:06 +08:00
Benny Liu	6143094421	Trigger Dual mode and Single mode test okay.	2021-10-29 15:57:58 +08:00
Benny Liu	e9d16791f8	Trigger sense function single mode & dual mode okay.	2021-10-26 14:25:22 +08:00
Benny Liu	215ef54e8e	Add comment and change variable name.	2021-10-25 18:07:18 +08:00
Benny Liu	69fdd640c4	Add comment.	2021-10-22 17:56:04 +08:00
Benny Liu	c124883e51	Trigger sensing function okay.	2021-10-22 17:55:00 +08:00
Benny Liu	254b6d2af1	Add set parameter function for TRIG01, not checked yet.	2021-10-19 18:13:17 +08:00
Benny Liu	568a910604	Aout Good.	2021-10-18 17:59:54 +08:00
Benny Liu	e7d423829c	Modify Current control function.	2021-10-15 18:05:42 +08:00
Benny Liu	a761f20dce	TW1508 auto set gain function okay!	2021-10-13 18:03:30 +08:00
Benny Liu	febc4c63eb	Add setAoutput function to fit the working principle of TW1508, good good.	2021-10-12 18:08:33 +08:00
Benny Liu	30a10a1f1e	Add setAoutput function to fit the working principle of TW1508, not checked.	2021-10-07 17:59:04 +08:00
Benny Liu	4af87987dc	Modify trigger function.	2021-10-05 18:03:41 +08:00
Benny Liu	0b27a7182f	Add curve trig CC mode. Modify trigger sensing function.	2021-10-05 16:32:43 +08:00
Benny Liu	962f7afc49	AOUT_DEV_TEST functioning, good.	2021-09-24 13:18:48 +08:00
Benny Liu	1fffa4dd4a	Modify LED function.	2021-09-24 10:29:38 +08:00
Benny Liu	fc314210e7	Use controller dev mode.	2021-09-22 18:30:24 +08:00
Benny Liu	89ff326b87	Merge to current controller version. Build okay, no error.	2021-09-22 15:57:14 +08:00
Benny Liu	6508f54216	Merge branch 'Elite_TRIG01_development' into Elite_TRIG01_20210922 # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteInstruction.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLED.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteReset.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteSPI.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_PIN.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_def.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h	2021-09-22 15:04:11 +08:00
Benny Liu	785358ea83	Update F08F calibration value	2021-09-16 16:22:26 +08:00
Roy	ecc6841a05	update BOARD_EF30 & EE3A & ED21 & EF50 calibration data	2021-09-14 23:08:31 +08:00
Roy	5b2889cbc7	don't update Iin channel when change gain	2021-09-09 18:01:12 +08:00
Roy	f638c872ad	add BOARD_EF30 & BOARD_EF50 calibration data	2021-09-03 15:19:31 +08:00
Roy	a0ddb1f13b	cal impedance use Vout_set for RT	2021-09-01 18:03:07 +08:00
Roy	cfe3aacfc5	fix change Iin gain damping	2021-08-25 14:18:34 +08:00
Roy	f38c99a226	VT mode use Iin_Vin_Plot and send Iin & Vin	2021-08-24 16:33:41 +08:00
Roy	b958536d96	fix realtime instruction	2021-08-20 16:19:10 +08:00
Roy	489047b7f6	annotation	2021-08-20 11:19:38 +08:00
Roy	9138b93e80	update all mode data	2021-08-19 13:33:04 +08:00
Roy	cdec2f5134	update CV & CA & LSV data	2021-08-17 13:57:42 +08:00
Benny Liu	9f5f87d3bd	Update BOARD_C5AF & BOARD_F08F calibration data	2021-08-12 18:20:50 +08:00
Roy	39280c1bce	CV.LSV.CA Vscan is Vset - Vin	2021-08-12 11:14:14 +08:00
Roy	565c415762	notify cycle in CV mode	2021-08-05 09:35:19 +08:00
Roy	97adad6ef1	take away read bettery in CURVE_UNI_PULSE mode	2021-08-02 12:53:30 +08:00
Roy	6cdbd35a8a	update CURVE_UNI_PULSE mode	2021-07-23 19:13:15 +08:00
Roy	04d4af4cad	change in sequence of IT_plot & VT_plot	2021-07-22 10:28:12 +08:00
Roy	7a0691a221	sort out code (correction.h)	2021-07-21 14:15:23 +08:00
Roy	e420b535d7	update adc relation function	2021-07-20 18:53:03 +08:00
Roy	568489d39e	update LED_DEV_TEST	2021-07-20 18:10:34 +08:00
Roy	95cf4a7f73	fix CIS return date (insert data length)	2021-07-20 17:29:22 +08:00
Roy	1d0ab06900	sort out code	2021-07-15 18:36:25 +08:00
Roy	52dd0e8585	sort out code	2021-07-15 16:02:11 +08:00
Roy	0749a7390d	multi channel separate from Iin, and calculate average skip 10ms	2021-07-15 13:28:24 +08:00
Roy	baa0894240	fix leadtime & vscantime	2021-07-12 23:22:08 +08:00
Roy	e29e5f4127	update OCP highz instruction	2021-07-12 16:01:47 +08:00
Roy	ca4a265b65	improve mode instruction, and change it & rt & vo volt anytime	2021-07-09 16:10:33 +08:00
Roy	0aea99cb2f	chart ugly	2021-07-07 18:46:16 +08:00
Roy	33f2e77ed9	new uni_pulse mode	2021-07-07 15:41:03 +08:00
Benny Liu	34838a793f	Combine battery voltage and CC2650 temperature measurement.	2021-07-06 14:57:25 +08:00
Benny Liu	9a87a5316f	Add over temperature protection check.	2021-07-05 16:23:11 +08:00
Benny Liu	a23235085d	Add Temperature sensing function. (Not done yet)	2021-07-05 14:00:48 +08:00
Benny Liu	78cc816ba3	Run Iin_Vin_Vout_plot() at CURVE_IT.	2021-07-02 11:22:28 +08:00
Benny Liu	2ff582a0c5	Merge branch 'Elite1.5_Vout_in_RT_0628' into Elite1.5 # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_mode_ADC_DAC.h # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h	2021-07-02 10:14:16 +08:00
Roy	23d16b37dc	modulize ADC.h	2021-07-01 19:02:23 +08:00
Roy	5eb08c48e5	modulize ADC.h	2021-07-01 15:52:09 +08:00
Roy	8d9d9a4955	optimize auto gain changer	2021-07-01 15:50:33 +08:00
Benny Liu	c5d487f7c7	Set Vout voltage and send notify at IT mode.	2021-06-30 13:56:39 +08:00
Roy	cfa28f9d7d	modify IV.CV notify	2021-06-28 18:18:24 +08:00
Benny Liu	d44843d525	Add parameter from UI.	2021-06-28 17:10:18 +08:00
Benny Liu	43d2623eb2	RT mode output 0.1V	2021-06-28 16:39:44 +08:00
Roy	be8a39694e	take away Old boundary	2021-06-28 12:13:22 +08:00
Roy	6f6fd80488	take away Old boundary	2021-06-28 11:58:51 +08:00
Roy	cfd06ea0ea	modify SIMPLEPROFILE_CHAR4_LEN 60 to 20	2021-06-22 16:46:33 +08:00
Roy	faff6a229a	nothing	2021-06-18 16:38:45 +08:00
Benny Liu	aa5d0be31e	Add calibration coeff. and offset for Vout_volt	2021-06-18 13:28:57 +08:00
Benny Liu	376d1777ba	Add calibration Vout plot and device correction parameter for Vout_in	2021-06-18 11:50:36 +08:00
Roy	12241635a3	[update] update CURVE_CALI_ADC	2021-06-17 12:18:24 +08:00
Roy	18eba87064	[update] update OCP mode & merge vscan_volt	2021-06-17 11:48:18 +08:00
Roy	d313f48eaa	[update] new OCP mode and centralized notify	2021-06-16 22:32:54 +08:00
Roy	117336020f	[update] new Vout_Plot	2021-06-15 14:03:49 +08:00
Roy	cf3172f99a	[update] update Elite_mode_ADC_DAC file	2021-06-09 14:28:16 +08:00
Roy	8b32a6d2d1	[cali] add BOARD_F08F & E774 & ED21 & EE3A & F010 & EEEF calibration data.	2021-06-07 15:27:44 +08:00
Roy	3e7d3abed7	[update] change to ELITE_PIN_1_5_RE version	2021-05-25 10:12:33 +08:00
Roy	6ac29b48c2	[update] change to ELITE_PIN_1_5_RE	2021-05-25 09:56:56 +08:00
Roy	d0d83e6ae6	[cali] add BOARD_C5AF & C6E7 & ED49 calibration data.	2021-05-25 09:36:48 +08:00
Benny Liu	123e620f50	Modify trigger receive function. Turn on PULSE_MODE. Use "struct" to express channel.	2021-05-24 16:20:25 +08:00
Roy	0e181aaa07	[cali] add BOARD_C68B & ED5A & C705 & C6EF calibration data.	2021-05-21 15:32:40 +08:00
Benny Liu	b5a7720c24	Modify LED notification.	2021-05-21 15:26:15 +08:00
Benny Liu	152937ca32	Disable all output after reset()	2021-05-07 17:39:57 +08:00
Benny Liu	3c85fbef6f	Work mode LED for TRIG01.	2021-05-07 16:28:49 +08:00
Benny Liu	4ff8f044c4	Check TW1508 function ok.	2021-05-03 18:01:13 +08:00
Benny Liu	22a2095cd7	Add update TRIG01 pin output value.	2021-05-03 14:57:29 +08:00
Benny Liu	9c10e4ba53	Add set channel select LED notification.	2021-04-26 17:24:44 +08:00
Benny Liu	0529f84511	Charging notification LED	2021-04-23 17:09:57 +08:00
Benny Liu	da63ff03d3	Add refresh TRIG01 LED function.	2021-04-23 13:25:27 +08:00
Roy	a7b0b3965c	RT send resister in denomination of mOhm to controller	2021-04-19 10:18:13 +08:00
Roy	dbbb44e0d2	new sps on IT.VT.RT.CC.VOUT mode	2021-04-14 09:28:08 +08:00
Roy	156927e8f9	new sps on IT.VT.RT.CC.VOUT mode	2021-04-13 11:31:27 +08:00
Roy	daab3bed0b	GPtimer CLOCK_FREQ 4800 -> 4769	2021-04-12 09:37:02 +08:00
Roy	7c6d7c68de	CC MODE deltaV = 10mV	2021-04-09 16:23:10 +08:00
Roy	eff1e4a43e	new 1.5re pin (use define)	2021-04-09 10:48:25 +08:00
Roy	9678266e59	fix RT (no 10 ohm)	2021-04-08 14:10:31 +08:00
Roy	6f74dc2c05	datalength extension:60bytes	2021-04-08 11:07:44 +08:00
Roy	910576ac6d	datalength extension 200 bytes	2021-03-31 10:19:35 +08:00
Benny Liu	141dcb70a3	full scale range for TW1508: 0x0000 ~ 0x03FF	2021-03-22 16:24:34 +08:00
Benny Liu	8625222e36	Switch to LOAD0 before remove_elite_pin().	2021-03-22 14:41:07 +08:00
Benny Liu	498652836c	Switch to LOAD0 before remove_elite_pin(). No pin overwrite issue.	2021-03-19 17:56:47 +08:00
Roy	9377dc517f	battery < 3V when running mode, don't close elite	2021-03-16 14:25:21 +08:00
Roy	e44d3d8e60	adjusted cc value	2021-03-16 11:24:45 +08:00
Benny Liu	dbfd4364e3	Latch LOADA & LOADB no no.	2021-03-15 18:22:08 +08:00
Roy	f5416d5e1f	measure battery when run mode	2021-03-15 15:44:47 +08:00
Benny Liu	bd049e4fec	Use headstage.h ADC_TEST to test TRIG01, TW1508 control still not working. TW1508reset() --> turnoff itself	2021-03-12 18:17:22 +08:00
Roy	0d60074697	send mode finish flag	2021-03-12 12:12:24 +08:00
Roy	3c74358634	update notify rate	2021-03-10 17:25:12 +08:00
Benny Liu	f20b6634ae	Merge remote-tracking branch 'origin/Elite_TRIG01_development' into Elite_TRIG01_development	2021-02-26 17:43:11 +08:00
Benny Liu	b59472ad2d	Add TRIG01 LED functions.	2021-02-26 17:29:59 +08:00
Benny Liu	a75b3ba58f	Add TRIG02 LED functions.	2021-02-26 17:19:20 +08:00
Benny Liu	8c3d8f46df	Update TRIG01 ADC command	2021-02-22 15:29:52 +08:00
Benny Liu	ca29a325f1	Use GPIO control TW1508, yes yes.	2021-02-20 18:50:00 +08:00
Benny Liu	61aee1a3e6	Use GPIO to control TW1508.	2021-02-18 14:33:25 +08:00
Benny Liu	162b528385	Add file TRIG.h	2021-02-17 14:40:17 +08:00
Benny Liu	b6e30d25f5	Modify trigger callback function.	2021-02-17 12:08:30 +08:00
Benny Liu	db8d7bf0af	5V output pin FLT callback function	2021-02-08 17:58:53 +08:00
Benny Liu	48d770b271	trigger callback	2021-02-08 17:49:47 +08:00
Benny Liu	88d1fc0a5e	Add trigger sensing pin.	2021-02-08 17:03:11 +08:00
Benny Liu	9769d38897	Update Elite TRIG01 pin. Add trigger sensing pin.	2021-02-08 16:43:37 +08:00
Benny Liu	8be3c30b23	Update Elite TRIG01 pin	2021-02-08 14:17:22 +08:00