add BOARD_F098 & BOARD_F068 calibration data

# 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

.gitignore

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.settings/org.eclipse.cdt.codan.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+inEditor=false
+onBuild=false

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.settings/org.eclipse.cdt.debug.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/app/.settings/org.eclipse.core.resources.prefs

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

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/.settings/org.eclipse.cdt.codan.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+inEditor=false
+onBuild=false

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_central/ccs/stack/.settings/org.eclipse.cdt.debug.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.launches/simple_peripheral_cc2650em_app.launch

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCV3Mode.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCVCurve.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCVSCANMode.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDAC.h

@@ -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
@@ -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(Turnon_VOUT_SMALL, 0);
     }
     else if(VOUTLevel == 1){
         // VOUT gain level = 1, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
     }
     else if(VOUTLevel == 2){
         // VOUT gain level = 2, using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
     }
     else{
         // default using 15K resister
-        PIN15_setOutputValue(Turon_VOUT_SMALL, 1);
+        PIN15_setOutputValue(Turnon_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);
         }
     }
 }

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteFlagCTInit.h

@@ -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;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteGPTimer.h

@@ -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 {                                                                                              \

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteIVCurve.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteInstruction.h

@@ -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,40 @@ 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];
+    int32_t  v_stop;
+    int32_t  v_up;
+    int32_t  v_low;
+    bool     v_invert_option;
+    bool     v_stop_direction;
+    int32_t  v_1;
+    int32_t  v_2;
+
+
+    // pulse mode
     int32_t  sti_v1;
     int32_t  sti_v2;
     int32_t  sti_v3;
@@ -62,38 +83,46 @@ struct HEADSTAGE_INSTRUCTION {
     uint16_t sti_cy;
     uint16_t sti_loop;
 
-    uint16_t StepTime;
+    int32_t Vout;
+
+    // not use
+    int32_t  Currentmax;
+    uint8_t  VoViSwitch;
+
+
+
 
-    uint8_t AdcChannel;
 
 } 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
 
 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -109,36 +138,72 @@ 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.v_stop          = 0;
+    instru.t_pulse[0]      = 0;
+    instru.t_pulse[1]      = 0;
+    instru.t_pulse[2]      = 0;
+    instru.t_pulse[3]      = 0;
+    instru.v_initial[0]    = 0;
+    instru.v_initial[1]    = 0;
+    instru.v_initial[2]    = 0;
+    instru.v_initial[3]    = 0;
+    instru.v_slope[0]      = 0;
+    instru.v_slope[1]      = 0;
+    instru.v_slope[2]      = 0;
+    instru.v_slope[3]      = 0;
+    instru.v_step[0]       = 0;
+    instru.v_step[1]       = 0;
+    instru.v_step[2]       = 0;
+    instru.v_step[3]       = 0;
+    instru.t_pulse_min[0]  = 0;
+    instru.t_pulse_min[1]  = 0;
+    instru.t_pulse_min[2]  = 0;
+    instru.t_pulse_min[3]  = 0;
+    instru.t_pulse_max[0]  = 0;
+    instru.t_pulse_max[1]  = 0;
+    instru.t_pulse_max[2]  = 0;
+    instru.t_pulse_max[3]  = 0;
+    instru.v_invert_option = false;
+    instru.v_stop_direction = true;
+    instru.v_1              = 0;
+    instru.v_2              = 0;
 
     //pulse mode
     instru.sti_t1          = 0;
@@ -157,6 +222,14 @@ static void InitEliteInstruction(){
     instru.sti_v7          = DAC_ZERO;
     instru.sti_loop        = 1;
     instru.sti_cy          = 0;
+
+    instru.Vout            = 0;
+
+    // not use
+    instru.Currentmax      = 0;
+    instru.VoViSwitch      = 0x01;
+
+    return;
 }
 
 #ifdef __cpulsplus

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLED.h

@@ -5,6 +5,12 @@
 #define DARKLED                  0xE1
 #define LIGHTLED                 0xE8
 
+static bool     btWaitLedFlag   = 0;
+static bool     noEventLedFlag  = 0;
+static bool     preWorkLedFlag  = 0;
+static bool     workingLedFlag  = 0;
+static bool     postWorkLedFlag = 0;
+
 static void WorkModeLED();
 
 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
@@ -134,7 +140,8 @@ static void ModeLED(uint16_t modeStatus) {
     }
 }
 
-static void checkFlafLED() {
+static void checkFlafLED()
+{
     if(btWaitLedFlag == 1){
         ModeLED(BT_WAIT);
     }
@@ -152,49 +159,42 @@ static void checkFlafLED() {
     }
 }
 
-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_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);
-        }
+        case CURVE_IV:
+        case CURVE_VO:
+        case CURVE_RT:
+        case CURVE_VT:
+        case CURVE_IT:
+        case CURVE_CV:
+        case CURVE_CA:
+        case CURVE_CC:
+        case CURVE_OCP:
+        case CURVE_LSV:
+        case CURVE_IV_CY:
+        case CURVE_PULSE:
+        case CURVE_UNI_PULSE:
+        case CURVE_DPV:
+        case CURVE_DPV_SMPRATE:
+        case CURVE_DPV_ADVANCE:
+        case CURVE_DPV_ADVANCE_SMPRATE:
+            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;
+
+        default:
+            break;
 
-        break;
-    }
-//    case VIS_RST: {
-//        LEDPowerON();
-//        break;
-//    }
-    default: {
-        WORKLED();
-        break;
-    }
     }
 }
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteLSVMode.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteNotify.h

