[update] gas1 is true when run done

[update] gas1 default lastSwitch is true
[update] MEGA_VAL_1 always open when elite on
2020-12-11 17:20:34 +08:00 · 2020-12-11 16:22:28 +08:00 · 2020-12-11 15:03:44 +08:00 · 2020-12-10 15:51:19 +08:00 · 2020-12-10 15:50:03 +08:00 · 2020-12-10 14:23:06 +08:00
35 changed files with 3841 additions and 3234 deletions
@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src

 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")
@@ -1,12 +1,12 @@

-XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3

 vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
+vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/

 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U

-XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/

 BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/

@@ -16,14 +16,14 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa

 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"

-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 

-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq

-DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
+DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f

 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)
@@ -0,0 +1,246 @@
+
+#ifndef Elite15_PIN
+#define Elite_15PIN
+
+#include "Elite_PIN.h"
+
+static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow) {
+    switch (latch_num) {
+        case LOAD0: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH0[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH0[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH0[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH0[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH0[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH0[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH0[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH0[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD1: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH1[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH1[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH1[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH1[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH1[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH1[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH1[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH1[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            break;
+        }
+        case LOAD2: {
+            switch (elite_pin) {
+                case D0: {
+                    LH.LATCH2[0] = highlow;
+                    break;
+                }
+                case D1: {
+                    LH.LATCH2[1] = highlow;
+                    break;
+                }
+                case D2: {
+                    LH.LATCH2[2] = highlow;
+                    break;
+                }
+                case D3: {
+                    LH.LATCH2[3] = highlow;
+                    break;
+                }
+                case D4: {
+                    LH.LATCH2[4] = highlow;
+                    break;
+                }
+                case D5: {
+                    LH.LATCH2[5] = highlow;
+                    break;
+                }
+                case D6: {
+                    LH.LATCH2[6] = highlow;
+                    break;
+                }
+                case D7: {
+                    LH.LATCH2[7] = highlow;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+             break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow) {
+    ELITE15_SPI_CLOSE();
+    add_elite_pin();
+    update_latch_status (latch_num, pin_num, highlow);
+//    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+
+    switch (latch_num) {
+        case LOAD0: {
+//            PIN_setOutputValue(&ZM_rst, D0, LH.LATCH0[0]);
+//            PIN_setOutputValue(&ZM_rst, D1, LH.LATCH0[1]);
+//            PIN_setOutputValue(&ZM_rst, D2, LH.LATCH0[2]);
+//            PIN_setOutputValue(&ZM_rst, D3, LH.LATCH0[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH0[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);
+            break;
+        }
+        case LOAD1: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH1[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH1[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH1[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH1[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH1[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH1[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH1[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH1[7]);
+            break;
+        }
+        case LOAD2: {
+            PIN_setOutputValue(pin_handle, D0, LH.LATCH2[0]);
+            PIN_setOutputValue(pin_handle, D1, LH.LATCH2[1]);
+            PIN_setOutputValue(pin_handle, D2, LH.LATCH2[2]);
+            PIN_setOutputValue(pin_handle, D3, LH.LATCH2[3]);
+            PIN_setOutputValue(pin_handle, D4, LH.LATCH2[4]);
+            PIN_setOutputValue(pin_handle, D5, LH.LATCH2[5]);
+            PIN_setOutputValue(pin_handle, D6, LH.LATCH2[6]);
+            PIN_setOutputValue(pin_handle, D7, LH.LATCH2[7]);
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+    PIN_setOutputValue(&ZM_rst, latch_num, 1);               // Turn on latch
+    CPUdelay(10);
+    PIN_setOutputValue(&ZM_rst, latch_num, 0);               // Turn off latch
+    remove_elite_pin();
+    ELITE15_SPI_HOLD();
+}
+
+static void Init_Elite15_PIN () {
+    InitLH();
+    add_elite_pin();
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 0);
+    PIN_setOutputValue(pin_handle, D5, 0);
+    PIN_setOutputValue(pin_handle, D6, 0);
+    PIN_setOutputValue(pin_handle, D7, 0);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 1);
+    PIN_setOutputValue(pin_handle, LOAD2, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+
+    PIN_setOutputValue(pin_handle, D0, 0);
+    PIN_setOutputValue(pin_handle, D1, 0);
+    PIN_setOutputValue(pin_handle, D2, 0);
+    PIN_setOutputValue(pin_handle, D3, 0);
+    PIN_setOutputValue(pin_handle, D4, 1);
+    PIN_setOutputValue(pin_handle, D5, 1);
+    PIN_setOutputValue(pin_handle, D6, 1);
+    PIN_setOutputValue(pin_handle, D7, 1);
+    CPUdelay(10);
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+
+    remove_elite_pin();
+
+//    InitLH();
+//    add_elite_pin();
+//
+//    PIN_setOutputValue(pin_handle, LOAD0, 1);
+//    PIN_setOutputValue(pin_handle, LOAD1, 1);
+//    PIN_setOutputValue(pin_handle, LOAD2, 1);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, D0, 0);
+//    PIN_setOutputValue(pin_handle, D1, 0);
+//    PIN_setOutputValue(pin_handle, D2, 0);
+//    PIN_setOutputValue(pin_handle, D3, 0);
+//    PIN_setOutputValue(pin_handle, D4, 0);
+//    PIN_setOutputValue(pin_handle, D5, 0);
+//    PIN_setOutputValue(pin_handle, D6, 0);
+//    PIN_setOutputValue(pin_handle, D7, 0);
+//    CPUdelay(10);
+//    PIN_setOutputValue(pin_handle, LOAD0, 0);
+//    PIN_setOutputValue(pin_handle, LOAD1, 0);
+//    PIN_setOutputValue(pin_handle, LOAD2, 0);
+//
+//    remove_elite_pin();
+}
+
+
+
+
+#endif
@@ -46,7 +46,6 @@ static void ADC_write(uint8_t ADCin) {
    spi_ADC_txbuf[0] = ADCin;
    spi_ADC_txbuf[1] = 0b11101011;

-
    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
 }

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

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

-static void ADCGainControl(uint8_t ADCLevel){
-    if(ADCLevel == 0){
-        // ADC gain level = 0, using 200K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
+/* Elite1.5 Calibration Usage */
+static void CAL_ADC_read(uint8_t *ADCdata){
+     for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+         spi_ADC_txbuf[i] = 0;
+         spi_ADC_rxbuf[i] = 0;
+     }
+
+     CAL_ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
+ }
+
+static void CAL_ADC_write(uint8_t ADCin) {
+    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
+        spi_ADC_txbuf[i] = 0;
+        spi_ADC_rxbuf[i] = 0;
    }
-    else if(ADCLevel == 1){
-        // ADC gain level = 1, using 10K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon200R, 0);
+
+    spi_ADC_txbuf[0] = ADCin;
+    spi_ADC_txbuf[1] = 0b11101011;
+
+    CAL_ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
+}
+
+/* Gain Control for Vin & Iin */
+static void IinADCGainControl(uint8_t IinADCLevel){
+    if(IinADCLevel == 0){
+        // ADC gain level = 0, using 3M resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
    }
-    else if(ADCLevel == 2){
-        // ADC gain level = 2, using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
+    else if(IinADCLevel == 1){
+        // ADC gain level = 1, using 100K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 1);
    }
-    else if(ADCLevel == 3){
-        // ADC gain level = 0, auto gain (using 200R resister)
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
+    else if(IinADCLevel == 2){
+        // ADC gain level = 2, using 3K resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 0);
+        PIN15_setOutputValue(Turnon_I_MID, 1);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 3){
+        // ADC gain level = 3, using 100R resistor
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+    else if(IinADCLevel == 4){
+        // ADC gain level = 3, auto gain (using 100R resister)
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
    }
    else{
-        // default using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon200R, 1);
+        // default using 100R resister
+        PIN15_setOutputValue(Turnon_I_LARGE, 1);
+        PIN15_setOutputValue(Turnon_I_MID, 0);
+        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+    }
+
+    if(IinADCLevel == 0 || IinADCLevel == 1 || IinADCLevel == 2 || IinADCLevel == 3){
+        lastIinADCGainLevel = IinADCLevel;
+    }else{
+        lastIinADCGainLevel = 3;
+    }
+}
+
+static void VinADCGainControl(uint8_t VinADCLevel){
+    if(VinADCLevel == 0){
+        // Vin ADC gain level = 0, using 1M resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 1){
+        // Vin ADC gain level = 1, using 30K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        PIN15_setOutputValue(Turnon_V_MID, 1);
+    }
+    else if(VinADCLevel == 2){
+        // Vin ADC gain level = 2, using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else if(VinADCLevel == 3){
+        // Vin ADC gain level = 3, auto gain (using 1K resister)
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+    else{
+        // default using 1K resister
+        PIN15_setOutputValue(Turnon_V_SMALL, 1);
+        PIN15_setOutputValue(Turnon_V_MID, 0);
+    }
+
+    if(VinADCLevel == 0 || VinADCLevel == 1 || VinADCLevel == 2){
+        lastVinADCGainLevel = VinADCLevel;
+    }else{
+        lastVinADCGainLevel = 2;
    }
 }

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

-static void ReadVolt(uint8_t *buf){
+static void ReadADCIin(uint8_t *buf){
    // Read data twice since the first data we get is previous data
+//    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+
+    ADCChannelSelect(ADC_CH_CURRENT);
+    ADC_read(buf);
+}
+
+static void ReadADCVin(uint8_t *buf){
+    // Read data twice since the first data we get is previous data
+
+//    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
    ADCChannelSelect(ADC_CH_VOLT);
    ADC_read(buf);

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

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

-static void ReadCurrent(uint8_t *buf){
-    // Read data twice since the first data we get is previous data
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-
-    ADCChannelSelect(ADC_CH_CURRENT);
-    ADC_read(buf);
-}
-
-static void ReadBatVolt(uint8_t *buf){
+static void ReadADCBat(uint8_t *buf){
    // Read data twice since the first data we get is previous data
    ADCChannelSelect(ADC_CH_BAT);
    ADC_read(buf);
@@ -160,122 +236,371 @@ static void ReadBatVolt(uint8_t *buf){
    ADC_read(buf);
 }

+/* for Elite1.5-re */
+// Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
+/* Old boundary
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2000  // 2    uA =     2,000,000 pA
+#define I_GAIN_MID1_BOUNDARY2    90000  // 90   uA =    90,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    70000  // 70   uA =    70,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  1800000  // 1800 uA =     1,800,000 nA
+#define I_GAIN_LARGE_BOUNDARY   950000  // 950  uA =       950,000 nA
+*/
+#define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
+#define I_GAIN_MID1_BOUNDARY1     2500  // 2.5  uA =     2,500,000 pA
+#define I_GAIN_MID1_BOUNDARY2   100000  // 100  uA =   100,000,000 pA
+#define I_GAIN_MID2_BOUNDARY1    85000  // 85   uA =    85,000,000 pA
+#define I_GAIN_MID2_BOUNDARY2  2050000  // 2050 uA =     2,050,000 nA
+#define I_GAIN_LARGE_BOUNDARY  1800000  // 1800 uA =     1,800,000 nA

-// theoretical boundary <20, 10~500, >100 (uA)
-//#define GAIN_SMALL_BOUNDARY 40000  // 40 uA = 40,000,000 pA
-//#define GAIN_MID_BOUNDARY1  20000  // 20 uA = 20,000,000 pA
-//#define GAIN_MID_BOUNDARY2  400000 // 400 uA = 400,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 200000 // 200 uA = 200,000 nA
+// Vin theoretical boundary <7, 5~200, >100 (mV)
+#define VIN_GAIN_SMALL_BOUNDARY   7000  // 7    mV =     7,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY1   5000  // 5    mV =     5,000,000 nV
+#define VIN_GAIN_MID1_BOUNDARY2 300000  // 300  mV =   300,000,000 nV
+#define VIN_GAIN_LARGE_BOUNDARY 250000  // 250  mV =   250,000,000 nV

-//#define GAIN_SMALL_BOUNDARY 8000  // 8 uA = 8,000,000 pA
-//#define GAIN_MID_BOUNDARY1  3000  // 3 uA = 3,000,000 pA
-//#define GAIN_MID_BOUNDARY2  90000 // 90 uA = 90,000,000 pA
-//#define GAIN_LARGE_BOUNDARY 70000 // 70 uA = 70,000 nA
+static int32_t AutoGainReadIin(uint8_t *buf){
+     int32_t RealCurrent = 0;

-/* for Elite1.4-re which 6.3kohm replaced by 10kohm */
-// theoretical boundary <40, 30~1350, >1000 (uA)
-#define GAIN_SMALL_BOUNDARY 35000  // 40 uA = 40,000,000 pA
-#define GAIN_MID_BOUNDARY1  30000  // 30 uA = 30,000,000 pA
-#define GAIN_MID_BOUNDARY2  1350000 // 1350 uA = 1350,000,000 pA
-#define GAIN_LARGE_BOUNDARY 1000000 // 1000 uA = 1000,000 nA
+     ReadADCIin(spi_ADC_rxbuf);
+     RealCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);

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

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

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

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

-static void AutoGainChange(int32_t Real_Current){
-    if(INSTRUCTION.ADCGainLevel == GAIN_200R){
-        // switch to mid range current
-        if(Real_Current < GAIN_LARGE_BOUNDARY && Real_Current > -1*GAIN_LARGE_BOUNDARY){
-            // switch to small range current
-            if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-                GAIN_200K_counter++;
-                if(GAIN_200K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200K;
-                    GAIN_200K_counter = 0;
+static void AutoGainChangeIin(int32_t RealCurrent){
+    // switch to 1 level current(small)   3M
+    // switch to 2 level current        100K
+    // switch to 3 level current          3K
+    // switch to 4 level current(large) 100R
+    if(INSTRUCTION.ADCGainLevel == I_GAIN_100R){
+        if(RealCurrent < I_GAIN_LARGE_BOUNDARY && RealCurrent > -1*I_GAIN_LARGE_BOUNDARY){
+            // switch to 1 level current(small)
+            if (RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
                }
-            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    GAIN_10K_counter = 0;
+            }
+            // switch to 2 level current
+            else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 3 level current
+            else{
+                I_GAIN_3K_counter++;
+                if(I_GAIN_3K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_3K_counter = 0;
+                    record_flag = false;
                }
            }
        }else{
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
+            if(I_GAIN_3K_counter > 0){
+                I_GAIN_3K_counter--;
            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
+            }
+            if(I_GAIN_3M_counter > 0){
+                I_GAIN_3M_counter--;
            }
        }
    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_10K){
-        // switch to large range current
-        if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-            GAIN_200R_counter++;
-            if(GAIN_200R_counter > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200R;
-                GAIN_200R_counter = 0;
+    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3K){
+        // switch to 4 level current(large)
+        if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+            I_GAIN_100R_counter++;
+            if(I_GAIN_100R_counter > 2){
+                INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                I_GAIN_100R_counter = 0;
+                record_flag = false;
            }
        }
-
-        // switch to small range current
-        else if (Real_Current < GAIN_MID_BOUNDARY1 && Real_Current > -1*GAIN_MID_BOUNDARY1){
-            GAIN_200K_counter++;
-            if(GAIN_200K_counter > 2){
-                INSTRUCTION.ADCGainLevel = GAIN_200K;
-                GAIN_200K_counter = 0;
+        else if (RealCurrent < I_GAIN_MID2_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID2_BOUNDARY1){
+            // switch to 1 level current(small)
+            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level current
+            else{
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
+                }
            }
        }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
+            if(I_GAIN_100R_counter > 0){
+                I_GAIN_100R_counter--;
            }
-            if(GAIN_200K_counter > 0){
-                GAIN_200K_counter--;
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
+            }
+            if(I_GAIN_3M_counter > 0){
+                I_GAIN_3M_counter--;
            }
        }
    }
-    else if(INSTRUCTION.ADCGainLevel == GAIN_200K){
-        // switch to mid range current
-        if(Real_Current > GAIN_SMALL_BOUNDARY || Real_Current < -1*GAIN_SMALL_BOUNDARY){
-            // switch to large range current
-            if(Real_Current > GAIN_MID_BOUNDARY2 || Real_Current < -1*GAIN_MID_BOUNDARY2){
-                GAIN_200R_counter++;
-                if(GAIN_200R_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_200R;
-                    GAIN_200R_counter = 0;
+    else if(INSTRUCTION.ADCGainLevel == I_GAIN_100K){
+            // switch to 1 level current(small)
+            if(RealCurrent < I_GAIN_MID1_BOUNDARY1 && RealCurrent > -1*I_GAIN_MID1_BOUNDARY1){
+                I_GAIN_3M_counter++;
+                if(I_GAIN_3M_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_3M;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_3M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            else if (RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+                 // switch to 4 level current(large)
+                 if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+                    I_GAIN_100R_counter++;
+                    if(I_GAIN_100R_counter > 2){
+                        INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                        I_GAIN_100R_counter = 0;
+                        record_flag = false;
+                    }
+                }
+                 // switch to 3 level current
+                 else{
+                    I_GAIN_3K_counter++;
+                    if(I_GAIN_3K_counter > 2){
+                        INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+                        IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                        I_GAIN_3K_counter = 0;
+                        record_flag = false;
+                    }
                }
-
            }else{
-                GAIN_10K_counter++;
-                if(GAIN_10K_counter > 2){
-                    INSTRUCTION.ADCGainLevel = GAIN_10K;
-                    GAIN_10K_counter = 0;
+                if(I_GAIN_100R_counter > 0){
+                    I_GAIN_100R_counter--;
+                }
+                if(I_GAIN_3K_counter > 0){
+                    I_GAIN_3K_counter--;
+                }
+                if(I_GAIN_3M_counter > 0){
+                    I_GAIN_3M_counter--;
+                }
+            }
+        }
+    else if(INSTRUCTION.ADCGainLevel == I_GAIN_3M){
+        if(RealCurrent > I_GAIN_SMALL_BOUNDARY || RealCurrent < -1*I_GAIN_SMALL_BOUNDARY){
+            // switch to 4 level current(large)
+            if(RealCurrent > I_GAIN_MID2_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID2_BOUNDARY2){
+                I_GAIN_100R_counter++;
+                if(I_GAIN_100R_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_100R;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_100R_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 3 level current
+            else if(RealCurrent > I_GAIN_MID1_BOUNDARY2 || RealCurrent < -1*I_GAIN_MID1_BOUNDARY2){
+                I_GAIN_3K_counter++;
+                if(I_GAIN_3K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_3K;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_3K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level current
+            else{
+                I_GAIN_100K_counter++;
+                if(I_GAIN_100K_counter > 2){
+                    INSTRUCTION.ADCGainLevel = I_GAIN_100K;
+                    IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                    I_GAIN_100K_counter = 0;
+                    record_flag = false;
                }

            }
-       }else{
-            if(GAIN_200R_counter > 0){
-                GAIN_200R_counter--;
+        }else{
+            if(I_GAIN_100R_counter > 0){
+                I_GAIN_100R_counter--;
            }
-            if(GAIN_10K_counter > 0){
-                GAIN_10K_counter--;
+            if(I_GAIN_3K_counter > 0){
+                I_GAIN_3K_counter--;
+            }
+            if(I_GAIN_100K_counter > 0){
+                I_GAIN_100K_counter--;
            }
        }
    }
-    ADCGainControl(INSTRUCTION.ADCGainLevel);
+}
+
+static void AutoGainChangeVin(int32_t RealVin){
+    // switch to 1 level volt(small)      1M
+    // switch to 2 level volt            30K
+    // switch to 3 level volt(large)      1K
+    if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1M){
+        if(RealVin > VIN_GAIN_SMALL_BOUNDARY || RealVin < -1*VIN_GAIN_SMALL_BOUNDARY){
+            // switch to 3 level volt(large)
+            if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+                VIN_GAIN_1K_counter++;
+                if(VIN_GAIN_1K_counter > 2){
+                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    VIN_GAIN_1K_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level volt
+            else{
+                VIN_GAIN_30K_counter++;
+                if(VIN_GAIN_30K_counter > 2){
+                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    VIN_GAIN_30K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(VIN_GAIN_1K_counter > 0){
+                VIN_GAIN_1K_counter--;
+            }
+            if(VIN_GAIN_30K_counter > 0){
+                VIN_GAIN_30K_counter--;
+            }
+        }
+    }
+    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_30K){
+        // switch to 1 level volt(small)
+        if(RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+            VIN_GAIN_1M_counter++;
+            if(VIN_GAIN_1M_counter > 2){
+                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                VIN_GAIN_1M_counter = 0;
+                record_flag = false;
+            }
+        }
+        else if (RealVin > VIN_GAIN_MID1_BOUNDARY2 || RealVin < -1*VIN_GAIN_MID1_BOUNDARY2){
+            // switch to 3 level volt
+            VIN_GAIN_1K_counter++;
+            if(VIN_GAIN_1K_counter > 2){
+                INSTRUCTION.VinADCGainLevel = VIN_GAIN_1K;
+                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                VIN_GAIN_1K_counter = 0;
+                record_flag = false;
+            }
+        }else{
+            if(VIN_GAIN_1K_counter > 0){
+                VIN_GAIN_1K_counter--;
+            }
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
+            }
+        }
+    }
+    else if(INSTRUCTION.VinADCGainLevel == VIN_GAIN_1K){
+        if(RealVin < VIN_GAIN_LARGE_BOUNDARY && RealVin > -1*VIN_GAIN_LARGE_BOUNDARY){
+            // switch to 1 level volt(small)
+            if (RealVin < VIN_GAIN_MID1_BOUNDARY1 && RealVin > -1*VIN_GAIN_MID1_BOUNDARY1){
+                VIN_GAIN_1M_counter++;
+                if(VIN_GAIN_1M_counter > 2){
+                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_1M;
+                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    VIN_GAIN_1M_counter = 0;
+                    record_flag = false;
+                }
+            }
+            // switch to 2 level volt
+            else{
+                VIN_GAIN_30K_counter++;
+                if(VIN_GAIN_30K_counter > 2){
+                    INSTRUCTION.VinADCGainLevel = VIN_GAIN_30K;
+                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    VIN_GAIN_30K_counter = 0;
+                    record_flag = false;
+                }
+            }
+        }else{
+            if(VIN_GAIN_1M_counter > 0){
+                VIN_GAIN_1M_counter--;
+            }
+            if(VIN_GAIN_30K_counter > 0){
+                VIN_GAIN_30K_counter--;
+            }
+        }
+    }
+}
+
+static uint16_t ADC_CURRENT_AVG_calibration (uint8_t ADC_channel) {
+    uint32_t ADCValueTemp           = 0;
+    uint32_t ADCValueSUM            = 0;
+    uint32_t ADCValueAVG            = 0;
+    uint16_t ADCValueAVG_RAW        = 0;
+    #define avgcount   10000
+
+    // Red light for start acquiring data
+    Elite_led_color(COLOR_RED);
+//    CPUdelay(10);
+    for(int i=0; i<avgcount; i++){
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(10);
+        CAL_ADC_write(ADC_channel);
+        CAL_ADC_read(spi_ADC_rxbuf);
+        CPUdelay(500);
+
+        ADCValueTemp = 0x0000FFFF & (((uint32_t) (spi_ADC_rxbuf[0]) << 8) | ((uint32_t) (spi_ADC_rxbuf[1])));
+        ADCValueSUM = ADCValueSUM + ADCValueTemp;
+    }
+
+    ADCValueAVG = ADCValueSUM / avgcount;
+    ADCValueAVG_RAW = (uint16_t) (ADCValueAVG & 0x0000FFFF);
+
+    // Blue light for data acquire done
+    Elite_led_color(COLOR_BLUE);
+
+    if (ADCValueAVG_RAW > 0x7FFF) {
+        ADCValueAVG_RAW = 0x0000;
+    }
+
+    // clean data
+    ADCValueAVG = 0;
+    ADCValueSUM = 0;
+    ADCValueTemp = 0;
+
+//    // Blue light for data acquire done
+//    Elite_led_color(COLOR_BLUE);
+
+
+
+    return ADCValueAVG_RAW;
 }

 #endif
@@ -19,7 +19,7 @@ static uint16_t CV3Curve(CV3Mode *CV3){
    }

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

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -72,56 +72,82 @@ static void CV3_Vscan(CV3Mode *CV3){
    }

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

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

-        if(VmaxCounter != 0 && VminCounter != 0){
-            if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset >= CV3->_Vinit){
-                        CV3->_cycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+            if (CV3->_current_direction_up){
+                Vset = Vset + CV3->_Vstep * GPT.GptimerMultiple;
+            }else{
+                Vset = Vset - CV3->_Vstep * GPT.GptimerMultiple;
+            }
+
+            if(VmaxCounter != 0 && VminCounter != 0){
+                if(VmaxCounter == VminCounter && CV3->_direction_up && CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset >= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
+                    }
+                }
+                if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
+                    if(CycleCounter != VmaxCounter){
+                        if(Vset <= CV3->_Vinit){
+                            CV3->_cycleNumber--;
+                            CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
+                        }
                    }
                }
            }
-            if(VmaxCounter == VminCounter && !CV3->_direction_up && !CV3->_current_direction_up){
-                if(CycleCounter != VmaxCounter){
-                    if(Vset <= CV3->_Vinit){
-                        CV3->_cycleNumber--;
-                        CycleCounter = VmaxCounter; //VmaxCounter = VminCounter = CycleCounter
-                    }
-                }
+
+            if (Vset >= CV3->_Vmax){
+                CV3->_current_direction_up = false;
+            }else if (Vset <= CV3->_Vmin){
+                CV3->_current_direction_up = true;
+            }
+
+            /*stop condition*/
+            if(CV3->_cycleNumber == 0){
+    //            PeriodicEvent = false;
+                ModeLED(POST_WORK);
+                InitEliteFlag();
+                INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
+                INSTRUCTION.sampleRate = 15;
+                INSTRUCTION.charge     = 0x01;
+                INSTRUCTION.constantCurrent = 0x00;
+                INSTRUCTION.Vmax       = 0xC350;
+                INSTRUCTION.Vmin       = 0x0000;
+                INSTRUCTION.notifyRate = 500;
+                INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
            }
        }

-        if (Vset >= CV3->_Vmax){
-            CV3->_current_direction_up = false;
-        }else if (Vset <= CV3->_Vmin){
-            CV3->_current_direction_up = true;
-        }
-
-        /*stop condition*/
-        if(CV3->_cycleNumber == 0){
-//            PeriodicEvent = false;
-            InitEliteFlag();
-            INSTRUCTION.eliteFxn   = CONSTANT_CURRENT;
-            INSTRUCTION.sampleRate = 15;
-            INSTRUCTION.charge     = 0x01;
-            INSTRUCTION.constantCurrent = 0x00;
-            INSTRUCTION.Vmax       = 0xC350;
-            INSTRUCTION.Vmin       = 0x0000;
-            INSTRUCTION.notifyRate = 500;
-            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
-        }
    }
 //    int32_t RealV;
 //    RealV = (int32_t)(Vset / 500);//[1uV]
@@ -177,9 +177,9 @@ static void CV_Vscan(CVMode *CV){
        }

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

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

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

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

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -52,9 +52,29 @@ static uint16_t DAC_outputV(uint16_t voltLV) {
    spi_DACtxbuf[2] = v2;

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

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

 static int32_t User2Real(uint16_t UserCode){
@@ -62,4 +82,40 @@ static int32_t User2Real(uint16_t UserCode){
    return (int32_t)((UserCode - 25000) / 5);
 }

+
+// DAC Vout theoretical boundary <300, 100~ (mV)
+#define DAC_VOUT_GAIN_SMALL_BOUNDARY           100000  // 25500(usercode) = 100 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY           300000  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE   26500  // 26500(usercode) = 300 mV
+#define DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE  23500  // 23500(usercode) = -300 mV
+
+static void AutoGainChangeVout(int32_t userCode){
+    int32_t RealVolt = (userCode - 25000) * 200; // (userCode - 25000) / 5 * 1000  [1uV]
+    // switch to 1 level volt(small)   15K
+    // switch to 2 level volt(large)   240K
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_AUTO){
+        INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+        VoutGainControl(INSTRUCTION.VoutGainLevel);
+        record_flag = false;
+    }
+
+    if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_15K){
+        if(RealVolt > DAC_VOUT_GAIN_LARGE_BOUNDARY || RealVolt < -1 * DAC_VOUT_GAIN_LARGE_BOUNDARY){
+            // switch to 2 level volt(large)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_240K;
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
+            record_flag = false;
+        }
+    }
+    else if(INSTRUCTION.VoutGainLevel == VOUT_GAIN_240K){
+        if(RealVolt < DAC_VOUT_GAIN_SMALL_BOUNDARY && RealVolt > -1 * DAC_VOUT_GAIN_SMALL_BOUNDARY ){
+            // switch to 1 level volt(small)
+            INSTRUCTION.VoutGainLevel = VOUT_GAIN_15K;
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
+            record_flag = false;
+        }
+    }
+}
+
 #endif
@@ -21,6 +21,12 @@ struct _GPT{
    uint32_t LeadTimeCounter;
    uint32_t BatteryADCCounter;
    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+    uint32_t StiCounter;
+    uint32_t LedGCounter;
+    uint32_t LedRCounter;
+    uint32_t Gas0Counter;
+    uint32_t Gas1Counter;
 }GPT = {0};

 static void InitCT(){
@@ -40,5 +46,10 @@ static void InitGPT(){
    GPT.LeadTimeCounter     = 0;
    GPT.BatteryADCCounter   = 0;
    GPT.BatteryCheckCounter = 0;
+    GPT.StiCounter          = 0;
+    GPT.LedGCounter         = 0;
+    GPT.LedRCounter         = 0;
+    GPT.Gas0Counter         = 0;
+    GPT.Gas1Counter         = 0;
 }
 #endif
@@ -27,18 +27,20 @@ static void IV_Vscan(IVMode *IV){
    if(!vscanReset){
        if(IV->_current_direction_up){
            if(Vset >= IV->_Vmax){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
            }
        }else{
            if(Vset <= IV->_Vmin){
-                reset();
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
            }
        }

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

-/** ADC gain level **/
-#define GAIN_200K   0x00 // largest gain
-#define GAIN_10K    0x01
-#define GAIN_200R   0x02 // the least gain
-#define GAIN_AUTO   0x03
+/** Iin, Vin, Vout **/
+#define IIN_ADC         0x00
+#define VIN_ADC         0x01
+#define VOUT_DAC        0x02
+#define HIGH_Z          0x03
+
+/** ADC Iin gain level **/
+#define I_GAIN_3M       0x00    // largest gain
+#define I_GAIN_100K     0x01
+#define I_GAIN_3K       0x02
+#define I_GAIN_100R     0x03    // the least gain
+#define I_GAIN_AUTO     0x04
+
+/** ADC Vin gain level **/
+#define VIN_GAIN_1M     0x00
+#define VIN_GAIN_30K    0x01
+#define VIN_GAIN_1K     0x02
+#define VIN_GAIN_AUTO   0x03
+
+/** Vout gain level **/
+#define VOUT_GAIN_240K  0x00
+#define VOUT_GAIN_15K   0x01
+#define VOUT_GAIN_AUTO  0x02

 /* DAC reset parameter */
 #define DAC_ZERO    25000
-#define DAC_POS_MAX 0x0000
-#define DAC_NEG_MAX 0xFFFF

 // Step time macro
 #define STEPTIME_HALF_SEC 5000
@@ -44,7 +60,12 @@ struct HEADSTAGE_INSTRUCTION {
    uint32_t sampleRate;
    uint8_t  VoViSwitch;
    uint8_t  AutoGainEnable;
+    uint8_t  VinAutoGainEnable;
+    uint8_t  VoutAutoGainEnable;
    uint8_t  ADCGainLevel;
+     // voltage output gain
+    uint16_t VoutGainLevel;
+    uint8_t  VinADCGainLevel;

    /** Notify parameter **/
    uint32_t notifyRate;
@@ -54,9 +75,95 @@ struct HEADSTAGE_INSTRUCTION {
    uint8_t  charge;
    int32_t  constantCurrent;
    int32_t  Currentmax;
+    int32_t  sti_v1;
+    int32_t  sti_v2;
+    int32_t  sti_v3;
+    int32_t  sti_v4;
+    int32_t  sti_v5;
+    int32_t  sti_v6;
+    int32_t  sti_v7;
+    int32_t  sti_t1;
+    int32_t  sti_t2;
+    int32_t  sti_t3;
+    int32_t  sti_t4;
+    int32_t  sti_t5;
+    int32_t  sti_t6;
+    int32_t  sti_t7;
+    uint16_t sti_cy;
+    uint16_t sti_loop;
+
+    uint8_t  ledG_sw1;
+    uint8_t  ledG_sw2;
+    uint8_t  ledG_sw3;
+    uint8_t  ledG_sw4;
+    uint8_t  ledG_sw5;
+    uint8_t  ledG_sw6;
+    uint8_t  ledG_sw7;
+    int32_t  ledG_t1;
+    int32_t  ledG_t2;
+    int32_t  ledG_t3;
+    int32_t  ledG_t4;
+    int32_t  ledG_t5;
+    int32_t  ledG_t6;
+    int32_t  ledG_t7;
+    uint16_t ledG_cy;
+    uint16_t ledG_loop;
+
+    uint8_t  ledR_sw1;
+    uint8_t  ledR_sw2;
+    uint8_t  ledR_sw3;
+    uint8_t  ledR_sw4;
+    uint8_t  ledR_sw5;
+    uint8_t  ledR_sw6;
+    uint8_t  ledR_sw7;
+    int32_t  ledR_t1;
+    int32_t  ledR_t2;
+    int32_t  ledR_t3;
+    int32_t  ledR_t4;
+    int32_t  ledR_t5;
+    int32_t  ledR_t6;
+    int32_t  ledR_t7;
+    uint16_t ledR_cy;
+    uint16_t ledR_loop;
+
+    uint8_t  gas0_sw1;
+    uint8_t  gas0_sw2;
+    uint8_t  gas0_sw3;
+    uint8_t  gas0_sw4;
+    uint8_t  gas0_sw5;
+    uint8_t  gas0_sw6;
+    uint8_t  gas0_sw7;
+    int32_t  gas0_t1;
+    int32_t  gas0_t2;
+    int32_t  gas0_t3;
+    int32_t  gas0_t4;
+    int32_t  gas0_t5;
+    int32_t  gas0_t6;
+    int32_t  gas0_t7;
+    uint16_t gas0_cy;
+    uint16_t gas0_loop;
+
+    uint8_t  gas1_sw1;
+    uint8_t  gas1_sw2;
+    uint8_t  gas1_sw3;
+    uint8_t  gas1_sw4;
+    uint8_t  gas1_sw5;
+    uint8_t  gas1_sw6;
+    uint8_t  gas1_sw7;
+    int32_t  gas1_t1;
+    int32_t  gas1_t2;
+    int32_t  gas1_t3;
+    int32_t  gas1_t4;
+    int32_t  gas1_t5;
+    int32_t  gas1_t6;
+    int32_t  gas1_t7;
+    uint16_t gas1_cy;
+    uint16_t gas1_loop;

    uint16_t StepTime;

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

 /*********************************************************************
@@ -86,40 +193,103 @@ static void InitEliteInstruction(){
    INSTRUCTION.sampleRate      = 100;
    INSTRUCTION.VoViSwitch      = 0x01;    //0:user see Vo     1: user see Vi
    INSTRUCTION.AutoGainEnable  = 1;
-    INSTRUCTION.ADCGainLevel    = GAIN_AUTO;
+    INSTRUCTION.VinAutoGainEnable = 1;
+    INSTRUCTION.VoutAutoGainEnable = 1;
+    INSTRUCTION.ADCGainLevel    = I_GAIN_AUTO;
+    INSTRUCTION.VoutGainLevel   = VOUT_GAIN_AUTO;
+    INSTRUCTION.VinADCGainLevel = VIN_GAIN_AUTO;
    INSTRUCTION.notifyRate      = STEPTIME_ONE_SEC;
    INSTRUCTION.cycleNumber     = 1;
    INSTRUCTION.charge          = 1;      //0:discharge        1:charge
    INSTRUCTION.constantCurrent = 0;
    INSTRUCTION.Currentmax      = 0;
    INSTRUCTION.StepTime        = STEPTIME_ONE_SEC;
+    INSTRUCTION.AdcChannel      = 0;
+
+    //pulse mode
+    INSTRUCTION.sti_t1          = 0;
+    INSTRUCTION.sti_t2          = 0;
+    INSTRUCTION.sti_t3          = 0;
+    INSTRUCTION.sti_t4          = 0;
+    INSTRUCTION.sti_t5          = 0;
+    INSTRUCTION.sti_t6          = 0;
+    INSTRUCTION.sti_t7          = 0;
+    INSTRUCTION.sti_v1          = DAC_ZERO;
+    INSTRUCTION.sti_v2          = DAC_ZERO;
+    INSTRUCTION.sti_v3          = DAC_ZERO;
+    INSTRUCTION.sti_v4          = DAC_ZERO;
+    INSTRUCTION.sti_v5          = DAC_ZERO;
+    INSTRUCTION.sti_v6          = DAC_ZERO;
+    INSTRUCTION.sti_v7          = DAC_ZERO;
+    INSTRUCTION.sti_loop        = 1;
+    INSTRUCTION.sti_cy          = 0;
+
+    INSTRUCTION.ledG_sw1        = false;
+    INSTRUCTION.ledG_sw2        = false;
+    INSTRUCTION.ledG_sw3        = false;
+    INSTRUCTION.ledG_sw4        = false;
+    INSTRUCTION.ledG_sw5        = false;
+    INSTRUCTION.ledG_sw6        = false;
+    INSTRUCTION.ledG_sw7        = false;
+    INSTRUCTION.ledG_t1         = 0;
+    INSTRUCTION.ledG_t2         = 0;
+    INSTRUCTION.ledG_t3         = 0;
+    INSTRUCTION.ledG_t4         = 0;
+    INSTRUCTION.ledG_t5         = 0;
+    INSTRUCTION.ledG_t6         = 0;
+    INSTRUCTION.ledG_t7         = 0;
+    INSTRUCTION.ledG_cy         = 0;
+    INSTRUCTION.ledG_loop       = 0;
+
+    INSTRUCTION.ledR_sw1        = false;
+    INSTRUCTION.ledR_sw2        = false;
+    INSTRUCTION.ledR_sw3        = false;
+    INSTRUCTION.ledR_sw4        = false;
+    INSTRUCTION.ledR_sw5        = false;
+    INSTRUCTION.ledR_sw6        = false;
+    INSTRUCTION.ledR_sw7        = false;
+    INSTRUCTION.ledR_t1         = 0;
+    INSTRUCTION.ledR_t2         = 0;
+    INSTRUCTION.ledR_t3         = 0;
+    INSTRUCTION.ledR_t4         = 0;
+    INSTRUCTION.ledR_t5         = 0;
+    INSTRUCTION.ledR_t6         = 0;
+    INSTRUCTION.ledR_t7         = 0;
+    INSTRUCTION.ledR_cy         = 0;
+    INSTRUCTION.ledR_loop       = 0;
+
+    INSTRUCTION.gas0_sw1        = false;
+    INSTRUCTION.gas0_sw2        = false;
+    INSTRUCTION.gas0_sw3        = false;
+    INSTRUCTION.gas0_sw4        = false;
+    INSTRUCTION.gas0_sw5        = false;
+    INSTRUCTION.gas0_sw6        = false;
+    INSTRUCTION.gas0_sw7        = false;
+    INSTRUCTION.gas0_t1         = 0;
+    INSTRUCTION.gas0_t2         = 0;
+    INSTRUCTION.gas0_t3         = 0;
+    INSTRUCTION.gas0_t4         = 0;
+    INSTRUCTION.gas0_t5         = 0;
+    INSTRUCTION.gas0_t6         = 0;
+    INSTRUCTION.gas0_t7         = 0;
+    INSTRUCTION.gas0_cy         = 0;
+    INSTRUCTION.gas0_loop       = 0;
+
+    INSTRUCTION.gas1_sw1        = false;
+    INSTRUCTION.gas1_sw2        = false;
+    INSTRUCTION.gas1_sw3        = false;
+    INSTRUCTION.gas1_sw4        = false;
+    INSTRUCTION.gas1_sw5        = false;
+    INSTRUCTION.gas1_sw6        = false;
+    INSTRUCTION.gas1_sw7        = false;
+    INSTRUCTION.gas1_t1         = 0;
+    INSTRUCTION.gas1_t2         = 0;
+    INSTRUCTION.gas1_t3         = 0;
+    INSTRUCTION.gas1_t4         = 0;
+    INSTRUCTION.gas1_t5         = 0;
+    INSTRUCTION.gas1_t6         = 0;
+    INSTRUCTION.gas1_t7         = 0;
+    INSTRUCTION.gas1_cy         = 0;
+    INSTRUCTION.gas1_loop       = 0;
 }
-
-/*********************************************************************
- * @fn      GetInstructionParameter
- *
- * @brief   Get Constant Current mode parameter.
- *
- * @param   ins - instruction including current value and unit
- *
- * @return  None.
- */
-static void GetInstructionParameter(uint8 *ins){
-    // CurrentLV=0 => unit is nA
-    // CurrentLV=1 => unit is uA
-    // CurrentLV=2 => unit is mA
-//    INSTRUCTION.CurrentLV = (*ins);
-
-    // ConstantCurrentRange=0 => current value is 0~499
-    // ConstantCurrentRange=1 => current value is 500~999
-//    INSTRUCTION.ConstantCurrentRange = (*ins) & 0x0F;
-
-    // ConstantCurrent divide ConstantCurrentRange into 50000 count (thus each count is 0.01)
-        // e.g. 485.7 uA can be represent by
-        // CurrentLV = 1 (unit is uA)
-        // ConstantCurrentRange = 0 (current range is 0~499)
-        // ConstantCurrent = 48570
-    INSTRUCTION.constantCurrent = (uint32_t) (*(ins+1))<<24 | (uint32_t) (*(ins+2))<<16 | (uint32_t) (*(ins+3))<<8 | (uint32_t) (*(ins+4));
-}
-
 #endif
@@ -12,12 +12,12 @@ static bool TurnOnElite(uint8_t key) {
            uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
                           ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
            if( bat < 768 && bat > 20){
-                PIN_setOutputValue(pin_handle, enable_5v, 0);
+                PIN15_setOutputValue(enable_5v, 0);
                return false;
            }else{
-                PIN_setOutputValue(pin_handle, enable_5v, 1);  // enable 5V
+                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
                TurnOn10V();
-                LEDPowerON();
+                ModeLED(BT_WAIT);
                return true;
            }
        } else {
@@ -26,7 +26,7 @@ static bool TurnOnElite(uint8_t key) {
        }
    } else {
        TurnOnCounter = 0;
-        PIN_setOutputValue(pin_handle, enable_5v, 0);
+        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
        return false;
    }
 }
@@ -40,20 +40,20 @@ static void EliteKeyPress(uint8_t key) {
        // press key => bight LED

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

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

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

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

+static void WorkModeLED();
+
 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue) {
    spi_LEDtxbuf[0] = 0x0000;
    spi_LEDtxbuf[1] = 0x0000;
@@ -17,26 +19,31 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue)
    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;

    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
+
 }

 static void Elite_led_color(uint16_t color){
    switch (color) {
        case COLOR_RED: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x00);
+            LED_color(DARKLED, 0x50, 0x00, 0x00);
            break;
        }
        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0xFF, 0x58, 0x09);
+            LED_color(DARKLED, 0x50, 0x58, 0x09);
            break;
        }
        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
+            LED_color(LIGHTLED, 0x50, 0x80, 0x00);
            break;
        }
        case COLOR_GREEN: {
            LED_color(DARKLED, 0x00, 0xFA, 0x00);
            break;
        }
+        case COLOR_YELLOWGREEN: {
+            LED_color(DARKLED, 0x64, 0xA6, 0x00);
+            break;
+        }
        case COLOR_BLUE: {
            LED_color(DARKLED, 0x00, 0x00, 0xAA);
            break;
@@ -46,15 +53,15 @@ static void Elite_led_color(uint16_t color){
            break;
        }
        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x80);
+            LED_color(DARKLED, 0x50, 0x00, 0x80);
            break;
        }
        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
+            LED_color(DARKLED, 0x50, 0x00, 0xFF);
            break;
        }
        case COLOR_WHITE: {
-            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
+            LED_color(DARKLED, 0x50, 0xFF, 0xFF);
            break;
        }
        case COLOR_BLACK: {
@@ -67,62 +74,37 @@ static void Elite_led_color(uint16_t color){
    }
 }

-static void WorkModeLED() {
-    switch (INSTRUCTION.eliteFxn) {
-    case IV_CURVE: {
-        WORKLED();
+static void ModeLED(uint16_t modeStatus) {
+    btWaitLedFlag   = 0;
+    noEventLedFlag  = 0;
+    preWorkLedFlag  = 0;
+    workingLedFlag  = 0;
+    postWorkLedFlag = 0;
+
+    switch (modeStatus) {
+    case BT_WAIT: {
+        btWaitLedFlag = 1;
+        BT_WAIT_LED();
        break;
    }
-    case CV_CURVE: {
-        WORKLED();
-        break;
-    }
-    case DIFFERENTIAL_PULSE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case SQUARE_WAVE_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case VOLT_OUTPUT: {
-        WORKLED();
-        break;
-    }
-    case ZT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case VT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case IT_CURVE: {
-        WORKLED();
-        break;
-    }
-    case CONSTANT_CURRENT:{
-        Elite_led_color(COLOR_BLUE);
-        break;
-    }
-    case VIS_RST: {
+    case NO_EVENT: {
+        noEventLedFlag = 1;
        LEDPowerON();
        break;
    }
-    case ADC_TEST: {
-        WORKLED();
+    case PRE_WORK: {
+        preWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
        break;
    }
-    case CYCLIC_VOLTAMMETRY: {
-        WORKLED();
+    case WORKING: {
+        workingLedFlag = 1;
+        WorkModeLED();
        break;
    }
-    case LINEAR_SWEEP_VOLTAMMETRY: {
-        WORKLED();
-        break;
-    }
-    case CONSTANT_VSCAN: {
-        WORKLED();
+    case POST_WORK: {
+        postWorkLedFlag = 1;
+        Elite_led_color(COLOR_BLUE);
        break;
    }
    default: {
@@ -132,58 +114,68 @@ static void WorkModeLED() {
    }
 }

-static void KeyWorkModeLED() {
-    KEYLED();
-    /*
-    switch(INSTRUCTION.eliteFxn){
-        case IV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case CV_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case DIFFERENTIAL_PULSE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case SQUARE_WAVE_VOLTAMMETRY:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VOLT_OUTPUT:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ZT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case VT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case IT_CURVE:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        case VIS_RST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-        case ADC_TEST:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
-
-        default:{
-            LED_color(LIGHTLED, 0xF0, 0xF0, 0x00);
-            break;
-        }
+static void checkFlafLED() {
+    if(btWaitLedFlag == 1){
+        ModeLED(BT_WAIT);
+    }
+    else if(noEventLedFlag == 1){
+        ModeLED(NO_EVENT);
+    }
+    else if(preWorkLedFlag == 1){
+        ModeLED(PRE_WORK);
+    }
+    else if(workingLedFlag == 1){
+        ModeLED(WORKING);
+    }
+    else if(postWorkLedFlag == 1){
+        ModeLED(POST_WORK);
+    }
+}
+
+static void WorkModeLED() {
+    switch (INSTRUCTION.eliteFxn) {
+    case IV_CURVE:
+    case CV_CURVE:
+    case DIFFERENTIAL_PULSE_VOLTAMMETRY:
+    case SQUARE_WAVE_VOLTAMMETRY:
+    case VOLT_OUTPUT:
+    case ZT_CURVE:
+    case VT_CURVE:
+    case IT_CURVE:
+    case ADC_TEST:
+    case CYCLIC_VOLTAMMETRY:
+    case LINEAR_SWEEP_VOLTAMMETRY:
+    case CONSTANT_VSCAN:{
+        WORKLED();
+        break;
+    }
+    case PULSE_MODE:{
+//        Elite_led_color(COLOR_YELLOW);
+        WORKLED();
+        break;
+    }
+    case CONSTANT_CURRENT:{
+        WORKLED();
+        break;
+    }
+    case CALI_ADC_MODE:{
+        if(INSTRUCTION.AdcChannel == IIN_ADC){
+            Elite_led_color(COLOR_RED);
+        }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+            Elite_led_color(COLOR_ORANGE);
+        }
+
+        break;
+    }
+//    case VIS_RST: {
+//        LEDPowerON();
+//        break;
+//    }
+    default: {
+        WORKLED();
+        break;
+    }
    }
-    */
 }

 #endif
@@ -19,7 +19,7 @@ static uint16_t LSVCurve(LSVMode *LSV){
    }

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

    int32_t RealV2;
    RealV2 = (int32_t)((Vout - Vin) / 200);//[1uV]
@@ -60,13 +60,14 @@ static void LSV_Vscan(LSVMode *LSV){
    if(!vscanReset){

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

        /*stop condition*/
        if (Vset >= LSV->_Vmax){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
            Vset = LSV->_Vmin;
            InitEliteFlag();
@@ -79,6 +80,7 @@ static void LSV_Vscan(LSVMode *LSV){
            INSTRUCTION.notifyRate = 500;
            INSTRUCTION.VoViSwitch = 0x02;//read Vscan = Vout - Vin
        }else if (Vset <= LSV->_Vmin){
+            ModeLED(POST_WORK);
 //            PeriodicEvent = false;
            Vset = LSV->_Vmax;
            InitEliteFlag();
@@ -0,0 +1,16 @@
+
+#ifndef ELITE_LATCH_INIT
+#define ELITE_LATCH_INIT
+
+static void InitLH() {
+    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
+        LH.LATCH0[i]       = 0;
+        LH.LATCH1[i]       = 0;
+        LH.LATCH2[i]       = 0;
+    }
+    LH.LoadState    = 0;
+}
+
+
+#endif
+
@@ -117,13 +117,13 @@ static void SendNotify() {

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

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

@@ -0,0 +1,528 @@
+#ifndef ELITEPULSE
+#define ELITEPULSE
+
+#define Vset INSTRUCTION.Vset
+
+static void PULSE_Vscan(PULSEMode *PULSE)
+{
+    static uint16_t lastVolt;
+    static uint16_t testV;
+    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 = INSTRUCTION.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;
+                    megaTrigEnable = false;
+                    ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    //InputNotify(NOTIFY_IMPEDANCE, testV);
+
+    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));
+    }
+}
+
+static void PULSE_ledG(PULSEMode *PULSE)
+{
+    static bool lastSwitch;
+
+    if (ledGFirstTime) {
+        ledGFirstTime = false;
+        lastSwitch = false;
+        PULSE->_ledG_t_flag = 1;
+        PULSE->_ledG_sw = PULSE->_ledG_sw1;
+        PULSE->_ledG_t = PULSE->_ledG_t1;
+        if (PULSE->_ledG_t == 1) {
+            PULSE->_ledG_sw = lastSwitch;
+        }
+    } else if(!ledGFirstTime) {
+        if (GPT.LedGCounter >= PULSE->_ledG_t) {
+            GPT.LedGCounter -= PULSE->_ledG_t; //to get right time
+
+            if (PULSE->_ledG_lp > 0) {
+                if (PULSE->_ledG_cy > 0) {
+                    if (PULSE->_ledG_t_flag == 1) {
+                        PULSE->_ledG_t_flag = 2;
+                        PULSE->_ledG_sw = PULSE->_ledG_sw2;
+                        PULSE->_ledG_t  = PULSE->_ledG_t2;
+                        if (PULSE->_ledG_t == 1) {
+                            PULSE->_ledG_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_ledG_t_flag == 2) {
+                        PULSE->_ledG_t_flag = 3;
+                        PULSE->_ledG_sw = PULSE->_ledG_sw3;
+                        PULSE->_ledG_t = PULSE->_ledG_t3;
+                        if (PULSE->_ledG_t == 1) {
+                            PULSE->_ledG_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_ledG_t_flag == 3) {
+                        PULSE->_ledG_cy -- ;
+                        if (PULSE->_ledG_cy == 0) {
+                            PULSE->_ledG_t_flag = 4;
+                            PULSE->_ledG_sw = PULSE->_ledG_sw4;
+                            PULSE->_ledG_t = PULSE->_ledG_t4;
+                            if (PULSE->_ledG_t == 1) {
+                                PULSE->_ledG_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_ledG_t_flag = 2;
+                            PULSE->_ledG_sw = PULSE->_ledG_sw2;
+                            PULSE->_ledG_t = PULSE->_ledG_t2;
+                            if (PULSE->_ledG_t == 1) {
+                                PULSE->_ledG_sw = lastSwitch;
+                            }
+                        }
+                    }
+                } else if (PULSE->_ledG_cy <= 0){
+                    if (PULSE->_ledG_t_flag == 4) {
+                        PULSE->_ledG_lp -- ;
+                        if (PULSE->_ledG_lp > 0) {
+                            PULSE->_ledG_cy = INSTRUCTION.ledG_cy;
+                            PULSE->_ledG_t_flag = 2;
+                            PULSE->_ledG_sw = PULSE->_ledG_sw2;
+                            PULSE->_ledG_t = PULSE->_ledG_t2;
+                            if (PULSE->_ledG_t == 1) {
+                                PULSE->_ledG_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_ledG_t_flag = 5;
+                            PULSE->_ledG_sw = PULSE->_ledG_sw5;
+                            PULSE->_ledG_t = PULSE->_ledG_t5;
+                            if (PULSE->_ledG_t == 1) {
+                                PULSE->_ledG_sw = lastSwitch;
+                            }
+                        }
+                    }
+                }
+            } else if (PULSE->_ledG_lp <= 0) {
+                if (PULSE->_ledG_t_flag == 5) {
+                    PULSE->_ledG_t_flag = 6;
+                    PULSE->_ledG_sw = PULSE->_ledG_sw6;
+                    PULSE->_ledG_t = PULSE->_ledG_t6;
+                    if (PULSE->_ledG_t == 1) {
+                        PULSE->_ledG_sw = lastSwitch;
+                    }
+                } else if (PULSE->_ledG_t_flag == 6) {
+                    PULSE->_ledG_t_flag = 7;
+                    PULSE->_ledG_sw = PULSE->_ledG_sw7;
+                    PULSE->_ledG_t = PULSE->_ledG_t7;
+                    if (PULSE->_ledG_t == 1) {
+                        PULSE->_ledG_sw = lastSwitch;
+                    }
+                } else if (PULSE->_ledG_t_flag == 7) {
+                    PULSE->_ledG_sw = false;
+                    //PeriodicEvent  = false;
+                    //megaTrigEnable = false;
+                    //ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastSwitch != PULSE->_ledG_sw) {
+        lastSwitch = PULSE->_ledG_sw;
+        PIN15_setOutputValue(MEGA_G_LED, PULSE->_ledG_sw);
+    }
+}
+
+static void PULSE_ledR(PULSEMode *PULSE)
+{
+    static bool lastSwitch;
+
+    if (ledRFirstTime) {
+        ledRFirstTime = false;
+        lastSwitch = false;
+        PULSE->_ledR_t_flag = 1;
+        PULSE->_ledR_sw = PULSE->_ledR_sw1;
+        PULSE->_ledR_t = PULSE->_ledR_t1;
+        if (PULSE->_ledR_t == 1) {
+            PULSE->_ledR_sw = lastSwitch;
+        }
+    } else if(!ledRFirstTime) {
+        if (GPT.LedRCounter >= PULSE->_ledR_t) {
+            GPT.LedRCounter -= PULSE->_ledR_t; //to get right time
+
+            if (PULSE->_ledR_lp > 0) {
+                if (PULSE->_ledR_cy > 0) {
+                    if (PULSE->_ledR_t_flag == 1) {
+                        PULSE->_ledR_t_flag = 2;
+                        PULSE->_ledR_sw = PULSE->_ledR_sw2;
+                        PULSE->_ledR_t = PULSE->_ledR_t2;
+                        if (PULSE->_ledR_t == 1) {
+                            PULSE->_ledR_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_ledR_t_flag == 2) {
+                        PULSE->_ledR_t_flag = 3;
+                        PULSE->_ledR_sw = PULSE->_ledR_sw3;
+                        PULSE->_ledR_t = PULSE->_ledR_t3;
+                        if (PULSE->_ledR_t == 1) {
+                            PULSE->_ledR_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_ledR_t_flag == 3) {
+                        PULSE->_ledR_cy -- ;
+                        if (PULSE->_ledR_cy == 0) {
+                            PULSE->_ledR_t_flag = 4;
+                            PULSE->_ledR_sw = PULSE->_ledR_sw4;
+                            PULSE->_ledR_t = PULSE->_ledR_t4;
+                            if (PULSE->_ledR_t == 1) {
+                                PULSE->_ledR_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_ledR_t_flag = 2;
+                            PULSE->_ledR_sw = PULSE->_ledR_sw2;
+                            PULSE->_ledR_t = PULSE->_ledR_t2;
+                            if (PULSE->_ledR_t == 1) {
+                                PULSE->_ledR_sw = lastSwitch;
+                            }
+                        }
+                    }
+                } else if (PULSE->_ledR_cy <= 0){
+                    if (PULSE->_ledR_t_flag == 4) {
+                        PULSE->_ledR_lp -- ;
+                        if (PULSE->_ledR_lp > 0) {
+                            PULSE->_ledR_cy = INSTRUCTION.ledR_cy;
+                            PULSE->_ledR_t_flag = 2;
+                            PULSE->_ledR_sw = PULSE->_ledR_sw2;
+                            PULSE->_ledR_t = PULSE->_ledR_t2;
+                            if (PULSE->_ledR_t == 1) {
+                                PULSE->_ledR_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_ledR_t_flag = 5;
+                            PULSE->_ledR_sw = PULSE->_ledR_sw5;
+                            PULSE->_ledR_t = PULSE->_ledR_t5;
+                            if (PULSE->_ledR_t == 1) {
+                                PULSE->_ledR_sw = lastSwitch;
+                            }
+                        }
+                    }
+                }
+            } else if (PULSE->_ledR_lp <= 0) {
+                if (PULSE->_ledR_t_flag == 5) {
+                    PULSE->_ledR_t_flag = 6;
+                    PULSE->_ledR_sw = PULSE->_ledR_sw6;
+                    PULSE->_ledR_t = PULSE->_ledR_t6;
+                    if (PULSE->_ledR_t == 1) {
+                        PULSE->_ledR_sw = lastSwitch;
+                    }
+                } else if (PULSE->_ledR_t_flag == 6) {
+                    PULSE->_ledR_t_flag = 7;
+                    PULSE->_ledR_sw = PULSE->_ledR_sw7;
+                    PULSE->_ledR_t = PULSE->_ledR_t7;
+                    if (PULSE->_ledR_t == 1) {
+                        PULSE->_ledR_sw = lastSwitch;
+                    }
+                } else if (PULSE->_ledR_t_flag == 7) {
+                    PULSE->_ledR_sw = false;
+                    //PeriodicEvent  = false;
+                    //megaTrigEnable = false;
+                    //ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastSwitch != PULSE->_ledR_sw) {
+        lastSwitch = PULSE->_ledR_sw;
+        PIN15_setOutputValue(MEGA_R_LED, PULSE->_ledR_sw);
+    }
+}
+
+static void PULSE_gas0(PULSEMode *PULSE)
+{
+    static bool lastSwitch;
+
+    if (gas0FirstTime) {
+        gas0FirstTime = false;
+        lastSwitch = false;
+        PULSE->_gas0_t_flag = 1;
+        PULSE->_gas0_sw = PULSE->_gas0_sw1;
+        PULSE->_gas0_t = PULSE->_gas0_t1;
+        if (PULSE->_gas0_t == 1) {
+            PULSE->_gas0_sw = lastSwitch;
+        }
+    } else if(!gas0FirstTime) {
+        if (GPT.Gas0Counter >= PULSE->_gas0_t) {
+            GPT.Gas0Counter -= PULSE->_gas0_t; //to get right time
+
+            if (PULSE->_gas0_lp > 0) {
+                if (PULSE->_gas0_cy > 0) {
+                    if (PULSE->_gas0_t_flag == 1) {
+                        PULSE->_gas0_t_flag = 2;
+                        PULSE->_gas0_sw = PULSE->_gas0_sw2;
+                        PULSE->_gas0_t = PULSE->_gas0_t2;
+                        if (PULSE->_gas0_t == 1) {
+                            PULSE->_gas0_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_gas0_t_flag == 2) {
+                        PULSE->_gas0_t_flag = 3;
+                        PULSE->_gas0_sw = PULSE->_gas0_sw3;
+                        PULSE->_gas0_t = PULSE->_gas0_t3;
+                        if (PULSE->_gas0_t == 1) {
+                            PULSE->_gas0_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_gas0_t_flag == 3) {
+                        PULSE->_gas0_cy -- ;
+                        if (PULSE->_gas0_cy == 0) {
+                            PULSE->_gas0_t_flag = 4;
+                            PULSE->_gas0_sw = PULSE->_gas0_sw4;
+                            PULSE->_gas0_t = PULSE->_gas0_t4;
+                            if (PULSE->_gas0_t == 1) {
+                                PULSE->_gas0_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_gas0_t_flag = 2;
+                            PULSE->_gas0_sw = PULSE->_gas0_sw2;
+                            PULSE->_gas0_t = PULSE->_gas0_t2;
+                            if (PULSE->_gas0_t == 1) {
+                                PULSE->_gas0_sw = lastSwitch;
+                            }
+                        }
+                    }
+                } else if (PULSE->_gas0_cy <= 0){
+                    if (PULSE->_gas0_t_flag == 4) {
+                        PULSE->_gas0_lp -- ;
+                        if (PULSE->_gas0_lp > 0) {
+                            PULSE->_gas0_cy = INSTRUCTION.gas0_cy;
+                            PULSE->_gas0_t_flag = 2;
+                            PULSE->_gas0_sw = PULSE->_gas0_sw2;
+                            PULSE->_gas0_t = PULSE->_gas0_t2;
+                            if (PULSE->_gas0_t == 1) {
+                                PULSE->_gas0_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_gas0_t_flag = 5;
+                            PULSE->_gas0_sw = PULSE->_gas0_sw5;
+                            PULSE->_gas0_t = PULSE->_gas0_t5;
+                            if (PULSE->_gas0_t == 1) {
+                                PULSE->_gas0_sw = lastSwitch;
+                            }
+                        }
+                    }
+                }
+            } else if (PULSE->_gas0_lp <= 0) {
+                if (PULSE->_gas0_t_flag == 5) {
+                    PULSE->_gas0_t_flag = 6;
+                    PULSE->_gas0_sw = PULSE->_gas0_sw6;
+                    PULSE->_gas0_t = PULSE->_gas0_t6;
+                    if (PULSE->_gas0_t == 1) {
+                        PULSE->_gas0_sw = lastSwitch;
+                    }
+                } else if (PULSE->_gas0_t_flag == 6) {
+                    PULSE->_gas0_t_flag = 7;
+                    PULSE->_gas0_sw = PULSE->_gas0_sw7;
+                    PULSE->_gas0_t = PULSE->_gas0_t7;
+                    if (PULSE->_gas0_t == 1) {
+                        PULSE->_gas0_sw = lastSwitch;
+                    }
+                } else if (PULSE->_gas0_t_flag == 7) {
+                    PULSE->_gas0_sw = false;
+                    //PeriodicEvent  = false;
+                    //megaTrigEnable = false;
+                    //ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastSwitch != PULSE->_gas0_sw) {
+        lastSwitch = PULSE->_gas0_sw;
+        PIN15_setOutputValue(MEGA_VAL_0, PULSE->_gas0_sw);
+    }
+}
+
+static void PULSE_gas1(PULSEMode *PULSE)
+{
+    static bool lastSwitch;
+
+    if (gas1FirstTime) {
+        gas1FirstTime = false;
+        lastSwitch = true;
+            PULSE->_gas1_t_flag = 1;
+            PULSE->_gas1_sw = PULSE->_gas1_sw1;
+            PULSE->_gas1_t = PULSE->_gas1_t1;
+            if (PULSE->_gas1_t == 1) {
+                PULSE->_gas1_sw = lastSwitch;
+            }
+    } else if(!gas1FirstTime) {
+        if (GPT.Gas1Counter >= PULSE->_gas1_t) {
+            GPT.Gas1Counter -= PULSE->_gas1_t; //to get right time
+
+            if (PULSE->_gas1_lp > 0) {
+                if (PULSE->_gas1_cy > 0) {
+                    if (PULSE->_gas1_t_flag == 1) {
+                        PULSE->_gas1_t_flag = 2;
+                        PULSE->_gas1_sw = PULSE->_gas1_sw2;
+                        PULSE->_gas1_t = PULSE->_gas1_t2;
+                        if (PULSE->_gas1_t == 1) {
+                            PULSE->_gas1_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_gas1_t_flag == 2) {
+                        PULSE->_gas1_t_flag = 3;
+                        PULSE->_gas1_sw = PULSE->_gas1_sw3;
+                        PULSE->_gas1_t = PULSE->_gas1_t3;
+                        if (PULSE->_gas1_t == 1) {
+                            PULSE->_gas1_sw = lastSwitch;
+                        }
+                    } else if (PULSE->_gas1_t_flag == 3) {
+                        PULSE->_gas1_cy -- ;
+                        if (PULSE->_gas1_cy == 0) {
+                            PULSE->_gas1_t_flag = 4;
+                            PULSE->_gas1_sw = PULSE->_gas1_sw4;
+                            PULSE->_gas1_t = PULSE->_gas1_t4;
+                            if (PULSE->_gas1_t == 1) {
+                                PULSE->_gas1_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_gas1_t_flag = 2;
+                            PULSE->_gas1_sw = PULSE->_gas1_sw2;
+                            PULSE->_gas1_t = PULSE->_gas1_t2;
+                            if (PULSE->_gas1_t == 1) {
+                                PULSE->_gas1_sw = lastSwitch;
+                            }
+                        }
+                    }
+                } else if (PULSE->_gas1_cy <= 0){
+                    if (PULSE->_gas1_t_flag == 4) {
+                        PULSE->_gas1_lp -- ;
+                        if (PULSE->_gas1_lp > 0) {
+                            PULSE->_gas1_cy = INSTRUCTION.gas1_cy;
+                            PULSE->_gas1_t_flag = 2;
+                            PULSE->_gas1_sw = PULSE->_gas1_sw2;
+                            PULSE->_gas1_t = PULSE->_gas1_t2;
+                            if (PULSE->_gas1_t == 1) {
+                                PULSE->_gas1_sw = lastSwitch;
+                            }
+                        } else {
+                            PULSE->_gas1_t_flag = 5;
+                            PULSE->_gas1_sw = PULSE->_gas1_sw5;
+                            PULSE->_gas1_t = PULSE->_gas1_t5;
+                            if (PULSE->_gas1_t == 1) {
+                                PULSE->_gas1_sw = lastSwitch;
+                            }
+                        }
+                    }
+                }
+            } else if (PULSE->_gas1_lp <= 0) {
+                if (PULSE->_gas1_t_flag == 5) {
+                    PULSE->_gas1_t_flag = 6;
+                    PULSE->_gas1_sw = PULSE->_gas1_sw6;
+                    PULSE->_gas1_t = PULSE->_gas1_t6;
+                    if (PULSE->_gas1_t == 1) {
+                        PULSE->_gas1_sw = lastSwitch;
+                    }
+                } else if (PULSE->_gas1_t_flag == 6) {
+                    PULSE->_gas1_t_flag = 7;
+                    PULSE->_gas1_sw = PULSE->_gas1_sw7;
+                    PULSE->_gas1_t = PULSE->_gas1_t7;
+                    if (PULSE->_gas1_t == 1) {
+                        PULSE->_gas1_sw = lastSwitch;
+                    }
+                } else if (PULSE->_gas1_t_flag == 7) {
+                    PULSE->_gas1_sw = true;
+                    //PeriodicEvent  = false;
+                    //megaTrigEnable = false;
+                    //ModeLED(NO_EVENT);
+                }
+            }
+        }
+    }
+
+    if (lastSwitch != PULSE->_gas1_sw) {
+        lastSwitch = PULSE->_gas1_sw;
+        PIN15_setOutputValue(MEGA_VAL_1, PULSE->_gas1_sw);
+    }
+}
+#endif
@@ -3,14 +3,33 @@
 #define ELITERESET

 static void reset() {
+    Mega_PeriodicEvent = false;
+    megaTrigEnable = false;
+    Mega_Trig_receive = false;
+    megaStiEnable  = false;
+    megaLedGEnable = false;
+    megaLedREnable = false;
+    megaGas0Enable = false;
+    megaGas1Enable = false;
+    PIN15_setOutputValue(MEGA_G_LED, 0);
+    PIN15_setOutputValue(MEGA_R_LED, 0);
+    PIN15_setOutputValue(MEGA_VAL_0, 0);
+    PIN15_setOutputValue(MEGA_VAL_1, 1);
+    ModeLED(NO_EVENT);
    InitEliteFlag();
    InitFlag();
    InitCT();
    InitGPT();

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

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

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

 static void Eliteinterrupt() {
-    InitEliteFlag();
+    Mega_PeriodicEvent = false;
+    Mega_Trig_receive = false;
+    megaTrigEnable = false;
+    megaStiEnable  = false;
+    megaLedGEnable = false;
+    megaLedREnable = false;
+    megaGas0Enable = false;
+    megaGas1Enable = false;
+    PIN15_setOutputValue(MEGA_G_LED, 0);
+    PIN15_setOutputValue(MEGA_R_LED, 0);
+    PIN15_setOutputValue(MEGA_VAL_0, 0);
+    PIN15_setOutputValue(MEGA_VAL_1, 1);
+    ModeLED(NO_EVENT);
    InitFlag();
+    InitEliteFlag();
    InitCT();
    InitGPT();

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

@@ -61,8 +94,6 @@ static void Eliteinterrupt() {
        spi_ADC_rxbuf[i] = 0;
    }

-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
    CPUdelay(8000);
 }
 #endif
@@ -36,6 +36,8 @@ static SPI_Params      spiParams1;
 static SPI_Transaction LED_transaction;
 static SPI_Transaction ADC_DAC_transaction;

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

 static void Elite_SPI_init(){
    SPI_init();
@@ -63,26 +65,68 @@ static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
 }

 static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+
    ADC_DAC_transaction.count = length;
    ADC_DAC_transaction.txBuf = spi_txbuf;
    ADC_DAC_transaction.rxBuf = spi_rxbuf;

-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-    PIN_setOutputValue(pin_handle, ADC_CS, 0);  // ADC_CS LOW
    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH

+    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

 static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-   ADC_DAC_transaction.count = length;
-   ADC_DAC_transaction.txBuf = spi_txbuf;
-   ADC_DAC_transaction.rxBuf = spi_rxbuf;
+//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW

-   PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-   PIN_setOutputValue(pin_handle, DAC_CS, 0);  // DAC_CS LOW
-   SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-   PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HOGH
+    update_latch_status (DAC_CS, 1);
+//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
+}
+
+static void ELITE15_SPI_HOLD() {
+    Elite_SPI_init();
+
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+}
+static void ELITE15_SPI_CLOSE() {
+    PIN_setOutputValue(pin_handle, LOAD0, 0);
+    PIN_setOutputValue(pin_handle, LOAD1, 0);
+    PIN_setOutputValue(pin_handle, LOAD2, 0);
+
+    SPI_close(spiHandle0);
+    SPI_close(spiHandle1);
+}
+
+/* Elite1.5 Calibration SPI */
+static void CAL_ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
+//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
+    PIN_setOutputValue(pin_handle, LOAD0, 1);
+    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
+
+    ADC_DAC_transaction.count = length;
+    ADC_DAC_transaction.txBuf = spi_txbuf;
+    ADC_DAC_transaction.rxBuf = spi_rxbuf;
+
+    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
+
+    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HOGH
+    update_latch_status (ADC_CS, 1);
+//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
 }

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

+/* PULSE_MODE Mode(PULSE_MODE)*/
+typedef struct _PULSEMode {
+    MEASURE;
+    int32_t  _Vset;
+    int32_t  _sti_v1;
+    int32_t  _sti_v2;
+    int32_t  _sti_v3;
+    int32_t  _sti_v4;
+    int32_t  _sti_v5;
+    int32_t  _sti_v6;
+    int32_t  _sti_v7;
+    int32_t  _sti_t1;
+    int32_t  _sti_t2;
+    int32_t  _sti_t3;
+    int32_t  _sti_t4;
+    int32_t  _sti_t5;
+    int32_t  _sti_t6;
+    int32_t  _sti_t7;
+    int32_t  _sti_t;
+    int32_t  _sti_v;         //output voltage now
+    int32_t  _sti_t_flag;    //Where's the time stage turn
+    uint16_t _sti_cy;
+    uint16_t _sti_lp;
+
+    //ledG
+    uint8_t  _ledG_sw1;
+    uint8_t  _ledG_sw2;
+    uint8_t  _ledG_sw3;
+    uint8_t  _ledG_sw4;
+    uint8_t  _ledG_sw5;
+    uint8_t  _ledG_sw6;
+    uint8_t  _ledG_sw7;
+    int32_t  _ledG_t1;
+    int32_t  _ledG_t2;
+    int32_t  _ledG_t3;
+    int32_t  _ledG_t4;
+    int32_t  _ledG_t5;
+    int32_t  _ledG_t6;
+    int32_t  _ledG_t7;
+    int32_t  _ledG_t;
+    uint8_t  _ledG_sw;
+    int32_t  _ledG_t_flag;
+    uint16_t _ledG_cy;
+    uint16_t _ledG_lp;
+
+    //ledR
+    uint8_t  _ledR_sw1;
+    uint8_t  _ledR_sw2;
+    uint8_t  _ledR_sw3;
+    uint8_t  _ledR_sw4;
+    uint8_t  _ledR_sw5;
+    uint8_t  _ledR_sw6;
+    uint8_t  _ledR_sw7;
+    int32_t  _ledR_t1;
+    int32_t  _ledR_t2;
+    int32_t  _ledR_t3;
+    int32_t  _ledR_t4;
+    int32_t  _ledR_t5;
+    int32_t  _ledR_t6;
+    int32_t  _ledR_t7;
+    int32_t  _ledR_t;
+    uint8_t  _ledR_sw;
+    int32_t  _ledR_t_flag;
+    uint16_t _ledR_cy;
+    uint16_t _ledR_lp;
+
+    //gas0
+    uint8_t  _gas0_sw1;
+    uint8_t  _gas0_sw2;
+    uint8_t  _gas0_sw3;
+    uint8_t  _gas0_sw4;
+    uint8_t  _gas0_sw5;
+    uint8_t  _gas0_sw6;
+    uint8_t  _gas0_sw7;
+    int32_t  _gas0_t1;
+    int32_t  _gas0_t2;
+    int32_t  _gas0_t3;
+    int32_t  _gas0_t4;
+    int32_t  _gas0_t5;
+    int32_t  _gas0_t6;
+    int32_t  _gas0_t7;
+    int32_t  _gas0_t;
+    uint8_t  _gas0_sw;
+    int32_t  _gas0_t_flag;
+    uint16_t _gas0_cy;
+    uint16_t _gas0_lp;
+
+    //gas1
+    uint8_t  _gas1_sw1;
+    uint8_t  _gas1_sw2;
+    uint8_t  _gas1_sw3;
+    uint8_t  _gas1_sw4;
+    uint8_t  _gas1_sw5;
+    uint8_t  _gas1_sw6;
+    uint8_t  _gas1_sw7;
+    int32_t  _gas1_t1;
+    int32_t  _gas1_t2;
+    int32_t  _gas1_t3;
+    int32_t  _gas1_t4;
+    int32_t  _gas1_t5;
+    int32_t  _gas1_t6;
+    int32_t  _gas1_t7;
+    int32_t  _gas1_t;
+    uint8_t  _gas1_sw;
+    int32_t  _gas1_t_flag;
+    uint16_t _gas1_cy;
+    uint16_t _gas1_lp;
+} PULSEMode;
+
+PULSEMode * InitPULSEMode() {
+    PULSEMode *ret = malloc(sizeof(PULSEMode));
+    ret->_measureCurrent = 0;
+    ret->_measureVin     = 0;
+    ret->_measureVout    = 0;
+    ret->_measureBat     = 0;
+    ret->_VoViSwitch     = INSTRUCTION.VoViSwitch;
+    ret->_Vset           = 0;
+    ret->_sti_v1         = INSTRUCTION.sti_v1;
+    ret->_sti_v2         = INSTRUCTION.sti_v2;
+    ret->_sti_v3         = INSTRUCTION.sti_v3;
+    ret->_sti_v4         = INSTRUCTION.sti_v4;
+    ret->_sti_v5         = INSTRUCTION.sti_v5;
+    ret->_sti_v6         = INSTRUCTION.sti_v6;
+    ret->_sti_v7         = INSTRUCTION.sti_v7;
+    ret->_sti_t1         = INSTRUCTION.sti_t1;
+    ret->_sti_t2         = INSTRUCTION.sti_t2;
+    ret->_sti_t3         = INSTRUCTION.sti_t3;
+    ret->_sti_t4         = INSTRUCTION.sti_t4;
+    ret->_sti_t5         = INSTRUCTION.sti_t5;
+    ret->_sti_t6         = INSTRUCTION.sti_t6;
+    ret->_sti_t7         = INSTRUCTION.sti_t7;
+    ret->_sti_t          = INSTRUCTION.sti_t1;
+    ret->_sti_v          = INSTRUCTION.sti_v1;
+    ret->_sti_t_flag     = 1;
+    ret->_sti_cy         = INSTRUCTION.sti_cy;
+    ret->_sti_lp         = INSTRUCTION.sti_loop;
+
+    //ledG
+    ret->_ledG_sw1       = INSTRUCTION.ledG_sw1;
+    ret->_ledG_sw2       = INSTRUCTION.ledG_sw2;
+    ret->_ledG_sw3       = INSTRUCTION.ledG_sw3;
+    ret->_ledG_sw4       = INSTRUCTION.ledG_sw4;
+    ret->_ledG_sw5       = INSTRUCTION.ledG_sw5;
+    ret->_ledG_sw6       = INSTRUCTION.ledG_sw6;
+    ret->_ledG_sw7       = INSTRUCTION.ledG_sw7;
+    ret->_ledG_t1        = INSTRUCTION.ledG_t1;
+    ret->_ledG_t2        = INSTRUCTION.ledG_t2;
+    ret->_ledG_t3        = INSTRUCTION.ledG_t3;
+    ret->_ledG_t4        = INSTRUCTION.ledG_t4;
+    ret->_ledG_t5        = INSTRUCTION.ledG_t5;
+    ret->_ledG_t6        = INSTRUCTION.ledG_t6;
+    ret->_ledG_t7        = INSTRUCTION.ledG_t7;
+    ret->_ledG_t         = INSTRUCTION.ledG_t1;
+    ret->_ledG_sw        = INSTRUCTION.ledG_sw1;
+    ret->_ledG_t_flag    = 1;
+    ret->_ledG_cy        = INSTRUCTION.ledG_cy;
+    ret->_ledG_lp        = INSTRUCTION.ledG_loop;
+
+    //ledR
+    ret->_ledR_sw1       = INSTRUCTION.ledR_sw1;
+    ret->_ledR_sw2       = INSTRUCTION.ledR_sw2;
+    ret->_ledR_sw3       = INSTRUCTION.ledR_sw3;
+    ret->_ledR_sw4       = INSTRUCTION.ledR_sw4;
+    ret->_ledR_sw5       = INSTRUCTION.ledR_sw5;
+    ret->_ledR_sw6       = INSTRUCTION.ledR_sw6;
+    ret->_ledR_sw7       = INSTRUCTION.ledR_sw7;
+    ret->_ledR_t1        = INSTRUCTION.ledR_t1;
+    ret->_ledR_t2        = INSTRUCTION.ledR_t2;
+    ret->_ledR_t3        = INSTRUCTION.ledR_t3;
+    ret->_ledR_t4        = INSTRUCTION.ledR_t4;
+    ret->_ledR_t5        = INSTRUCTION.ledR_t5;
+    ret->_ledR_t6        = INSTRUCTION.ledR_t6;
+    ret->_ledR_t7        = INSTRUCTION.ledR_t7;
+    ret->_ledR_t         = INSTRUCTION.ledR_t1;
+    ret->_ledR_sw        = INSTRUCTION.ledR_sw1;
+    ret->_ledR_t_flag    = 1;
+    ret->_ledR_cy        = INSTRUCTION.ledR_cy;
+    ret->_ledR_lp        = INSTRUCTION.ledR_loop;
+
+    //gas0
+    ret->_gas0_sw1       = INSTRUCTION.gas0_sw1;
+    ret->_gas0_sw2       = INSTRUCTION.gas0_sw2;
+    ret->_gas0_sw3       = INSTRUCTION.gas0_sw3;
+    ret->_gas0_sw4       = INSTRUCTION.gas0_sw4;
+    ret->_gas0_sw5       = INSTRUCTION.gas0_sw5;
+    ret->_gas0_sw6       = INSTRUCTION.gas0_sw6;
+    ret->_gas0_sw7       = INSTRUCTION.gas0_sw7;
+    ret->_gas0_t1        = INSTRUCTION.gas0_t1;
+    ret->_gas0_t2        = INSTRUCTION.gas0_t2;
+    ret->_gas0_t3        = INSTRUCTION.gas0_t3;
+    ret->_gas0_t4        = INSTRUCTION.gas0_t4;
+    ret->_gas0_t5        = INSTRUCTION.gas0_t5;
+    ret->_gas0_t6        = INSTRUCTION.gas0_t6;
+    ret->_gas0_t7        = INSTRUCTION.gas0_t7;
+    ret->_gas0_t         = INSTRUCTION.gas0_t1;
+    ret->_gas0_sw        = INSTRUCTION.gas0_sw1;
+    ret->_gas0_t_flag    = 1;
+    ret->_gas0_cy        = INSTRUCTION.gas0_cy;
+    ret->_gas0_lp        = INSTRUCTION.gas0_loop;
+
+    //gas1
+    ret->_gas1_sw1       = INSTRUCTION.gas1_sw1;
+    ret->_gas1_sw2       = INSTRUCTION.gas1_sw2;
+    ret->_gas1_sw3       = INSTRUCTION.gas1_sw3;
+    ret->_gas1_sw4       = INSTRUCTION.gas1_sw4;
+    ret->_gas1_sw5       = INSTRUCTION.gas1_sw5;
+    ret->_gas1_sw6       = INSTRUCTION.gas1_sw6;
+    ret->_gas1_sw7       = INSTRUCTION.gas1_sw7;
+    ret->_gas1_t1        = INSTRUCTION.gas1_t1;
+    ret->_gas1_t2        = INSTRUCTION.gas1_t2;
+    ret->_gas1_t3        = INSTRUCTION.gas1_t3;
+    ret->_gas1_t4        = INSTRUCTION.gas1_t4;
+    ret->_gas1_t5        = INSTRUCTION.gas1_t5;
+    ret->_gas1_t6        = INSTRUCTION.gas1_t6;
+    ret->_gas1_t7        = INSTRUCTION.gas1_t7;
+    ret->_gas1_t         = INSTRUCTION.gas1_t1;
+    ret->_gas1_sw        = INSTRUCTION.gas1_sw1;
+    ret->_gas1_t_flag    = 1;
+    ret->_gas1_cy        = INSTRUCTION.gas1_cy;
+    ret->_gas1_lp        = INSTRUCTION.gas1_loop;
+    return ret;
+}
+/*End of PULSE_MODE Mode*/
+
 /* Cycle CC Mode */
 typedef struct _CCCMode{
    int32_t _measureCurrent;
@@ -423,6 +647,7 @@ typedef union _WorkMode{
    LSVMode *LSV;
    CVSCANMode *CVSCAN;
    PSMode *PS;
+    PULSEMode *PULSE;
 //    CCCMode *CCC;
 }WorkMode;

@@ -434,6 +659,7 @@ WorkMode *CreateWorkMode(){
 void InitWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
            WM->VO = InitVoltOutMode();
            break;
        case IT_CURVE:
@@ -463,6 +689,9 @@ void InitWorkMode(WorkMode *WM){
        case CONSTANT_VSCAN:
            WM->CVSCAN = InitCVSCANMode();
            break;
+        case PULSE_MODE:
+            WM->PULSE = InitPULSEMode();
+            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            WM->CCC = InitCCCMode();
 //            break;
@@ -475,6 +704,7 @@ void InitWorkMode(WorkMode *WM){
 void FreeWorkMode(WorkMode *WM){
    switch(INSTRUCTION.eliteFxn){
        case VOLT_OUTPUT:
+        case CALI_DAC_MODE:
            if(WM->VO != NULL){
                free(WM->VO);
                WM->VO = NULL;
@@ -534,6 +764,12 @@ void FreeWorkMode(WorkMode *WM){
                WM->CVSCAN = NULL;
            }
            break;
+        case PULSE_MODE:
+            if(WM->PULSE != NULL){
+                free(WM->PULSE);
+                WM->PULSE = NULL;
+            }
+            break;
 //        case CYCLE_CONSTANT_CURRENT:
 //            if(WM->CCC != NULL){
 //                free(WM->CCC);
@@ -8,50 +8,114 @@

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

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

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

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

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

-#define shutdown_6994                   IOID_10
-#define switch_on                       IOID_11
-#define enable_10v                      IOID_12
-#define enable_5v                       IOID_13
+#define shutdown_6994                   LOAD2, D6
+#define switch_on                       IOID_14
+#define HIGH_Z_MODE                     LOAD2, D5
+#define enable_10v                      LOAD1, D5
+#define enable_5v                       LOAD1, D6
+
+/* Megafly control */
+#define MEGA_G_LED                      LOAD1, D0
+#define MEGA_R_LED                      LOAD1, D1
+#define MEGA_VAL_0                      LOAD1, D2
+#define MEGA_VAL_1                      LOAD1, D3
+#define MEGA_TRIG                       IOID_0

 PIN_Handle       pin_handle;
 static PIN_State ZM_rst;

 const PIN_Config BLE_IO[] = {
-    //
-    ADC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // ADC_CS
-    DAC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // DAC_CS
+//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,

-    enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // 10V_enable
-    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // 5V_enable
-    shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // turn off power
-    Turnon200R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
+    LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,                                    // to sense switch
+    MEGA_TRIG | PIN_GPIO_OUTPUT_DIS | PIN_INPUT_EN | PIN_PULLDOWN,

    PIN_TERMINATE
 };

+static void add_elite_pin() {
+//    PIN_Status elite15_status;
+    PIN_add(pin_handle,
+    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(pin_handle,
+    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+
+//    if(elite15_status != PIN_SUCCESS) {
+//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
+//    }
+}
+
+static void megafly_trig_callback(PIN_Handle handle, PIN_Id pinId);
+
+static void remove_elite_pin() {
+    PIN_close(pin_handle);
+    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+    PIN_registerIntCb(pin_handle, megafly_trig_callback);
+    PIN_setInterrupt(pin_handle, MEGA_TRIG | PIN_IRQ_NEGEDGE);
+}
+
 /*!
 *  @def    BOOSTXL_CC2650MA_SPIName
 *  @brief  Enum of SPI names on the CC2650 Booster Pack
@@ -2,7 +2,7 @@
 ***********************************************************
    Read battery's method
 ***********************************************************
-1.ReadBatVolt(spi_ADC_rxbuf)
+1.ReadADCBat(spi_ADC_rxbuf)
  let "spi_ADC_rxbuf" be 8000
  8000 * 187.5uV * 2 = 3000000uV = 3V ;
 2.AONBatMonBatteryVoltageGet()
@@ -34,7 +34,7 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
    uint32_t bat_volt = 0;

-    ReadBatVolt(spi_ADC_rxbuf);
+    ReadADCBat(spi_ADC_rxbuf);
    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
    bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
    InputNotify(NOTIFY_VOLT_BAT, bat_volt);
@@ -42,19 +42,50 @@ static void headstage_battery_volt(){

 static void EliteADCBattery(){
    static uint8_t ADCSwitch = 0;
-
-    if(ADCSwitch == 0){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheck_flag = false;
+    if(INSTRUCTION.eliteFxn == ADC_TEST){
        ADCSwitch = 0;
+    }else{
+        if(ADCSwitch == 0){ /**read V**/
+            ReadADCBat(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read V**/
+            ReadADCBat(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read V(buffer)**/
+            headstage_battery_volt();
+            batteryCheck_flag = false;
+            ADCSwitch = 0;
+        }
+    }
+}
+
+static void measureBat(){
+    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+    GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+
+    if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
+        GPT.BatteryCheckCounter = 0;
+        batteryCheck_flag = true;
+    }
+
+    if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
+        GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
+        batteryADC_flag = true;
+        if(batteryADC_flag){
+            EliteADCBattery();
+            batteryADC_flag = false;
+        }
+    }
+
+    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+    if( bat < 768 && bat > 20){
+        PIN15_setOutputValue(enable_5v, 0);
    }
 }

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

 // CIS (control instruction)
 #define CIS_VERSION                     0x40
@@ -50,24 +53,49 @@
 #define VDIRECTION(v1,v2)        ((v1 > v2)  ?  0 : 1)
 #define AFTER_READ_I             0
 #define AFTER_READ_V             1
-#define ReadADCVolt(x)           ((x==0)? ReadVoutVolt(spi_ADC_rxbuf) : ReadVolt(spi_ADC_rxbuf))
+#define ReadADCVolt(x)           ((x==0)? ReadADCVout(spi_ADC_rxbuf) : ReadADCVin(spi_ADC_rxbuf))
 #define PARA_1                   0x01
 #define PARA_2                   0x02
+#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              0
-#define COLOR_RED                1
-#define COLOR_ORANGE             2
-#define COLOR_YELLOW             3
-#define COLOR_GREEN              4
-#define COLOR_BLUE               5
-#define COLOR_CYAN               6
-#define COLOR_MAGENTA            7
-#define COLOR_PURPLE             8
-#define COLOR_WHITE              9
+#define COLOR_BLACK              0x00
+#define COLOR_RED                0x01
+#define COLOR_ORANGE             0x02
+#define COLOR_YELLOW             0x03
+#define COLOR_GREEN              0x04
+#define COLOR_BLUE               0x05
+#define COLOR_CYAN               0x06
+#define COLOR_MAGENTA            0x07
+#define COLOR_PURPLE             0x08
+#define COLOR_WHITE              0x09
+#define COLOR_YELLOWGREEN        0x0A
 #define LEDPowerON()             Elite_led_color(COLOR_GREEN)
 #define WORKLED()                Elite_led_color(COLOR_CYAN)
 #define KEYLED()                 Elite_led_color(COLOR_YELLOW)
+#define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)


+#define BT_WAIT                  0x01
+#define NO_EVENT                 0x02
+#define PRE_WORK                 0x03
+#define WORKING                  0x04
+#define POST_WORK                0x05
+
+#define MEGA_15V                 41406
+#define VALUE_ZERO_TO_ONE(_v)    (_v == 0) ? 1 : _v
 #endif
@@ -20,7 +20,7 @@ static uint16_t OneWayVoltScan() {
    }

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

    if ((INSTRUCTION.eliteFxn == IV_CURVE)||(INSTRUCTION.eliteFxn == CV_CURVE)||(INSTRUCTION.eliteFxn == CONSTANT_CURRENT)){
@@ -62,7 +62,8 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
            case VT_CURVE:
            case CYCLIC_VOLTAMMETRY:
            case LINEAR_SWEEP_VOLTAMMETRY:
-            case CONSTANT_VSCAN:{
+            case CONSTANT_VSCAN:
+            case PULSE_MODE:{
                break;
            }
            default:{
@@ -82,7 +83,8 @@ static void DACenable(WorkMode *WorkModeData, int32_t VoltData ,uint8_t afterRea
            }
            case IT_CURVE:
            case VT_CURVE:
-            case CONSTANT_CURRENT:{
+            case CONSTANT_CURRENT:
+            case PULSE_MODE:{
                break;
            }
            case CYCLIC_VOLTAMMETRY:{
@@ -142,6 +144,10 @@ static void CC_Plot(WorkMode *WorkModeData){
            #define CURRENT_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
@@ -155,13 +161,22 @@ static void CC_Plot(WorkMode *WorkModeData){
        if(BatSwitch == 0){
            if(ADCSwitch == 0){ /**read Iin(buffer),read bat**/
                readIin(WorkModeData);
-                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                if(record_flag == false){
+                    static int recordCount = 0;
+                    recordCount++;
+                    if(recordCount == 2){
+                        record_flag = true;
+                        recordCount = 0;
+                    }
+                }else{
+                    InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                }
                DACenable(WorkModeData, VoltData, AFTER_READ_I);

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

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

            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
@@ -212,11 +236,11 @@ static void CC_Plot(WorkMode *WorkModeData){
            }
            DACenable(WorkModeData, VoltData, AFTER_READ_V);

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

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

    static uint8_t ADCSwitch = 0;
    static int32_t VoltData;
@@ -351,7 +392,16 @@ static void VT_Plot(WorkMode *WorkModeData) {
    }else{
        if(ADCSwitch == 0){ /**read V(buffer)**/
            VoltData = readVinVout(WorkModeData);
-            InputNotify(NOTIFY_VOLT, VoltData);
+            if(record_flag == false){
+                static int recordCount = 0;
+                recordCount++;
+                if(recordCount == 2){
+                    record_flag = true;
+                    recordCount = 0;
+                }
+            }else{
+                InputNotify(NOTIFY_VOLT, VoltData);
+            }
            ADCSwitch++;
        }
        else if(ADCSwitch == 1){ /**read V**/
@@ -404,18 +454,25 @@ static void readIin(WorkMode *WorkModeData){
            #define TEMP_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define TEMP_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
    }

    if(INSTRUCTION.AutoGainEnable){
-        TEMP_MODE->_measureCurrent = AutoGainReadCurrent(spi_ADC_rxbuf);
-        AutoGainChange(TEMP_MODE->_measureCurrent);
+        TEMP_MODE->_measureCurrent = AutoGainReadIin(spi_ADC_rxbuf);
+        AutoGainChangeIin(TEMP_MODE->_measureCurrent);
    }else{
-        ADCGainControl(INSTRUCTION.ADCGainLevel);
-        ReadCurrent(spi_ADC_rxbuf);
+        ReadADCIin(spi_ADC_rxbuf);
        TEMP_MODE->_measureCurrent = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_CURRENT, spi_ADC_rxbuf);
+        if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            record_flag = false;
+        }
    }
    #undef TEMP_MODE
 }
@@ -458,17 +515,33 @@ static int32_t readVinVout(WorkMode *WorkModeData){
            #define TEMP_MODE WorkModeData->CVSCAN
            break;
        }
+        case PULSE_MODE:{
+            #define TEMP_MODE WorkModeData->PULSE
+            break;
+        }
        default: {
            break;
        }
    }

    static int32_t VoltData;
-    ReadADCVolt(TEMP_MODE->_VoViSwitch);
+
    if(TEMP_MODE->_VoViSwitch == 0x01 || TEMP_MODE->_VoViSwitch == 0x02){
-        TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+        if(INSTRUCTION.VinAutoGainEnable){
+            TEMP_MODE->_measureVin = AutoGainReadVin(spi_ADC_rxbuf);
+            AutoGainChangeVin(TEMP_MODE->_measureVin);
+        }else{
+            ReadADCVolt(TEMP_MODE->_VoViSwitch);
+            TEMP_MODE->_measureVin = DecodeADCValue(INSTRUCTION.VinADCGainLevel, ADC_CH_VOLT, spi_ADC_rxbuf);
+            if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+                VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                record_flag = false;
+            }
+
+        }
        VoltData = TEMP_MODE->_measureVin;
    }else if(TEMP_MODE->_VoViSwitch == 0x00){
+        ReadADCVolt(TEMP_MODE->_VoViSwitch);
        TEMP_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
        VoltData = TEMP_MODE->_measureVout;
    }
@@ -476,4 +549,259 @@ static int32_t readVinVout(WorkMode *WorkModeData){
    return VoltData;
 }

+static void cali_IT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    int32_t ADCValueTemp           = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+    int16_t ADCValueAVG_RAW        = 0;
+    static uint16_t cali_count_max = 1000;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(INSTRUCTION.AutoGainEnable){
+            CURRENT_MODE->_measureCurrent = 0xFFFF;
+        }else{
+            ReadADCIin(spi_ADC_rxbuf);
+            CURRENT_MODE->_measureCurrent = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            if(lastIinADCGainLevel != INSTRUCTION.ADCGainLevel){
+                IinADCGainControl(INSTRUCTION.ADCGainLevel);
+                record_flag = false;
+            }
+        }
+        if(INSTRUCTION.ADCGainLevel == 0) {
+            cali_count_max = 5000;
+        } else {
+            cali_count_max = 1000;
+        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= cali_count_max){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.ADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureCurrent;
+                InputNotify(NOTIFY_CURRENT, CURRENT_MODE->_measureCurrent);
+                InputNotify(NOTIFY_VOLT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read Iin**/
+        ReadADCIin(spi_ADC_rxbuf);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
+static void cali_VT_plot(WorkMode *WorkModeData) {
+    switch (INSTRUCTION.eliteFxn) {
+        case IT_CURVE:{
+            #define CURRENT_MODE WorkModeData->IT
+            break;
+        }
+        case VT_CURVE:{
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+        case ZT_CURVE:{
+            #define CURRENT_MODE WorkModeData->RT
+            break;
+        }
+        case IV_CURVE:{
+            #define CURRENT_MODE WorkModeData->IV
+            break;
+        }
+        case CV_CURVE:{
+            #define CURRENT_MODE WorkModeData->CV
+            break;
+        }
+        case CONSTANT_CURRENT:{
+            #define CURRENT_MODE WorkModeData->CC
+            break;
+        }
+        case CYCLIC_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->CV3
+            break;
+        }
+        case LINEAR_SWEEP_VOLTAMMETRY:{
+            #define CURRENT_MODE WorkModeData->LSV
+            break;
+        }
+        case CONSTANT_VSCAN:{
+            #define CURRENT_MODE WorkModeData->CVSCAN
+            break;
+        }
+        case PULSE_MODE:{
+            #define CURRENT_MODE WorkModeData->PULSE
+            break;
+        }
+        default: {
+            #define CURRENT_MODE WorkModeData->VT
+            break;
+        }
+    }
+
+    static uint8_t ADCSwitch = 0;
+    static int32_t VoltData;
+    int32_t ADCValueTemp           = 0;
+    static int32_t ADCValueSUM     = 0;
+    int32_t ADCValueAVG            = 0;
+    int16_t ADCValueAVG_RAW        = 0;
+    static uint16_t cali_count_max = 1000;
+
+    if(ADCSwitch == 0){ /**read Iin(buffer)**/
+        if(CURRENT_MODE->_VoViSwitch == 0x01 || CURRENT_MODE->_VoViSwitch == 0x02){
+            if(INSTRUCTION.VinAutoGainEnable){
+                CURRENT_MODE->_measureVin = 0xFFFF;
+            }else{
+                ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+                CURRENT_MODE->_measureVin = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+                if(lastVinADCGainLevel != INSTRUCTION.VinADCGainLevel){
+                    VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+                    record_flag = false;
+                }
+
+            }
+            VoltData = CURRENT_MODE->_measureVin;
+        }
+
+        if(INSTRUCTION.VinADCGainLevel == 0) {
+            cali_count_max = 5000;
+        } else {
+            cali_count_max = 1000;
+        }
+//        else if(CURRENT_MODE->_VoViSwitch == 0x00){
+//            ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+//            CURRENT_MODE->_measureVout = DecodeADCValue(INSTRUCTION.ADCGainLevel, ADC_CH_DAC, spi_ADC_rxbuf);
+//            VoltData = CURRENT_MODE->_measureVout;
+//        }
+
+        if(record_flag == false){
+            static int recordCount = 0;
+            recordCount++;
+            if(recordCount == 2){
+                record_flag = true;
+                recordCount = 0;
+            }
+        }else{
+            static uint16_t cali_count = 0;
+            if(cali_count >= cali_count_max){
+                ADCValueAVG = ADCValueSUM / cali_count;
+
+                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                SendNotify();
+
+                uint8_t CIS_buf[9]   = {0};
+                CIS_buf[0] = INSTRUCTION.chip_id;
+                CIS_buf[1] = (uint8_t) ((ADCValueAVG & 0xFF00) >> 8);
+                CIS_buf[2] = (uint8_t) (ADCValueAVG & 0x00FF);
+                CIS_buf[3] = 0x00;
+                CIS_buf[4] = INSTRUCTION.VinADCGainLevel;
+                SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                ADCValueSUM = 0;
+                cali_count = 0;
+
+                PeriodicEvent = false;
+                ModeLED(NO_EVENT);
+            }else{
+                cali_count++;
+                ADCValueSUM = ADCValueSUM + CURRENT_MODE->_measureVin;
+                InputNotify(NOTIFY_VOLT, CURRENT_MODE->_measureVin);
+                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+            }
+
+        }
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 1){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch++;
+    }
+    else if(ADCSwitch == 2){ /**read v**/
+        ReadADCVolt(CURRENT_MODE->_VoViSwitch);
+        ADCSwitch = 0;
+    }
+
+    #undef CURRENT_MODE
+}
+
 #endif
@@ -3,10 +3,10 @@
 #define VERSION_DATE

 #define VERSION_DATE_YEAR      20
-#define VERSION_DATE_MONTH     7
-#define VERSION_DATE_DAY       29
-#define VERSION_DATE_HOUR      15
-#define VERSION_DATE_MINUTE    21
+#define VERSION_DATE_MONTH     12
+#define VERSION_DATE_DAY       11
+#define VERSION_DATE_HOUR      17
+#define VERSION_DATE_MINUTE    20

 // this is NOT the version hash !!
 // it's the last version hash
@@ -38,6 +38,15 @@ static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_In
    GPT.GptimerCounter++;
 }

+static void megafly_trig_callback(PIN_Handle handle, PIN_Id pinId) {
+//    bool trig = 1;
+//    trig = PIN_getInputValue(MEGA_TRIG);
+    if (INSTRUCTION.eliteFxn == PULSE_MODE && megaTrigEnable){
+        Mega_PeriodicEvent = true;
+        Mega_Trig_receive = true;
+    }
+//    PIN15_setOutputValue(MEGA_G_LED, 1);
+}

 static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins);

@@ -46,15 +55,26 @@ static void ZM_init() {

    // initialize
    pin_handle = PIN_open(&ZM_rst, BLE_IO);
+//    PIN_registerIntCb(pin_handle, megafly_trig_callback);
+//    PIN_setInterrupt(pin_handle, MEGA_TRIG | PIN_IRQ_NEGEDGE);

-    PIN_setOutputValue(pin_handle, shutdown_6994, 1);  // OFF = 1 => turn off 6994
-    PIN_setOutputValue(pin_handle, enable_10v, 0);     // enable 10V
+    Init_Elite15_PIN();
+    ELITE15_SPI_HOLD();

-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
+    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
+    PIN15_setOutputValue(enable_10v, 0);        // enable 10V
+    PIN15_setOutputValue(HIGH_Z_MODE, 0);       // HIGH Z MODE // 1 => close high_z mode
+
+    /* Turn off Megafly output pin */
+    PIN15_setOutputValue(MEGA_G_LED, 0);
+    PIN15_setOutputValue(MEGA_R_LED, 0);
+    PIN15_setOutputValue(MEGA_VAL_0, 0);
+    PIN15_setOutputValue(MEGA_VAL_1, 1);

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

    //    PIN_registerIntCb(pin_handle, switch_on_callback);
@@ -66,7 +86,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui

 static void DACCode2Real2Notify(uint16_t DACcode) {
    int32_t RealV;
-    RealV = DAC_to_realV(DACcode);
+    RealV = DAC_to_realV(INSTRUCTION.VoutGainLevel, DACcode);

    NotifyVolt[0] = (uint8_t)((RealV & 0xFF000000) >> 24);
    NotifyVolt[1] = (uint8_t)((RealV & 0x00FF0000) >> 16);
@@ -83,7 +103,8 @@ static void DACCode2Real2Notify(uint16_t DACcode) {
 (INSTRUCTION.eliteFxn == CONSTANT_CURRENT)         || \
 (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)       || \
 (INSTRUCTION.eliteFxn == LINEAR_SWEEP_VOLTAMMETRY) || \
-(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)              \
+(INSTRUCTION.eliteFxn == CONSTANT_VSCAN)           || \
+(INSTRUCTION.eliteFxn == CALI_ADC_MODE)               \
 )

 #define Ve1MatchVe2Mode() (                           \
@@ -113,12 +134,17 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {

        if(EliteWorkReset){
            InitEliteGPtimer();
-            EliteWorkReset = false;
+            EliteWorkReset  = false;
            batteryADC_flag = false;
+            record_flag     = true;
+            VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+            IinADCGainControl(INSTRUCTION.ADCGainLevel);
+            VoutGainControl(INSTRUCTION.VoutGainLevel);
            if( Ve1MatchVe2Mode() ){
                if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
-                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.Ve1));
+                    DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
                    PeriodicEvent = false;
+                    ModeLED(NO_EVENT);
                }
            }
        }
@@ -139,7 +165,12 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
        //vscan counter
        GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
        if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
-            GPT.VscanRateCounter -= INSTRUCTION.VsetRate; //To get right time
+            if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
+                GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
+            }else{
+                GPT.GptimerMultiple = 1;
+            }
+            GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
            vscan_flag = true;
            if(vscan_flag){
                EliteVscanControl(WorkModeData);
@@ -157,7 +188,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {

        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
        if( bat < 768 && bat > 20){
-            PIN_setOutputValue(pin_handle, enable_5v, 0);
+//            PIN15_setOutputValue(enable_5v, 0);
        }

        //ADC counter
@@ -186,14 +217,161 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) {
            }
        }

-        EliteDone();
-    }else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
+//        EliteDone();
+    }
+    else if (INSTRUCTION.eliteFxn == PULSE_MODE) {
+         /** Periodic Event **/
+         // Default working flow is vscan -> ADC read -> send notify
+         // We will need a flag to control vscan, ADC and notify
+
+         GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
+         GPT.GptimerCounter0 = GPT.GptimerCounter;
+
+         if(EliteWorkReset){
+             InitEliteGPtimer();
+             EliteWorkReset  = false;
+             batteryADC_flag = false;
+             record_flag     = true;
+             //pulsemode variable
+             stiFirstTime  = true;
+             ledGFirstTime = true; //green led
+             ledRFirstTime = true; //red led
+             gas0FirstTime = true; //gas0
+             gas1FirstTime = true; //gas1
+             VinADCGainControl(INSTRUCTION.VinADCGainLevel);
+             IinADCGainControl(INSTRUCTION.ADCGainLevel);
+             VoutGainControl(INSTRUCTION.VoutGainLevel);
+             if (Ve1MatchVe2Mode()) {
+                 if (INSTRUCTION.Ve1 == INSTRUCTION.Ve2) {
+                     DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, INSTRUCTION.Ve1));
+                     PeriodicEvent = false;
+                     ModeLED(NO_EVENT);
+                 }
+             } else if (INSTRUCTION.eliteFxn == PULSE_MODE) {
+                if(!megaStiEnable && !megaLedGEnable && !megaLedREnable && !megaGas0Enable && !megaGas1Enable){
+                     PeriodicEvent = false;
+                     ModeLED(NO_EVENT);
+                }
+             }
+
+         }
+
+
+         GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
+         if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
+             vscanReset = true;
+         }else{
+             if(notifyFirst_flag){
+                 GPT.NotifyCounter = INSTRUCTION.notifyRate - 20;
+                 notifyFirst_flag = false;
+             }
+             vscanReset = false;
+             leadTimeReset = false;
+         }
+
+        //pulse mode counter
+        GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
+        GPT.LedGCounter = GPT.LedGCounter + GPT.DeltaGptimerCounter;
+        GPT.LedRCounter = GPT.LedRCounter + GPT.DeltaGptimerCounter;
+        GPT.Gas0Counter = GPT.Gas0Counter + GPT.DeltaGptimerCounter;
+        GPT.Gas1Counter = GPT.Gas1Counter + GPT.DeltaGptimerCounter;
+
+        if (vscanReset) {
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+            DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000));
+            //vscanReset = false;
+        }else{
+            if (megaStiEnable) {
+                PULSE_Vscan(WorkModeData->PULSE);
+            }
+
+            if (megaLedGEnable){
+                PULSE_ledG(WorkModeData->PULSE);
+            }
+
+            if (megaLedREnable){
+                PULSE_ledR(WorkModeData->PULSE);
+            }
+
+            if (megaGas0Enable){
+                PULSE_gas0(WorkModeData->PULSE);
+            }
+
+            if (megaGas1Enable){
+                PULSE_gas1(WorkModeData->PULSE);
+            }
+        }
+
+//         if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate){
+//             if(GPT.VscanRateCounter >= INSTRUCTION.VsetRate * 2){
+//                 GPT.GptimerMultiple = GPT.VscanRateCounter / INSTRUCTION.VsetRate;
+//             }else{
+//                 GPT.GptimerMultiple = 1;
+//             }
+//             GPT.VscanRateCounter -= INSTRUCTION.VsetRate * GPT.GptimerMultiple; //To get right time
+//             vscan_flag = true;
+//             if(vscan_flag){
+//                 EliteVscanControl(WorkModeData);
+//                 vscan_flag = false;
+//             }
+//         }
+
+         //battery counter
+         GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
+         GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+         if(GPT.BatteryCheckCounter >= 50000){
+             GPT.BatteryCheckCounter -= 50000; //To get right time
+             batteryCheck_flag = true;
+         }
+
+         uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) | ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+         if( bat < 768 && bat > 20){
+ //            PIN15_setOutputValue(enable_5v, 0);
+         }
+
+         //ADC counter
+         GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
+         if(GPT.SampleRateCounter >= INSTRUCTION.sampleRate){
+             GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+             ADC_flag = true;
+             if(ADC_flag){
+                 EliteADCControl(WorkModeData);
+                 ADC_flag = false;
+             }
+         }
+
+         //Notify counter(Notify control, check if we need to send notify)
+         //please don't put Notify counter before ADC counter, maybe get wrong data
+         GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
+         if(GPT.NotifyCounter >= INSTRUCTION.notifyRate){
+             GPT.NotifyCounter -= INSTRUCTION.notifyRate; //To get right time
+             notify_flag = true;
+             if(vscanReset){
+                 notify_flag = false;
+             }
+             if(notify_flag && megaStiEnable){
+                 InputNotify(NOTIFY_IMPEDANCE, Mega_Trig_receive);
+                 SendNotify();
+                 Mega_Trig_receive = false;
+                 notify_flag = false;
+             }
+         }
+
+    //        EliteDone();
+    }
+    else if(INSTRUCTION.eliteFxn == VOLT_OUTPUT){
        WorkModeData->VO->_Vset = INSTRUCTION.VoltConstant;
-        DAC_outputV(Usercode_Correction_to_DAC(WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
+        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, WorkModeData->VO->_Vset)); //UserCode -> DAC code -> DAC out
        FreeWorkMode(WorkModeData);
        PeriodicEvent = false;
-    }else{
-        InitFlag();
+    }
+    else if(INSTRUCTION.eliteFxn == CALI_DAC_MODE){
+        DAC_outputV(INSTRUCTION.VoltConstant); //UserCode -> DAC code -> DAC out
+        FreeWorkMode(WorkModeData);
+        PeriodicEvent = false;
+    }
+    else{
+//        InitFlag();
    }
 }

@@ -235,6 +413,19 @@ static void EliteADCControl(WorkMode *WorkModeData) {
            CC_Plot(WorkModeData);
            break;
        }
+        case CALI_ADC_MODE:{
+            if(INSTRUCTION.AdcChannel == IIN_ADC){
+                cali_IT_plot(WorkModeData);
+            }else if(INSTRUCTION.AdcChannel == VIN_ADC){
+                cali_VT_plot(WorkModeData);
+            }
+
+            break;
+        }
+        case PULSE_MODE:{
+            CC_Plot(WorkModeData);
+            break;
+        }
        default:{
            break;
        }
@@ -245,7 +436,7 @@ static void EliteDone() {
    if ((INSTRUCTION.eliteFxn == IV_CURVE) || (INSTRUCTION.eliteFxn == CV_CURVE) || (INSTRUCTION.eliteFxn == CYCLIC_VOLTAMMETRY)) {
        if (!PeriodicEvent) {
            SendNotify();
-            reset();
+            Eliteinterrupt();
        }
    }
 }
@@ -280,6 +471,10 @@ static void EliteVscanControl(WorkMode *WorkModeData) {
            CVSCAN_Vscan(WorkModeData->CVSCAN);
            break;
        }
+        case PULSE_MODE:{
+//            PULSE_Vscan(WorkModeData->PULSE);
+            break;
+        }
        default:{
            break;
        }
@@ -343,8 +538,9 @@ static void InitEliteFlag() {
    vscanReset        = true;
    EliteWorkReset    = true;
    leadTimeReset     = true;
-    GAIN_200R_counter = 0;
-    GAIN_200K_counter = 0;
-    GAIN_10K_counter  = 0;
+    I_GAIN_100R_counter = 0;
+    I_GAIN_3K_counter   = 0;
+    I_GAIN_100K_counter = 0;
+    I_GAIN_3M_counter   = 0;
 }
 #endif /* IMPEDANCE_METER_H_ */
@@ -546,17 +546,18 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {

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

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

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

    // Application main loops
@@ -616,53 +617,44 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
            events &= ~SBP_PERIODIC_EVT;
            if (!PeriodicEvent) {                // if there is no periodic event
                key = PIN_getInputValue(switch_on);
+
                if (EliteOn) {
                    if (counter6994 < CLOCK_ONE_SECOND/2) {  // counter6994 enable a IC after 35 counts
                        counter6994++;
                    } else if (counter6994 == CLOCK_ONE_SECOND/2) {
-                        PIN_setOutputValue(pin_handle, shutdown_6994, 1);  // OFF = 1 => turn off 6994
+                        PIN15_setOutputValue(shutdown_6994, 1);  // OFF = 1 => turn off 6994
                        counter6994++;
                    }
                    EliteKeyPress(key);
-                    if(key != 0){  //detect Elite battery power when no periodic event
-                        GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                        GPT.GptimerCounter0 = GPT.GptimerCounter;

-                        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-
-                        if(GPT.BatteryCheckCounter >= 50000){//5min=3000000, 5s=50000
-                            GPT.BatteryCheckCounter = 0;
-                            batteryCheck_flag = true;
-                        }
-
-                        if(GPT.BatteryADCCounter >= 15 && batteryCheck_flag){
-                            GPT.BatteryADCCounter = 0; //To get the data right, ADC must be delay 1.5ms
-                            batteryADC_flag = true;
-                            if(batteryADC_flag){
-                                EliteADCBattery();
-                                batteryADC_flag = false;
-                            }
-                        }
-
-                        uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
-                                       ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
-                        if( bat < 768 && bat > 20){
-                            PIN_setOutputValue(pin_handle, enable_5v, 0);
-                        }
-
-                    }
+//                    if(key != 0){  //detect Elite battery power when no periodic event
+//                        measureBat();
+//                    }
                    if(Free_Work_Mode){
                        FreeWorkMode(WorkModeData);
                        InitEliteInstruction();
-                        ADCGainControl(INSTRUCTION.ADCGainLevel);
-                        DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoltConstant));
-
                        Free_Work_Mode = false;
                    }
+                    /* Megafly trigger */
+//                    trig = PIN_getInputValue(MEGA_TRIG);        // trigger: 1 -> 0
+                    if (Mega_PeriodicEvent) {
+                        Mega_PeriodicEvent = false;
+                        PeriodicEvent = true;
+                    } else {
+
+                    }
                } else {
-                    EliteOn = TurnOnElite(key);
+//                    EliteOn = TurnOnElite(key);
+                    headstage_battery_volt();
+                    uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
+                                   ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
+                    PIN15_setOutputValue(enable_5v, 1);  // enable 5V
+                    TurnOn10V();
+                    ModeLED(BT_WAIT);
+                    EliteOn = true;
                }
+
+
            }
            else {                               // if there is periodic event
                if(InitPeriodicEvent){
@@ -950,7 +942,6 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

        numActive = linkDB_NumActive();

-
 //        uint16_t cxnHandle;
 //
 //        // requestedPDUSize = LL payload = L2CAP_header + ATT header + BLE_NOT_BUFF_SIZE = 7 + BLE_NOT_BUFF_SIZE //roy
@@ -996,7 +987,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)

    case GAPROLE_WAITING:
        SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-
+        ModeLED(BT_WAIT);
        break;

    case GAPROLE_WAITING_AFTER_TIMEOUT:
Author	SHA1	Message	Date
Roy	b4d2e96c1b	[update] gas1 is true when run done	2020-12-11 17:20:34 +08:00
Roy	4e46602753	[update] gas1 default lastSwitch is true	2020-12-11 16:22:28 +08:00
Roy	ba49c70af7	[update] MEGA_VAL_1 always open when elite on	2020-12-11 15:03:44 +08:00
Benny Liu	7a80f99106	Merge remote-tracking branch 'origin/Elite1.5_developement_magafly' into Elite1.5_developement_magafly	2020-12-10 15:51:19 +08:00
Benny Liu	59a3dfedf5	cali_count_max = 5000 for smallest Vin and Iin gain	2020-12-10 15:50:03 +08:00
Roy	af1613e43a	[update] add t6 & t7 of every func of pulse mode	2020-12-10 14:23:06 +08:00
Roy	ef61452bbf	[update] every board adjust vout	2020-12-07 18:28:45 +08:00
Roy	6c4c5a6e8e	[update] open elite when connect power	2020-12-07 15:34:11 +08:00
Roy	1f656f6be3	[update] every board adjust vout	2020-12-07 13:44:03 +08:00
Roy	3dea49aaa3	[update] vout of stim of pulse mode is 3.281v(megafly = 15v)	2020-12-04 18:33:30 +08:00
Roy	8ad154f4e4	[cali] add BOARD_C724 & BOARD_C874 calibration data.	2020-12-04 18:28:29 +08:00
Benny Liu	19c85c0fb5	Don't care	2020-12-03 18:12:47 +08:00
Roy	6807a787d9	[update] vout of stim of pulse mode is 3.281v(megafly = 15v) & record trigger	2020-12-03 15:40:14 +08:00
Roy	557953aedc	[update] only stim of pulse mode send data & reset when no func of pulse mode	2020-12-03 11:16:09 +08:00
Roy	d17a54d7f8	[update] update pulsemode's gas2 & ledR & ledG	2020-12-03 09:47:06 +08:00
Roy	31a7e9b5f2	[update] set sti_v5 = 0V	2020-12-02 11:49:08 +08:00
Roy	ec69da3b6d	[update] open highz when reset	2020-12-02 11:33:13 +08:00
Roy	b9aff38268	[update] controller send gas0's instruction	2020-12-02 09:21:45 +08:00
Roy	627ca7dde0	[update] comment out	2020-11-30 11:20:08 +08:00
Roy	ae143d2d7b	[update] if E.stim volt = 0V, open highz	2020-11-27 18:49:15 +08:00
Roy	900c9c4706	[update] update pulsemode's gas1	2020-11-27 18:22:18 +08:00
Roy	b712c99487	[update] update pulsemode's gas0	2020-11-27 17:59:13 +08:00
Roy	9664e9ab6d	[update] update pulsemode's ledR	2020-11-27 17:28:05 +08:00
Roy	f43341fc0c	[update] update pulsemode's ledG	2020-11-27 17:17:08 +08:00
Roy	aa572db220	[update] update pulsemode's ledG	2020-11-27 11:38:09 +08:00
Roy	47c10d5e73	Merge branch 'Elite1.5_developement_magafly_1119_2' into Elite1.5_developement_magafly_1119_1 # Conflicts: # simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h	2020-11-27 10:58:57 +08:00
Roy	b743a552ee	[update] align notify and update pulsemode's ledG	2020-11-26 22:42:20 +08:00
Roy	e2bb110d15	[update] Change 1.5 Iin measurement range.	2020-11-26 18:27:34 +08:00
Benny Liu	2723304b4c	ADC_test for output control.	2020-11-26 17:45:14 +08:00
Roy	d1c324acde	[update] add Vout boundary (usc)	2020-11-26 16:20:15 +08:00
Roy	afa28c9781	[update] run pulsemode's ledG	2020-11-26 10:08:23 +08:00
Roy	9cc51a14c6	[update] run pulsemode's ledG	2020-11-25 13:55:11 +08:00
Roy	d305b8a948	not ok	2020-11-25 09:41:31 +08:00
Roy	1b0acb5bad	[update] run pulsemode when receive trigger.[ok]	2020-11-24 18:04:30 +08:00
Roy	1d4330b903	[update] run pulsemode when receive trigger.[ok]	2020-11-24 17:37:16 +08:00
Roy	ec1782b6f8	[update] run pulsemode when receive trigger.	2020-11-23 17:31:14 +08:00
Roy	f2b52f34a9	[cali] update BOARD_C7A1 calibration data.	2020-11-23 13:54:40 +08:00
Roy	bbf60ebfed	test periodicEvent	2020-11-19 16:00:51 +08:00
Roy	0e9f40bdd5	Megafly trigger yes yes.	2020-11-19 15:47:07 +08:00
Roy	e32897f6b5	[update] Megafly notify check. & Megafly trigger.	2020-11-19 15:40:12 +08:00
Roy	6ee4b47d90	[update]update pulsefly INSTRUCTION.notifyRate	2020-11-18 11:57:53 +08:00
YiChin	dac19f62b2	test ok,but T2~T3=0 can't handle	2020-11-16 14:43:50 +08:00
YiChin	8e6d112729	test ok,but T2~T3=0 can't handle	2020-11-16 14:30:27 +08:00
YiChin	9e1dc1e3f4	test ok,but T1~T5=0 can't handle	2020-11-13 18:28:48 +08:00
YiChin	49fb3afc01	test ok,but T1~T5=0 can't handle	2020-11-13 13:30:47 +08:00
YiChin	f3b402fce9	test ok	2020-11-12 18:01:32 +08:00
YiChin	ef9a38d7fc	test not ok(RT not ok)	2020-11-12 17:24:04 +08:00
YiChin	67275a7921	test not ok(RT not ok)	2020-11-12 16:17:15 +08:00
YiChin	0ddaa02414	test not ok	2020-11-12 15:39:44 +08:00
YiChin	96d5735164	test not ok	2020-11-12 14:55:28 +08:00
YiChin	ac32fb9c73	test not ok	2020-11-12 12:23:14 +08:00
Benny Liu	9acc242ff6	Add Megafly pin.	2020-11-12 10:22:31 +08:00
YiChin	d8a403c410	add BOARD_C771 calibration data.	2020-11-12 10:18:12 +08:00
YiChin	f1d0acef23	update pulse mode	2020-11-12 10:16:40 +08:00
YiChin	9811572f47	add pulse mode	2020-11-11 16:44:49 +08:00
YiChin	f6167c25ca	update SPI hold & take away AutoGainChangeVout()	2020-10-20 18:41:00 +08:00
YiChin	cbe9bd8211	CV mode foolproof	2020-09-07 17:58:18 +08:00
YiChin	0293647d0c	update cali dac mod	2020-09-04 16:32:53 +08:00
YiChin	87d187c3a5	add cali dac mode, need to take away auto change voutgain	2020-09-03 18:30:39 +08:00
YiChin	09fbfd9dda	update cali adc mode	2020-09-03 14:49:33 +08:00
YiChin	74ca631309	add cali adc mode	2020-09-02 15:49:49 +08:00
YiChin	03e86e175d	add cali mode 9/1	2020-09-01 15:44:42 +08:00
YiChin	1c54525256	update cali code	2020-09-01 13:41:02 +08:00
YiChin	d49874a666	add Vout of DAC	2020-08-28 13:30:35 +08:00
YiChin	6d6ba43d81	fix Iin of ADC	2020-08-26 09:50:37 +08:00
YiChin	4914498732	fix Vin of ADC	2020-08-25 18:10:08 +08:00
YiChin	85220734de	spi hold when run mode	2020-08-24 15:59:18 +08:00
YiChin	7531a6638b	update Iin boundary	2020-08-20 11:50:21 +08:00
Benny Liu	4088a4d38b	Calibration data of BOARD_C6D4.	2020-08-19 18:18:53 +08:00
YiChin	1b3d057d33	update LED fun	2020-08-18 14:18:35 +08:00
YiChin	17e1846afa	fix slowly vscan of CV3 & CV & LSV mode	2020-08-18 14:09:14 +08:00
YiChin	0407690197	fix slowly vscan of IV mode	2020-08-14 09:22:21 +08:00
YiChin	55e8b37f13	test Vout & highZ	2020-08-12 14:52:47 +08:00
YiChin	fb4c0a59e8	update Vin boundary	2020-08-11 16:35:39 +08:00
YiChin	ea3d146c86	test Vin change level	2020-08-11 15:38:32 +08:00
YiChin	cddafdffff	Modify ADC test for calibration.	2020-08-11 15:11:50 +08:00
YiChin	05e953d6e2	test Vin change level	2020-08-11 15:09:57 +08:00
YiChin	9b7e960bec	test Vin change level	2020-08-11 14:42:27 +08:00
YiChin	c3aa2f7178	test Vin change level	2020-08-11 14:37:37 +08:00
YiChin	5b4970d814	test Vin change level	2020-08-11 14:09:19 +08:00
YiChin	46c43afa26	test Vin change level	2020-08-10 18:08:27 +08:00
YiChin	6bcfc74d1a	test Vin change level	2020-08-10 17:25:23 +08:00
YiChin	4d920209f7	test ADC code	2020-08-10 16:11:36 +08:00
YiChin	52f8708905	test ADC code	2020-08-10 15:46:53 +08:00
YiChin	b7024363ee	test ADC code	2020-08-10 14:54:09 +08:00
YiChin	1a6d30606c	test ADC code	2020-08-10 10:48:09 +08:00
YiChin	e72698dea3	test ADC code	2020-08-07 14:36:04 +08:00
YiChin	3100dded42	update BOARD_C6E1 calibration data.	2020-08-06 18:23:55 +08:00
YiChin	53584f2b5b	add BOARD_C6E1 calibration data.	2020-08-06 15:35:03 +08:00
YiChin	b2d924228a	fix auto change level	2020-08-06 13:48:28 +08:00
YiChin	f3de02477d	fix change level ok	2020-08-06 10:01:48 +08:00
YiChin	77a2bc2d8f	fix change level ok	2020-08-06 09:49:25 +08:00
YiChin	c56a07ead8	test ADC_TEST	2020-08-05 09:37:25 +08:00
YiChin	2e3ca56ece	test ADC_TEST	2020-08-04 16:35:42 +08:00
YiChin	b8588393b7	test ADC_TEST	2020-08-04 16:31:27 +08:00
YiChin	ea33b37080	test ADC_TEST	2020-08-04 15:22:40 +08:00
YiChin	ea7815dc64	Elite 1.4 upgrade to Elite 1.5	2020-08-04 12:36:31 +08:00