@@ -10,57 +10,22 @@
 #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
+#define FINISH_MODE_INS 0b10100000
 
-/**
- * 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 bool  finishMode         = false;
 
 /*
  * Notify format
@@ -108,10 +73,17 @@ 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;
+    if (finishMode) {
+        not_buf[19] = (FINISH_MODE_INS) & 0b11110000;
+    } else {
+        not_buf[19] = 0 & 0b11110000;
     }
 
+
+//    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 +108,7 @@ static void initCISBuf(){
 static void initRawDataBuf(){
     not_time_stamp    = 0;
     NotifyCycleNumber = 0;
+    finishMode        = false;
 
     for (int i = 0; i < 4; i++){
         NotifyCurrent[i]   = 0;
@@ -183,6 +156,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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteReset.h

@@ -3,24 +3,21 @@
 #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);
+    VinADCGainCtrl(VIN_GAIN_AUTO);
+    IinADCGainCtrl(I_GAIN_AUTO);
 
-    instru.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+    instru.VoutGainLv = VOUT_GAIN_15K;
+    VoutGainControl(instru.VoutGainLv);
+    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
 
     for (int i = 0; i < SPI_LED_SIZE; i++) {
         spi_LEDtxbuf[i] = 0;
@@ -42,21 +39,18 @@ 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));
+    instru.VoutGainLv = VOUT_GAIN_15K;
+    VoutGainControl(instru.VoutGainLv);
+    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
 
     for (int i = 0; i < SPI_LED_SIZE; i++) {
         spi_LEDtxbuf[i] = 0;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteSPI.h

@@ -75,7 +75,7 @@ static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
 
     SPI_transfer(spiHandle1, &ADC_DAC_transaction);
 
-    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
+    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HIGH
     update_latch_status (ADC_CS, 1);
 //    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }
@@ -91,13 +91,18 @@ static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
 
     SPI_transfer(spiHandle1, &ADC_DAC_transaction);
 
-    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HOGH
+    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HIGH
     update_latch_status (DAC_CS, 1);
 //    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
 }
 
 static void ELITE15_SPI_HOLD() {
     Elite_SPI_init();
+    #ifdef ELITE_PIN_1_5_RE
+    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
+    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
+    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
+    #endif
 
     PIN_setOutputValue(pin_handle, LOAD0, 1);
     PIN_setOutputValue(pin_handle, LOAD1, 0);

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteWorkData.h

@@ -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,84 @@ 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_dpv_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t  _Vset;
+
+    int32_t _v0;
+    uint32_t _t_pulse[4];
+    int32_t _v_initial[4];
+    int32_t _v_slope[4];
+    int32_t _v_step[4];
+
+    uint32_t _t_period;
+    uint32_t _t_pa[4];
+    int32_t _v_stop;
+    bool _v_curr_direc;
+    int32_t _v_amp;
+
+    uint32_t _t_pulse_min[4];
+    uint32_t _t_pulse_max[4];
+
+    bool _v_direc_init;
+};
+
+struct wm_dpv_advance_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+    int32_t  _Vset;
+
+    int32_t _v0;
+    uint32_t _t_pulse[4];
+    int32_t _v_initial[4];
+    int32_t _v_slope[4];
+    int32_t _v_step[4];
+
+    uint32_t _t_period;
+    uint32_t _t_pa[4];
+    int32_t _v_stop;
+    int32_t _v_up;
+    int32_t _v_low;
+    int32_t _v_amp;
+    int32_t _v_1;
+    int32_t _v_2;
+
+    uint32_t _t_pulse_min[4];
+    uint32_t _t_pulse_max[4];
+
+    uint16_t _cycleNumber;
+
+    bool _v_curr_direc;
+    bool _v_direc_init;
+    bool _v_invert_option;
+    bool _v_stop_direction;
+};
+
+struct wm_ocp_ctx_t {
+    /* WARNING: please keep MEASURE at first!! */
+    struct wm_meas_t measure;
+};
+
+int wm_init(void);
 int wm_deinit(void);
 void *wm_get(void);
 
@@ -176,6 +257,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 +524,222 @@ static int __pulse_create(void)
     return 0;
 }
 
+static int __uni_pulse_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_uni_pulse_ctx_t *p;
+    void **wm = &workMode_p;
+    uint32_t pul_acc = 0;
+    int i;
+
+    p = malloc(sizeof(struct wm_uni_pulse_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vset           = 0;
+
+    p->_v0             = UC_TO_5NV(instru.v0); //[5nV]
+
+    p->_t_pulse[0]     = instru.t_pulse[0];
+    p->_t_pulse[1]     = instru.t_pulse[1];
+    p->_t_pulse[2]     = instru.t_pulse[2];
+    p->_t_pulse[3]     = instru.t_pulse[3];
+
+    p->_v_initial[0]   = UC_TO_5NV(instru.v_initial[0]); //[5nv]
+    p->_v_initial[1]   = UC_TO_5NV(instru.v_initial[1]); //[5nv]
+    p->_v_initial[2]   = UC_TO_5NV(instru.v_initial[2]); //[5nv]
+    p->_v_initial[3]   = UC_TO_5NV(instru.v_initial[3]); //[5nv]
+
+    p->_v_slope[0]     = instru.v_slope[0];
+    p->_v_slope[1]     = instru.v_slope[1];
+    p->_v_slope[2]     = instru.v_slope[2];
+    p->_v_slope[3]     = instru.v_slope[3];
+
+    p->_v_step[0]      = UC_TO_5NV(instru.v_step[0]); //[5nv]
+    p->_v_step[1]      = UC_TO_5NV(instru.v_step[1]); //[5nv]
+    p->_v_step[2]      = UC_TO_5NV(instru.v_step[2]); //[5nv]
+    p->_v_step[3]      = UC_TO_5NV(instru.v_step[3]); //[5nv]
+
+    p->_t_period = 0;
+
+    for (i=0; i<4; i++) {
+        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
+        pul_acc = p->_t_pa[i];
+        p->_t_period += p->_t_pulse[i];
+    }
+
+    instru.period = p->_t_period;
+
+    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
+    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
+    p->_t_pulse_min[2]     = (instru.t_pulse[2] - 100) * instru.t_pulse_min[2] / 100 + 50;
+    p->_t_pulse_min[3]     = (instru.t_pulse[3] - 100) * instru.t_pulse_min[3] / 100 + 50;
+
+    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
+    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
+    p->_t_pulse_max[2]     = (instru.t_pulse[2] - 100) * instru.t_pulse_max[2] / 100 + 50;
+    p->_t_pulse_max[3]     = (instru.t_pulse[3] - 100) * instru.t_pulse_max[3] / 100 + 50;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __dpv_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_dpv_ctx_t *p;
+    void **wm = &workMode_p;
+    uint32_t pul_acc = 0;
+    int i;
+
+    p = malloc(sizeof(struct wm_dpv_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vset           = 0;
+
+    p->_v0             = instru.v0; //[5nV]
+    p->_v_stop         = instru.v_stop; //[5nV]
+
+    p->_t_pulse[0]     = instru.t_pulse[0];
+    p->_t_pulse[1]     = instru.t_pulse[1];
+
+    p->_v_initial[0]   = instru.v_initial[0]; //[5nv]
+    p->_v_initial[1]   = instru.v_initial[1]; //[5nv]
+
+    p->_v_slope[0]     = instru.v_slope[0];
+    p->_v_slope[1]     = instru.v_slope[1];
+
+    p->_v_step[0]      = instru.v_step[0]; //[5nv]
+    p->_v_step[1]      = instru.v_step[1]; //[5nv]
+
+    p->_t_period = 0;
+
+    for (i=0; i<4; i++) {
+        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
+        pul_acc = p->_t_pa[i];
+        p->_t_period += p->_t_pulse[i];
+    }
+
+    instru.period = p->_t_period;
+
+    p->_v_direc_init   = instru.directionInit;
+    p->_v_curr_direc = instru.directionInit;
+    p->_v_amp = instru.v_initial[1] - instru.v_initial[0];
+
+    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
+    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
+
+    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
+    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __dpv_advance_create(void)
+{
+    struct wm_meas_t *m;
+    struct wm_dpv_advance_ctx_t *p;
+    void **wm = &workMode_p;
+    uint32_t pul_acc = 0;
+    int i;
+
+    p = malloc(sizeof(struct wm_dpv_advance_ctx_t));
+    if (!p) return -1;
+
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    p->_Vset           = 0;
+
+    p->_v0             = instru.v0; //[5nV]
+    p->_v_stop         = instru.v_stop; //[5nV]
+
+    p->_t_pulse[0]     = instru.t_pulse[0];
+    p->_t_pulse[1]     = instru.t_pulse[1];
+
+    p->_v_initial[0]   = instru.v_initial[0]; //[5nv]
+    p->_v_initial[1]   = instru.v_initial[1]; //[5nv]
+
+    p->_v_slope[0]     = instru.v_slope[0];
+    p->_v_slope[1]     = instru.v_slope[1];
+
+    p->_v_step[0]      = instru.v_step[0]; //[5nv]
+    p->_v_step[1]      = instru.v_step[1]; //[5nv]
+
+    p->_t_period = 0;
+
+    for (i=0; i<4; i++) {
+        p->_t_pa[i] = pul_acc + p->_t_pulse[i];
+        pul_acc = p->_t_pa[i];
+        p->_t_period += p->_t_pulse[i];
+    }
+
+    instru.period = p->_t_period;
+
+    p->_v_direc_init   = instru.directionInit;
+    p->_v_curr_direc = instru.directionInit;
+    p->_v_stop_direction = instru.v_stop_direction;
+    p->_v_up = instru.v_up;
+    p->_v_low = instru.v_low;
+    p->_v_amp = instru.v_initial[1] - instru.v_initial[0];
+    p->_v_1 = instru.v_1;
+    p->_v_2 = instru.v_2;
+
+    p->_t_pulse_min[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_min[0] / 100 + 50;
+    p->_t_pulse_min[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_min[1] / 100 + 50;
+
+    p->_t_pulse_max[0]     = (instru.t_pulse[0] - 100) * instru.t_pulse_max[0] / 100 + 50;
+    p->_t_pulse_max[1]     = (instru.t_pulse[1] - 100) * instru.t_pulse_max[1] / 100 + 50;
+
+    p->_cycleNumber = instru.cycleNumber;
+    p->_v_invert_option = instru.v_invert_option;
+
+    *wm = p;
+
+    return 0;
+}
+
+static int __ocp_create(void)
+{
+    struct wm_meas_t *m;
+    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;
+}
+
 int wm_init(void)
 {
     int mode = instru.eliteFxn;
@@ -449,7 +749,6 @@ int wm_init(void)
 
     switch (mode) {
         case CURVE_VO:
-        case CURVE_CALI_DAC:
             if (__vo_create()) return -2;
             break;
 
@@ -493,10 +792,27 @@ 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_DPV:
+        case CURVE_DPV_SMPRATE:
+            if (__dpv_create()) return -2;
+            break;
+        case CURVE_DPV_ADVANCE:
+        case CURVE_DPV_ADVANCE_SMPRATE:
+            if (__dpv_advance_create()) return -2;
+            break;
+
         default:
             // printf("DO NOT support!!");
             return -3;
-    };
+    }
 
     return 0;
 }
@@ -522,20 +838,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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteZTcurve.h

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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_PIN.h

@@ -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
@@ -36,15 +39,24 @@
 #define ADC_DAC_SPI_CLK                 LOAD0, D2
 #define LED_MOSI                        LOAD0, D1
 #define LED_CLK                         LOAD0, D0
-#define MEM_HOLD                        LOAD0, D4
 #define MEM_CS                          LOAD0, D5
 
+#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 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 Turnon_VOUT_SMALL                LOAD2, D7
+#define shutdown_6994                   LOAD2, D6
 
 //#define Turnon10K                       Turnon_I_MID
 //#define Turnon200R                      Turnon_I_LARGE
@@ -55,9 +67,7 @@
 #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
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_batt.h

@@ -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;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_def.h

@@ -21,32 +21,48 @@
 
 // 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_DPV                      =  0x0E,
+    CURVE_DPV_SMPRATE              =  0x0F,
+    CURVE_DPV_ADVANCE              =  0x10,
+    CURVE_DPV_ADVANCE_SMPRATE      =  0x11,
+
+    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
+
+
+    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
+    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
+    SET_PARA                       =  0xE2
 };
 
+enum set_para_e {
+    DAC_VOLT                        = 0x01,
+};
+
+enum dev_para_e {
+    VERSION_DEV_TEST                = 0x01,
+    BAT_DEV_TEST                    = 0x02,
+    TEMP_DEV_TEST                   = 0x03,
+    LED_DEV_TEST                    = 0x04,
+};
+
+
 // CIS (control instruction)
 #define CIS_VERSION                     0x40
 #define CIS_VOLT                        0x10
-#define CIS_LED_TEST                    0x70
+#define CIS_TEMPERATURE                 0x80
 
 // mode parameter
 #define STEP_TO_VSETRATE(step)   step2VsetRate(step)
@@ -55,24 +71,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
@@ -105,4 +103,14 @@ enum all_mode_e {
 #define POST_WORK                0x05
 
 #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

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h

@@ -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     11
+#define VERSION_DATE_DAY       10
+#define VERSION_DATE_HOUR      17
+#define VERSION_DATE_MINUTE    58
 
 // this is NOT the version hash !!
 // it's the last version hash

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_tni.h

@@ -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};
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h

@@ -56,13 +56,13 @@ static void ZM_init() {
     InitEliteInstruction();
 
     // init DAC, set output ~= 0 V
-    instru.VoutGainLevel = VOUT_GAIN_15K;
-    VoutGainControl(instru.VoutGainLevel);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLevel, 25000));
+    instru.VoutGainLv = VOUT_GAIN_15K;
+    VoutGainControl(instru.VoutGainLv);
+    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
 
     /* when elite open, must change vin level,
     measure battery value will be right */
-    VinADCGainControl(VIN_GAIN_AUTO);
+    VinADCGainCtrl(VIN_GAIN_AUTO);
 
     elite_gptimer_open();
     elite_gptimer_start();
@@ -73,18 +73,7 @@ static void ZM_init() {
 
 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
 
-
-static void DACCode2Real2Notify(uint16_t DACcode) {
-    int32_t RealV;
-    RealV = DAC_to_realV(instru.VoutGainLevel, DACcode);
-
-    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
-    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
-    NotifyVolt[2] = (uint8_t)((RealV & 0x0000FF00) >> 8);
-    NotifyVolt[3] = (uint8_t)(RealV & 0x000000FF);
-}
-
-#define IsPeriodicMode() (                            \
+#define IsPeriodicMode() (                       \
 (instru.eliteFxn == CURVE_IV)                 || \
 (instru.eliteFxn == CURVE_IV_CY)              || \
 (instru.eliteFxn == CURVE_IT)                 || \
@@ -95,16 +84,345 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (instru.eliteFxn == CURVE_LSV)                || \
 (instru.eliteFxn == CURVE_CA)                 || \
 (instru.eliteFxn == CURVE_VO)                 || \
+(instru.eliteFxn == CURVE_OCP)                || \
 (instru.eliteFxn == CURVE_CALI_ADC)              \
 )
 
-#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;
+        dpv_step_cnt = 0;
+        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
+            PIN15_setOutputValue(HIGH_Z_MODE, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+            first_highz_flag = false;
+        }
+    } else {
+        if (notifyFirst_flag) {
+            GPT.NotifyCounter = instru.notifyRate - 20;
+            notifyFirst_flag = false;
+        }
+        if (vscanReset) {
+            GPT.VscanRateCounter = 0xFFFFFFFF;
+            dpv_step_cnt = 0;
+        }
+        vscanReset = false;
+        leadTimeReset = false;
+    }
+
+    //vscan counter
+    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
+    if (GPT.VscanRateCounter >= instru.period) {
+        GPT.VscanRateCounter -= instru.period; //To get right time
+        dpv_step_cnt +=1;
+    }
+    vscan_ctrl(GPT.VscanRateCounter);
+
+    //battery counter
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+    if(GPT.BatteryCheckCounter >= 50000){
+        GPT.BatteryCheckCounter -= 50000; //To get right time
+        batteryCheck_flag = true;
+        tempCheck_flag = true;
+    }
+
+    //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);
+    }
+
+    //Notify counter(Notify control, check if we need to send notify)
+    //please don't put Notify counter before ADC counter, maybe get wrong data
+    GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
+    if(GPT.NotifyCounter >= instru.notifyRate){
+        GPT.NotifyCounter -= instru.notifyRate; //To get right time
+        notify_flag = true;
+        if (instru.eliteFxn == CURVE_UNI_PULSE || instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
+            notify_flag = false;
+        }
+        if(vscanReset){
+            notify_flag = false;
+        }
+
+        if (!volt_rec_en || !curr_rec_en) {
+            notify_flag = false;
+        }
+
+        if(notify_flag){
+            SendNotify();
+            notify_flag = false;
+        }
+    }
+
+    mode_done();
+
+}
+
+static void mode_init_set(void)
+{
+    batteryADC_flag = false;
+    volt_rec_en     = true;
+    curr_rec_en     = true;
+    firstTimeReset  = true;
+    notifyFirst_flag = true;
+    first_highz_flag = true;
+    DACReset          = true;
+    vscanReset        = true;
+    leadTimeReset     = true;
+
+    if (instru.notifyRate > 1000) {
+    // slow notify rate, < 10sps, auto gain changer only use ADC gain level = 1.2.3.4
+    // gain_switch_on: [1:4]: none
+    //                 [5]: ADC gain level = 4, if value = 1, gain 4 switch on
+    //                 [6]: ADC gain level = 3, if value = 1, gain 3 switch on
+    //                 [7]: ADC gain level = 2, if value = 1, gain 2 switch on
+    //                 [8]: ADC gain level = 1, if value = 1, gain 1 switch on
+        instru.gain_switch_on = 0b11110000;
+
+    } else {
+    // fast notify rate, >= 10sps, auto gain changer only use ADC gain level = 1.2.3
+        instru.gain_switch_on = 0b01110000;
+    }
+
+    if (instru.IinADCGainLv == I_GAIN_AUTO) {
+        instru.IinADCGainLv = I_GAIN_100R;
+    }
+
+    if (instru.VinADCAutoGainEn == VIN_GAIN_AUTO) {
+        instru.VinADCGainLv = VIN_GAIN_1K;
+    }
+
+    VinADCGainCtrl(instru.VinADCGainLv);
+    IinADCGainCtrl(instru.IinADCGainLv);
+    VoutGainControl(instru.VoutGainLv);
+
+    if (Ve1MatchVe2Mode()) {
+        if (instru.Ve1 == instru.Ve2) {
+            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
+            PeriodicEvent = false;
+            PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+            ModeLED(NO_EVENT);
+        }
+    }
+
+    return;
+}
+
 /*********************************************************************
  * @fn      SimpleBLEPeripheral_performPeriodicTask
  *
@@ -114,278 +432,240 @@ 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;
     }
+
+    if (instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
+        if (mode_init) {
+            mode_init = false;
+            mode_init_set();
+            calc_avg_en = false;
+        }
+
+        uni_pulse_mode();
+
+        return;
+    }
+
+    if (instru.eliteFxn == CURVE_DPV_SMPRATE || instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) {
+        if (mode_init) {
+            mode_init = false;
+            mode_init_set();
+        }
+
+        uni_pulse_mode();
+
+        return;
+    }
+
+
+    return;
 }
 
-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(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200);
+                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
+            }
+            break;
+
         case CURVE_RT:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200);
+            }
+            break;
+
         case CURVE_CC:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
+            break;
+
         case CURVE_CV:
         case CURVE_CA:
-        case CURVE_VO:
         case CURVE_LSV:
-        case CURVE_IV_CY:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
+            break;
+
         case CURVE_PULSE:
-            CC_Plot();
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
+            }
             break;
 
         case CURVE_IT:
-            IT_Plot();
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+
+            if(volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
             break;
 
         case CURVE_VT:
-            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(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200);
+                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
+            }
+            break;
+
+        case CURVE_OCP:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm) - MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, MEAS_VIN(wm));
+            }
             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_DPV:
+            Iin_Vin_Vout_Plot(t);
+            break;
+
+        case CURVE_DPV_SMPRATE:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
+            break;
+
+        case CURVE_DPV_ADVANCE:
+            Iin_Vin_Vout_Plot(t);
+            break;
+
+        case CURVE_DPV_ADVANCE_SMPRATE:
+            Iin_Vin_Vout_Plot(t);
+            if (curr_rec_en) {
+                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
+            }
+            if (volt_rec_en) {
+                InputNotify(NOTIFY_VOLT, instru.Vout/200 - MEAS_VIN(wm));
+                InputNotify(NOTIFY_IMPEDANCE, instru.Vout/200);
+            }
             break;
 
         default:
@@ -398,16 +678,23 @@ static void mode_done(void)
     if ((instru.eliteFxn == CURVE_IV)  ||
         (instru.eliteFxn == CURVE_CV)  ||
         (instru.eliteFxn == CURVE_LSV) ||
-        (instru.eliteFxn == CURVE_IV_CY)) {
+        (instru.eliteFxn == CURVE_IV_CY) ||
+        (instru.eliteFxn == CURVE_DPV) ||
+        (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
+        (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
+        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE)) {
         if (!PeriodicEvent) {
+            finishMode = true;
             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 +712,10 @@ static void vscan_ctrl(void)
             rt_vscan();
             break;
 
+        case CURVE_IT:
+            it_vscan();
+            break;
+
         case CURVE_CV:
             cv_vscan();
             break;
@@ -437,6 +728,21 @@ static void vscan_ctrl(void)
             ca_vscan();
             break;
 
+        case CURVE_UNI_PULSE:
+            uni_pulse_vscan(t);
+            break;
+
+        case CURVE_DPV:
+        case CURVE_DPV_SMPRATE:
+            dpv_vscan(t);
+            break;
+
+        case CURVE_DPV_ADVANCE:
+        case CURVE_DPV_ADVANCE_SMPRATE:
+            dpv_advance_vscan(t);
+            break;
+
+
         default:{
             break;
         }

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/scan_volt.h

@@ -0,0 +1,879 @@
+#ifndef SCAN_VOLT_H
+#define SCAN_VOLT_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define Vset instru.Vset
+
+static void iv_vscan(void)
+{
+    struct wm_iv_ctx_t *iv = (struct wm_iv_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        if (instru.directionInit == 1) {
+            iv->_direction_up         = true;
+            iv->_current_direction_up = true;
+        } else if (instru.directionInit == 0) {
+            iv->_direction_up         = false;
+            iv->_current_direction_up = false;
+        }
+
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if (instru.step <= 10) {
+            iv->_Vstep = instru.step * instru.VsetRate / 5;
+        } else {
+            iv->_Vstep = instru.step / 5 * instru.VsetRate;
+        }
+
+        Vset = iv->_Vinit;
+    }
+
+    if (!vscanReset) {
+        if (iv->_current_direction_up) {
+            if (Vset >= iv->_Vmax) {
+                PeriodicEvent = false;
+            }
+        } else {
+            if (Vset <= iv->_Vmin) {
+                PeriodicEvent = false;
+            }
+        }
+
+        if (iv->_current_direction_up) {
+            Vset = Vset + iv->_Vstep * GPT.GptimerMultiple;
+        } else {
+            Vset = Vset - iv->_Vstep * GPT.GptimerMultiple;
+        }
+    }
+
+    return;
+}
+
+static void iv_cy_vscan(void)
+{
+    struct wm_iv_cy_ctx_t *iv_cy = (struct wm_iv_cy_ctx_t *)wm_get();
+    static bool VminCounter;
+    static bool VmaxCounter;
+
+    NotifyCycleNumber = (instru.cycleNumber - iv_cy->_cycleNumber + 1);
+
+    if(vscanReset){
+        VmaxCounter = false;
+        VminCounter = false;
+
+        if(instru.directionInit == 1){
+            iv_cy->_direction_up         = true;
+            iv_cy->_current_direction_up = true;
+        }else if(instru.directionInit == 0){
+            iv_cy->_direction_up         = false;
+            iv_cy->_current_direction_up = false;
+        }
+
+        //Vsetp = x * 20 * N, x=xmV ; N=VscanRate
+        if(instru.step <= 10){
+            iv_cy->_Vstep = instru.step * instru.VsetRate / 5;
+        }else{
+            iv_cy->_Vstep = instru.step / 5 * instru.VsetRate;
+        }
+
+        if(iv_cy->_Vmin == iv_cy->_Vinit){
+            VminCounter = true;
+        }
+        if(iv_cy->_Vmax == iv_cy->_Vinit){
+            VmaxCounter = true;
+        }
+
+        Vset = iv_cy->_Vinit;
+    }
+
+    if(!vscanReset){
+        if (Vset >= iv_cy->_Vmax){
+            VmaxCounter = true;
+        }else if (Vset <= iv_cy->_Vmin){
+            VminCounter = true;
+        }
+
+        if (iv_cy->_current_direction_up){
+            Vset = Vset + iv_cy->_Vstep * GPT.GptimerMultiple;
+        }else{
+            Vset = Vset - iv_cy->_Vstep * GPT.GptimerMultiple;
+        }
+
+        if(VmaxCounter && VminCounter){
+            if(iv_cy->_direction_up && iv_cy->_current_direction_up){
+                if(Vset >= iv_cy->_Vinit){
+                    iv_cy->_cycleNumber--;
+                    VminCounter = false;
+                    VmaxCounter = false;
+                }
+            }
+            if(!iv_cy->_direction_up && !iv_cy->_current_direction_up){
+                if(Vset <= iv_cy->_Vinit){
+                    iv_cy->_cycleNumber--;
+                    VminCounter = false;
+                    VmaxCounter = false;
+                }
+            }
+        }
+
+        if (Vset >= iv_cy->_Vmax){
+            iv_cy->_current_direction_up = false;
+        }else if (Vset <= iv_cy->_Vmin){
+            iv_cy->_current_direction_up = true;
+        }
+
+        /*stop condition*/
+        if(iv_cy->_cycleNumber == 0){
+            PeriodicEvent = false;
+        }
+    }
+
+    return;
+}
+
+static void it_vscan(void)
+{
+    struct wm_it_ctx_t *it = (struct wm_it_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = it->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = it->_Vinit;
+    }
+
+    return;
+}
+
+static void rt_vscan(void)
+{
+    struct wm_rt_ctx_t *rt = (struct wm_rt_ctx_t *)wm_get();
+
+    if (vscanReset) {
+        Vset = rt->_Vinit;
+    }
+
+    if(!vscanReset) {
+        Vset = rt->_Vinit;
+    }
+
+    return;
+}
+
+static void vo_vscan(void)
+{
+    struct wm_vo_ctx_t *vo = (struct wm_vo_ctx_t *)wm_get();
+
+    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 dpv_vscan(uint32_t time)
+{
+    uint32_t t = time;
+    struct wm_dpv_ctx_t *p = (struct wm_dpv_ctx_t *)wm_get();
+    uint32_t m;
+    uint32_t t_min;
+    uint32_t t_max;
+
+    if(vscanReset){
+        Vset = p->_v0;
+
+        return;
+    }
+
+    if(!vscanReset){
+
+        if (t == 0) {
+            m = 0;
+        } else {
+           m = t % p->_t_period;
+        }
+
+        if (m < p->_t_pa[0]) {
+            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 + p->_v_step[0] * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
+            Vset = p->_Vset;
+
+            t_min = p->_t_pulse_min[0];
+            t_max = p->_t_pulse_max[0];
+
+            if (m > t_min && m < t_max) {
+                calc_avg_en = true;
+            } else {
+                calc_avg_en = false;
+            }
+
+            if ((p->_v_curr_direc && Vset >= p->_v_stop) ||
+               (!p->_v_curr_direc && Vset <= p->_v_stop)) {
+                PeriodicEvent = false;
+            }
+
+            return;
+        }
+
+        if (m < p->_t_pa[1]) {
+            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t / 1000 + p->_v_step[1] * (int32_t)dpv_step_cnt;
+            Vset = p->_Vset;
+
+            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
+            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
+
+            if (m > t_min && m < t_max) {
+                calc_avg_en = true;
+            } else {
+                calc_avg_en = false;
+            }
+
+            return;
+        }
+
+        return;
+    }
+
+    return;
+}
+
+static void dpv_advance_vscan(uint32_t time)
+{
+    uint32_t t = time;
+    struct wm_dpv_advance_ctx_t *p = (struct wm_dpv_advance_ctx_t *)wm_get();
+    uint32_t m;
+    uint32_t t_min;
+    uint32_t t_max;
+    static bool VminCounter;
+    static bool VmaxCounter;
+
+    if(vscanReset){
+        if (p->_v_direc_init) {
+            if (p->_v0 <= p->_v_up && p->_v0 <= p->_v_low && p->_v_2 > p->_v_1) {
+                VminCounter = true;
+            }
+
+        } else {
+            if (p->_v0 >= p->_v_up && p->_v0 >= p->_v_low && p->_v_1 > p->_v_2) {
+                VmaxCounter = true;
+            }
+        }
+
+
+
+        p->_Vset = p->_v0;
+        Vset = p->_Vset;
+
+        return;
+    }
+
+    if(!vscanReset){
+
+        if (t == 0) {
+            m = 0;
+        } else {
+           m = t % p->_t_period;
+        }
+
+        if (m < p->_t_pa[0]) {
+
+            t_min = p->_t_pulse_min[0];
+            t_max = p->_t_pulse_max[0];
+
+            if (m > t_min && m < t_max) {
+                calc_avg_en = true;
+            } else {
+                calc_avg_en = false;
+            }
+
+            p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 + p->_v_step[0] * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
+            Vset = p->_Vset;
+
+            if (VminCounter == true && VmaxCounter == true) {
+                p->_cycleNumber--;
+                VminCounter = false;
+                VmaxCounter = false;
+
+            }
+
+            if (p->_cycleNumber <= 0) {
+                if (p->_v_stop_direction == true && p->_Vset >= p->_v_stop - p->_v_amp + p->_v_step[0]) {
+                    PeriodicEvent = false;
+                } else if (p->_v_stop_direction == false && p->_Vset <= p->_v_stop - p->_v_amp + p->_v_step[0]) {
+                    PeriodicEvent = false;
+                }
+            }
+
+            if (p->_v_curr_direc && p->_Vset >= p->_v_up - p->_v_amp + p->_v_step[0]) {
+                if (p->_v_invert_option) {
+                    p->_v_amp = p->_v_amp * (-1);
+                }
+                p->_v_initial[0] = p->_Vset;
+                p->_v_initial[1] = p->_v_initial[0] + p->_v_amp;
+                dpv_step_cnt = 0;
+                p->_v_step[0] = (-1) * p->_v_step[0];
+                p->_v_step[1] = (-1) * p->_v_step[1];
+                p->_v_curr_direc = false;
+                VmaxCounter = true;
+                p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
+                Vset = p->_Vset;
+
+            } else if (!p->_v_curr_direc && p->_Vset <= p->_v_low - p->_v_amp + p->_v_step[0]) {
+                if (p->_v_invert_option) {
+                    p->_v_amp = p->_v_amp * (-1);
+                }
+                p->_v_initial[0] = p->_Vset;
+                p->_v_initial[1] = p->_v_initial[0] + p->_v_amp;
+                dpv_step_cnt = 0;
+                p->_v_step[0] = (-1) * p->_v_step[0];
+                p->_v_step[1] = (-1) * p->_v_step[1];
+                p->_v_curr_direc = true;
+                VminCounter = true;
+                p->_Vset = p->_v_initial[0] + p->_v_slope[0] * t / 1000 * (int32_t)dpv_step_cnt; // _v_slope/100 = slope
+                Vset = p->_Vset;
+
+            }
+
+            return;
+        }
+
+        if (m < p->_t_pa[1]) {
+            p->_Vset = p->_v_initial[1] + p->_v_slope[1] * t / 1000 + p->_v_step[1] * (int32_t)dpv_step_cnt;
+            Vset = p->_Vset;
+
+            t_min = p->_t_pa[0] + p->_t_pulse_min[1];
+            t_max = p->_t_pa[0] + p->_t_pulse_max[1];
+
+            if (m > t_min && m < t_max) {
+                calc_avg_en = true;
+            } else {
+                calc_avg_en = false;
+            }
+
+            return;
+        }
+
+        return;
+    }
+
+    return;
+}
+
+static void pulse_vscan(void)
+{
+    struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
+    static uint16_t lastVolt;
+
+    if (stiFirstTime) {
+        stiFirstTime = false;
+        lastVolt = 25000;
+        pulse->_sti_t_flag = 1;
+        pulse->_sti_v = pulse->_sti_v1;
+        pulse->_sti_t = pulse->_sti_t1;
+        if (pulse->_sti_t == 1) {
+            pulse->_sti_v = lastVolt;
+        }
+    } else if(!stiFirstTime) {
+        if (GPT.StiCounter >= pulse->_sti_t) {
+            GPT.StiCounter -= pulse->_sti_t; //to get right time
+
+            if (pulse->_sti_lp > 0) {
+                if (pulse->_sti_cy > 0) {
+                    if (pulse->_sti_t_flag == 1) {
+                        pulse->_sti_t_flag = 2;
+                        pulse->_sti_v = pulse->_sti_v2;
+                        pulse->_sti_t = pulse->_sti_t2;
+                        if (pulse->_sti_t == 1) {
+                            pulse->_sti_v = lastVolt;
+                        }
+                    } else if (pulse->_sti_t_flag == 2) {
+                        pulse->_sti_t_flag = 3;
+                        pulse->_sti_v = pulse->_sti_v3;
+                        pulse->_sti_t = pulse->_sti_t3;
+                        if (pulse->_sti_t == 1) {
+                            pulse->_sti_v = lastVolt;
+                        }
+                    } else if (pulse->_sti_t_flag == 3) {
+                        pulse->_sti_cy -- ;
+                        if (pulse->_sti_cy == 0) {
+                            pulse->_sti_t_flag = 4;
+                            pulse->_sti_v = pulse->_sti_v4;
+                            pulse->_sti_t = pulse->_sti_t4;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        } else {
+                            pulse->_sti_t_flag = 2;
+                            pulse->_sti_v = pulse->_sti_v2;
+                            pulse->_sti_t = pulse->_sti_t2;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        }
+                    }
+                } else if (pulse->_sti_cy <= 0){
+                    if (pulse->_sti_t_flag == 4) {
+                        pulse->_sti_lp -- ;
+                        if (pulse->_sti_lp > 0) {
+                            pulse->_sti_cy = instru.sti_cy;
+                            pulse->_sti_t_flag = 2;
+                            pulse->_sti_v = pulse->_sti_v2;
+                            pulse->_sti_t = pulse->_sti_t2;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        } else {
+                            pulse->_sti_t_flag = 5;
+                            pulse->_sti_v = pulse->_sti_v5;
+                            pulse->_sti_t = pulse->_sti_t5;
+                            if (pulse->_sti_t == 1) {
+                                pulse->_sti_v = lastVolt;
+                            }
+                        }
+                    }
+                }
+            } else if (pulse->_sti_lp <= 0) {
+                if (pulse->_sti_t_flag == 5) {
+                    pulse->_sti_t_flag = 6;
+                    pulse->_sti_v = pulse->_sti_v6;
+                    pulse->_sti_t = pulse->_sti_t6;
+                    if (pulse->_sti_t == 1) {
+                        pulse->_sti_v = lastVolt;
+                    }
+                } else if (pulse->_sti_t_flag == 6) {
+                    pulse->_sti_t_flag = 7;
+                    pulse->_sti_v = pulse->_sti_v7;
+                    pulse->_sti_t = pulse->_sti_t7;
+                    if (pulse->_sti_t == 1) {
+                        pulse->_sti_v = lastVolt;
+                    }
+                } else if (pulse->_sti_t_flag == 7) {
+                    pulse->_sti_v = 25000;
+                    PeriodicEvent  = false;
+                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+                    ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastVolt != pulse->_sti_v) {
+        lastVolt = pulse->_sti_v;
+        //if (pulse->_sti_v == 25000) {
+        //    PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 1 => close high_z mode
+        //} else {
+        //    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+        //}
+        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
+        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
+    }
+
+    return;
+}
+
+static void chg_vo_para(uint16_t parameter, int32_t value)
+{
+    uint16_t pa = parameter;
+    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 set_para(uint8_t eliteFxn, uint16_t parameter, int32_t value)
+{
+    uint8_t mode = eliteFxn;
+    uint16_t pa = parameter;
+    int32_t val = value;
+
+    if (mode == CURVE_VO) {
+        chg_vo_para(pa, val);
+
+        return;
+    }
+
+    if (mode == CURVE_IT) {
+        chg_it_para(pa, val);
+
+        return;
+    }
+
+    if (mode == CURVE_RT) {
+        chg_rt_para(pa, val);
+
+        return;
+    }
+
+    return;
+}
+
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c

@@ -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();
                     }
@@ -919,16 +925,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