[update] new Cali Mode version

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.c

@@ -193,49 +193,63 @@ const UDMACC26XX_Config UDMACC26XX_config[] = {
  *  ========================== SPI DMA begin ===================================
  */
 /* Place into subsections to allow the TI linker to remove items properly */
-// #if defined(__TI_COMPILER_VERSION__)
-// #pragma DATA_SECTION(SPI_config, ".const:SPI_config")
-// #pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
-// #endif
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
+#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
+#endif
 
-// /* Include drivers */
-// #include <ti/drivers/spi/SPICC26XXDMA.h>
+/* Include drivers */
+#include <ti/drivers/spi/SPICC26XXDMA.h>
 
-// /* SPI objects */
-// SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
+/* SPI objects */
+SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
 
-// /* SPI configuration structure, describing which pins are to be used */
-// const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_UDMACOUNT] = {
-//     {
-//         .baseAddr           = SSI0_BASE,
-//         .intNum             = INT_SSI0_COMB,
-//         .intPriority        = ~0,
-//         .swiPriority        = 0,
-//         .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
-//         .defaultTxBufValue  = 0,
-//         .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
-//         .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
-//         .mosiPin            = Board_SPI0_MOSI,
-//         .misoPin            = Board_SPI0_MISO,
-//         .clkPin             = Board_SPI0_CLK,
-//         .csnPin             = Board_SPI0_CS
-//     },
-// };
+/* SPI configuration structure, describing which pins are to be used */
+const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
+    {
+        .baseAddr           = SSI0_BASE,
+        .intNum             = INT_SSI0_COMB,
+        .intPriority        = ~0,
+        .swiPriority        = 0,
+        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
+        .defaultTxBufValue  = 0,
+        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
+        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
+        .mosiPin            = Board_SPI0_MOSI,
+        .misoPin            = Board_SPI0_MISO,
+        .clkPin             = Board_SPI0_CLK,
+        .csnPin             = Board_SPI0_CS
+    },
+    {
+        .baseAddr           = SSI1_BASE,
+        .intNum             = INT_SSI1_COMB,
+        .intPriority        = ~0,
+        .swiPriority        = 0,
+        .powerMngrId        = PowerCC26XX_PERIPH_SSI1,
+        .defaultTxBufValue  = 0,
+        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI1_RX,
+        .txChannelBitMask   = 1<<UDMA_CHAN_SSI1_TX,
+        .mosiPin            = Board_SPI1_MOSI,
+        .misoPin            = Board_SPI1_MISO,
+        .clkPin             = Board_SPI1_CLK,
+        .csnPin             = Board_SPI1_CS
+    },  
+};
 
-// /* SPI configuration structure */
-// const SPI_Config SPI_config[] = {
-//     {
-//          .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-//          .object      = &spiCC26XXDMAObjects[0],
-//          .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-//     },
-//     {
-//          .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-//          .object      = &spiCC26XXDMAObjects[1],
-//          .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-//     },
-//     {NULL, NULL, NULL}
-// };
+/* SPI configuration structure */
+const SPI_Config SPI_config[] = {
+    {
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[0],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+    },
+    {
+         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+         .object      = &spiCC26XXDMAObjects[1],
+         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+    },
+    {NULL, NULL, NULL}
+};
 /*
  *  ========================== SPI DMA end =====================================
 */
@@ -423,3 +437,44 @@ const PWM_Config PWM_config[BOOSTXL_CC2650MA_PWMCOUNT + 1] = {
 /*
  *  ============================= PWM end ======================================
  */
+
+/*
+ *  ============================= I2C Begin=====================================
+*/
+/* Place into subsections to allow the TI linker to remove items properly */
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
+#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
+#endif
+
+/* Include drivers */
+#include <ti/drivers/i2c/I2CCC26XX.h>
+
+/* I2C objects */
+I2CCC26XX_Object i2cCC26xxObjects[BOOSTXL_CC2650MA_I2CCOUNT];
+
+/* I2C configuration structure, describing which pins are to be used */
+const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[BOOSTXL_CC2650MA_I2CCOUNT] = {
+    {
+        .baseAddr = I2C0_BASE,
+        .powerMngrId = PowerCC26XX_PERIPH_I2C0,
+        .intNum = INT_I2C_IRQ,
+        .intPriority = ~0,
+        .swiPriority = 0,
+        .sdaPin = Board_I2C0_SDA0,
+        .sclPin = Board_I2C0_SCL0,
+    }
+};
+
+/* I2C configuration structure */
+const I2C_Config I2C_config[] = {
+    {
+        .fxnTablePtr = &I2CCC26XX_fxnTable,
+        .object = &i2cCC26xxObjects[0],
+        .hwAttrs = &i2cCC26xxHWAttrs[0]
+    },
+    {NULL, NULL, NULL}
+};
+/*
+ *  ========================== I2C end =========================================
+ */

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h

@@ -50,6 +50,7 @@ extern "C" {
  *  ==========================================================================*/
 #include <ti/drivers/PIN.h>
 #include <driverlib/ioc.h>
+#include "boards_config/elite_boards_select.h"
 
 /** ============================================================================
  *  Externs
@@ -171,6 +172,8 @@ extern const PIN_Config BoardGpioInitTable[];
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  BOOSTXL_CC2650MA_SPI0
 #define Board_SPI1                  BOOSTXL_CC2650MA_SPI1
+/* Generic I2C instance identifiers */
+#define Board_I2C0                  BOOSTXL_CC2650MA_I2C0
 /* Generic UART instance identifiers */
 #define Board_UART                  BOOSTXL_CC2650MA_UART0
 /* Generic TRNG instance identiifer */
@@ -209,15 +212,16 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
 } BOOSTXL_CC2650MA_CryptoName;
 
 
-// /*!
-//  *  @def    BOOSTXL_CC2650MA_SPIName
-//  *  @brief  Enum of SPI names on the CC2650 Booster Pack
-//  */
-// typedef enum BOOSTXL_CC2650MA_SPIName {
-//     BOOSTXL_CC2650MA_SPI0 = 0,
+/*!
+ *  @def    BOOSTXL_CC2650MA_SPIName
+ *  @brief  Enum of SPI names on the CC2650 Booster Pack
+ */
+typedef enum BOOSTXL_CC2650MA_SPIName {
+    BOOSTXL_CC2650MA_SPI0 = 0,
+    BOOSTXL_CC2650MA_SPI1 = 1,
 
-//     BOOSTXL_CC2650MA_SPICOUNT
-// } BOOSTXL_CC2650MA_SPIName;
+    BOOSTXL_CC2650MA_SPICOUNT
+} BOOSTXL_CC2650MA_SPIName;
 
 /*!
  *  @def    BOOSTXL_CC2650MA_TRNGName
@@ -295,6 +299,16 @@ typedef enum BOOSTXL_CC2650MA_PWM
     BOOSTXL_CC2650MA_PWMCOUNT
 } BOOSTXL_CC2650MA_PWM;
 
+/*!
+ *  @def    BOOSTXL_CC2650MA_I2CName
+ *  @brief  Enum of I2C names on the CC2650 Booster Pack
+ */
+typedef enum BOOSTXL_CC2650MA_I2CName {
+    BOOSTXL_CC2650MA_I2C0 = 0,
+
+    BOOSTXL_CC2650MA_I2CCOUNT
+} BOOSTXL_CC2650MA_I2CName;
+
 #ifdef __cplusplus
 }
 #endif

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/boards_config/elite_boards_select.h

@@ -0,0 +1,67 @@
+#ifndef ELITE_BOARDS_SELECT_H
+#define ELITE_BOARDS_SELECT_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/*
+ * +---------------+----------------------+-------------------------+
+ * |  model name   |      upper board     |       lower board       |
+ * +---------------+----------------------+-------------------------+
+ * | EDC1.4        | Elite1.4-re Jun.2019 | Elite1.4-re Jun. 2019   |<- DEF_ELITE_EDC_1_4
+ * | EDC1.5        | Elite1.5 Dec. 2019   | Elite1.5 Dec. 2019      |<- DEF_ELITE_EDC_1_5
+ * | EDC1.5re      | Elite1.5 Dec. 2019   | Elite1.5-re Jan. 2021   |<- DEF_ELITE_EDC_1_5_RE
+ * | EDC1.5r2      | Elite1.5 Dec. 2019   | Elite1.5 - r2 May. 2022 |<- DEF_ELITE_EDC_1_5_R2
+ * | EIS1.0        | Elite1.5 Dec. 2019   | Elite EIS 1.0 Aug. 2020 |<- DEF_ELITE_EIS_1_0
+ * | EIS1.1        | Elite1.5 Dec. 2019   | Elite EIS 1.1 Feb. 2022 |<- DEF_ELITE_EIS_1_1
+ * | BAT1.0        |             Elite2.0 Feb. 2022                 |<- DEF_ELITE_BAT_1_0
+ * | MEGAFLY0.1    |          ?           |           ?             |<- DEF_ELITE_MEGAFLY_0_1
+ * | TRIG0.1       |            Elite TRIG01 Jan. 2021              |<- DEF_ELITE_TRIG_0_1
+ * +---------------+----------------------+-------------------------+
+ */
+
+
+#define DEF_ELITE_EDC_1_4       0
+#define DEF_ELITE_EDC_1_5       1
+#define DEF_ELITE_EDC_1_5_RE    2
+#define DEF_ELITE_EDC_1_5_R2    3
+#define DEF_ELITE_EIS_1_0       4
+#define DEF_ELITE_EIS_1_1       5
+#define DEF_ELITE_BAT_1_0       6
+#define DEF_ELITE_MEGAFLY_0_1   7
+#define DEF_ELITE_TRIG_0_1      8
+#define DEF_ELITE_MAX           9
+
+
+#define DEF_ELITE_MODEL    DEF_ELITE_EDC_1_5_RE
+#ifndef DEF_ELITE_MODEL
+#error "DEF_ELITE_MODEL not defined"
+#endif
+
+#if (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_4)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_RE)
+  #include "boards_config/pin_def_edc15re.h"
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EDC_1_5_R2)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_0)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_EIS_1_1)
+  #include "boards_config/pin_def_eis11.h"
+#elif (DEF_ELITE_MODEL == DEF_ELITE_BAT_1_0)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_MEGAFLY_0_1)
+  #error "code no support"    // need fix
+#elif (DEF_ELITE_MODEL == DEF_ELITE_TRIG_0_1)
+  #error "code no support"    // need fix
+#else
+  #error "no this model"
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+#endif  // ELITE_BOARDS_SELECT_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/boards_config/pin_def_edc15re.h

@@ -0,0 +1,63 @@
+#ifndef PIN_DEF_EDC15RE_H
+#define PIN_DEF_EDC15RE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * +------------------------------+
+ * |          CC2650moda          |
+ * +-------------+----------------+
+ * | MISO        | DIO1           |
+ * | D0          | DIO3           |
+ * | D1          | DIO4           |
+ * | D2/JTAG_TDO | DIO5/JTAG_TDO  |
+ * | D3/JTAG_TDI | DIO6/JTAG_TDI  |
+ * | D4          | DIO7           |
+ * | D5          | DIO8           |
+ * | D6          | DIO9           |
+ * | D7          | DIO10          |
+ * | LOAD2       | DIO11          |
+ * | LOAD1       | DIO12          |
+ * | LOAD0       | DIO13          |
+ * | SHUT_DOWN   | DIO14          |
+ * +-------------+----------------+
+ */
+
+
+/* CC2650moda */
+#define E_PIN_MISO            DIO1
+#define E_PIN_D0              DIO3
+#define E_PIN_D1              DIO4
+#define E_PIN_D2              DIO5
+#define E_PIN_D3              DIO6
+#define E_PIN_D4              DIO7
+#define E_PIN_D5              DIO8
+#define E_PIN_D6              DIO9
+#define E_PIN_D7              DIO10
+
+#define E_PIN_LOAD2           DIO11
+#define E_PIN_LOAD1           DIO12
+#define E_PIN_LOAD0           DIO13
+#define E_PIN_SHUT_DOWN       DIO14     // to sense switch
+
+/* SPI Board */
+#define Board_SPI0_MISO                 PIN_UNASSIGNED
+#define Board_SPI0_MOSI                 E_PIN_D1
+#define Board_SPI0_CLK                  E_PIN_D0
+#define Board_SPI0_CS                   PIN_UNASSIGNED
+
+#define Board_SPI1_MISO                 E_PIN_MISO
+#define Board_SPI1_MOSI                 E_PIN_D3
+#define Board_SPI1_CLK                  E_PIN_D2
+#define Board_SPI1_CS                   PIN_UNASSIGNED
+
+/* I2C */ 
+#define Board_I2C0_SCL0                 PIN_UNASSIGNED
+#define Board_I2C0_SDA0                 PIN_UNASSIGNED
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // PIN_DEF_EDC15RE_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/gpio_edc15re.h

@@ -0,0 +1,15 @@
+#ifndef GPIO_EDC15RE_H
+#define GPIO_EDC15RE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint8_t gpio_create(void);
+uint8_t add_pin_d0_d3(void);
+uint8_t remove_pin_d0_d3(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // GPIO_EDC15RE_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/gpio_edc15re_c.h

@@ -0,0 +1,89 @@
+#include <Board.h>
+#include <ti/drivers/pin/PINCC26XX.h>
+#include "driver/gpio_edc15re.h"
+
+static PIN_Handle   PinHandle;
+static PIN_State    PinStatus;
+
+const PIN_Config BLE_IO[] = {
+    E_PIN_D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_LOAD0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_LOAD1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    E_PIN_LOAD2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    E_PIN_SHUT_DOWN | PIN_INPUT_EN | PIN_PULLDOWN,
+
+    PIN_TERMINATE
+};
+
+static PIN_Handle __get_gpio_handle(void)
+{
+    return PinHandle;
+}
+
+static void __set_gpio_handle(PIN_Handle handle)
+{
+    PinHandle = handle;
+
+    return;
+}
+
+uint8_t gpio_create(void)
+{
+    PIN_Handle h;
+
+    h = PIN_open(&PinStatus, BLE_IO);
+    __set_gpio_handle(h);
+
+    if (h == NULL)
+        return 1;
+        
+    return 0;
+}
+
+uint8_t add_pin_d0_d3(void)
+{
+    PIN_Handle h = __get_gpio_handle();
+
+    PIN_add(h, E_PIN_D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(h, E_PIN_D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(h, E_PIN_D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+    PIN_add(h, E_PIN_D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
+
+    return 0;
+}
+
+uint8_t remove_pin_d0_d3(void)
+{
+    PIN_Handle h = __get_gpio_handle();
+
+    PIN_remove(h, E_PIN_D0);
+    PIN_remove(h, E_PIN_D1);
+    PIN_remove(h, E_PIN_D2);
+    PIN_remove(h, E_PIN_D3);
+
+    return 0;
+}
+
+static uint8_t pin_set(uint8_t pin, uint8_t set_value)
+{
+    /*
+     * if status = 0: success
+     * else: fail
+     */
+    uint8_t p = pin;
+    uint8_t v = set_value;
+    PIN_Status status;
+    PIN_Handle h = __get_gpio_handle();
+
+    status = PIN_setOutputValue(h, p, v);
+
+    return (uint8_t)status;
+}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/spi_ctrl.h

@@ -0,0 +1,27 @@
+#ifndef SPI_CTRL_H
+#define SPI_CTRL_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define POL0    0
+#define POL1    1
+#define PHA0    0
+#define PHA1    1
+
+#define SPI_CLK_1M      1000000
+#define SPI_CLK_4M      4000000
+
+uint8_t spi0_open(uint32_t bitRate, uint8_t polarity, uint8_t phase);
+uint8_t spi0_close(void);
+uint8_t spi0_write(uint8_t *rxBuf, uint8_t *txBuf, uint8_t len);
+
+uint8_t spi1_open(uint32_t bitRate, uint8_t polarity, uint8_t phase);
+uint8_t spi1_close(void);
+uint8_t spi1_write(uint8_t *rxBuf, uint8_t *txBuf, uint8_t len);
+
+#ifdef  __cplusplus
+}
+#endif
+#endif  // SPI_CTRL_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/spi_ctrl_c.h

@@ -0,0 +1,208 @@
+#include <Board.h>
+#include <ti/drivers/SPI.h>
+#include "driver/spi_ctrl.h"
+
+#define CC2650_SPI_BITRATE_MAX  4000000     //4M
+
+static SPI_Handle SpiHandle0 = NULL;
+static SPI_Params SpiParams0;
+
+static SPI_Handle SpiHandle1 = NULL;
+static SPI_Params SpiParams1;
+
+static SPI_Handle __get_spi_handle(uint8_t spi_channel)
+{
+    uint8_t c = spi_channel;
+
+    if (c >= BOOSTXL_CC2650MA_SPICOUNT)
+        return NULL;
+
+    if (c == Board_SPI0)
+        return SpiHandle0;
+
+    if (c == Board_SPI1)
+        return SpiHandle1;
+
+    return 0;
+}
+
+static void __set_spi_handle(uint8_t spi_channel, SPI_Handle handle)
+{
+    uint8_t c = spi_channel;
+
+    if (c == Board_SPI0)
+        SpiHandle0 = handle;
+    else if (c == Board_SPI1)
+        SpiHandle1 = handle;
+
+    return;
+}
+
+static SPI_FrameFormat __get_spi_mode(uint8_t polarity, uint8_t phase)
+{
+    uint8_t pol = polarity;
+    uint8_t pha = phase;
+    SPI_FrameFormat mode;
+
+    if (pol == 0 && pha == 0)
+        mode = SPI_POL0_PHA0;
+    else if (pol == 0 && pha == 1)
+        mode = SPI_POL0_PHA1;
+    else if (pol == 1 && pha == 0)
+        mode = SPI_POL1_PHA0;
+    else if (pol == 1 && pha == 1)
+        mode = SPI_POL1_PHA1;
+
+    return mode;
+}
+
+uint8_t spi0_open(uint32_t bitRate, uint8_t polarity, uint8_t phase)
+{
+    uint32_t rate = bitRate;
+    uint8_t pol = polarity;
+    uint8_t pha = phase;
+    SPI_Handle h = __get_spi_handle(Board_SPI0);
+    SPI_Params *para = &SpiParams0;
+
+    if (rate > CC2650_SPI_BITRATE_MAX)
+        return 1;
+
+    if (pol > 1 || pha > 1)
+        return 2;
+
+    if (h != NULL)
+        return 3;
+
+    SPI_Params_init(para);
+    para->bitRate = rate;
+    para->mode = SPI_MASTER;
+    para->dataSize = 8;
+    para->frameFormat = __get_spi_mode(pol, pha);
+
+    h = SPI_open(Board_SPI0, para);
+    __set_spi_handle(Board_SPI0, h);
+
+    if (h == NULL)
+        return 4;
+
+    return 0;
+}
+
+uint8_t spi0_close(void)
+{
+    SPI_Handle h = __get_spi_handle(Board_SPI0);
+
+    if (h == NULL)
+        return 1;
+
+    SPI_close(h);
+    __set_spi_handle(Board_SPI0, NULL);
+
+    return 0;
+}
+
+uint8_t spi0_write(uint8_t *rxBuf, uint8_t *txBuf, uint8_t len)
+{
+    SPI_Handle h = __get_spi_handle(Board_SPI0);
+    SPI_Transaction spi0_tran;
+    uint8_t ret;
+
+    if (h == NULL)
+        return 1;
+
+    spi0_tran.count  = len;
+    spi0_tran.txBuf  = txBuf;
+    spi0_tran.arg    = NULL;
+    spi0_tran.rxBuf  = NULL;
+    ret = SPI_transfer(h, &spi0_tran);
+
+    if (ret == false)
+        return 2;
+
+    return 0;
+}
+
+uint8_t spi1_open(uint32_t bitRate, uint8_t polarity, uint8_t phase)
+{
+    uint32_t rate = bitRate;
+    uint8_t pol = polarity;
+    uint8_t pha = phase;
+    SPI_Handle h = __get_spi_handle(Board_SPI1);
+    SPI_Params *para = &SpiParams1;
+
+    if (rate > CC2650_SPI_BITRATE_MAX)
+        return 1;
+
+    if (pol > 1 || pha > 1)
+        return 2;
+
+    if (h != NULL)
+        return 3;
+    
+    SPI_Params_init(para);
+    para->bitRate = rate;
+    para->mode = SPI_MASTER;
+    para->dataSize = 8;
+    para->frameFormat = __get_spi_mode(pol, pha);
+
+    h = SPI_open(Board_SPI1, para);
+    __set_spi_handle(Board_SPI1, h);
+
+    if (h == NULL)
+        return 4;
+
+    return 0;
+}
+
+uint8_t spi1_close(void)
+{
+    SPI_Handle h = __get_spi_handle(Board_SPI1);
+    if (h == NULL)
+        return 1;
+
+    SPI_close(h);
+    __set_spi_handle(Board_SPI1, NULL);
+
+    return 0;
+}
+
+uint8_t spi1_write(uint8_t *rxBuf, uint8_t *txBuf, uint8_t len)
+{
+    SPI_Handle h = __get_spi_handle(Board_SPI1);
+    SPI_Transaction spi1_tran;
+    uint8_t ret;
+
+    if (h == NULL)
+        return 1;
+
+    spi1_tran.count  = len;
+    spi1_tran.txBuf  = txBuf;
+    spi1_tran.arg    = NULL;
+    spi1_tran.rxBuf  = rxBuf;
+    ret = SPI_transfer(h, &spi1_tran);
+
+    if (ret == false)
+        return 2;
+
+    return 0;
+}
+
+/* utils.c.h */
+/*
+#include <stdio.h>
+#include <stdint.h>
+
+static void ___print_hex(uint8_t* p, int len)
+{
+    // ___print_hex((uint8_t *)p, sizeof(struct led_series_data_t));
+
+    int i;
+    
+    for (i = 0; i < len; i++) {
+        printf("0x%x, ", *p++);
+    }
+    printf("\n\n");
+    
+    return;
+}
+*/

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/timers.h

@@ -0,0 +1,40 @@
+#ifndef TIMERS_H
+#define TIMERS_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+//timer
+enum gptimer0_ctrl_e {
+    GPT_CTRL_START = 0,
+    GPT_CTRL_STOP,
+    GPT_CTRL_CLOSE,
+
+    GPT_CTRL_MAX,
+};
+
+void elite_gptimer_open();
+uint8_t gptimer0_ctrl(enum gptimer0_ctrl_e gpt_ctrl);
+
+
+//clock
+/***************************************************
+ * Q: Why define CPU_1us = 16?
+ * A:
+ *   3 cycles per loop: 16 loops @ 48 Mhz ~= 1 us
+ *   3 cycles * X loops / 48Mhz = 1us(ideal value)
+ *   3 cycles * X loops / 48us = 1us(ideal value)
+ *   X = 48 / 3 => X = 16 loops
+ ***************************************************/
+#define CPU_1us     16
+#define CPU_1ms     16000
+
+void CPUdelay_us(uint32_t delay_t);
+void CPUdelay_ms(uint32_t delay_t);
+void GPT_timerIncrement();
+
+#ifdef  __cplusplus
+}
+#endif
+#endif  // TIMERS_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/driver/timers_c.h

@@ -0,0 +1,95 @@
+#include <Board.h>
+#include <ti/drivers/timer/GPTimerCC26XX.h>
+#include <xdc/runtime/Types.h>
+#include <ti/sysbios/BIOS.h>
+#include "driver/timers.h"
+#include "simple_peripheral.h"
+
+#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
+
+static GPTimerCC26XX_Handle gptimer_handle; // was defined static
+
+//#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
+// #define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
+// #define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
+#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)
+
+static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
+    elite_gptimer_task();
+
+    return;
+}
+
+void elite_gptimer_open()
+{
+    GPTimerCC26XX_Params params;
+    GPTimerCC26XX_Params_init(&params);
+    params.width          = GPT_CONFIG_16BIT;
+    params.mode           = GPT_MODE_PERIODIC_UP;
+    params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;
+    gptimer_handle = GPTimerCC26XX_open(Board_GPTIMER0A, &params);
+    if (gptimer_handle == NULL) {
+        Task_exit();
+    }
+    
+    Types_FreqHz  freq;
+    BIOS_getCpuFreq(&freq);
+    GPTimerCC26XX_Value loadVal = freq.lo / 1000 - 1; //47999 = 1ms
+    loadVal = CLOCK_FREQ; //0.1ms
+    GPTimerCC26XX_setLoadValue(gptimer_handle, loadVal);
+    GPTimerCC26XX_registerInterrupt(gptimer_handle, elite_gptimer_callback, GPT_INT_TIMEOUT);
+
+    GPTimerCC26XX_start(gptimer_handle);
+
+    return;
+}
+
+uint8_t gptimer0_ctrl(enum gptimer0_ctrl_e gpt_ctrl)
+{
+    enum gptimer0_ctrl_e gc = gpt_ctrl;
+    
+    if (gc > GPT_CTRL_MAX)
+        return 1;
+
+    switch (gc) {
+        case GPT_CTRL_START:
+            GPTimerCC26XX_start(gptimer_handle);
+            break;
+        
+        case GPT_CTRL_STOP:
+            GPTimerCC26XX_stop(gptimer_handle);
+            break;
+
+        case GPT_CTRL_CLOSE:
+            GPTimerCC26XX_close(gptimer_handle);
+            break;
+    }
+
+    return 0;
+}
+
+/*******************************************************************************************/
+//clock
+void CPUdelay_us(uint32_t delay_t)
+{
+    uint32_t t = delay_t;
+
+    CPUdelay(t * CPU_1us);
+
+    return;
+}
+
+void CPUdelay_ms(uint32_t delay_t)
+{
+    uint32_t t = delay_t;
+
+    CPUdelay(t * CPU_1ms);
+
+    return;
+}
+
+
+void GPT_timerIncrement() {
+    GPT.cnt_gpt_delta = GPT.cnt_gpt - GPT.cnt_gpt0;
+    GPT.cnt_gpt0 = GPT.cnt_gpt;
+}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/elite_task/elite_GPtimer.h

@@ -0,0 +1,26 @@
+#ifndef ELITE_GPTIMER_H
+#define ELITE_GPTIMER_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct gptimer0_t{
+    uint32_t cnt_gpt;
+    uint32_t cnt_gpt0;
+    uint8_t  cnt_gpt_delta;
+    uint32_t cnt_adc_rate;
+    uint32_t cnt_notify_rate;
+    uint32_t cnt_v_scan_rate;
+    uint32_t cnt_lead_time;
+    uint32_t BatteryADCCounter;
+    uint32_t BatteryCheckCounter;
+    uint32_t GptimerMultiple;
+};
+
+void InitGPT();
+
+#ifdef  __cplusplus
+}
+#endif
+#endif  // ELITE_GPTIMER_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/elite_task/elite_GPtimer_c.h

@@ -0,0 +1,16 @@
+#include "elite_task/elite_GPtimer.h"
+
+void InitGPT()
+{
+    GPT.cnt_gpt = 0;
+    GPT.cnt_gpt0 = 0;
+    GPT.cnt_gpt_delta = 0;
+    GPT.cnt_adc_rate = 0;
+    GPT.cnt_notify_rate = 0;
+    GPT.cnt_v_scan_rate = 0;
+    GPT.cnt_lead_time = 0;
+    GPT.BatteryADCCounter = 0;
+    GPT.BatteryCheckCounter = 0;
+
+    return;
+}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/elite_task/elite_latch.h

@@ -0,0 +1,56 @@
+#ifndef ELITE_LATCH_H
+#define ELITE_LATCH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LOAD0       0
+#define LOAD1       1
+#define LOAD2       2
+#define LOAD_MAX    3
+
+#define D0      0
+#define D1      1
+#define D2      2
+#define D3      3
+#define D4      4
+#define D5      5
+#define D6      6
+#define D7      7
+#define D_MAX   8
+
+// latch 1 control
+// #define E_LATCH_LED_SCLK_A      LOAD0, D0    // not gpio
+// #define E_LATCH_LED_MOSI_A      LOAD0, D1    // not gpio
+// #define E_LATCH_SCLK            LOAD0, D2    // not gpio
+// #define E_LATCH_MOSI            LOAD0, D3    // not gpio
+#define E_LATCH_HIGH_Z          LOAD0, D4
+#define E_LATCH_CS_MEM          LOAD0, D5
+#define E_LATCH_CS_ADC          LOAD0, D6
+#define E_LATCH_CS_DAC          LOAD0, D7
+
+// latch 2 control
+#define E_LATCH_MEM_HOLD        LOAD1, D0
+#define E_LATCH_10V_ENABLE      LOAD1, D5
+#define E_LATCH_5V_ENABLE       LOAD1, D6
+
+// latch 3 control  
+#define E_LATCH_I_MID_ON        LOAD2, D0
+#define E_LATCH_I_LARGE_ON      LOAD2, D1
+#define E_LATCH_V_SMALL_ON      LOAD2, D2
+#define E_LATCH_V_MID_ON        LOAD2, D3
+#define E_LATCH_I_SMALL_ON      LOAD2, D4
+#define E_LATCH_OFF             LOAD2, D6
+#define E_LATCH_VOUT_SMALL_ON   LOAD2, D7
+
+#define HIGH_Z_OPEN()           latch_single_ctrl(E_LATCH_HIGH_Z, 0);
+#define HIGH_Z_CLOSE()          latch_single_ctrl(E_LATCH_HIGH_Z, 1);
+uint8_t update_latch_stat(uint8_t latch, uint8_t dio, uint8_t value);
+uint8_t latch_single_ctrl(uint8_t latch, uint8_t dio, uint8_t value);
+uint8_t latch_multi_ctrl(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  // ELITE_LATCH_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/elite_task/elite_latch_c.h

@@ -0,0 +1,352 @@
+#include "elite_task/elite_latch.h"
+#include "driver/gpio_edc15re.h"
+#include "driver/spi_ctrl.h"
+
+enum pin_ctrl_e {
+    PC_LOAD0_CLR    = 0,
+    PC_LOAD0_SET,
+    PC_LOAD1_CLR,
+    PC_LOAD1_SET,
+    PC_LOAD2_CLR,
+    PC_LOAD2_SET,
+    PC_D0_CLR,
+    PC_D0_SET,
+    PC_D1_CLR,
+    PC_D1_SET,
+    PC_D2_CLR,
+    PC_D2_SET,
+    PC_D3_CLR,
+    PC_D3_SET,
+    PC_D4_CLR,
+    PC_D4_SET,
+    PC_D5_CLR,
+    PC_D5_SET,
+    PC_D6_CLR,
+    PC_D6_SET,
+    PC_D7_CLR,
+    PC_D7_SET,
+    PC_MAX,
+};
+
+//d0.d1.d2.d3.d4.d5.d6.d7
+struct latch_t {
+    uint8_t d7: 1,
+            d6: 1,
+            d5: 1,
+            d4: 1,
+            d3: 1,
+            d2: 1,
+            d1: 1,
+            d0: 1;
+};
+
+static struct latch_t LH0 = {0};
+static struct latch_t LH1 = {0};
+static struct latch_t LH2 = {0};
+
+static uint8_t __pin_ctrl(uint8_t pin_control)
+{
+    uint8_t pc = pin_control;
+    int8_t st;
+
+    if (pc >= PC_MAX)
+        return 1;
+
+    switch (pc) {
+        case PC_LOAD0_CLR:
+            st = pin_set(E_PIN_LOAD0, 0);
+            break;
+
+        case PC_LOAD0_SET:
+            st = pin_set(E_PIN_LOAD0, 1);
+            break;
+
+        case PC_LOAD1_CLR:
+            st = pin_set(E_PIN_LOAD1, 0);
+            break;
+
+        case PC_LOAD1_SET:
+            st = pin_set(E_PIN_LOAD1, 1);
+            break;
+
+        case PC_LOAD2_CLR:
+            st = pin_set(E_PIN_LOAD2, 0);
+            break;
+
+        case PC_LOAD2_SET:
+            st = pin_set(E_PIN_LOAD2, 1);
+            break;
+
+        case PC_D0_CLR:
+            st = pin_set(E_PIN_D0, 0);
+            break;
+
+        case PC_D0_SET:
+            st = pin_set(E_PIN_D0, 1);
+            break;
+
+        case PC_D1_CLR:
+            st = pin_set(E_PIN_D1, 0);
+            break;
+
+        case PC_D1_SET:
+            st = pin_set(E_PIN_D1, 1);
+            break;
+
+        case PC_D2_CLR:
+            st = pin_set(E_PIN_D2, 0);
+            break;
+
+        case PC_D2_SET:
+            st = pin_set(E_PIN_D2, 1);
+            break;
+
+        case PC_D3_CLR:
+            st = pin_set(E_PIN_D3, 0);
+            break;
+
+        case PC_D3_SET:
+            st = pin_set(E_PIN_D3, 1);
+            break;
+
+        case PC_D4_CLR:
+            st = pin_set(E_PIN_D4, 0);
+            break;
+
+        case PC_D4_SET:
+            st = pin_set(E_PIN_D4, 1);
+            break;
+
+        case PC_D5_CLR:
+            st = pin_set(E_PIN_D5, 0);
+            break;
+
+        case PC_D5_SET:
+            st = pin_set(E_PIN_D5, 1);
+            break;
+
+        case PC_D6_CLR:
+            st = pin_set(E_PIN_D6, 0);
+            break;
+
+        case PC_D6_SET:
+            st = pin_set(E_PIN_D6, 1);
+            break;
+
+        case PC_D7_CLR:
+            st = pin_set(E_PIN_D7, 0);
+            break;
+
+        case PC_D7_SET:
+            st = pin_set(E_PIN_D7, 1);
+            break;
+    }
+
+    if (st)
+        return 2;
+
+    return 0;
+}
+
+static struct latch_t *__get_lh_stat(uint8_t latch)
+{
+    uint8_t lh = latch;
+
+    if (lh == LOAD0)
+        return &LH0;
+
+    if (lh == LOAD1)
+        return &LH1;
+
+    if (lh == LOAD2)
+        return &LH2;
+
+    return 0;
+}
+
+static void __latch0_set(void)
+{
+    struct latch_t *lh_p = __get_lh_stat(LOAD0);
+
+    pin_set(E_PIN_D4, lh_p->d4);
+    pin_set(E_PIN_D5, lh_p->d5);
+    pin_set(E_PIN_D6, lh_p->d6);
+    pin_set(E_PIN_D7, lh_p->d7);
+
+    return;
+}
+
+static void __latch1_set(void)
+{
+    struct latch_t *lh_p = __get_lh_stat(LOAD1);
+
+    pin_set(E_PIN_D0, lh_p->d0);
+    pin_set(E_PIN_D5, lh_p->d5);
+    pin_set(E_PIN_D6, lh_p->d6);
+
+    return;
+}
+
+static void __latch2_set(void)
+{
+    struct latch_t *lh_p = __get_lh_stat(LOAD2);
+
+    pin_set(E_PIN_D0, lh_p->d0);
+    pin_set(E_PIN_D1, lh_p->d1);
+    pin_set(E_PIN_D2, lh_p->d2);
+    pin_set(E_PIN_D3, lh_p->d3);
+    pin_set(E_PIN_D4, lh_p->d4);
+    pin_set(E_PIN_D6, lh_p->d6);
+    pin_set(E_PIN_D7, lh_p->d7);
+
+    return;
+}
+
+static uint8_t __latch0_as_gpio(void)
+{
+    __pin_ctrl(PC_LOAD0_CLR);
+
+    spi0_close();
+    spi1_close();
+
+    add_pin_d0_d3();
+
+    return 0;
+}
+
+static uint8_t __latch0_as_spi(void)
+{
+    remove_pin_d0_d3();
+
+    Board_initSPI();
+    spi0_open(SPI_CLK_1M, POL0, PHA1);  //SPI 1M: LED 
+    spi1_open(SPI_CLK_4M, POL0, PHA1);  //SPI 4M: ADC、DAC
+
+    __latch0_set();
+    __pin_ctrl(PC_LOAD0_SET);
+
+    return 0;
+}
+
+uint8_t update_latch_stat(uint8_t latch, uint8_t dio, uint8_t value)
+{
+    uint8_t lh = latch;
+    uint8_t d = dio;
+    uint8_t val = value;
+    struct latch_t *lh_p;
+
+    if (lh >= LOAD_MAX)
+        return 1;
+
+    if (d >= D_MAX)
+        return 2;
+
+    if (val != 1 && value != 0)
+        return 3;
+
+    lh_p = __get_lh_stat(lh);
+
+    switch (d) {
+        case D0:
+            lh_p->d0 = val;
+            break;
+
+        case D1:
+            lh_p->d1 = val;
+            break;
+
+        case D2:
+            lh_p->d2 = val;
+            break;
+
+        case D3:
+            lh_p->d3 = val;
+            break;
+
+        case D4:
+            lh_p->d4 = val;
+            break;
+
+        case D5:
+            lh_p->d5 = val;
+            break;
+
+        case D6:
+            lh_p->d6 = val;
+            break;
+
+        case D7:
+            lh_p->d7 = val;
+            break;
+    }
+
+    return 0;
+}
+
+uint8_t latch_single_ctrl(uint8_t latch, uint8_t dio, uint8_t value)
+{
+    // control one latch pin -> update_latch_stat -> what latch to update? -> latch?_ctrl
+    uint8_t lh = latch;
+    uint8_t d = dio;
+    uint8_t val = value;
+
+    if (lh >= LOAD_MAX)
+        return 1;
+
+    if (d >= D_MAX)
+        return 2;
+
+    if (val != 1 && value != 0)
+        return 3;
+
+    update_latch_stat(lh, d, val);
+
+    switch (lh) {
+        case LOAD0:
+            __latch0_set();
+            break;
+
+        case LOAD1:
+            __latch0_as_gpio();
+
+            __latch1_set();
+            __pin_ctrl(PC_LOAD1_SET);
+            __pin_ctrl(PC_LOAD1_CLR);
+
+            __latch0_as_spi();
+            break;
+
+        case LOAD2:
+            __latch0_as_gpio();
+
+            __latch2_set();
+            __pin_ctrl(PC_LOAD2_SET);
+            __pin_ctrl(PC_LOAD2_CLR);
+
+            __latch0_as_spi();
+            break;
+    }
+
+    return 0;
+}
+
+uint8_t latch_multi_ctrl(void)
+{
+    // control many latch pin -> update_latch_stat -> update_latch_stat -> ... -> latch_ctrl 0.1.2
+    __latch0_set();
+    __pin_ctrl(PC_LOAD0_SET);
+
+    __latch0_as_gpio();
+
+    __latch1_set();
+    __pin_ctrl(PC_LOAD1_SET);
+    __pin_ctrl(PC_LOAD1_CLR);
+
+    __latch2_set();
+    __pin_ctrl(PC_LOAD2_SET);
+    __pin_ctrl(PC_LOAD2_CLR);
+
+    __latch0_as_spi();
+
+    return 0;
+}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/DAC_MAX5136.h

@@ -0,0 +1,41 @@
+#ifndef DAC_MAX5136_H
+#define DAC_MAX5136_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include "driver/spi_ctrl.h"
+
+#define CTRL_B_LDAC                 0x01
+#define CTRL_B_CLR                  0x02
+#define CTRL_B_POW_CTRL             0x03
+#define CTRL_B_LINEARITY            0x05
+#define CTRL_B_WRT(_d0, _d1)        (0x10 | ((_d1) << 1) | (_d0))
+#define CTRL_B_WRT_THR(_d0, _d1)    (0x30 | ((_d1) << 1) | (_d0))
+
+#define DATA_B_LDAC(_d0, _d1)           ((_d1) << 9 | (_d0) << 8)
+#define DATA_B_POW_CT(_d0, _d1, _rd)    ((_d1) << 9 | (_d0) << 8 | (_rd) << 7)
+#define DATA_B_LINE(_en)                ((_en) << 9)
+    
+#define DAC0_EN      1
+#define DAC0_DIS     0
+#define DAC1_EN      1
+#define DAC1_DIS     0
+
+#define DAC0_W_T(_v)    dac_write_through_mode(DAC0_EN, DAC1_DIS, _v);
+#define DAC0_W(_v)      dac_write_mode(DAC0_EN, DAC1_DIS, _v);
+#define DAC0_P_C(_rdy)  dac_power_control_mode(DAC0_EN, DAC1_DIS, _rdy); 
+#define DAC0_LDAC()     dac_ldac_mode(DAC0_EN, DAC1_DIS);  
+
+
+int dac_ldac_mode(uint8_t dac0_enable, uint8_t dac1_enable);
+int dac_clear_mode();
+int dac_power_control_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint8_t ready_enable);
+int dac_linearity_mode(uint8_t linear_enable);
+int dac_write_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint16_t volts);
+int dac_write_through_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint16_t volts);
+#ifdef __cplusplus
+}
+#endif
+#endif  //DAC_MAX5136_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/DAC_MAX5136_c.h

@@ -0,0 +1,110 @@
+#include "hardware/dac_MAX5136.h"
+
+struct dac_series_data_t {
+    uint8_t control_bits;
+    uint16_t data_bits;
+}__attribute__((packed));
+
+static struct dac_series_data_t dac_series_data_g = {0};
+
+
+static int __dac_transfer(struct dac_series_data_t *sd) 
+{
+    latch_single_ctrl(E_LATCH_CS_DAC, 0); 
+
+    #define WRITE_TO_DAC(_d, _l) spi1_write(NULL, (uint8_t *)(_d), (_l))
+    WRITE_TO_DAC(sd, sizeof(struct dac_series_data_t));
+    
+    latch_single_ctrl(E_LATCH_CS_DAC, 1);
+    return 0; 
+}
+
+int dac_ldac_mode(uint8_t dac0_enable, uint8_t dac1_enable) 
+{
+    uint8_t d0 = dac0_enable;
+    uint8_t d1 = dac1_enable;
+
+    struct dac_series_data_t *sd = &dac_series_data_g;
+    sd->control_bits = CTRL_B_LDAC;
+    sd->data_bits = REVERT_2_BYTE(DATA_B_LDAC(d0, d1));
+    __dac_transfer(sd);
+
+    return 0;
+
+}
+
+
+int dac_clear_mode() 
+{
+    struct dac_series_data_t *sd = &dac_series_data_g;
+    sd->control_bits = CTRL_B_CLR;
+    __dac_transfer(sd);
+
+    return 0;
+}
+
+
+int dac_power_control_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint8_t ready_enable) 
+{
+    uint8_t d0 = dac0_enable;
+    uint8_t d1 = dac1_enable;
+    uint8_t rdy_en = ready_enable;
+    struct dac_series_data_t *sd = &dac_series_data_g;
+
+    sd->control_bits = CTRL_B_POW_CTRL;
+    sd->data_bits = REVERT_2_BYTE(DATA_B_POW_CT(d0, d1, rdy_en));
+
+    __dac_transfer(sd);
+
+    return 0;
+}
+
+
+int dac_linearity_mode(uint8_t linear_enable) 
+{
+    uint8_t lin_en = linear_enable;
+    struct dac_series_data_t *sd = &dac_series_data_g;
+    
+    sd->control_bits = CTRL_B_LINEARITY;
+    sd->data_bits = REVERT_2_BYTE(DATA_B_LINE(lin_en));
+    __dac_transfer(sd);
+
+    return 0;
+}
+
+
+int dac_write_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint16_t volts) 
+{
+    uint8_t d0 = dac0_enable;
+    uint8_t d1 = dac1_enable;
+    uint16_t v = volts;
+    struct dac_series_data_t *sd = &dac_series_data_g;
+
+    sd->control_bits = CTRL_B_WRT(d0, d1);
+    sd->data_bits = REVERT_2_BYTE(v);
+    __dac_transfer(sd);
+
+    return 0;
+}
+
+
+int dac_write_through_mode(uint8_t dac0_enable, uint8_t dac1_enable, uint16_t volts) 
+{
+    uint8_t d0 = dac0_enable;
+    uint8_t d1 = dac1_enable;
+    uint16_t v = volts;
+    struct dac_series_data_t *sd = &dac_series_data_g;
+
+    sd->control_bits = CTRL_B_WRT_THR(d0, d1);
+    sd->data_bits = REVERT_2_BYTE(v);
+    __dac_transfer(sd);
+    
+
+    return 0;
+}
+
+
+
+
+
+

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/adc_ads1118.h

@@ -0,0 +1,67 @@
+#ifndef DAC_ADS1118_H
+#define DAC_ADS1118_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include "driver/spi_ctrl.h"
+
+#define ADC_CH_CURR     AIN0_GND
+#define ADC_CH_VIN      AIN1_GND
+#define ADC_CH_BAT      AIN3_GND
+#define ADC_CH_VOUT     AIN2_GND
+
+#define MEASURE_CURRENT()   read_adc_data(ADC_CH_CURR, FSR3)
+#define MEASURE_VOLT()      read_adc_data(ADC_CH_VIN, FSR3)
+#define MEASURE_DAC()       read_adc_data(ADC_CH_VOUT, FSR3)
+#define MEASURE_BATTERY()   read_adc_data(ADC_CH_BAT, FSR1)
+
+
+enum input_mux_e {
+    AIN0_AIN1   = 0x00,
+    AIN0_AIN3   = 0x01,
+    AIN1_AIN3   = 0x02,
+    AIN2_AIN3   = 0x03,
+    AIN0_GND    = 0x04,
+    AIN1_GND    = 0x05,
+    AIN2_GND    = 0x06,
+    AIN3_GND    = 0x07,
+};
+
+/*
+ *             [Progrmmable gain amplifier configuration]
+ *      
+ * The corresponing relationship of FSRx to volt will be the form:
+ *      FSRx        <->      0xXX        <->        +-    xV
+ *
+ *      FSR1        <->      0x00        <->        +-6.144V
+ *      FSR2        <->      0x01        <->        +-4.096V   
+ *      FSR3        <->      0x02        <->        +-2.408V   
+ *      FSR4        <->      0x03        <->        +-1.024V   
+ *      FSR5        <->      0x04        <->        +-0.512V   
+ *      FSR6        <->      0x05        <->        +-0.256V   
+ *      FSR7        <->      0x06        <->        +-0.256V   
+ *      FSR8        <->      0x07        <->        +-0.256V   
+ *    
+ */
+
+
+enum gain_amplifier_e {
+    FSR1 = 0x00,
+    FSR2 = 0x01,
+    FSR3 = 0x02,
+    FSR4 = 0X03,
+    FSR5 = 0x04,
+    FSR6 = 0x05,
+    FSR7 = 0x06,
+    FSR8 = 0x07,
+};
+
+uint16_t read_adc_data(uint8_t AdcChannel, uint8_t gainAmp);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif  //ADC_ADS1118_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/adc_ads1118_c.h

@@ -0,0 +1,79 @@
+#include "hardware/adc_ads1118.h"
+
+static uint8_t spi_ADC_txbuf_l[2] = {0};
+static uint8_t spi_ADC_rxbuf_l[2] = {0};
+
+
+static void __ADC_read(uint8_t input_mux, uint8_t gAmp)
+{
+   /*
+    *   write SPI to get ADC value
+    *   [7]~[0] should always be 0b11101011, data rate is 860 sps, other is default
+    *
+    *   [15]        : SS, 0 = no effect, 1 = start work, default 0b0
+    *   [14]~[12]   : MUX[2:0], default 0b000
+    *
+    *                 [Input multiplexer configuration]
+    *         
+    *         the MUX selection will correspond to a pin pair
+    *         where the pair is positive and negative input
+    *         
+    *         MUX[2:0]          <->             (AINp, AINn)   
+    *   
+    *          000              <->       AINp is AIN0, AINn is AIN1
+    *          001              <->       AINp is AIN0, AINn is AIN3
+    *          010              <->       AINp is AIN1, AINn is AIN3                          
+    *          011              <->       AINp is AIN2, AINn is AIN3          
+    *          100              <->       AINp is AIN0, AINn is GND                           
+    *          101              <->       AINp is AIN1, AINn is GND           
+    *          110              <->       AINp is AIN2, AINn is GND                           
+    *          111              <->       AINp is AIN3, AINn is GND          
+    *
+    * 
+    * 
+    *   [11]~[9]    : PGA[2:0], default 0b010 = FSR is ±2.048
+    *   [8]         : mode, 0 = continuous, 1 = one shot, default 0b1 (Power-down and single-shot mode )
+    *
+    *   [7]~[5]     : data rate, default 0b100 = 128 SPS; 0b111 = 860 SPS
+    *   [4]         : Temperature? default 0b0 = ADC mode
+    *   [3]         : Pullup enable, default 0b1 = Pullup resistor enabled
+    *   [2]~[1]     : NOP, default 0b01
+    *   [0]         : reserved, default 0b1
+    *
+    */
+
+    uint8_t *tx = spi_ADC_txbuf_l;
+    uint8_t *rx = spi_ADC_rxbuf_l;
+    uint8_t i_mux = input_mux;
+    uint8_t ga = gAmp;
+
+
+    tx[0] = i_mux << 4 | ga << 1 | 0b10000001;
+    tx[1] = 0b11101011;
+
+    latch_single_ctrl(E_LATCH_CS_ADC, 0);
+    spi1_write(NULL, tx, 2);
+    latch_single_ctrl(E_LATCH_CS_ADC, 1);
+
+    memset(tx, 0, sizeof(tx));
+    memset(rx, 0, sizeof(rx));
+
+    latch_single_ctrl(E_LATCH_CS_ADC, 0);
+    spi1_write(rx, tx, 2);
+    latch_single_ctrl(E_LATCH_CS_ADC, 1);
+
+    return;
+}
+
+uint16_t read_adc_data(uint8_t AdcChannel, uint8_t gainAmplifier) 
+{
+    uint8_t Adc_ch = AdcChannel;
+    uint8_t gainAmp = gainAmplifier;
+    uint16_t rx;
+
+    __ADC_read(Adc_ch, gainAmp);
+
+    rx = (uint16_t)spi_ADC_rxbuf_l[0] << 8 | (uint16_t)spi_ADC_rxbuf_l[1];
+
+    return rx;
+}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/led_APA_102.h

@@ -0,0 +1,93 @@
+#ifndef LED_APA_102_H
+#define LED_APA_102_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/*
+ *  APA-102-2020-256-8A-20190612: Series data structure
+ *    +-------------------+------------------------- ... -+-----------------+
+ *    |  start_frame(4B)  |  led_frame(4B) *LED_TANDEM_N  |  end_frame(4B)  |
+ *    +-------------------+------------------------- ... -+-----------------+
+ *                       /                \
+ *                     /   led_frame(4B)   \
+ *                   /                      \
+ *       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *      | 111 | bright  |      blue     |     green     |      red      |
+ *      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+#include "driver/spi_ctrl.h"
+
+#define DEF_LED_TANDEN_N    12
+
+#ifdef DEF_LED_TANDEN_N
+#define LED_TANDEM_N  DEF_LED_TANDEN_N
+#else
+#define LED_TANDEM_N  12
+#endif
+
+enum led_series_nb_e {
+    LED_NB_1 = 0,
+    LED_NB_2,
+    LED_NB_3,
+    LED_NB_4,
+    LED_NB_5,
+    LED_NB_6,
+    LED_NB_7,
+    LED_NB_8,
+    LED_NB_9,
+    LED_NB_10,
+    LED_NB_11,
+    LED_NB_12,
+    
+    LED_NB_MAX = LED_TANDEM_N,
+};
+
+enum led_bright_e {
+    LED_BR_LV0  = 0x00,
+    LED_BR_LV1  = 0x01,
+    LED_BR_LV8  = 0x08,
+
+    LED_BR_MAX  = 0x1F,
+};
+
+enum led_color_e {
+    LED_CLR_BLACK = 0,
+    LED_CLR_WHITE,
+    LED_CLR_RED,
+    LED_CLR_ORANGE,
+    LED_CLR_YELLOW,
+    LED_CLR_GREEN,
+    LED_CLR_CYAN,
+    LED_CLR_BLUE,
+    LED_CLR_PURPLE,
+    LED_CLR_MAGENTA,
+    LED_CLR_YELLOWGREEN,
+    LED_CLR_EMERALD,
+
+    LED_CLR_MAX,
+};
+
+struct led_color_t {
+    uint8_t b;
+    uint8_t g;
+    uint8_t r;    
+};
+
+struct led_frame_t {
+    uint8_t bright: 5,
+            rsvd: 3;
+    struct led_color_t color;
+};
+
+int led_color_set(enum led_series_nb_e led_nb, enum led_bright_e bright, enum led_color_e color);
+int led_color_code_set(enum led_series_nb_e led_nb, enum led_bright_e bright, struct led_color_t *color);
+int led_rainbow(enum led_bright_e bright);
+
+#ifdef  __cplusplus
+}
+#endif
+#endif  // LED_APA_102_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/hardware/led_APA_102_c.h

@@ -0,0 +1,198 @@
+#include "hardware/led_APA_102.h"
+
+#define LED_FRME_FILL_RSVD(_f)      (_f)->rsvd = 0x07 // 0x11100000 || bright
+#define LED_SERIES_D_START          0x00000000
+#define LED_SERIES_D_END            0xFFFFFFFF
+
+
+// struct of led_series_data defined
+struct led_series_data_t {
+    uint32_t f_start;
+    struct led_frame_t f_led[LED_TANDEM_N];
+    uint32_t f_end;
+};
+
+
+static struct led_series_data_t led_series_data_g = {0};
+
+const struct led_color_t led_color_list_g[LED_CLR_MAX] = {
+//  {blue, green, red}
+    {0x00, 0x00, 0x00},     // LED_CLR_BLACK
+    {0xFF, 0xFF, 0xCA},     // LED_CLR_WHITE
+    {0x00, 0x00, 0xFF},     // LED_CLR_RED
+    {0x09, 0x58, 0xFF},     // LED_CLR_ORANGE
+    {0x00, 0xE1, 0xE1},     // LED_CLR_YELLOW
+    {0x00, 0xFA, 0x00},     // LED_CLR_GREEN
+    {0x40, 0x40, 0x00},     // LED_CLR_CYAN
+    {0xAA, 0x00, 0x00},     // LED_CLR_BLUE
+    {0x6F, 0x00, 0x3A},     // LED_CLR_PURPLE
+    {0xFF, 0x00, 0xFF},     // LED_CLR_MAGENTA
+    {0x00, 0xA6, 0x64},     // LED_CLR_YELLOWGREEN
+    {0x78, 0xC8, 0x50},     // LED_CLR_EMERALD
+};
+
+
+/*led_single_set*/
+static int __led_single_set(struct led_series_data_t *led_s_d, struct led_frame_t *led_f, enum led_series_nb_e led_nb)
+{
+    struct led_series_data_t *sd = led_s_d;
+    struct led_frame_t *f = led_f;
+    enum led_series_nb_e nb = led_nb;
+    
+    memcpy(&sd->f_led[nb], f, sizeof(struct led_frame_t));
+
+    return 0;
+}
+
+
+/*led _multiple_set*/
+static int __led_multiple_set(struct led_series_data_t *led_s_d, struct led_frame_t *led_f)
+{
+    struct led_series_data_t *sd = led_s_d;
+    struct led_frame_t *f = led_f;
+    int i;
+    
+    /*
+     * use __led_single_set() to finish all led;
+     */
+    for (i = LED_NB_1; i < LED_NB_MAX; i++) {
+        __led_single_set(sd, f, (enum led_series_nb_e)i);
+    }
+    
+    return 0;
+}
+
+
+/*led_complete*/
+static int __led_complete(struct led_series_data_t *led_s_d)
+{
+    struct led_series_data_t *sd = led_s_d;
+    struct led_frame_t *f = sd->f_led;
+    int i;
+
+    for (i = LED_NB_1; i < LED_NB_MAX; i++) {
+        LED_FRME_FILL_RSVD(f);
+        f++;
+    }
+
+    sd->f_start = LED_SERIES_D_START;
+    sd->f_end   = LED_SERIES_D_END;
+    
+    return 0;
+}
+
+static int __led_color_set(enum led_series_nb_e led_nb, struct led_frame_t *led_f)
+{
+    enum led_series_nb_e nb = led_nb;
+    struct led_frame_t *f = led_f;
+    struct led_series_data_t *sd = &led_series_data_g;
+
+    if (f == NULL)
+        return -1;
+
+    /*
+     * nb -  < LED_NB_MAX: fill one led_frame
+     *      == LED_NB_MAX: fill multiple led_frame
+     *
+     * complete: then, fill (start_frame, end_frame and the rsvd of every led_frame)
+     *
+     * finally, write cmd to hw by spi
+     */
+    if (nb < LED_NB_MAX) {
+        __led_single_set(sd, f, nb);
+    } else if (nb == LED_NB_MAX) {
+        __led_multiple_set(sd, f);
+    } else {
+        return -2;
+    }
+
+    __led_complete(sd);
+    
+#define WRITE_TO_HW(_d, _l) spi0_write(NULL, (uint8_t *)(_d), (_l))
+    WRITE_TO_HW(sd, sizeof(struct led_series_data_t));
+
+    return 0;
+}
+
+int led_color_set(enum led_series_nb_e led_nb, enum led_bright_e bright, enum led_color_e color)
+{
+    enum led_series_nb_e nb = led_nb;
+    enum led_bright_e b = bright;
+    enum led_color_e c = color;
+    struct led_frame_t led_f;
+    
+    if (nb > LED_NB_MAX)
+        return -1;
+
+    if (c >= LED_CLR_MAX)
+        return -2;
+    
+    if (b > LED_BR_MAX)
+        return -3;
+    
+    led_f.bright = b;
+    led_f.color = led_color_list_g[c];
+    __led_color_set(nb, &led_f);
+
+    return 0;
+}
+
+int led_color_code_set(enum led_series_nb_e led_nb, enum led_bright_e bright, struct led_color_t *color)
+{
+    enum led_series_nb_e nb = led_nb;
+    enum led_bright_e b = bright;
+    struct led_color_t *c = color;
+    struct led_frame_t led_f;
+    
+    // valid the input values
+    if (nb > LED_NB_MAX)
+        return -1;
+
+    if (b > LED_BR_MAX)
+        return -2;
+    
+    led_f.bright = b;
+    memcpy(&led_f.color, c, sizeof(struct led_color_t));
+
+    __led_color_set(nb, &led_f);
+
+    return 0;
+}
+
+int led_rainbow(enum led_bright_e bright)
+{
+    enum led_bright_e b = bright;
+    int i;
+    
+    if (b > LED_BR_MAX)
+        return -1;
+    
+    for(i=0; i<LED_NB_MAX; i++) {
+        led_color_set((enum led_series_nb_e)i, b, (enum led_color_e)i);
+    }
+    
+    return 0;
+}
+
+/*
+ * example -
+ *    customize color:
+ *        struct led_color_t led_c; 
+ *        uint8_t bri;
+ *                       // { ins,  ins,      num,    r,    g,    b,  bri};
+ *        uint8_t ins[20] = {0x30, 0x00, LED_NB_4, 0xFF, 0x00, 0x44,  0x3};  
+ *        led_c.r = ins[3];
+ *        led_c.g = ins[4];
+ *        led_c.b = ins[5];
+ *        bri = ins[6];   
+ *        led_color_code_set(LED_NB_4, bri, &led_c);
+ *
+ *    single led:
+ *        led_color_set(LED_NB_1, LED_BR_LV1, LED_CLR_WHITE);
+ * 
+ *    multiple led:
+ *        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_BLUE);
+ * 
+ *    rainbow led:
+ *        led_rainbow(LED_BR_LV1);
+ */

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

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

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

@@ -4,21 +4,6 @@
 #ifndef EliteADC
 #define EliteADC
 
-#include "Elite_PIN.h"
-#include "EliteSPI.h"
-
-// ADC command, Elite will use these cmd to control ADC
-#define CMD_CURRENT_MEASURE 0xC5
-#define CMD_VOLT_MEASURE    0xD5
-#define CMD_DAC_MEASURE     0xE5
-#define CMD_BATTERY_MEASURE 0xF1
-
-// controller command, these are command from control box
-#define ADC_CH_CURR         0x00
-#define ADC_CH_VIN          0x01
-#define ADC_CH_VOUT         0x02
-#define ADC_CH_BAT          0x03
-
 /* for Elite1.5-re */
 // Iin theoretical boundary <2.67, 1.89~80, 63~2600, >1900 (uA)
 #define I_GAIN_SMALL_BOUNDARY     4000  // 4    uA =     4,000,000 pA
@@ -49,7 +34,6 @@
 
 void IinADCGainCtrl(uint8_t IinADCLevel);
 void VinADCGainCtrl(uint8_t VinADCLevel);
-void read_adc_raw_data(uint8_t AdcChannel, uint8_t *rxbuf, uint8_t *txbuf);
 void AutoGainChangeIin(int32_t RealCurrent, uint16_t plot_type, uint16_t *no_rec_time);
 void AutoGainChangeVin(int32_t RealVin);
 
@@ -57,125 +41,7 @@ void AutoGainChangeVin(int32_t RealVin);
  =                          EliteADC.c                                        =
  =============================================================================*/
 
-static void __ADC_write(uint8_t ADCin, uint8_t *rxbuf, uint8_t *txbuf)
-{
-   /*
-    *   write SPI to get ADC value
-    *   This function can only define [15]~[8] through ADCin
-    *   [7]~[0] should always be 0b11101011
-    *
-    *   [15]        : SS, 0 = no effect, 1 = start work, default 0b0
-    *   [14]~[12]   : MUX[2:0], default 0b000
-    *   [11]~[9]    : PGA[2:0], default 0b010 = FSR is ±2.048
-    *   [8]         : mode, 0 = continuous, 1 = one shot, default 0b1 (Power-down and single-shot mode )
-    *
-    *   [7]~[5]     : data rate, default 0b100 = 128 SPS
-    *   [4]         : Temperature? default 0b0 = ADC mode
-    *   [3]         : Pullup enable, default 0b1 = Pullup resistor enabled
-    *   [2]~[1]     : NOP, default 0b01
-    *   [0]         : reserved, default 0b1
-    *
-    */
-    uint8_t *rx = rxbuf;
-    uint8_t *tx = txbuf;
 
-//    tx[0] = 0b00000101;
-    for (int i=0; i<SPI_ADC_SIZE; i++) {
-        tx[i] = 0;
-        rx[i] = 0;
-
-    }
-
-    tx[0] = ADCin;
-    tx[1] = 0b11101011;
-
-    ADC_SPI(2, tx, rx);
-
-    return;
-}
-
-static void __ADC_read(uint8_t *rxbuf, uint8_t *txbuf)
-{
-    /*
-     *  read SPI to get ADC value
-     */
-    uint8_t *rx = rxbuf;
-    uint8_t *tx = txbuf;
-
-    for (int i=0; i<SPI_ADC_SIZE; i++) {
-        tx[i] = 0;
-        rx[i] = 0;
-
-    }
-
-    ADC_SPI(2, tx, rx);
-
-    return;
-}
-
-static void __ADC_ch_sel(uint8_t AdcChannel, uint8_t *rxbuf, uint8_t *txbuf)
-{
-    /*
-     *  choise ADC channel to write
-     *
-     *  set ADC parameter
-     *  0xC1~F1 = reading AIN0~AIN3. Using FSR+-6V, resolution = 187.5uV
-     *  0xC5~F5 = reading AIN0~AIN3. Using FSR+-2V, resolution = 62.5 uV
-     *
-     *  ADCChannel == ADC_CH_CURR: - AINp is AIN0; AINn is GND
-     *                             - measure AIN0, which is a current measure
-     *             == ADC_CH_VIN:  - AINp is AIN1; AINn is GND
-     *                             - AIN1, which is a volt measure
-     *             == ADC_CH_VOUT: - AINp is AIN2; AINn is GND
-     *                             - AIN2, measure DAC voltage (Note that this is NOT DAC real output value!!)
-     *             == ADC_CH_BAT:  - measure battery volt
-     *
-     */
-
-    uint8_t ch = AdcChannel;
-    uint8_t *rx = rxbuf;
-    uint8_t *tx = txbuf;
-
-    switch (ch) {
-        case ADC_CH_CURR:
-            __ADC_write(CMD_CURRENT_MEASURE, rx, tx);
-            break;
-
-        case ADC_CH_VIN:
-            __ADC_write(CMD_VOLT_MEASURE, rx, tx);
-            break;
-
-
-        case ADC_CH_VOUT:
-            __ADC_write(CMD_DAC_MEASURE, rx, tx);
-            break;
-
-        case ADC_CH_BAT:
-            __ADC_write(CMD_BATTERY_MEASURE, rx, tx);
-            break;
-
-        default:
-            break;
-    }
-
-    return;
-}
-
-static void __read_ADC_value(uint8_t AdcChannel, uint8_t *rxbuf, uint8_t *txbuf)
-{
-    uint8_t ch = AdcChannel;
-    uint8_t *rx = rxbuf;
-    uint8_t *tx = txbuf;
-
-    // Read data twice since the first data we get is previous data
-    __ADC_ch_sel(ch, rx, tx);
-    __ADC_read(rx, tx);
-
-    __ADC_ch_sel(ch, rx, tx);
-    __ADC_read(rx, tx);
-
-    return;
-}
 
 static void __reset_i_gain_cnt(int16_t *I_100R_cnt, int16_t *I_3K_cnt, int16_t *I_100K_cnt, int16_t *I_3M_cnt)
 {
@@ -358,42 +224,49 @@ static void __small_switch_lv2(uint8_t gain2_en, uint16_t plot, int16_t *I_GAIN_
 
 void IinADCGainCtrl(uint8_t IinADCLevel)
 {
+    
     /* hardware need open before close, so don't change position*/
     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);
+        // ADC gain level = 0, using 2M resister
+        update_latch_stat(E_LATCH_I_LARGE_ON, 0);
+        update_latch_stat(E_LATCH_I_MID_ON, 0);
+        update_latch_stat(E_LATCH_I_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     } else if (IinADCLevel == 1) {
-        // ADC gain level = 1, using 100K resister
-        PIN15_setOutputValue(Turnon_I_SMALL, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_I_LARGE, 0);
-        PIN15_setOutputValue(Turnon_I_MID, 0);
+        // ADC gain level = 1, using 91K resister
+        update_latch_stat(E_LATCH_I_SMALL_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_I_LARGE_ON, 0);
+        update_latch_stat(E_LATCH_I_MID_ON, 0);
+        latch_multi_ctrl();
 
     } else if (IinADCLevel == 2) {
-        // ADC gain level = 2, using 3K resister
-        PIN15_setOutputValue(Turnon_I_MID, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_I_LARGE, 0);
-        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+        // ADC gain level = 2, using 4.3K resister
+        update_latch_stat(E_LATCH_I_MID_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_I_LARGE_ON, 0);
+        update_latch_stat(E_LATCH_I_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     } else if (IinADCLevel == 3) {
-        // ADC gain level = 3, using 100R resistor
-        PIN15_setOutputValue(Turnon_I_LARGE, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_I_MID, 0);
-        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+        // ADC gain level = 3, using 200R resistor
+        update_latch_stat(E_LATCH_I_LARGE_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_I_MID_ON, 0);
+        update_latch_stat(E_LATCH_I_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     } else if (IinADCLevel == 4) {
-        // ADC gain level = 3, auto gain (using 100R resister)
-        PIN15_setOutputValue(Turnon_I_LARGE, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_I_MID, 0);
-        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+        // ADC gain level = 3, auto gain (using 200R resister)
+        update_latch_stat(E_LATCH_I_LARGE_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_I_MID_ON, 0);
+        update_latch_stat(E_LATCH_I_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     } else {
         // default using 100R resister
-        PIN15_setOutputValue(Turnon_I_LARGE, 1);  /* need open first */
-        PIN15_setOutputValue(Turnon_I_MID, 0);
-        PIN15_setOutputValue(Turnon_I_SMALL, 0);
+        update_latch_stat(E_LATCH_I_LARGE_ON, 1);  /* need open first */
+        update_latch_stat(E_LATCH_I_MID_ON, 0);
+        update_latch_stat(E_LATCH_I_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     }
 
@@ -404,39 +277,42 @@ void IinADCGainCtrl(uint8_t IinADCLevel)
         lastIinADCGainLevel = 3;
 
     }
-
     curr_rec_en = false;
-
     return;
 }
 
 void VinADCGainCtrl(uint8_t VinADCLevel)
-{
+{   
     /* hardware need open before close, so don't change position*/
     if (VinADCLevel == 0) {
         // Vin ADC gain level = 0, using 1M resister
-        PIN15_setOutputValue(Turnon_V_SMALL, 0);
-        PIN15_setOutputValue(Turnon_V_MID, 0);
+        update_latch_stat(E_LATCH_V_SMALL_ON, 0);
+        update_latch_stat(E_LATCH_V_MID_ON, 0);
+        latch_multi_ctrl();
 
     } else if (VinADCLevel == 1) {
         // Vin ADC gain level = 1, using 30K resister
-        PIN15_setOutputValue(Turnon_V_MID, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_V_SMALL, 0);
+        update_latch_stat(E_LATCH_V_MID_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_V_SMALL_ON, 0);
+        latch_multi_ctrl();
 
     } else if (VinADCLevel == 2) {
         // Vin ADC gain level = 2, using 1K resister
-        PIN15_setOutputValue(Turnon_V_SMALL, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_V_MID, 0);
+        update_latch_stat(E_LATCH_V_SMALL_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_V_MID_ON, 0);
+        latch_multi_ctrl();
 
     } else if (VinADCLevel == 3) {
         // Vin ADC gain level = 3, auto gain (using 1K resister)
-        PIN15_setOutputValue(Turnon_V_SMALL, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_V_MID, 0);
+        update_latch_stat(E_LATCH_V_SMALL_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_V_MID_ON, 0);
+        latch_multi_ctrl();
 
     } else {
         // default using 1K resister
-        PIN15_setOutputValue(Turnon_V_SMALL, 1); /* need open first */
-        PIN15_setOutputValue(Turnon_V_MID, 0);
+        update_latch_stat(E_LATCH_V_SMALL_ON, 1); /* need open first */
+        update_latch_stat(E_LATCH_V_MID_ON, 0);
+        latch_multi_ctrl();
 
     }
 
@@ -447,42 +323,9 @@ void VinADCGainCtrl(uint8_t VinADCLevel)
     }
 
     volt_rec_en = false;
-
     return;
 }
 
-void read_adc_raw_data(uint8_t AdcChannel, uint8_t *rxbuf, uint8_t *txbuf)
-{
-    uint8_t ch = AdcChannel;
-    uint8_t *rx = rxbuf;
-    uint8_t *tx = txbuf;
-
-    if (ch == RIS_ADC_IIN) {
-        __read_ADC_value(ADC_CH_CURR, rx, tx);
-
-        return;
-    }
-
-    if (ch == RIS_ADC_VIN) {
-        __read_ADC_value(ADC_CH_VIN, rx, tx);
-
-        return;
-    }
-
-    if (ch == RIS_ADC_VOUT) {
-        __read_ADC_value(ADC_CH_VOUT, rx, tx);
-
-        return;
-    }
-
-    if (ch == RIS_ADC_BAT) {
-        __read_ADC_value(ADC_CH_BAT, rx, tx);
-
-        return;
-    }
-
-    return;
-}
 
 void AutoGainChangeIin(int32_t RealCurrent, uint16_t plot_type, uint16_t *no_rec_time)
 {

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

@@ -8,45 +8,23 @@ static bool DACReset;
 #define DACCLS 0x02
 #define DACOUT 0x31
 
-static uint16_t DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC CCCC = command
-    // DDDD DDDD = v1
-    // DDDD DDDD = v2
-
-    // command
-    // 0x02 = clear
-    // 0x31 = output voltage
-
-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-    v2 = (uint8_t) (voltLV & 0x00FF);
-
-    spi_DACtxbuf[0] = DACOUT;
-    spi_DACtxbuf[1] = v1;
-    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(Turnon_VOUT_SMALL, 0);
+        latch_single_ctrl(E_LATCH_VOUT_SMALL_ON, 0);
     }
     else if(VOUTLevel == 1){
         // VOUT gain level = 1, using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        latch_single_ctrl(E_LATCH_VOUT_SMALL_ON, 1);
     }
     else if(VOUTLevel == 2){
         // VOUT gain level = 2, using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        latch_single_ctrl(E_LATCH_VOUT_SMALL_ON, 1);
     }
     else{
         // default using 15K resister
-        PIN15_setOutputValue(Turnon_VOUT_SMALL, 1);
+        latch_single_ctrl(E_LATCH_VOUT_SMALL_ON, 1);
     }
     volt_rec_en = false;
 }

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

@@ -1431,40 +1431,6 @@ struct correction_ctx_t Correction = {
 };
 #endif
 
-#ifdef BOARD_F0_68
-struct correction_ctx_t Correction = {
-.ADC_volt[0].coeff = 6267,
-.ADC_volt[0].offset = (-102028002),
-
-.ADC_volt[1].coeff = 215634,
-.ADC_volt[1].offset = (-3517189151),
-
-.ADC_volt[2].coeff = 6281201,
-.ADC_volt[2].offset = (-102431111612),
-
-.ADC_current[0].coeff = 3117736,
-.ADC_current[0].offset = (-50837353744),
-
-.ADC_current[1].coeff = 71655674,
-.ADC_current[1].offset = (-1168489519122),
-
-.ADC_current[2].coeff = 1454231926,
-.ADC_current[2].offset = (-23713068124450),
-
-.ADC_current[3].coeff = 30667117763,
-.ADC_current[3].offset = (-500020256785398),
-
-.Usercode2DAC[0].coeff = (-10547916),
-.Usercode2DAC[0].offset = 583186274643,
-
-.Usercode2DAC[1].coeff = (-179389854),
-.Usercode2DAC[1].offset = 4804853449970,
-
-.ADC_Vout_volt[0].coeff = (-6244452),
-.ADC_Vout_volt[0].offset = 102103245637,
-};
-#endif
-
 #ifdef BOARD_E7_2D
 struct correction_ctx_t Correction = {
 .ADC_volt[0].coeff = 6293,
@@ -1601,40 +1567,6 @@ struct correction_ctx_t Correction = {
 };
 #endif
 
-#ifdef BOARD_A4_DA_32_D4_E8_0B
-struct correction_ctx_t Correction = {
-.ADC_volt[0].coeff = 6266,
-.ADC_volt[0].offset = (-102510450),
-
-.ADC_volt[1].coeff = 215104,
-.ADC_volt[1].offset = (-3516281969),
-
-.ADC_volt[2].coeff = 6263495,
-.ADC_volt[2].offset = (-102366794643),
-
-.ADC_current[0].coeff = 3134531,
-.ADC_current[0].offset = (-51203208091),
-
-.ADC_current[1].coeff = 71817037,
-.ADC_current[1].offset = (-1173217647997),
-
-.ADC_current[2].coeff = 1462086757,
-.ADC_current[2].offset = (-23883222331602),
-
-.ADC_current[3].coeff = 30700669121,
-.ADC_current[3].offset = (-501453504657573),
-
-.Usercode2DAC[0].coeff = (-10544373),
-.Usercode2DAC[0].offset = 584350176185,
-
-.Usercode2DAC[1].coeff = (-178475043),
-.Usercode2DAC[1].offset = 4783237161078,
-
-.ADC_Vout_volt[0].coeff = (-6261766),
-.ADC_Vout_volt[0].offset = 101995687562,
-};
-#endif
-
 #ifdef BOARD_E7_6E
 struct correction_ctx_t Correction = {
 .ADC_volt[0].coeff = 6277,
@@ -1669,41 +1601,6 @@ struct correction_ctx_t Correction = {
 };
 #endif
 
-
-#ifdef BOARD_A4_DA_32_D4_E7_34
-struct correction_ctx_t Correction = {
-.ADC_volt[0].coeff = 6271,
-.ADC_volt[0].offset = (-101634397),
-
-.ADC_volt[1].coeff = 215437,
-.ADC_volt[1].offset = (-3491402418),
-
-.ADC_volt[2].coeff = 6274038,
-.ADC_volt[2].offset = (-101654277903),
-
-.ADC_current[0].coeff = 3117355,
-.ADC_current[0].offset = (-50497924237),
-
-.ADC_current[1].coeff = 71774648,
-.ADC_current[1].offset = (-1162852302911),
-
-.ADC_current[2].coeff = 1452664130,
-.ADC_current[2].offset = (-23532284128026),
-
-.ADC_current[3].coeff = 30668623144,
-.ADC_current[3].offset = (-496799430136624),
-
-.Usercode2DAC[0].coeff = (-10573209),
-.Usercode2DAC[0].offset = 582781434937,
-
-.Usercode2DAC[1].coeff = (-179369334),
-.Usercode2DAC[1].offset = 4803319819942,
-
-.ADC_Vout_volt[0].coeff = (-6260515),
-.ADC_Vout_volt[0].offset = 101238248026,
-};
-#endif
-
 #ifdef BOARD_1
 struct correction_ctx_t Correction = {
 .ADC_volt[0].coeff = 6315,
@@ -1715,60 +1612,60 @@ struct correction_ctx_t Correction = {
 .ADC_volt[2].coeff = 6308429,
 .ADC_volt[2].offset = (-102635617764),
 
-.ADC_current[0].coeff = 3156898,
-.ADC_current[0].offset = (-51438927976),
+.ADC_current[0].coeff = 3156315,
+.ADC_current[0].offset = (-51438344681),
 
-.ADC_current[1].coeff = 72301623,
-.ADC_current[1].offset = (-1178167981915),
+.ADC_current[1].coeff = 72304608,
+.ADC_current[1].offset = (-1178438121249),
 
-.ADC_current[2].coeff = 1464429161,
-.ADC_current[2].offset = (-23862375612241),
+.ADC_current[2].coeff = 1464191587,
+.ADC_current[2].offset = (-23862163505975),
 
-.ADC_current[3].coeff = 30894502102,
-.ADC_current[3].offset = (-503359960019922),
+.ADC_current[3].coeff = 30888240646,
+.ADC_current[3].offset = (-503408729801573),
 
-.Usercode2DAC[0].coeff = (-10538970),
-.Usercode2DAC[0].offset = 583952997041,
+.Usercode2DAC[0].coeff = (-10538401),
+.Usercode2DAC[0].offset = 583999264775,
 
-.Usercode2DAC[1].coeff = (-177570442),
-.Usercode2DAC[1].offset = 4760354859768,
+.Usercode2DAC[1].coeff = (-177550021),
+.Usercode2DAC[1].offset = 4759896184151,
 
-.ADC_Vout_volt[0].coeff = (-6241858),
-.ADC_Vout_volt[0].offset = 102166686340,
+.ADC_Vout_volt[0].coeff = (-6243651),
+.ADC_Vout_volt[0].offset = 102210944196,
 };
 #endif
 
 #ifdef BOARD_2
 struct correction_ctx_t Correction = {
-.ADC_volt[0].coeff = 6234,
-.ADC_volt[0].offset = (-101493321),
+.ADC_volt[0].coeff = 6230,
+.ADC_volt[0].offset = (-101437544),
 
-.ADC_volt[1].coeff = 213971,
-.ADC_volt[1].offset = (-3485112171),
+.ADC_volt[1].coeff = 213934,
+.ADC_volt[1].offset = (-3484584765),
 
-.ADC_volt[2].coeff = 6247968,
-.ADC_volt[2].offset = (-101739720097),
+.ADC_volt[2].coeff = 6246732,
+.ADC_volt[2].offset = (-101725090674),
 
-.ADC_current[0].coeff = 3112362,
-.ADC_current[0].offset = (-50644603940),
+.ADC_current[0].coeff = 3112908,
+.ADC_current[0].offset = (-50655254352),
 
-.ADC_current[1].coeff = 71727943,
-.ADC_current[1].offset = (-1167221793306),
+.ADC_current[1].coeff = 71720599,
+.ADC_current[1].offset = (-1167260727022),
 
-.ADC_current[2].coeff = 1453074599,
-.ADC_current[2].offset = (-23645424090461),
+.ADC_current[2].coeff = 1453192668,
+.ADC_current[2].offset = (-23648559112492),
 
-.ADC_current[3].coeff = 30629831832,
-.ADC_current[3].offset = (-498401716288422),
+.ADC_current[3].coeff = 30628424312,
+.ADC_current[3].offset = (-498473690168297),
 
-.Usercode2DAC[0].coeff = (-10541600),
-.Usercode2DAC[0].offset = 582903765879,
+.Usercode2DAC[0].coeff = (-10541755),
+.Usercode2DAC[0].offset = 582943515821,
 
-.Usercode2DAC[1].coeff = (-178545712),
-.Usercode2DAC[1].offset = 4783666004036,
+.Usercode2DAC[1].coeff = (-178547678),
+.Usercode2DAC[1].offset = 4783742988037,
 
-.ADC_Vout_volt[0].coeff = (-6260712),
-.ADC_Vout_volt[0].offset = 102045664022,
+.ADC_Vout_volt[0].coeff = (-6261279),
+.ADC_Vout_volt[0].offset = 102062559721,
 };
 #endif
 
@@ -1817,17 +1714,17 @@ struct correction_ctx_t Correction = {
 .ADC_volt[2].coeff = 6272056,
 .ADC_volt[2].offset = (-101898197885),
 
-.ADC_current[0].coeff = 3120583,
-.ADC_current[0].offset = (-50952018649),
+.ADC_current[0].coeff = 3122581,
+.ADC_current[0].offset = (-50990772435),
 
-.ADC_current[1].coeff = 71782053,
-.ADC_current[1].offset = (-1172185993613),
+.ADC_current[1].coeff = 71783278,
+.ADC_current[1].offset = (-1172259135178),
 
-.ADC_current[2].coeff = 1455794482,
-.ADC_current[2].offset = (-23771014006994),
+.ADC_current[2].coeff = 1458649016,
+.ADC_current[2].offset = (-23817223539623),
 
-.ADC_current[3].coeff = 30680080834,
-.ADC_current[3].offset = (-500914481788232),
+.ADC_current[3].coeff = 30694489296,
+.ADC_current[3].offset = (-501242075218683),
 
 .Usercode2DAC[0].coeff = (-10497415),
 .Usercode2DAC[0].offset = 581646261432,
@@ -1840,7 +1737,415 @@ struct correction_ctx_t Correction = {
 };
 #endif
 
-int32_t DecodeADCValue(uint8_t adc_gain, uint8_t adc_channel, uint8_t *adc_rxbuf);
+#ifdef BOARD_5
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6237,
+.ADC_volt[0].offset = (-101855130),
+
+.ADC_volt[1].coeff = 213703,
+.ADC_volt[1].offset = (-3491189842),
+
+.ADC_volt[2].coeff = 6244405,
+.ADC_volt[2].offset = (-101986129186),
+
+.ADC_current[0].coeff = 3130068,
+.ADC_current[0].offset = (-50984593111),
+
+.ADC_current[1].coeff = 72080835,
+.ADC_current[1].offset = (-1174200131726),
+
+.ADC_current[2].coeff = 1457082070,
+.ADC_current[2].offset = (-23733331223750),
+
+.ADC_current[3].coeff = 30696257882,
+.ADC_current[3].offset = (-500026090255991),
+
+.Usercode2DAC[0].coeff = (-10534133),
+.Usercode2DAC[0].offset = 581929808996,
+
+.Usercode2DAC[1].coeff = (-178323512),
+.Usercode2DAC[1].offset = 4777303676874,
+
+.ADC_Vout_volt[0].coeff = (-6258567),
+.ADC_Vout_volt[0].offset = 101427042471,
+};
+#endif
+
+#ifdef BOARD_6
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6313,
+.ADC_volt[0].offset = (-102797766),
+
+.ADC_volt[1].coeff = 216580,
+.ADC_volt[1].offset = (-3528929783),
+
+.ADC_volt[2].coeff = 6320430,
+.ADC_volt[2].offset = (-102965476465),
+
+.ADC_current[0].coeff = 3107357,
+.ADC_current[0].offset = (-50583555853),
+
+.ADC_current[1].coeff = 71314255,
+.ADC_current[1].offset = (-1160993950796),
+
+.ADC_current[2].coeff = 1447582803,
+.ADC_current[2].offset = (-23564917012505),
+
+.ADC_current[3].coeff = 30569895236,
+.ADC_current[3].offset = (-497665095915136),
+
+.Usercode2DAC[0].coeff = (-10579871),
+.Usercode2DAC[0].offset = 586502855315,
+
+.Usercode2DAC[1].coeff = (-178895152),
+.Usercode2DAC[1].offset = 4795005362039,
+
+.ADC_Vout_volt[0].coeff = (-6273016),
+.ADC_Vout_volt[0].offset = 102363252317,
+};
+#endif
+
+#ifdef BOARD_7
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6261,
+.ADC_volt[0].offset = (-101829392),
+
+.ADC_volt[1].coeff = 216264,
+.ADC_volt[1].offset = (-3516891018),
+
+.ADC_volt[2].coeff = 6303328,
+.ADC_volt[2].offset = (-102474893054),
+
+.ADC_current[0].coeff = 3116515,
+.ADC_current[0].offset = (-50706637833),
+
+.ADC_current[1].coeff = 71754936,
+.ADC_current[1].offset = (-1167563957189),
+
+.ADC_current[2].coeff = 1455534427,
+.ADC_current[2].offset = (-23681827162816),
+
+.ADC_current[3].coeff = 30714861578,
+.ADC_current[3].offset = (-499791620533034),
+
+.Usercode2DAC[0].coeff = (-10523335),
+.Usercode2DAC[0].offset = 582979514455,
+
+.Usercode2DAC[1].coeff = (-178902791),
+.Usercode2DAC[1].offset = 4793071084176,
+
+.ADC_Vout_volt[0].coeff = (-6237351),
+.ADC_Vout_volt[0].offset = 101984862423,
+};
+#endif
+
+#ifdef BOARD_8
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6263,
+.ADC_volt[0].offset = (-101682131),
+
+.ADC_volt[1].coeff = 215329,
+.ADC_volt[1].offset = (-3498402458),
+
+.ADC_volt[2].coeff = 6269445,
+.ADC_volt[2].offset = (-101833589970),
+
+.ADC_current[0].coeff = 3131643,
+.ADC_current[0].offset = (-50940975097),
+
+.ADC_current[1].coeff = 71884258,
+.ADC_current[1].offset = (-1169236286490),
+
+.ADC_current[2].coeff = 1455983505,
+.ADC_current[2].offset = (-23681166075995),
+
+.ADC_current[3].coeff = 30733849637,
+.ADC_current[3].offset = (-499848813950696),
+
+.Usercode2DAC[0].coeff = (-10529784),
+.Usercode2DAC[0].offset = 582486528189,
+
+.Usercode2DAC[1].coeff = (-179068703),
+.Usercode2DAC[1].offset = 4796606756196,
+
+.ADC_Vout_volt[0].coeff = (-6285173),
+.ADC_Vout_volt[0].offset = 102222446826,
+};
+#endif
+
+#ifdef BOARD_9
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6267,
+.ADC_volt[0].offset = (-102028002),
+
+.ADC_volt[1].coeff = 215634,
+.ADC_volt[1].offset = (-3517189151),
+
+.ADC_volt[2].coeff = 6281201,
+.ADC_volt[2].offset = (-102431111612),
+
+.ADC_current[0].coeff = 3117736,
+.ADC_current[0].offset = (-50837353744),
+
+.ADC_current[1].coeff = 71655674,
+.ADC_current[1].offset = (-1168489519122),
+
+.ADC_current[2].coeff = 1454231926,
+.ADC_current[2].offset = (-23713068124450),
+
+.ADC_current[3].coeff = 30667117763,
+.ADC_current[3].offset = (-500020256785398),
+
+.Usercode2DAC[0].coeff = (-10547916),
+.Usercode2DAC[0].offset = 583186274643,
+
+.Usercode2DAC[1].coeff = (-179389854),
+.Usercode2DAC[1].offset = 4804853449970,
+
+.ADC_Vout_volt[0].coeff = (-6244452),
+.ADC_Vout_volt[0].offset = 102103245637,
+};
+#endif
+
+#ifdef BOARD_10
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6266,
+.ADC_volt[0].offset = (-102510450),
+
+.ADC_volt[1].coeff = 215104,
+.ADC_volt[1].offset = (-3516281969),
+
+.ADC_volt[2].coeff = 6263495,
+.ADC_volt[2].offset = (-102366794643),
+
+.ADC_current[0].coeff = 3134531,
+.ADC_current[0].offset = (-51203208091),
+
+.ADC_current[1].coeff = 71817037,
+.ADC_current[1].offset = (-1173217647997),
+
+.ADC_current[2].coeff = 1462086757,
+.ADC_current[2].offset = (-23883222331602),
+
+.ADC_current[3].coeff = 30700669121,
+.ADC_current[3].offset = (-501453504657573),
+
+.Usercode2DAC[0].coeff = (-10544373),
+.Usercode2DAC[0].offset = 584350176185,
+
+.Usercode2DAC[1].coeff = (-178475043),
+.Usercode2DAC[1].offset = 4783237161078,
+
+.ADC_Vout_volt[0].coeff = (-6261766),
+.ADC_Vout_volt[0].offset = 101995687562,
+};
+#endif
+
+#ifdef BOARD_11
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6271,
+.ADC_volt[0].offset = (-101634397),
+
+.ADC_volt[1].coeff = 215437,
+.ADC_volt[1].offset = (-3491402418),
+
+.ADC_volt[2].coeff = 6274038,
+.ADC_volt[2].offset = (-101654277903),
+
+.ADC_current[0].coeff = 3117355,
+.ADC_current[0].offset = (-50497924237),
+
+.ADC_current[1].coeff = 71774648,
+.ADC_current[1].offset = (-1162852302911),
+
+.ADC_current[2].coeff = 1452664130,
+.ADC_current[2].offset = (-23532284128026),
+
+.ADC_current[3].coeff = 30668623144,
+.ADC_current[3].offset = (-496799430136624),
+
+.Usercode2DAC[0].coeff = (-10573209),
+.Usercode2DAC[0].offset = 582781434937,
+
+.Usercode2DAC[1].coeff = (-179369334),
+.Usercode2DAC[1].offset = 4803319819942,
+
+.ADC_Vout_volt[0].coeff = (-6260515),
+.ADC_Vout_volt[0].offset = 101238248026,
+};
+#endif
+
+#ifdef BOARD_12
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6279,
+.ADC_volt[0].offset = (-102038347),
+
+.ADC_volt[1].coeff = 215399,
+.ADC_volt[1].offset = (-3499372419),
+
+.ADC_volt[2].coeff = 6271256,
+.ADC_volt[2].offset = (-101854059267),
+
+.ADC_current[0].coeff = 3127579,
+.ADC_current[0].offset = (-50976515534),
+
+.ADC_current[1].coeff = 71810250,
+.ADC_current[1].offset = (-1170512309345),
+
+.ADC_current[2].coeff = 1459326140,
+.ADC_current[2].offset = (-23785128070449),
+
+.ADC_current[3].coeff = 30698357437,
+.ADC_current[3].offset = (-500364793529135),
+
+.Usercode2DAC[0].coeff = (-10515092),
+.Usercode2DAC[0].offset = 583551823033,
+
+.Usercode2DAC[1].coeff = (-178895889),
+.Usercode2DAC[1].offset = 4793704222970,
+
+.ADC_Vout_volt[0].coeff = (-6264947),
+.ADC_Vout_volt[0].offset = 101871189432,
+};
+#endif
+
+#ifdef BOARD_13
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6267,
+.ADC_volt[0].offset = (-101500321),
+
+.ADC_volt[1].coeff = 214738,
+.ADC_volt[1].offset = (-3479346399),
+
+.ADC_volt[2].coeff = 6266076,
+.ADC_volt[2].offset = (-101495271507),
+
+.ADC_current[0].coeff = 3131355,
+.ADC_current[0].offset = (-50776447942),
+
+.ADC_current[1].coeff = 71941999,
+.ADC_current[1].offset = (-1166670778645),
+
+.ADC_current[2].coeff = 1459861085,
+.ADC_current[2].offset = (-23672231221240),
+
+.ADC_current[3].coeff = 30713643316,
+.ADC_current[3].offset = (-498023476090336),
+
+.Usercode2DAC[0].coeff = (-10534478),
+.Usercode2DAC[0].offset = 581065668584,
+
+.Usercode2DAC[1].coeff = (-177995981),
+.Usercode2DAC[1].offset = 4768228482663,
+
+.ADC_Vout_volt[0].coeff = (-6242146),
+.ADC_Vout_volt[0].offset = 101296652593,
+};
+#endif
+
+#ifdef BOARD_14
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6233,
+.ADC_volt[0].offset = (-101600596),
+
+.ADC_volt[1].coeff = 214213,
+.ADC_volt[1].offset = (-3492067604),
+
+.ADC_volt[2].coeff = 6231071,
+.ADC_volt[2].offset = (-101547302286),
+
+.ADC_current[0].coeff = 3127494,
+.ADC_current[0].offset = (-50791776302),
+
+.ADC_current[1].coeff = 71436522,
+.ADC_current[1].offset = (-1160264778964),
+
+.ADC_current[2].coeff = 1454999583,
+.ADC_current[2].offset = (-23631081707179),
+
+.ADC_current[3].coeff = 30734513992,
+.ADC_current[3].offset = (-499174754129614),
+
+.Usercode2DAC[0].coeff = (-10524578),
+.Usercode2DAC[0].offset = 580685281839,
+
+.Usercode2DAC[1].coeff = (-178938545),
+.Usercode2DAC[1].offset = 4791672708498,
+
+.ADC_Vout_volt[0].coeff = (-6287121),
+.ADC_Vout_volt[0].offset = 101919340594,
+};
+#endif
+
+#ifdef BOARD_15
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6278,
+.ADC_volt[0].offset = (-102374780),
+
+.ADC_volt[1].coeff = 215578,
+.ADC_volt[1].offset = (-3514021066),
+
+.ADC_volt[2].coeff = 6277736,
+.ADC_volt[2].offset = (-102314560841),
+
+.ADC_current[0].coeff = 3121442,
+.ADC_current[0].offset = (-50925291177),
+
+.ADC_current[1].coeff = 71617588,
+.ADC_current[1].offset = (-1168563472647),
+
+.ADC_current[2].coeff = 1456095704,
+.ADC_current[2].offset = (-23757431937207),
+
+.ADC_current[3].coeff = 30728459175,
+.ADC_current[3].offset = (-501347924376505),
+
+.Usercode2DAC[0].coeff = (-10522914),
+.Usercode2DAC[0].offset = 582323677692,
+
+.Usercode2DAC[1].coeff = (-178029958),
+.Usercode2DAC[1].offset = 4770650014378,
+
+.ADC_Vout_volt[0].coeff = (-6278317),
+.ADC_Vout_volt[0].offset = 102365137425,
+};
+#endif
+
+#ifdef BOARD_16     // R2
+struct correction_ctx_t Correction = {
+.ADC_volt[0].coeff = 6276,
+.ADC_volt[0].offset = (-102671998),
+
+.ADC_volt[1].coeff = 216563,
+.ADC_volt[1].offset = (-3543055230),
+
+.ADC_volt[2].coeff = 6307068,
+.ADC_volt[2].offset = (-103165069679),
+
+.ADC_current[0].coeff = 3128089,
+.ADC_current[0].offset = (-51016401920),
+
+.ADC_current[1].coeff = 71887266,
+.ADC_current[1].offset = (-1172673156926),
+
+.ADC_current[2].coeff = 1458529439,
+.ADC_current[2].offset = (-23791298278977),
+
+.ADC_current[3].coeff = 30688895879,
+.ADC_current[3].offset = (-500613041520786),
+
+.Usercode2DAC[0].coeff = (-10547767),
+.Usercode2DAC[0].offset = 582805793442,
+
+.Usercode2DAC[1].coeff = (-177870657),
+.Usercode2DAC[1].offset = 4766517514398,
+
+.ADC_Vout_volt[0].coeff = (-6223522),
+.ADC_Vout_volt[0].offset = 101414758679,
+};
+#endif
+
+int32_t DecodeADCValue(uint8_t adc_gain, uint8_t adc_channel, uint16_t adc_rxbuf);
 uint16_t Usercode_Correction_to_DAC(uint8_t dac_gain, uint16_t usercode);
 
 /*=============================================================================
@@ -1909,12 +2214,11 @@ static int32_t DecodeADCCurrent(uint8_t adc_gain, uint16_t adc_measure)
     return (int32_t) (curr);
 }
 
-int32_t DecodeADCValue(uint8_t adc_gain, uint8_t adc_channel, uint8_t *adc_rxbuf)
+int32_t DecodeADCValue(uint8_t adc_gain, uint8_t adc_channel, uint16_t adc_rxbuf)
 {
     uint8_t gain = adc_gain;
     uint8_t ch = adc_channel;
-    uint8_t *rx = adc_rxbuf;
-    uint16_t adc_16b_measure;
+    uint16_t adc_16b_measure = adc_rxbuf;
     int32_t ret = 0;
 
     /*
@@ -1925,7 +2229,6 @@ int32_t DecodeADCValue(uint8_t adc_gain, uint8_t adc_channel, uint8_t *adc_rxbuf
      * if channel == RIS_ADC_VIN: return real battery volt
      */
 
-    adc_16b_measure = (uint16_t)rx[0] << 8 | (uint16_t)rx[1];
 
     if(ch == RIS_ADC_VIN){
         return DecodeADCVolt(gain, adc_16b_measure);

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

@@ -1,32 +0,0 @@
-
-#ifndef ELITE_FLAG_CT_INIT
-#define ELITE_FLAG_CT_INIT
-
-// GPT counter
-struct _GPT{
-    uint32_t GptimerCounter;
-    uint32_t GptimerCounter0;
-    uint8_t  DeltaGptimerCounter;
-    uint32_t SampleRateCounter;
-    uint32_t NotifyCounter;
-    uint32_t VscanRateCounter;
-    uint32_t LeadTimeCounter;
-    uint32_t BatteryADCCounter;
-    uint32_t BatteryCheckCounter;
-    uint32_t GptimerMultiple;
-    uint32_t StiCounter;
-}GPT = {0};
-
-static void InitGPT(){
-    GPT.GptimerCounter      = 0;
-    GPT.GptimerCounter0     = 0;
-    GPT.DeltaGptimerCounter = 0;
-    GPT.SampleRateCounter   = 0;
-    GPT.NotifyCounter       = 0;
-    GPT.VscanRateCounter    = 0;
-    GPT.LeadTimeCounter     = 0;
-    GPT.BatteryADCCounter   = 0;
-    GPT.BatteryCheckCounter = 0;
-    GPT.StiCounter          = 0;
-}
-#endif

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

@@ -1,38 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-#ifndef HEADSTAGE_GPTIMER_H
-#define HEADSTAGE_GPTIMER_H
-
-#include <Board.h>
-#include <ti/drivers/timer/GPTimerCC26XX.h>
-#include <ti/sysbios/BIOS.h>
-#include <xdc/runtime/Types.h>
-
-#define EVT_PERIODIC_GPTIMER EVT_PERIODIC_0
-
-static GPTimerCC26XX_Handle gptimer_handle;
-
-static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-
-#define elite_gptimer_start() GPTimerCC26XX_start(gptimer_handle)
-#define elite_gptimer_stop() GPTimerCC26XX_stop(gptimer_handle)
-#define elite_gptimer_close() GPTimerCC26XX_close(gptimer_handle)
-#define CLOCK_FREQ 4769  // clock freq = 0.1 ms(4800), Measured(4769)
-
-#define elite_gptimer_open()                                                                          \
-    do {                                                                                              \
-        GPTimerCC26XX_Params params;                                                                  \
-        GPTimerCC26XX_Params_init(&params);                                                           \
-        params.width          = GPT_CONFIG_16BIT;                                                     \
-        params.mode           = GPT_MODE_PERIODIC_DOWN;                                               \
-        params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                        \
-        gptimer_handle        = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                         \
-        Types_FreqHz  freq;                                                                           \
-        BIOS_getCpuFreq(&freq);                                                                       \
-        GPTimerCC26XX_Value loadVal = freq.lo / 1000 - 1; /*47999*/                                   \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, loadVal);                                          \
-        GPTimerCC26XX_setLoadValue(gptimer_handle, CLOCK_FREQ); /* 0.1 ms*/                           \
-        GPTimerCC26XX_registerInterrupt(gptimer_handle, elite_gptimer_callback, GPT_INT_TIMEOUT);     \
-    } while (0)
-
-#endif  // HEADSTAGE_GPTIMER_H

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

@@ -1,95 +0,0 @@
-
-#ifndef ELITE_I2C
-#define ELITE_I2C
-
-/*
-* Read I2C example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_i2_c_c_c26_x_x_8h.html
-*
-*/
-
-#include <ti/drivers/I2C.h>
-#include <ti/drivers/Power.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-// I2C
-static I2C_Handle I2Chandle;
-static I2C_Params I2Cparams;
-static I2C_Transaction i2cTrans;
-
-#define I2CBufSize 4
-static uint8_t I2CtxBuf[I2CBufSize];      // Transmit buffer
-static uint8_t I2CrxBuf[I2CBufSize];      // Receive buffer
-bool transferDone = false;
-
-static void I2CCallbackFunction(I2C_Handle handle, I2C_Transaction *msg, bool transfer) {
-    if(transfer){
-        transferDone = true;
-    }
-}
-
-static void I2Cinit(){
-    I2C_init();
-
-    // Configure I2C parameters.
-    I2C_Params_init(&I2Cparams);
-
-    I2Cparams.transferMode  = I2C_MODE_CALLBACK;
-    I2Cparams.transferCallbackFxn = I2CCallbackFunction;
-    I2Cparams.bitRate  = I2C_100kHz;
-
-    // Initialize master I2C transaction structure
-    i2cTrans.writeCount   = I2CBufSize;
-    i2cTrans.writeBuf     = I2CtxBuf;
-    i2cTrans.readCount    = I2CBufSize;
-    i2cTrans.readBuf      = I2CrxBuf;
-    i2cTrans.slaveAddress = 0xA0;
-
-    for(int i=0 ; i<10 ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    // Open I2C
-    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-
-}
-#define WriteMem 0b10100001
-#define ReadMem  0b10100000
-
-static void I2CWrite(uint8_t addr, uint8_t data){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = WriteMem;
-    I2CtxBuf[1] = addr;
-    I2CtxBuf[2] = data;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-static void I2CRead(uint8_t addr){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = ReadMem;
-    I2CtxBuf[1] = addr;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-#endif  // ELITE_I2C
-

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

@@ -47,6 +47,8 @@ struct HEADSTAGE_INSTRUCTION {
     uint16_t cycleNumber;
     uint8_t  charge;
     int32_t  constantCurrent;
+    uint8_t  cc_resistance;
+    uint8_t  cc_cp_speed;
 
     // uni pulse mode
     int32_t  v0;
@@ -64,35 +66,12 @@ struct HEADSTAGE_INSTRUCTION {
     int32_t  v_1;
     int32_t  v_2;
 
-
-    // pulse mode
-    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;
-
     int32_t Vout;
 
     // not use
     int32_t  Currentmax;
     uint8_t  VoViSwitch;
 
-
-
-
-
 } instru = {0};
 
 /** Iin, Vin, Vout **/
@@ -167,7 +146,7 @@ static void InitEliteInstruction(void)
     instru.VoutGainLv       = VOUT_GAIN_AUTO;
     instru.gain_switch_on   = 0b11110000;   // cur auto gain switch, |lv0|lv1|lv2|lv3|none|none|none|none|
     instru.AdcChannel       = 0;         // RIS_ADC_IIN: 0x00, RIS_ADC_VIN: 0x01, RIS_DAC_VOUT: 0x02, RIS_HIGH_Z: 0x03
-    instru.hign_z_en        = 1;
+    instru.hign_z_en        = 0;
 
     instru.cycleNumber     = 1;
     instru.charge          = 1;         // 0:discharge, 1:charge
@@ -205,24 +184,6 @@ static void InitEliteInstruction(void)
     instru.v_1              = 0;
     instru.v_2              = 0;
 
-    //pulse mode
-    instru.sti_t1          = 0;
-    instru.sti_t2          = 0;
-    instru.sti_t3          = 0;
-    instru.sti_t4          = 0;
-    instru.sti_t5          = 0;
-    instru.sti_t6          = 0;
-    instru.sti_t7          = 0;
-    instru.sti_v1          = DAC_ZERO;
-    instru.sti_v2          = DAC_ZERO;
-    instru.sti_v3          = DAC_ZERO;
-    instru.sti_v4          = DAC_ZERO;
-    instru.sti_v5          = DAC_ZERO;
-    instru.sti_v6          = DAC_ZERO;
-    instru.sti_v7          = DAC_ZERO;
-    instru.sti_loop        = 1;
-    instru.sti_cy          = 0;
-
     instru.Vout            = 0;
 
     // not use

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

@@ -1,74 +0,0 @@
-
-#ifndef ELITEKEYDETECT
-#define ELITEKEYDETECT
-
-static bool TurnOnElite(uint8_t key) {
-    static uint16_t TurnOnCounter = 0;
-
-    if (key == 0) {
-        // press 1 sec, power on LED, read bat power
-        if (TurnOnCounter >= CLOCK_ONE_SECOND) {
-            headstage_battery_volt();
-            uint16_t bat = NotifyVoltBat;
-            if( bat < 768 && bat > 20){
-                PIN15_setOutputValue(enable_5v, 0);
-                return false;
-            }else{
-                PIN15_setOutputValue(enable_5v, 1);  // enable 5V
-                TurnOn10V();
-                ModeLED(BT_WAIT);
-                return true;
-            }
-        } else {
-            TurnOnCounter++;
-            return false;
-        }
-    } else {
-        TurnOnCounter = 0;
-        PIN15_setOutputValue(enable_5v, 0);  // disable 5V
-        return false;
-    }
-}
-
-static void EliteKeyPress(uint8_t key) {
-    static uint16_t ShutDownCounter = 0;
-    static uint8_t OriginEliteFxn  = 0;
-
-    if (key == 0) {
-        // key = 0 if press
-        // press key => bight LED
-
-        if (ShutDownCounter == CLOCK_ONE_SECOND) {
-            KEYLED();
-        }
-
-        // press 3~4 sec, shutdown 2650
-        else if (ShutDownCounter > (CLOCK_ONE_SECOND*3) ) {
-            LED_color(DARKLED, 0xFF, 0xFF, 0x00);
-            PIN15_setOutputValue(enable_5v, 0);  // disable 5V
-        }
-        ShutDownCounter ++;
-    } else {
-        if (OriginEliteFxn == instru.eliteFxn) {  // old function == currunt instruction
-            if (ShutDownCounter != 0) {
-                // dark LED
-                checkFlafLED();
-                ShutDownCounter = 0;
-            }
-        } else {  // old function != currunt instruction
-            OriginEliteFxn = instru.eliteFxn;
-            if (ShutDownCounter != 0) {
-                ShutDownCounter = 0;
-            }
-            checkFlafLED();
-        }
-    }
-}
-
-static void TurnOn10V() {
-    If10Von = true;
-    PIN15_setOutputValue(enable_10v, 1);
-    CPUdelay(8000);
-}
-
-#endif

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

@@ -13,93 +13,6 @@ static bool     postWorkLedFlag = 0;
 
 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;
-    for (int i = 2; i < SPI_LED_SIZE - 2; i += 2) {
-        spi_LEDtxbuf[i]     = 0xE000 | ((uint16_t)bright << 8) | blue;
-        spi_LEDtxbuf[i + 1] = ((uint16_t)green << 8) | red;
-    }
-
-    spi_LEDtxbuf[SPI_LED_SIZE - 2] = 0xffff;
-    spi_LEDtxbuf[SPI_LED_SIZE - 1] = 0xffff;
-
-    LED_SPI(SPI_LED_SIZE, spi_LEDtxbuf, spi_LEDrxbuf);
-}
-
-static void Elite_led_color(uint16_t color){
-    switch (color) {
-        case COLOR_RED: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x00);
-            break;
-        }
-        case COLOR_ORANGE: {
-            LED_color(DARKLED, 0xFF, 0x58, 0x09);
-            break;
-        }
-        case COLOR_YELLOW: {
-            LED_color(LIGHTLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN: {
-            LED_color(DARKLED, 0x00, 0xFA, 0x00);
-            break;
-        }
-        case COLOR_YELLOWGREEN: {
-            LED_color(DARKLED, 0x64, 0xA6, 0x00);
-            break;
-        }
-        case COLOR_BLUE: {
-            LED_color(DARKLED, 0x00, 0x00, 0xAA);
-            break;
-        }
-        case COLOR_CYAN: {
-            LED_color(DARKLED, 0x00, 0x40, 0x40);
-            break;
-        }
-        case COLOR_MAGENTA: {
-            LED_color(DARKLED, 0xFF, 0x00, 0x80);
-            break;
-        }
-        case COLOR_PURPLE: {
-            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
-            break;
-        }
-        case COLOR_WHITE: {
-            LED_color(DARKLED, 0xCA, 0xFF, 0xFF);
-            break;
-        }
-        case COLOR_BLACK: {
-            LED_color(0x00, 0x00, 0x00, 0x00);
-            break;
-        }
-        //dark LED
-        case COLOR_YELLOW_DARK: {
-            LED_color(DARKLED, 0xFF, 0x80, 0x00);
-            break;
-        }
-        case COLOR_GREEN_DARK: {
-            LED_color(DARKLED, 0x00, 0x33, 0x00);
-            break;
-        }
-        case COLOR_BLUE_DARK: {
-            LED_color(DARKLED, 0x00, 0x00, 0x33);
-            break;
-        }
-        case COLOR_CYAN_DARK: {
-            LED_color(DARKLED, 0x00, 0x10, 0x10);
-            break;
-        }
-        case COLOR_PURPLE_DARK: {
-            LED_color(DARKLED, 0x55, 0x00, 0x55);
-            break;
-        }
-        default: {
-            break;
-        }
-    }
-}
-
 static void ModeLED(uint16_t modeStatus) {
     btWaitLedFlag   = 0;
     noEventLedFlag  = 0;
@@ -110,17 +23,17 @@ static void ModeLED(uint16_t modeStatus) {
     switch (modeStatus) {
     case BT_WAIT: {
         btWaitLedFlag = 1;
-        BT_WAIT_LED();
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_YELLOWGREEN);
         break;
     }
     case NO_EVENT: {
         noEventLedFlag = 1;
-        LEDPowerON();
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_GREEN);
         break;
     }
     case PRE_WORK: {
         preWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_BLUE);
         break;
     }
     case WORKING: {
@@ -130,11 +43,11 @@ static void ModeLED(uint16_t modeStatus) {
     }
     case POST_WORK: {
         postWorkLedFlag = 1;
-        Elite_led_color(COLOR_BLUE);
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_GREEN);        
         break;
     }
     default: {
-        LEDPowerON();
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_GREEN);
         break;
     }
     }
@@ -173,22 +86,21 @@ static void WorkModeLED()
         case CURVE_OCP:
         case CURVE_LSV:
         case CURVE_IV_CY:
-        case CURVE_PULSE:
         case CURVE_UNI_PULSE:
         case CURVE_DPV:
         case CURVE_DPV_SMPRATE:
         case CURVE_DPV_ADVANCE:
         case CURVE_DPV_ADVANCE_SMPRATE:
-            WORKLED();
+            led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_CYAN);
             break;
 
-        case CURVE_CALI_ADC:
+        case CURVE_CALI:
             if (instru.AdcChannel == RIS_ADC_IIN) {
-                Elite_led_color(COLOR_RED);
+                led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_RED);
             } else if (instru.AdcChannel == RIS_ADC_VIN) {
-                Elite_led_color(COLOR_ORANGE);
+                led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_ORANGE);
             } else if (instru.AdcChannel == RIS_DAC_VOUT) {
-                Elite_led_color(COLOR_BLUE);
+                led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_BLUE);
             }
             break;
 

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

@@ -1,16 +0,0 @@
-
-#ifndef ELITE_LATCH_INIT
-#define ELITE_LATCH_INIT
-
-static void InitLH() {
-    for (int i=0; i<LATCH_BUFF_SIZE; i++) {
-        LH.LATCH0[i]       = 0;
-        LH.LATCH1[i]       = 0;
-        LH.LATCH2[i]       = 0;
-    }
-    LH.LoadState    = 0;
-}
-
-
-#endif
-

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

@@ -10,29 +10,16 @@ static void reset() {
     initINSBuf();
     initDATBuf();
 
-    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+    latch_single_ctrl(E_LATCH_HIGH_Z, 0); // HIGH Z MODE // 1: close; 0: open;
 
     VinADCGainCtrl(VIN_GAIN_AUTO);
     IinADCGainCtrl(I_GAIN_AUTO);
 
     instru.VoutGainLv = VOUT_GAIN_15K;
     VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+    DAC0_W_T(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
 
-    for (int i = 0; i < SPI_LED_SIZE; i++) {
-        spi_LEDtxbuf[i] = 0;
-        spi_LEDrxbuf[i] = 0;
-    }
 
-    for (int i = 0; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-        spi_rxbuf[i]    = 0;
-    }
-
-    for (int i = 0; i < SPI_ADC_SIZE; i++) {
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
 
     ModeLED(NO_EVENT);
     CPUdelay(1600);
@@ -46,27 +33,14 @@ static void Eliteinterrupt() {
     initINSBuf();
     initDATBuf();
 
-    PIN15_setOutputValue(HIGH_Z_MODE, 0); // HIGH Z MODE // 1: close; 0: open;
+    latch_single_ctrl(E_LATCH_HIGH_Z, 0); // HIGH Z MODE // 1: close; 0: open;
 
     instru.VoutGainLv = VOUT_GAIN_15K;
     VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-
-    for (int i = 0; i < SPI_LED_SIZE; i++) {
-        spi_LEDtxbuf[i] = 0;
-        spi_LEDrxbuf[i] = 0;
-    }
-
-    for (int i = 0; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-        spi_rxbuf[i]    = 0;
-    }
-
-    for (int i = 0; i < SPI_ADC_SIZE; i++) {
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
+    DAC0_W_T(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+    
+    ADC_rxbuf = 0;
+    
     ModeLED(NO_EVENT);
     CPUdelay(8000);
 }

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

@@ -1,137 +0,0 @@
-
-#ifndef ELITE_SPI
-#define ELITE_SPI
-
-/*
-* Read SPI example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_s_p_i_c_c26_x_x_d_m_a_8h.html
-*/
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-#include "Elite_PIN.h"
-
-/* application use SPI parameters and buffers */
-#define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 3
-#define SPI_ADC_SIZE 4
-
-static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
-static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
-
-static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
-static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};
-
-static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
-static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
-
-/* system use SPI parameters */
-static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
-static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
-static SPI_Params      spiParams0;
-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();
-    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 10000000;  // 10M
-    spiParams0.mode        = SPI_MASTER;
-    spiParams0.dataSize    = 16;
-    spiParams0.frameFormat = SPI_POL0_PHA1;
-    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // LED SPI
-
-    SPI_Params_init(&spiParams1);
-    spiParams1.bitRate     = 10000000;  // 10M
-    spiParams1.mode        = SPI_MASTER;
-    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA1;
-    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
-}
-
-static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
-    LED_transaction.count = length;
-    LED_transaction.txBuf = spi_txbuf;
-    LED_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle0, &LED_transaction);
-}
-
-static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(ADC_CS, 0);  // ADC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D6, 0); // ADC_CS LOW
-
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, D6, 1); // ADC_CS HIGH
-    update_latch_status (ADC_CS, 1);
-//    PIN15_setOutputValue(ADC_CS, 1);  // ADC_CS HIGH
-}
-
-static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-//    PIN15_setOutputValue(DAC_CS, 0);            // DAC_CS LOW
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, D7, 0); // DAC_CS LOW
-
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-
-    PIN_setOutputValue(pin_handle, D7, 1); // DAC_CS HIGH
-    update_latch_status (DAC_CS, 1);
-//    PIN15_setOutputValue(DAC_CS, 1);            // DAC_CS HIGH
-}
-
-static void ELITE15_SPI_HOLD() {
-    Elite_SPI_init();
-    #ifdef ELITE_PIN_1_5_RE
-    PIN_setOutputValue(pin_handle, D6, LH.LATCH0[6]);   // ADC_CS
-    PIN_setOutputValue(pin_handle, D7, LH.LATCH0[7]);   // DAC_CS
-    PIN_setOutputValue(pin_handle, D4, LH.LATCH0[4]);   // update HIGH_Z_MODE
-    #endif
-
-    PIN_setOutputValue(pin_handle, LOAD0, 1);
-    PIN_setOutputValue(pin_handle, LOAD1, 0);
-    PIN_setOutputValue(pin_handle, LOAD2, 0);
-}
-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

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

@@ -205,6 +205,12 @@ struct wm_ocp_ctx_t {
     struct wm_meas_t measure;
 };
 
+struct wm_adc_cali_ctx_t {
+    
+    struct wm_meas_t measure;
+};
+
+
 int wm_init(void);
 int wm_deinit(void);
 void *wm_get(void);
@@ -482,48 +488,6 @@ static int __ca_create(void)
     return 0;
 }
 
-static int __pulse_create(void)
-{
-    struct wm_meas_t *m;
-    struct wm_pulse_ctx_t *p;
-    void **wm = &workMode_p;
-
-    p = malloc(sizeof(struct wm_pulse_ctx_t));
-    if (!p) return -1;
-
-    m = (struct wm_meas_t *)p;
-    m->_measureCurrent = 0;
-    m->_measureVin     = 0;
-    m->_measureVout    = 0;
-    m->_measureBat     = 0;
-    m->_VoViSwitch     = instru.VoViSwitch;
-
-    p->_Vset           = 0;
-    p->_sti_v1         = instru.sti_v1;
-    p->_sti_v2         = instru.sti_v2;
-    p->_sti_v3         = instru.sti_v3;
-    p->_sti_v4         = instru.sti_v4;
-    p->_sti_v5         = instru.sti_v5;
-    p->_sti_v6         = instru.sti_v6;
-    p->_sti_v7         = instru.sti_v7;
-    p->_sti_t1         = instru.sti_t1;
-    p->_sti_t2         = instru.sti_t2;
-    p->_sti_t3         = instru.sti_t3;
-    p->_sti_t4         = instru.sti_t4;
-    p->_sti_t5         = instru.sti_t5;
-    p->_sti_t6         = instru.sti_t6;
-    p->_sti_t7         = instru.sti_t7;
-    p->_sti_t          = instru.sti_t1;
-    p->_sti_v          = instru.sti_v1;
-    p->_sti_t_flag     = 1;
-    p->_sti_cy         = instru.sti_cy;
-    p->_sti_lp         = instru.sti_loop;
-
-    *wm = p;
-
-    return 0;
-}
-
 static int __uni_pulse_create(void)
 {
     struct wm_meas_t *m;
@@ -740,6 +704,29 @@ static int __ocp_create(void)
     return 0;
 }
 
+
+static int __adc_cali_create()
+{
+    struct wm_meas_t *m;
+    struct wm_adc_cali_ctx_t *p;
+    void **wm = &workMode_p;
+    
+    p = malloc(sizeof(struct wm_adc_cali_ctx_t));
+    if (!p) return -1;
+    
+    m = (struct wm_meas_t *)p;
+    m->_measureCurrent = 0;
+    m->_measureVin     = 0;
+    m->_measureVout    = 0;
+    m->_measureBat     = 0;
+    m->_VoViSwitch     = instru.VoViSwitch;
+
+    *wm = p;
+    
+    return 0;   
+}
+
+
 int wm_init(void)
 {
     int mode = instru.eliteFxn;
@@ -788,10 +775,6 @@ int wm_init(void)
             if (__ca_create()) return -2;
             break;
 
-        case CURVE_PULSE:
-            if (__pulse_create()) return -2;
-            break;
-
         case CURVE_UNI_PULSE:
             if (__uni_pulse_create()) return -2;
             break;
@@ -808,7 +791,10 @@ int wm_init(void)
         case CURVE_DPV_ADVANCE_SMPRATE:
             if (__dpv_advance_create()) return -2;
             break;
-
+        case CURVE_CALI:
+            if (__adc_cali_create()) return -2;
+            break;
+            
         default:
             // printf("DO NOT support!!");
             return -3;

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

@@ -1,252 +0,0 @@
-
-#ifndef Elite_PIN
-#define Elite_PIN
-
-#include <ti/drivers/pin/PINCC26XX.h>
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-//#define ELITE_PIN_1_5
-#define ELITE_PIN_1_5_RE
-
-/* SPI Board */
-#define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 D1
-#define Board_SPI0_CLK                  D0
-#define Board_SPI0_CS                   PIN_UNASSIGNED
-
-#define Board_SPI1_MISO                 IOID_1
-#define Board_SPI1_MOSI                 D3
-#define Board_SPI1_CLK                  D2
-#define Board_SPI1_CS                   PIN_UNASSIGNED
-
-#define D0                              IOID_3
-#define D1                              IOID_4
-#define D2                              IOID_5
-#define D3                              IOID_6
-#define D4                              IOID_7
-#define D5                              IOID_8
-#define D6                              IOID_9
-#define D7                              IOID_10
-
-#define 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_CS                          LOAD0, D5
-
-#ifdef ELITE_PIN_1_5
-#define MEM_HOLD                        LOAD0, D4
-#define HIGH_Z_MODE                     LOAD2, D5
-#endif
-#ifdef ELITE_PIN_1_5_RE
-#define MEM_HOLD                        LOAD1, D0
-#define HIGH_Z_MODE                     LOAD0, D4
-#endif
-
-#define Turnon_I_MID                    LOAD2, D0
-#define Turnon_I_SMALL                  LOAD2, D4
-#define Turnon_I_LARGE                  LOAD2, D1
-#define Turnon_V_SMALL                  LOAD2, D2
-#define Turnon_V_MID                    LOAD2, D3
-#define Turnon_VOUT_SMALL                LOAD2, D7
-#define shutdown_6994                   LOAD2, D6
-
-//#define Turnon10K                       Turnon_I_MID
-//#define Turnon200R                      Turnon_I_LARGE
-
-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 PIN_UNASSIGNED
-#define Board_I2C0_SDA0                 PIN_UNASSIGNED
-#endif
-
-#define switch_on                       IOID_14
-#define enable_10v                      LOAD1, D5
-#define enable_5v                       LOAD1, D6
-
-PIN_Handle       pin_handle;
-static PIN_State ZM_rst;
-
-const PIN_Config BLE_IO[] = {
-//    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-//    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    D7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-
-    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
-
-    PIN_TERMINATE
-};
-
-static void add_elite_pin() {
-//    PIN_Status elite15_status;
-    PIN_add(pin_handle,
-    D0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-    PIN_add(pin_handle,
-    D3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL);
-
-//    if(elite15_status != PIN_SUCCESS) {
-//        LED_color(DARKLED, 0x0F, 0x0F, 0x0F);
-//    }
-}
-
-static void remove_elite_pin() {
-    PIN_close(pin_handle);
-    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-}
-
-/*!
- *  @def    BOOSTXL_CC2650MA_SPIName
- *  @brief  Enum of SPI names on the CC2650 Booster Pack
- */
-typedef enum BOOSTXL_CC2650MA_SPIName {
-    BOOSTXL_CC2650MA_SPI0 = 0,
-    BOOSTXL_CC2650MA_SPI1 = 1,
-
-    BOOSTXL_CC2650MA_SPICOUNT
-} BOOSTXL_CC2650MA_SPIName;
-
-/*
- *  ========================== SPI DMA begin ===================================
- */
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
-#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/* SPI objects */
-SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
-
-/* SPI configuration structure, describing which pins are to be used */
-const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
-    {
-        .baseAddr           = SSI0_BASE,
-        .intNum             = INT_SSI0_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
-        .mosiPin            = Board_SPI0_MOSI,
-        .misoPin            = Board_SPI0_MISO,
-        .clkPin             = Board_SPI0_CLK,
-        .csnPin             = Board_SPI0_CS
-    },
-    {
-        .baseAddr           = SSI1_BASE,
-        .intNum             = INT_SSI1_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI1,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI1_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI1_TX,
-        .mosiPin            = Board_SPI1_MOSI,
-        .misoPin            = Board_SPI1_MISO,
-        .clkPin             = Board_SPI1_CLK,
-        .csnPin             = Board_SPI1_CS
-    },
-};
-
-/* SPI configuration structure */
-const SPI_Config SPI_config[] = {
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[0],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-    },
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[1],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== SPI DMA end =====================================
-*/
-
-
-/*
- *  ============================= I2C Begin=====================================
-*/
-
-#ifdef ELITE_VERSION_1_4
-
-/* Generic I2C instance identifiers */
-#define Board_I2C                   CC2650_MA_I2C0
-/*!
- *  @def    CC2650_LAUNCHXL_I2CName
- *  @brief  Enum of I2C names on the CC2650 dev board
- */
-typedef enum CC2650_MA_I2CName {
-    CC2650_MA_I2C0 = 0,
-
-    CC2650_MA_I2CCOUNT
-} CC2650_MA_I2CName;
-
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
-#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/i2c/I2CCC26XX.h>
-
-/* I2C objects */
-I2CCC26XX_Object i2cCC26xxObjects[CC2650_MA_I2CCOUNT];
-
-/* I2C configuration structure, describing which pins are to be used */
-const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
-    {
-        .baseAddr = I2C0_BASE,
-        .powerMngrId = PowerCC26XX_PERIPH_I2C0,
-        .intNum = INT_I2C_IRQ,
-        .intPriority = ~0,
-        .swiPriority = 0,
-        .sdaPin = Board_I2C0_SDA0,
-        .sclPin = Board_I2C0_SCL0,
-    }
-};
-
-/* I2C configuration structure */
-const I2C_Config I2C_config[] = {
-    {
-        .fxnTablePtr = &I2CCC26XX_fxnTable,
-        .object = &i2cCC26xxObjects[0],
-        .hwAttrs = &i2cCC26xxHWAttrs[0]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== I2C end =========================================
- */
-#endif
-
-#endif
-

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

@@ -34,8 +34,8 @@ static uint8_t headstage_battery_percent() {
 static void headstage_battery_volt(){
     uint32_t bat_volt = 0;
 
-    read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
-    bat_volt = (uint32_t) (spi_ADC_rxbuf[0] << 8) | (uint32_t) (spi_ADC_rxbuf[1]);
+    ADC_rxbuf = MEASURE_BATTERY();
+    bat_volt = (uint32_t) ADC_rxbuf;
     bat_volt = bat_volt * 12 / 125; //x  * 187.5 * 1e-6 * 2 / 125 * 320 * 100 ;
 //    bat_volt = (bat_volt - 1) * 187.5 * 2;
 
@@ -53,11 +53,11 @@ static bool EliteADCBattery(){
     static uint8_t ADCSwitch = 0;
     bool read_adc_flag = false;
     if(ADCSwitch == 0){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_BATTERY();
         ADCSwitch++;
     }
     else if(ADCSwitch == 1){ /**read V**/
-        read_adc_raw_data(RIS_ADC_BAT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_BATTERY();
         ADCSwitch++;
     }
     else if(ADCSwitch == 2){ /**read V(buffer)**/
@@ -92,7 +92,7 @@ static void measureBat(){
 
     uint16_t bat = NotifyVoltBat;
     if( bat < 768 && bat > 20){
-        PIN15_setOutputValue(enable_5v, 0);
+        latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
     }
 }
 

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

@@ -21,34 +21,33 @@
 
 // RIS (real instruction)
 enum all_mode_e {
-    CURVE_IV                       =  0x01, // I-V Curve                       //0x10,
-    CURVE_IV_CY                    =  0x02, // Cycle I-V                       //0x20,
-    CURVE_VO                       =  0x03, // Function Generator              //0x30,
-    CURVE_RT                       =  0x04, // R-T Graph                       //0x40,
-    CURVE_VT                       =  0x05, // V-T Graph                       //0x50,
-    CURVE_IT                       =  0x06, // I-T Graph                       //0x60,
-    CURVE_CC                       =  0x07, // Constant Current (CC)           //0xD0,
-    CURVE_OCP                      =  0x08, // Open Circuit Potential (OCP)
-    CURVE_CV                       =  0x09, // Cyclic Voltammetry (CV)         //0xC0,
-    CURVE_LSV                      =  0x0A, // Linear Sweep Voltammetry (LSV)  //0x02,
-    CURVE_CA                       =  0x0B, // Chronoamperometric Graph (CA)   //0x03,
-    CURVE_PULSE                    =  0x0C,                                    //0x94,
-    CURVE_UNI_PULSE                =  0x0D, // universal pulse
+    CURVE_IV                       =  0x01,
+    CURVE_IV_CY                    =  0x02,
+    CURVE_VO                       =  0x03,
+    CURVE_RT                       =  0x04,
+    CURVE_VT                       =  0x05,
+    CURVE_IT                       =  0x06,
+    CURVE_CC                       =  0x07,
+    CURVE_OCP                      =  0x08,
+    CURVE_CV                       =  0x09,
+    CURVE_LSV                      =  0x0A,
+    CURVE_CA                       =  0x0B,
+    CURVE_UNI_PULSE                =  0x0D,
     CURVE_DPV                      =  0x0E,
     CURVE_DPV_SMPRATE              =  0x0F,
     CURVE_DPV_ADVANCE              =  0x10,
     CURVE_DPV_ADVANCE_SMPRATE      =  0x11,
 
-    CURVE_CALI_ADC                 =  0xF1, // Cali ADC - test                 //0x92,
+    CURVE_CALI                 =  0xF1,    // 0xF1
 
 
-    SET_SAMPLE_RATE                =  0xE0,                                    //0x70,
-    SET_ADC_DAC_GAIN               =  0xE1,                                    //0x80,
+    SET_SAMPLE_RATE                =  0xE0,
+    SET_ADC_DAC_GAIN               =  0xE1,     //0xE1
     SET_PARA                       =  0xE2
 };
 
 enum set_para_e {
-    DAC_VOLT                        = 0x01,
+    DAC_VOLT                        = 0x01, 
 };
 
 enum dev_para_e {
@@ -82,19 +81,15 @@ enum dev_para_e {
 #define COLOR_CYAN               0x06
 #define COLOR_MAGENTA            0x07
 #define COLOR_PURPLE             0x08
-#define COLOR_WHITE              0x09
+#define COLOR_WHITE              0x09           
 #define COLOR_YELLOWGREEN        0x0A
+#define COLOR_EMERALD            0x0B
 #define COLOR_YELLOW_DARK        0xF3
 #define COLOR_GREEN_DARK         0xF4
 #define COLOR_BLUE_DARK          0xF5
 #define COLOR_CYAN_DARK          0xF6
 #define COLOR_PURPLE_DARK        0xF8
 
-#define LEDPowerON()             Elite_led_color(COLOR_GREEN)
-#define WORKLED()                Elite_led_color(COLOR_CYAN)
-#define KEYLED()                 Elite_led_color(COLOR_YELLOW)
-#define BT_WAIT_LED()            Elite_led_color(COLOR_YELLOWGREEN)
-
 
 #define BT_WAIT                  0x01
 #define NO_EVENT                 0x02

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

@@ -23,8 +23,7 @@ static void volt_out() {
 
     instru.VoltConstant = instru.Vout / 40000 + 25000; //5nV=>usercode
     DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLv, instru.VoltConstant);
-    DAC_outputV(DACOutCode);
-
+    DAC0_W_T(DACOutCode);
     return;
 }
 
@@ -46,8 +45,7 @@ static void vscan_volt_out(void)
 
     instru.VoltConstant = instru.Vout / 40000 + 25000;//5nV=>usercode
     DACOutCode = Usercode_Correction_to_DAC(instru.VoutGainLv, instru.VoltConstant);
-    DAC_outputV(DACOutCode);
-
+    DAC0_W_T(DACOutCode);
     return;
 }
 
@@ -127,18 +125,18 @@ static void DACenable(uint8_t afterRead){
  */
 #define CNT_TO_I_GAIN_3M_IIN_VIN_VOUT_PLOT      7   // 7 * 12ms = 84ms
 #define CNT_TO_I_GAIN_100K_IIN_VIN_VOUT_PLOT    2   // 2 * 12ms = 24ms
-#define CNT_TO_I_GAIN_3K_IIN_VIN_VOUT_PLOT      1   // 1 * 12ms = 12ms
-#define CNT_TO_I_GAIN_100R_IIN_VIN_VOUT_PLOT    1   // 1 * 12ms = 12ms
+#define CNT_TO_I_GAIN_3K_IIN_VIN_VOUT_PLOT      5   // 5 * 12ms = 60ms
+#define CNT_TO_I_GAIN_100R_IIN_VIN_VOUT_PLOT    5   // 5 * 12ms = 60ms
 
 #define CNT_TO_I_GAIN_3M_IIN_VIN_PLOT           10  // 10 * 8ms = 80ms
 #define CNT_TO_I_GAIN_100K_IIN_VIN_PLOT         3   // 3 * 8ms = 24ms
-#define CNT_TO_I_GAIN_3K_IIN_VIN_PLOT           2   // 2 * 8ms = 16ms
-#define CNT_TO_I_GAIN_100R_IIN_VIN_PLOT         2   // 2 * 8ms = 16ms
+#define CNT_TO_I_GAIN_3K_IIN_VIN_PLOT           5   // 5 * 8ms = 40ms
+#define CNT_TO_I_GAIN_100R_IIN_VIN_PLOT         5   // 5 * 8ms = 40ms
 
 #define CNT_TO_I_GAIN_3M_IT_PLOT                20  // 20 * 4ms = 80ms
 #define CNT_TO_I_GAIN_100K_IT_PLOT              5   // 5 * 4ms = 20ms
-#define CNT_TO_I_GAIN_3K_IT_PLOT                3   // 3 * 4ms = 12ms
-#define CNT_TO_I_GAIN_100R_IT_PLOT              3   // 3 * 4ms = 12ms
+#define CNT_TO_I_GAIN_3K_IT_PLOT                5   // 5 * 4ms = 20ms
+#define CNT_TO_I_GAIN_100R_IT_PLOT              5   // 5 * 4ms = 20ms
 
 static void read_Iin_change_gain(uint16_t plot_type)
 {
@@ -156,8 +154,8 @@ static void read_Iin_change_gain(uint16_t plot_type)
     if (instru.IinADCAutoGainEn > 1)
         return;
 
-    read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
-    MEAS_CURR(wm) = DecodeADCValue(instru.IinADCGainLv, RIS_ADC_IIN, spi_ADC_rxbuf);
+    ADC_rxbuf = MEASURE_CURRENT();
+    MEAS_CURR(wm) = DecodeADCValue(instru.IinADCGainLv, RIS_ADC_IIN, ADC_rxbuf);
 
     if (instru.IinADCAutoGainEn) {
         AutoGainChangeIin(MEAS_CURR(wm), plot, &no_rec_time);
@@ -225,8 +223,8 @@ static void read_Vin_change_gain(void)
         return;
 
     /* read Vin and do NOT record the Vin after changing gain twice */
-    read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
-    MEAS_VIN(wm) = DecodeADCValue(instru.VinADCGainLv, RIS_ADC_VIN, spi_ADC_rxbuf);
+    ADC_rxbuf = MEASURE_VOLT();
+    MEAS_VIN(wm) = DecodeADCValue(instru.VinADCGainLv, RIS_ADC_VIN, ADC_rxbuf);
     if (instru.VinADCAutoGainEn) {
         AutoGainChangeVin(MEAS_VIN(wm));
     } else {
@@ -253,8 +251,8 @@ static void read_Vout_change_gain(void)
     void *wm = wm_get();
 
     /* read Vout and do NOT record the Vout after changing gain twice */
-    read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
-    MEAS_VOUT(wm) = DecodeADCValue(0, RIS_ADC_VOUT, spi_ADC_rxbuf);
+    ADC_rxbuf = MEASURE_DAC();
+    MEAS_VOUT(wm) = DecodeADCValue(0, RIS_ADC_VOUT, ADC_rxbuf);
 
     if (volt_rec_en == false) {
         rec_cnt++;
@@ -431,7 +429,7 @@ static void Iin_Vin_Vout_Plot(uint32_t time)
     if (batteryCheck_flag && tempCheck_flag) {
         read_adc_flag = EliteADCBattery();
         if (!read_adc_flag) {
-             read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+            ADC_rxbuf = MEASURE_CURRENT();
             ADC_cnt = 5;
         }
 
@@ -463,7 +461,7 @@ static void Iin_Vin_Vout_Plot(uint32_t time)
         ADC_cnt++;
 
     } else if (ADC_cnt == 1) {
-        read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_VOLT();
         ADC_cnt++;
 
     } else if (ADC_cnt == 2) {
@@ -472,7 +470,7 @@ static void Iin_Vin_Vout_Plot(uint32_t time)
         ADC_cnt++;
 
     } else if (ADC_cnt == 3) {
-        read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_DAC();
         ADC_cnt++;
 
     } else if (ADC_cnt == 4) {
@@ -481,7 +479,7 @@ static void Iin_Vin_Vout_Plot(uint32_t time)
         ADC_cnt++;
 
     } else if (ADC_cnt == 5) {
-        read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_CURRENT();
         ADC_cnt = 0;
     }
 
@@ -498,7 +496,7 @@ static void Iin_Vin_Plot(void)
     if (batteryCheck_flag && tempCheck_flag) {
         read_adc_flag = EliteADCBattery();
         if (!read_adc_flag) {
-            read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+            ADC_rxbuf = MEASURE_CURRENT();
             ADC_cnt = 3;
         }
 
@@ -519,7 +517,7 @@ static void Iin_Vin_Plot(void)
         ADC_cnt++;
 
     } else if (ADC_cnt == 1) {
-        read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_VOLT();
         ADC_cnt++;
 
     } else if (ADC_cnt == 2) {
@@ -528,7 +526,7 @@ static void Iin_Vin_Plot(void)
         ADC_cnt++;
 
     } else if (ADC_cnt == 3) {
-        read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_CURRENT();
         ADC_cnt = 0;
     }
 
@@ -549,7 +547,7 @@ static void IT_Plot(uint32_t time)
     if (batteryCheck_flag || tempCheck_flag) {
         read_adc_flag = EliteADCBattery();
         if (!read_adc_flag) {
-            read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+            ADC_rxbuf = MEASURE_CURRENT();
             ADC_cnt = 1;
         }
 
@@ -560,7 +558,7 @@ static void IT_Plot(uint32_t time)
      *           1 - read Iin and reset ADC_cnt
      */
     if (ADC_cnt == 0) {
-        read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_CURRENT();
         ADC_cnt++;
 
         return;
@@ -592,7 +590,7 @@ static void VT_Plot(void)
     if (batteryCheck_flag && tempCheck_flag) {
         EliteADCBattery();
         if (!batteryCheck_flag) {
-            read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+            ADC_rxbuf = MEASURE_VOLT();
             ADC_cnt = 1;
         }
 
@@ -603,7 +601,7 @@ static void VT_Plot(void)
      *           1 - read Vin and reset ADC_cnt
      */
     if (ADC_cnt == 0) {
-        read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_VOLT();
         ADC_cnt++;
 
         return;
@@ -629,7 +627,7 @@ static void Vout_Plot(void)
     if (batteryCheck_flag && tempCheck_flag) {
         EliteADCBattery();
         if (!batteryCheck_flag) {
-            read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
+            ADC_rxbuf = MEASURE_DAC();
             ADC_cnt = 1;
         }
 
@@ -640,7 +638,7 @@ static void Vout_Plot(void)
      *           1 - read Vout and reset ADC_cnt
      */
     if (ADC_cnt == 0) {
-        read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_DAC();
         ADC_cnt++;
 
         return;
@@ -675,8 +673,8 @@ static void cali_IT_plot(void) {
         if (instru.IinADCAutoGainEn) {
             MEAS_CURR(wm) = 0xFFFF;
         } else {
-            read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
-            MEAS_CURR(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            ADC_rxbuf = MEASURE_CURRENT();
+            MEAS_CURR(wm) = (int32_t) ADC_rxbuf;
             if (lastIinADCGainLevel != instru.IinADCGainLv) {
                 IinADCGainCtrl(instru.IinADCGainLv);
             }
@@ -713,13 +711,15 @@ static void cali_IT_plot(void) {
             } else {
                 cali_count++;
                 ADCValueSUM = ADCValueSUM + MEAS_CURR(wm);
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-                InputNotify(NOTIFY_VOLT, ADCValueSUM);
+                ADCValueAVG = ADCValueSUM / cali_count;
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                InputNotify(NOTIFY_VOLT, MEAS_CURR(wm));
                 InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
             }
         }
 
         if (rec_cnt == 2) {
+            volt_rec_en = true;
             curr_rec_en = true;
             rec_cnt = 0;
         }
@@ -729,14 +729,14 @@ static void cali_IT_plot(void) {
     }
 
     if (ADC_cnt == 1) {
-        read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_CURRENT();
         ADC_cnt++;
 
         return;
     }
 
     if (ADC_cnt == 2) {
-        read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_CURRENT();
         ADC_cnt = 0;
 
         return;
@@ -763,8 +763,8 @@ static void cali_VT_plot(void) {
         if (instru.VinADCAutoGainEn) {
             MEAS_VIN(wm) = 0xFFFF;
         } else {
-            read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
-            MEAS_VIN(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+            ADC_rxbuf = MEASURE_VOLT();
+            MEAS_VIN(wm) = (int32_t) ADC_rxbuf;
             if (lastVinADCGainLv != instru.VinADCGainLv) VinADCGainCtrl(instru.VinADCGainLv);
         }
 
@@ -794,19 +794,21 @@ static void cali_VT_plot(void) {
 
                 PeriodicEvent = false;
                 ADCValueSUM = 0;
-                cali_count = 0;
+                cali_count = 0;                    
                 ModeLED(NO_EVENT);
             } else {
                 cali_count++;
                 ADCValueSUM = ADCValueSUM + MEAS_VIN(wm);
+                ADCValueAVG = ADCValueSUM / cali_count;
                 InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
                 InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
             }
         }
 
         if (rec_cnt == 2) {
             volt_rec_en = true;
+            curr_rec_en = true;
             rec_cnt = 0;
         }
         ADC_cnt++;
@@ -815,14 +817,14 @@ static void cali_VT_plot(void) {
     }
 
     if (ADC_cnt == 1) {
-        read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_VOLT();
         ADC_cnt++;
 
         return;
     }
 
     if (ADC_cnt == 2) {
-        read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_VOLT();
         ADC_cnt = 0;
 
         return;
@@ -830,24 +832,24 @@ static void cali_VT_plot(void) {
 
     return;
 }
-static void cali_Vout_plot(void) {
+static void cali_Vout_plot() {
     void *wm = wm_get();
-
     static int32_t ADCValueSUM = 0;
     static uint16_t cali_count = 0;
     static uint8_t ADC_cnt = 0;
     static uint8_t rec_cnt = 0;
-    uint16_t cali_count_max = 1000;
+    uint16_t cali_count_max = 2000;
     int32_t ADCValueAVG = 0;
-
     /* ADC_cnt:  0 - read Vin and do NOT buffer the Vin after changing gain twice
      *           1 - read Vin and increase ADC_cnt
      *           2 - read Vin and reset ADC_cnt
      */
+    if(vscanReset)
+        return;
     if (ADC_cnt == 0) {
 
-        read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
-        MEAS_VOUT(wm) = (int32_t) (spi_ADC_rxbuf[0] << 8) | (int32_t) (spi_ADC_rxbuf[1]);
+        ADC_rxbuf = MEASURE_DAC();
+        MEAS_VOUT(wm) = (int32_t) ADC_rxbuf;
 
         if (volt_rec_en == false) {
            rec_cnt++;
@@ -855,9 +857,9 @@ static void cali_Vout_plot(void) {
             if (cali_count >= cali_count_max) {
                 ADCValueAVG = ADCValueSUM / cali_count;
 
-                InputNotify(NOTIFY_VOLT, ADCValueAVG);
+                InputNotify(NOTIFY_VOLT, ADCValueAVG); 
                 SendNotify();
-
+                
                 uint8_t CIS_buf[9]   = {0};
                 CIS_buf[0] = 5; //data len
                 CIS_buf[1] = instru.chip_id;
@@ -866,7 +868,7 @@ static void cali_Vout_plot(void) {
                 CIS_buf[4] = 0x00;
                 CIS_buf[5] = instru.VinADCGainLv;
                 SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
-
+                //HIGH_Z_OPEN();
                 PeriodicEvent = false;
                 ADCValueSUM = 0;
                 cali_count = 0;
@@ -874,14 +876,16 @@ static void cali_Vout_plot(void) {
             } else {
                 cali_count++;
                 ADCValueSUM = ADCValueSUM + MEAS_VOUT(wm);
+                ADCValueAVG = ADCValueSUM / cali_count;
                 InputNotify(NOTIFY_VOLT, MEAS_VOUT(wm));
-                InputNotify(NOTIFY_CURRENT, ADCValueSUM);
-                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);
+                InputNotify(NOTIFY_CURRENT, ADCValueAVG);
+                InputNotify(NOTIFY_IMPEDANCE, (int32_t)cali_count);        
             }
         }
 
         if (rec_cnt == 2) {
             volt_rec_en = true;
+            curr_rec_en = true;
             rec_cnt = 0;
         }
         ADC_cnt++;
@@ -890,14 +894,14 @@ static void cali_Vout_plot(void) {
     }
 
     if (ADC_cnt == 1) {
-        read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_DAC();
         ADC_cnt++;
 
         return;
     }
 
     if (ADC_cnt == 2) {
-        read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
+        ADC_rxbuf = MEASURE_DAC();
         ADC_cnt = 0;
 
         return;

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

@@ -1,9 +0,0 @@
-#ifndef HEADSTAGE_POWER_H
-#define HEADSTAGE_POWER_H
-
-#include <ti/drivers/Power.h>
-#include <ti/drivers/power/PowerCC26XX.h>
-
-#define headstage_power_shutdown() Power_shutdown(NULL, 0)
-
-#endif // HEADSTAGE_POWER_H

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

@@ -3,10 +3,10 @@
 #define VERSION_DATE
 
 #define VERSION_DATE_YEAR      22
-#define VERSION_DATE_MONTH     4
-#define VERSION_DATE_DAY       13
-#define VERSION_DATE_HOUR      14
-#define VERSION_DATE_MINUTE    16
+#define VERSION_DATE_MONTH     8
+#define VERSION_DATE_DAY       15
+#define VERSION_DATE_HOUR      18
+#define VERSION_DATE_MINUTE    30
 
 // this is NOT the version hash !!
 // it's the last version hash

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

@@ -487,20 +487,6 @@ static uint8_t ins_buf[BLE_INS_BUFF_SIZE] = {0};
 static uint8_t not_buf[BLE_DAT_BUFF_SIZE] = {0};
 static uint8_t cis_buf[BLE_CIS_BUFF_SIZE] = {0};
 
-/**
- *  Latch initialize
- */
-#define LATCH_BUFF_SIZE  8      // define latch
-struct _LH{
-    bool LATCH0[LATCH_BUFF_SIZE];
-    bool LATCH1[LATCH_BUFF_SIZE];
-    bool LATCH2[LATCH_BUFF_SIZE];
-    uint8_t LoadState;
-} LH= {0};
-static void InitLH();
-static void Init_Elite15_PIN();
-
-
 static Clock_Struct    periodicClock;
 static bool            PeriodicEvent     = false;
 static bool            InitPeriodicEvent = true;
@@ -571,20 +557,16 @@ static bool     stiFirstTime;
 static uint8_t  lastVinADCGainLv;
 static uint8_t  lastIinADCGainLevel;
 
-static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow);
+// static void update_latch_status (uint32_t latch_num, uint32_t elite_pin, bool highlow);
 
 // ADC function
 static void    headstage_battery_volt();
 static bool    EliteADCBattery();
 static void    VinADCGainCtrl(uint8_t VinADCLevel);
 static void    VoutGainControl(uint8_t VOUTLevel);
-static void PIN15_setOutputValue (uint32_t latch_num, uint32_t pin_num, bool highlow);
 
 // Elite key detection & turn on/ shutdown function (peripheral hardware control)
-static void Elite_led_color(uint16_t color);
 static void ModeLED(uint16_t modeStatus);
-static bool If10Von = false;
-static void TurnOn10V();
 
 // periodic event control
 static void EliteADCControl(uint32_t time);
@@ -609,27 +591,15 @@ static void initDATBuf();
 #include "EliteADC.h"
 #include "EliteInstruction.h"
 #include "EliteDAC.h"
-#include "EliteSPI.h"
-#include "Elite_PIN.h"
-#include "Elite15_PIN.h"
-
-#ifdef ELITE_VERSION_1_4
-#include "EliteI2C.h"
-#endif
-
 #include "EliteDeviceCorrection.h"
 #include "EliteNotify.h"
-#include "EliteFlagCTInit.h"
-#include "EliteLatchInit.h"
 #include "EliteReset.h"
 #include "EliteLED.h"
-#include "EliteKeyDetect.h"
 #include "Elite_mode_ADC_DAC.h"
 #include "scan_volt.h"
 #include "impedance_meter.h"
 #include "Elite_version.h"
 #include "Elite_batt.h"
-#include "Elite_power.h"
 
 // update instruction for Z meter
 static void update_ZM_instruction(uint8 *ins) {
@@ -657,7 +627,7 @@ static void update_ZM_instruction(uint8 *ins) {
             STEP_TO_VSETRATE(instru.step);
             instru.VsetRate      = VsetRateTable[instru.VsetRateIndex];//N
             instru.cycleNumber   = 1;
-            instru.hign_z_en     = ~(ins[11] & 0x0F);
+            instru.hign_z_en     = ins[11] & 0x0F;
             instru.notifyRate    = ((uint32_t)ins[12] << 8) | (uint32_t)ins[13];
             instru.notifyRate    = 10000 / instru.notifyRate * 10;
 
@@ -688,7 +658,7 @@ static void update_ZM_instruction(uint8 *ins) {
             STEP_TO_VSETRATE(instru.step);
             instru.VsetRate      = VsetRateTable[instru.VsetRateIndex];//N
             instru.cycleNumber   = ((uint16_t)(ins[10]) << 8) | (uint16_t)(ins[11]);
-            instru.hign_z_en     = ~(ins[13] & 0x0F);
+            instru.hign_z_en     = ins[13] & 0x0F;
             instru.notifyRate    = ((uint32_t)ins[14] << 8) | (uint32_t)ins[15];
             instru.notifyRate    = 10000 / instru.notifyRate * 10;
 
@@ -705,10 +675,10 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case CURVE_VO: {
-            instru.eliteFxn      = CURVE_VO;
+            instru.eliteFxn      = CURVE_VO; //0x3000037530000103E8
             instru.Ve1           = ((uint16_t)ins[3] << 8) | (uint16_t)ins[4];
             instru.Vinit         = (int32_t)instru.Ve1;
-            instru.hign_z_en     = ~(ins[6] & 0x0F);
+            instru.hign_z_en     = ins[6] & 0x0F;
 
             if(instru.Ve1 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && instru.Ve1 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
                 instru.VoutGainLv = VOUT_GAIN_15K;
@@ -731,7 +701,7 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.VsetRate      = 2;
             instru.Ve1           = ((uint16_t)ins[3] << 8) | (uint16_t)ins[4];
             instru.Vinit         = (int32_t)instru.Ve1;
-            instru.hign_z_en     = ~(ins[6] & 0x0F);
+            instru.hign_z_en     = ins[6] & 0x0F;
 
             if(instru.Ve1 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && instru.Ve1 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
                 instru.VoutGainLv = VOUT_GAIN_15K;
@@ -748,7 +718,7 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.eliteFxn      = CURVE_VT;
             instru.notifyRate    = ((uint32_t)ins[5] << 8) | (uint32_t)ins[6];
             instru.notifyRate    = 10000 / instru.notifyRate * 10;
-            instru.hign_z_en     = ~(ins[4] & 0x0F);
+            instru.hign_z_en     = ins[4] & 0x0F;
 
             ModeLED(WORKING);
 
@@ -761,7 +731,7 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.notifyRate    = 10000 / instru.notifyRate * 10;
             instru.Ve1           = ((uint16_t)ins[3] << 8) | (uint16_t)ins[4];
             instru.Vinit         = (int32_t)instru.Ve1;
-            instru.hign_z_en     = ~(ins[6] & 0x0F);
+            instru.hign_z_en     = ins[6] & 0x0F;
 
             if(instru.Ve1 < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && instru.Ve1 > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
                 instru.VoutGainLv = VOUT_GAIN_15K;
@@ -782,7 +752,9 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.constantCurrent = (uint32_t)(ins[4])  << 24 | (uint32_t)(ins[5]) << 16 | (uint32_t)(ins[6]) << 8 | (uint32_t)(ins[7]);
             instru.Vmax            = (uint32_t)(ins[8])  << 8  | (uint32_t)(ins[9]);
             instru.Vmin            = (uint32_t)(ins[10]) << 8  | (uint32_t)(ins[11]);
-            instru.hign_z_en       = ~(ins[13] & 0x0F);
+            instru.hign_z_en       = ins[13] & 0x0F;
+            instru.cc_resistance   = ins[16] & 0xF0;   // 0:vout has 0R 1:vout has 100R
+            instru.cc_cp_speed     = ins[16] & 0x0F;   // 0:low 1:normal 2:high
 
             instru.VoutGainLv   = VOUT_GAIN_240K;
 
@@ -821,7 +793,7 @@ static void update_ZM_instruction(uint8 *ins) {
                 instru.cycleNumber = ((uint16_t)(ins[4]) << 8) | (uint16_t)(ins[5]);
                 instru.notifyRate  = (uint32_t)(ins[8]) << 8 | (uint32_t)(ins[9]);
                 instru.notifyRate  = 10000 / instru.notifyRate * 10;
-                instru.hign_z_en   = ~(ins[7] & 0x0F);
+                instru.hign_z_en   = ins[7] & 0x0F;
 
                 instru.VoutGainLv = VOUT_GAIN_240K;
                 ModeLED(WORKING);
@@ -850,7 +822,7 @@ static void update_ZM_instruction(uint8 *ins) {
                 instru.eliteFxn      = CURVE_LSV;
                 instru.notifyRate    = (uint32_t)(ins[6]) << 8 | (uint32_t)(ins[7]);
                 instru.notifyRate    = 10000 / instru.notifyRate * 10;
-                instru.hign_z_en     = ~(ins[5] & 0x0F);
+                instru.hign_z_en     = ins[5] & 0x0F;
 
                 instru.VoutGainLv = VOUT_GAIN_240K;
 
@@ -866,7 +838,7 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.notifyRate  = (uint32_t)(ins[7]) << 8 | (uint32_t)(ins[8]);
             instru.notifyRate  = 10000 / instru.notifyRate * 10;
             instru.VsetRate    = VsetRateTable[0];
-            instru.hign_z_en   = ~(ins[6] & 0x0F);
+            instru.hign_z_en   = ins[6] & 0x0F;
 
             instru.VoutGainLv = VOUT_GAIN_240K;
 
@@ -878,7 +850,7 @@ static void update_ZM_instruction(uint8 *ins) {
             instru.eliteFxn      = CURVE_OCP;
             instru.notifyRate    = ((uint32_t)ins[5] << 8) | (uint32_t)ins[6];
             instru.notifyRate    = 10000 / instru.notifyRate * 10;
-            instru.hign_z_en     = 0;
+            instru.hign_z_en     = ins[4] & 0x0F;;
 
             ModeLED(WORKING);
 
@@ -898,10 +870,11 @@ static void update_ZM_instruction(uint8 *ins) {
                     instru.IinADCGainLv = ins[4];
                     if (instru.IinADCGainLv != I_GAIN_AUTO) {
                         instru.IinADCAutoGainEn = 0;
+                        //IinADCGainCtrl(instru.IinADCGainLv);
                     } else {
                         instru.IinADCAutoGainEn = 1;
                         instru.IinADCGainLv = I_GAIN_100R;
-                        IinADCGainCtrl(instru.IinADCGainLv);
+                        //IinADCGainCtrl(instru.IinADCGainLv);
                     }
                     break;
                 }
@@ -912,27 +885,30 @@ static void update_ZM_instruction(uint8 *ins) {
                     } else {
                         instru.VinADCAutoGainEn = 1;
                         instru.VinADCGainLv = VIN_GAIN_1K;
-                        VinADCGainCtrl(instru.VinADCGainLv);
+                        //VinADCGainCtrl(instru.VinADCGainLv);
                     }
                     break;
                 }
                 case RIS_DAC_VOUT : {
-//                    instru.VoutGainLv = ins[4];
-//                    if(instru.VoutGainLv == VOUT_GAIN_AUTO){
-//                        instru.VoutGainLv = VOUT_GAIN_15K;
-//                    }
                     instru.VoutGainLv = ins[4];
-                    VoutGainControl(instru.VoutGainLv);
+                    //VoutGainControl(instru.VoutGainLv);
                     break;
                 }
                 case RIS_HIGH_Z : {
                     switch(ins[4]) {
                         case 0x00 : {
-                            PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 0 => open high_z mode
+                            if (PeriodicEvent) {
+                                //latch_single_ctrl(E_LATCH_HIGH_Z, 0);   // 0 => open high_z mode
+                                HIGH_Z_OPEN();                            
+                            }
+                            
                             break;
                         }
                         case 0x01 : {
-                            PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
+                            if (PeriodicEvent) {
+                                //latch_single_ctrl(E_LATCH_HIGH_Z, 1);   // 1 => close high_z mode
+                                HIGH_Z_CLOSE();
+                            }
                             break;
                         }
                         default : {
@@ -948,28 +924,47 @@ static void update_ZM_instruction(uint8 *ins) {
             break;
         }
 
-        case CURVE_CALI_ADC: {
-            switch(ins[3]) {
+        case CURVE_CALI: {
+            switch(ins[3]) {             
                 case RIS_ADC_IIN : {             // 0x00
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_ADC_IIN;
                     instru.notifyRate    = 1000;
                     ModeLED(WORKING);
                     break;
                 }
                 case RIS_ADC_VIN : {             // 0x01
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_ADC_VIN;
                     instru.notifyRate    = 1000;
                     ModeLED(WORKING);
                     break;
                 }
                 case RIS_DAC_VOUT : {             // 0x02
-                    instru.eliteFxn      = CURVE_CALI_ADC;
+                    instru.eliteFxn      = CURVE_CALI;
                     instru.AdcChannel    = RIS_DAC_VOUT;
                     instru.notifyRate    = 1000;
-                    instru.VoltConstant  = ( ((uint16_t)(ins[4])) << 8) | (uint16_t)(ins[5]);      // output voltage
-                    DAC_outputV(instru.VoltConstant); //UserCode -> DAC code -> DAC out
+                    instru.hign_z_en = 1;
+                    
+                    switch(ins[4]) {
+                        case 0x00: {
+                            instru.VoltConstant = 0x2710;
+                            break;
+                        }
+                        case 0x01: {
+                            instru.VoltConstant =  0x61A8;
+                            break;
+                        }
+                        case 0x02: {
+                            instru.VoltConstant = 0xC350;
+                            break;
+                        }
+                        case 0x03: {
+                            instru.VoltConstant =  0xEA60;
+                            break;
+                        }
+                    }
+                    DAC0_W_T(instru.VoltConstant);    
                     ModeLED(WORKING);
                     break;
                 }
@@ -980,44 +975,6 @@ static void update_ZM_instruction(uint8 *ins) {
             break;
         }
 
-        case CURVE_PULSE: {
-            instru.VoutGainLv = VOUT_GAIN_240K;
-            instru.notifyRate    = 100;
-            if (ins[3] == PARA_1) {
-                instru.sti_t1    = (int32_t)(ins[4]) << 24 | (int32_t)(ins[5]) << 16 | (int32_t)(ins[6]) << 8 | (int32_t)(ins[7]);
-                instru.sti_t2    = (int32_t)(ins[8]) << 24 | (int32_t)(ins[9]) << 16 | (int32_t)(ins[10]) << 8 | (int32_t)(ins[11]);
-                instru.sti_t3    = (int32_t)(ins[12]) << 24 | (int32_t)(ins[13]) << 16 | (int32_t)(ins[14]) << 8 | (int32_t)(ins[15]);
-                instru.sti_t4    = (int32_t)(ins[16]) << 24 | (int32_t)(ins[17]) << 16 | (int32_t)(ins[18]) << 8 | (int32_t)(ins[19]);
-            } else if (ins[3] == PARA_2) {
-                instru.sti_t5    = (int32_t)(ins[4]) << 24 | (int32_t)(ins[5]) << 16 | (int32_t)(ins[6]) << 8 | (int32_t)(ins[7]);
-                instru.sti_v1    = 25000; //8~11
-                instru.sti_v2    = 50000; //12~15  //41406.43161.
-                instru.sti_v3    = 25000; //16~19
-            } else if (ins[3] == PARA_3) {
-                instru.sti_v4    = 25000; //4~7
-                instru.sti_v5    = 25000; //8~11
-                instru.sti_cy    = (uint16_t)(ins[12]); //12
-                instru.sti_loop  = (uint16_t)(ins[13]); //13
-            } else if (ins[3] == PARA_4) {
-                instru.sti_t6    = (int32_t)(ins[4]) << 24 | (int32_t)(ins[5]) << 16 | (int32_t)(ins[6]) << 8 | (int32_t)(ins[7]); //4~7
-                instru.sti_t7    = (int32_t)(ins[8]) << 24 | (int32_t)(ins[9]) << 16 | (int32_t)(ins[10]) << 8 | (int32_t)(ins[11]); //8~11
-                instru.sti_v6    = 25000; //12~15
-                instru.sti_v7    = 25000;; //16~19
-                instru.sti_t1    = VALUE_ZERO_TO_ONE(instru.sti_t1);
-                instru.sti_t2    = VALUE_ZERO_TO_ONE(instru.sti_t2);
-                instru.sti_t3    = VALUE_ZERO_TO_ONE(instru.sti_t3);
-                instru.sti_t4    = VALUE_ZERO_TO_ONE(instru.sti_t4);
-                instru.sti_t5    = VALUE_ZERO_TO_ONE(instru.sti_t5);
-                instru.sti_t6    = VALUE_ZERO_TO_ONE(instru.sti_t6);
-                instru.sti_t7    = VALUE_ZERO_TO_ONE(instru.sti_t7);
-                megaStiEnable         = true;
-            } else if (ins[3] == PARA_17) {
-                instru.eliteFxn  = CURVE_PULSE;
-                ModeLED(WORKING);
-            }
-            break;
-        }
-
         case CURVE_UNI_PULSE: {
             if (ins[3] == PARA_1) {
                 uint8_t seg_index             = ins[12];
@@ -1058,6 +1015,7 @@ static void update_ZM_instruction(uint8 *ins) {
 
             } else if (ins[3] == PARA_FINAL) {
                 instru.eliteFxn       = CURVE_UNI_PULSE;
+                instru.hign_z_en     = ins[5] & 0x0F;
 
                 instru.VoutGainLv = VOUT_GAIN_240K;
 
@@ -1122,6 +1080,8 @@ static void update_ZM_instruction(uint8 *ins) {
                 dpv_curr_rec_percent_max[1] = (uint32_t)ins[11];
 
             } else if (ins[3] == PARA_FINAL) {
+                instru.hign_z_en     = ins[5] & 0x0F;
+
                 dpv_e_init = UC_TO_5NV(dpv_e_init);
                 dpv_e_final = UC_TO_5NV(dpv_e_final);
                 dpv_amp = UC_TO_5NV(dpv_amp);
@@ -1230,6 +1190,8 @@ static void update_ZM_instruction(uint8 *ins) {
                 dpv_cycle = (uint16_t)ins[9] << 8 | (uint16_t)ins[10];
 
             } else if (ins[3] == PARA_FINAL) {
+                instru.hign_z_en     = ins[5] & 0x0F;
+
                 dpv_e_init = UC_TO_5NV(dpv_e_init);
                 dpv_e_final = UC_TO_5NV(dpv_e_final);
                 dpv_amp = UC_TO_5NV(dpv_amp);
@@ -1346,7 +1308,8 @@ static void update_ZM_instruction(uint8 *ins) {
                 switch (ins[3]){
                     case DAC_VOLT:
                         value = (ins[4] << 8) | ins[5]; // usercode
-
+                        
+                        
                         if(value < DAC_VOUT_GAIN_LARGE_BOUNDARY_USERCODE && value > DAC_VOUT_GAIN_LARGE_BOUNDARY1_USERCODE){
                             instru.VoutGainLv = VOUT_GAIN_15K;
                         } else {
@@ -1413,15 +1376,42 @@ static void update_ZM_instruction(uint8 *ins) {
                 }
 
                 case LED_DEV_TEST: {
-                    if (ins[4] == 0) {
-                        Elite_led_color(ins[5]);
-                    } else if (ins[4] == 1) {
-                        LED_color(LIGHTLED, ins[5], ins[6], ins[7]);
-                    } else if (ins[4] == 2) {
-                        LED_color(DARKLED, ins[5], ins[6], ins[7]);
-                    }
+                    led_rainbow(LED_BR_LV8);
                     break;
                 }
+
+                case 0x90 : {
+
+                    led_rainbow(LED_BR_LV8);
+                    VoutGainControl(0x00);
+                    
+                    
+                    HIGH_Z_CLOSE();
+
+
+
+                    uint16_t volts  = ( ((uint16_t)(ins[4])) << 8) | (uint16_t)(ins[5]);
+                    dac_write_through_mode(0x01, 0x01, volts);
+
+                    //CPUdelay(32000000);
+                    led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_BLUE);
+                    CPUdelay(32000000);
+                    ADC_rxbuf = MEASURE_DAC();
+                    CPUdelay(32000000);
+                    ADC_rxbuf = MEASURE_DAC();
+                    led_rainbow(LED_BR_LV1);
+                    uint8_t CIS_buf[9]   = {0};
+                    CIS_buf[0] = 5; //data len
+                    CIS_buf[1] = instru.chip_id;
+                    CIS_buf[2] = (uint8_t) ((ADC_rxbuf & 0xFF00) >> 8);
+                    CIS_buf[3] = (uint8_t) (ADC_rxbuf & 0x00FF);
+                    CIS_buf[4] = 0x00;
+                    CIS_buf[5] = instru.VinADCGainLv;
+                    SimpleProfile_SetParameter(BLE_CIS_BUFF_CHAR, 9, CIS_buf);
+                    break;
+                }
+
+
             }
             break;
         }
@@ -1459,12 +1449,12 @@ static void update_ZM_instruction(uint8 *ins) {
             PeriodicEvent = true;
             InitPeriodicEvent = true;      // need to create a WorkModeData?
             mode_init         = true;
-            InitGPT();
+            // InitGPT();
             break;
         }
 
         case VIS_FUH: {
-            LED_color(DARKLED, 0x0F, 0x00, 0x0F);
+            led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_MAGENTA);
             break;
         }
 
@@ -1477,15 +1467,15 @@ static void update_ZM_instruction(uint8 *ins) {
         }
 
         case VIS_DEVICE_SHINY: {
-            Elite_led_color(COLOR_PURPLE);
+            led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_PURPLE);
             break;
         }
 
         case VIS_SHINY_DIS: {
             if (PeriodicEvent) {
-                WORKLED();
+                led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_CYAN);
             } else if (!PeriodicEvent) {
-                LEDPowerON();
+                led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_GREEN);
             }
             break;
         }
@@ -1516,11 +1506,6 @@ static void update_ZM_instruction(uint8 *ins) {
 
     case INS_TYPE_CIS: {
         switch (oper) {
-        case 0x00: {
-            I2CWrite(0x01, 0xAB);
-            break;
-        }
-
         case CIS_VERSION: {
             initCISBuf();
             cis_buf[0] = 6; //data len
@@ -1576,7 +1561,6 @@ static void update_ZM_instruction(uint8 *ins) {
 static void ZM_instruction_update_handle(uint8_t characteristic) {
     switch (characteristic) {
     case BLE_INS_BUFF_CHAR:
-        //            LED_color(0xf8, 0x00, 0xFF, 0xFF);
         SimpleProfile_GetParameter(SIMPLEPROFILE_CHAR3, ins_buf);
         update_ZM_instruction(ins_buf);
         break;

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

@@ -32,46 +32,47 @@ static void SimpleBLEPeripheral_clockHandler(UArg arg) {
 //    Semaphore_post(semaphore);  // send samaphore to jump out of infinite waiting(simple_peripheral.c line570)
 
 }
-static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
-    events |= SBP_PERIODIC_EVT;
-    Semaphore_post(semaphore);
-    GPT.GptimerCounter++;
-}
+// static void elite_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask) {
+//     events |= SBP_PERIODIC_EVT;
+//     Semaphore_post(semaphore);
+//     GPT.cnt_gpt++;
+// }
 
 
-static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins);
+// static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins);
 
 static void ZM_init() {
-    set_update_instruction_callback(ZM_update_instruction_callback);
+    // set_update_instruction_callback(ZM_update_instruction_callback);
 
     // initialize
-    pin_handle = PIN_open(&ZM_rst, BLE_IO);
-    Init_Elite15_PIN();
-    ELITE15_SPI_HOLD();
+    gpio_create();
 
-    PIN15_setOutputValue(shutdown_6994, 1);     // OFF = 1 => turn off 6994
-    PIN15_setOutputValue(enable_10v, 0);        // enable 10V
-    PIN15_setOutputValue(HIGH_Z_MODE, 0);       // HIGH Z MODE // 1: close; 0: open;
+    update_latch_stat(E_LATCH_CS_MEM, 1);
+    update_latch_stat(E_LATCH_CS_ADC, 1);
+    update_latch_stat(E_LATCH_CS_DAC, 1);
+    update_latch_stat(E_LATCH_OFF, 1);  // OFF = 1 => turn off 6994
+    latch_multi_ctrl();
 
     InitEliteInstruction();
 
     // init DAC, set output ~= 0 V
     instru.VoutGainLv = VOUT_GAIN_15K;
     VoutGainControl(instru.VoutGainLv);
-    DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+    DAC0_W_T(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
+
 
     /* when elite open, must change vin level,
     measure battery value will be right */
     VinADCGainCtrl(VIN_GAIN_AUTO);
 
     elite_gptimer_open();
-    elite_gptimer_start();
+    //elite_gptimer_start();
 
     //    PIN_registerIntCb(pin_handle, switch_on_callback);
-    //    PIN_setInterrupt(pin_handle, switch_on | PIN_IRQ_POSEDGE);
+    //    PIN_setInterrupt(pin_handle, E_PIN_SHUT_DOWN | PIN_IRQ_POSEDGE);
 }
 
-static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
+// static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, uint8_t *ins) {}
 
 #define IsPeriodicMode() (                       \
 (instru.eliteFxn == CURVE_IV)                 || \
@@ -85,7 +86,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui
 (instru.eliteFxn == CURVE_CA)                 || \
 (instru.eliteFxn == CURVE_VO)                 || \
 (instru.eliteFxn == CURVE_OCP)                || \
-(instru.eliteFxn == CURVE_CALI_ADC)              \
+(instru.eliteFxn == CURVE_CALI)              \
 )
 
 #define Ve1MatchVe2Mode() (                      \
@@ -95,145 +96,30 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t chip_ID, ui
 (instru.eliteFxn == CURVE_LSV)                   \
 )
 
-static void pulse_mode(void)
-{
-     // Default working flow is vscan -> ADC read -> send notify
-     // We will need a flag to control vscan, ADC and notify
-
-     if(mode_init){
-        GPT.SampleRateCounter = instru.sampleRate - 10;
-        GPT.VscanRateCounter  = instru.VsetRate - 1;
-         mode_init       = false;
-         batteryADC_flag = false;
-         volt_rec_en     = true;
-         curr_rec_en     = true;
-         firstTimeReset  = true;
-         notifyFirst_flag = true;
-         //pulsemode variable
-         stiFirstTime  = true;
-         VinADCGainCtrl(instru.VinADCGainLv);
-         IinADCGainCtrl(instru.IinADCGainLv);
-         VoutGainControl(instru.VoutGainLv);
-         if (Ve1MatchVe2Mode()) {
-             if (instru.Ve1 == instru.Ve2) {
-                 DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
-                 PeriodicEvent = false;
-                 PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                 ModeLED(NO_EVENT);
-             }
-         } else if (instru.eliteFxn == CURVE_PULSE) {
-             if(!megaStiEnable){
-                  PeriodicEvent = false;
-                  PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                  ModeLED(NO_EVENT);
-             }
-         }
-     }
-
-
-     GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-     if(leadTimeReset && GPT.LeadTimeCounter <= 2000){
-         vscanReset = true;
-     }else{
-         if(notifyFirst_flag){
-             GPT.NotifyCounter = instru.notifyRate - 20;
-             notifyFirst_flag = false;
-         }
-         vscanReset = false;
-         leadTimeReset = false;
-     }
-
-    //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    //pulse mode counter
-    GPT.StiCounter = GPT.StiCounter + GPT.DeltaGptimerCounter;
-    if (vscanReset) {
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
-        //vscanReset = false;
-    }else{
-        if (megaStiEnable) {
-            pulse_vscan();
-        }
-    }
-
-     //battery counter
-     GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-     GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
-     if(GPT.BatteryCheckCounter >= 50000){
-         GPT.BatteryCheckCounter -= 50000; //To get right time
-         batteryCheck_flag = true;
-         tempCheck_flag = true;
-
-        if ((instru.eliteFxn == CURVE_IV) ||
-                (instru.eliteFxn == CURVE_IV_CY) ||
-                (instru.eliteFxn == CURVE_CC) ||
-                (instru.eliteFxn == CURVE_CV) ||
-                (instru.eliteFxn == CURVE_LSV) ||
-                (instru.eliteFxn == CURVE_CA) ||
-                (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
-                (instru.eliteFxn == CURVE_UNI_PULSE) ||
-                (instru.eliteFxn == CURVE_DPV) ||
-                (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-                (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
-            batteryCheck_flag = false;
-            tempCheck_flag = false;
-
-        }
-     }
-
-     uint16_t bat = NotifyVoltBat;
-     if( bat < 768 && bat > 20){
-         PIN15_setOutputValue(enable_5v, 0);
-     }
-
-     //ADC counter
-     GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-     if(GPT.SampleRateCounter >= instru.sampleRate){
-         GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-         EliteADCControl(0);
-     }
-
-     //Notify counter(Notify control, check if we need to send notify)
-     //please don't put Notify counter before ADC counter, maybe get wrong data
-     GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-     if(GPT.NotifyCounter >= instru.notifyRate){
-         GPT.NotifyCounter -= instru.notifyRate; //To get right time
-         notify_flag = true;
-         if(vscanReset){
-             notify_flag = false;
-         }
-         if(notify_flag){
-             SendNotify();
-             notify_flag = false;
-         }
-     }
-
-     mode_done();
-
-}
-
 static void peri_mode(void)
 {
 
 
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
+    GPT.cnt_lead_time = GPT.cnt_lead_time + GPT.cnt_gpt_delta;
+    if (leadTimeReset && GPT.cnt_lead_time <= 2000) {
         vscanReset = true;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
+        if (first_highz_flag && GPT.cnt_lead_time >= 1000) {
             if (instru.eliteFxn == CURVE_OCP) {
-                PIN15_setOutputValue(HIGH_Z_MODE, 0);
+                HIGH_Z_OPEN(); // HIGH Z MODE // 1: close; 0: open;
             } else {
-                PIN15_setOutputValue(HIGH_Z_MODE, 1); // HIGH Z MODE // 1: close; 0: open;
+                //latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+                if(instru.hign_z_en == 1) {
+                    HIGH_Z_CLOSE();
+                }
+                else{
+                    HIGH_Z_OPEN();            
+                }  
             }
             first_highz_flag = false;
         }
     } else {
         if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
+            GPT.cnt_notify_rate = instru.notifyRate - 20;
             notifyFirst_flag = false;
         }
         vscanReset = false;
@@ -241,20 +127,20 @@ static void peri_mode(void)
     }
 
     //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.VsetRate) {
-        if (GPT.VscanRateCounter >= instru.VsetRate * 2) {
-            GPT.GptimerMultiple = GPT.VscanRateCounter / instru.VsetRate;
+    GPT.cnt_v_scan_rate = GPT.cnt_v_scan_rate + GPT.cnt_gpt_delta;
+    if (GPT.cnt_v_scan_rate >= instru.VsetRate) {
+        if (GPT.cnt_v_scan_rate >= instru.VsetRate * 2) {
+            GPT.GptimerMultiple = GPT.cnt_v_scan_rate / instru.VsetRate;
         } else {
             GPT.GptimerMultiple = 1;
         }
-        GPT.VscanRateCounter -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
+        GPT.cnt_v_scan_rate -= instru.VsetRate * GPT.GptimerMultiple; //To get right time
         vscan_ctrl(0);
     }
 
     //battery counter
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.cnt_gpt_delta;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.cnt_gpt_delta;
     if(GPT.BatteryCheckCounter >= 50000){
         GPT.BatteryCheckCounter -= 50000; //To get right time
         batteryCheck_flag = true;
@@ -266,13 +152,12 @@ static void peri_mode(void)
                 (instru.eliteFxn == CURVE_LSV) ||
                 (instru.eliteFxn == CURVE_CA) ||
                 (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
                 (instru.eliteFxn == CURVE_UNI_PULSE) ||
                 (instru.eliteFxn == CURVE_DPV) ||
                 (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
+                (instru.eliteFxn == CURVE_CALI)) {
             batteryCheck_flag = false;
             tempCheck_flag = false;
 
@@ -281,27 +166,27 @@ static void peri_mode(void)
 
     uint16_t bat = NotifyVoltBat;
     if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
+//            latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
     }
 
     //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
+    GPT.cnt_adc_rate = GPT.cnt_adc_rate + GPT.cnt_gpt_delta;
+    if(GPT.cnt_adc_rate >= instru.sampleRate){
+        GPT.cnt_adc_rate = 0; //To get right data, ADC must be delay 1.5ms
         EliteADCControl(0);
     }
 
     // Over temperature protection
     uint16_t CC2650temp = NotifyTemperature;
     if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
+        latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
     }
 
     //Notify counter(Notify control, check if we need to send notify)
     //please don't put Notify counter before ADC counter, maybe get wrong data
-    GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-    if(GPT.NotifyCounter >= instru.notifyRate){
-        GPT.NotifyCounter -= instru.notifyRate; //To get right time
+    GPT.cnt_notify_rate = GPT.cnt_notify_rate + GPT.cnt_gpt_delta;
+    if(GPT.cnt_notify_rate >= instru.notifyRate){
+        GPT.cnt_notify_rate -= instru.notifyRate; //To get right time
         notify_flag = true;
         if(vscanReset){
             notify_flag = false;
@@ -326,22 +211,22 @@ static void uni_pulse_mode(void)
     // Default working flow is vscan -> ADC read -> send notify
     // We will need a flag to control vscan, ADC and notify
 
-    GPT.LeadTimeCounter = GPT.LeadTimeCounter + GPT.DeltaGptimerCounter;
-    if (leadTimeReset && GPT.LeadTimeCounter <= 2000) {
+    GPT.cnt_lead_time = GPT.cnt_lead_time + GPT.cnt_gpt_delta;
+    if (leadTimeReset && GPT.cnt_lead_time <= 2000) {
         vscanReset = true;
-        GPT.VscanRateCounter = 0xFFFFFFFF;
+        GPT.cnt_v_scan_rate = 0xFFFFFFFF;
         dpv_step_cnt = 0;
-        if (first_highz_flag && GPT.LeadTimeCounter >= 1000) {
-            PIN15_setOutputValue(HIGH_Z_MODE, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
+        if (first_highz_flag && GPT.cnt_lead_time >= 1000) {
+            latch_single_ctrl(E_LATCH_HIGH_Z, instru.hign_z_en); // HIGH Z MODE // 1: close; 0: open;
             first_highz_flag = false;
         }
     } else {
         if (notifyFirst_flag) {
-            GPT.NotifyCounter = instru.notifyRate - 20;
+            GPT.cnt_notify_rate = instru.notifyRate - 20;
             notifyFirst_flag = false;
         }
         if (vscanReset) {
-            GPT.VscanRateCounter = 0xFFFFFFFF;
+            GPT.cnt_v_scan_rate = 0xFFFFFFFF;
             dpv_step_cnt = 0;
         }
         vscanReset = false;
@@ -349,16 +234,16 @@ static void uni_pulse_mode(void)
     }
 
     //vscan counter
-    GPT.VscanRateCounter = GPT.VscanRateCounter + GPT.DeltaGptimerCounter;
-    if (GPT.VscanRateCounter >= instru.period) {
-        GPT.VscanRateCounter -= instru.period; //To get right time
+    GPT.cnt_v_scan_rate = GPT.cnt_v_scan_rate + GPT.cnt_gpt_delta;
+    if (GPT.cnt_v_scan_rate >= instru.period) {
+        GPT.cnt_v_scan_rate -= instru.period; //To get right time
         dpv_step_cnt +=1;
     }
-    vscan_ctrl(GPT.VscanRateCounter);
+    vscan_ctrl(GPT.cnt_v_scan_rate);
 
     //battery counter
-    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.cnt_gpt_delta;
+    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.cnt_gpt_delta;
     if(GPT.BatteryCheckCounter >= 50000){
         GPT.BatteryCheckCounter -= 50000; //To get right time
         batteryCheck_flag = true;
@@ -371,13 +256,12 @@ static void uni_pulse_mode(void)
                 (instru.eliteFxn == CURVE_LSV) ||
                 (instru.eliteFxn == CURVE_CA) ||
                 (instru.eliteFxn == CURVE_OCP) ||
-                (instru.eliteFxn == CURVE_PULSE) ||
                 (instru.eliteFxn == CURVE_UNI_PULSE) ||
                 (instru.eliteFxn == CURVE_DPV) ||
                 (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
                 (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
-                (instru.eliteFxn == CURVE_CALI_ADC)) {
+                (instru.eliteFxn == CURVE_CALI)) {
             batteryCheck_flag = false;
             tempCheck_flag = false;
 
@@ -385,21 +269,21 @@ static void uni_pulse_mode(void)
     }
 
     //ADC counter
-    GPT.SampleRateCounter = GPT.SampleRateCounter + GPT.DeltaGptimerCounter;
-    if(GPT.SampleRateCounter >= instru.sampleRate){
-        GPT.SampleRateCounter = 0; //To get right data, ADC must be delay 1.5ms
-        EliteADCControl(GPT.VscanRateCounter);
+    GPT.cnt_adc_rate = GPT.cnt_adc_rate + GPT.cnt_gpt_delta;
+    if(GPT.cnt_adc_rate >= instru.sampleRate){
+        GPT.cnt_adc_rate = 0; //To get right data, ADC must be delay 1.5ms
+        EliteADCControl(GPT.cnt_v_scan_rate);
     }
 
     uint16_t bat = NotifyVoltBat;
     if( bat < 768 && bat > 20){
-//            PIN15_setOutputValue(enable_5v, 0);
+//            latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
     }
 
     // Over temperature protection
     uint16_t CC2650temp = NotifyTemperature;
     if(CC2650temp > 40) {
-        PIN15_setOutputValue(enable_5v, 0);
+        latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
     }
 
     if (instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
@@ -407,9 +291,9 @@ static void uni_pulse_mode(void)
     } else {
         //Notify counter(Notify control, check if we need to send notify)
         //please don't put Notify counter before ADC counter, maybe get wrong data
-        GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
-        if(GPT.NotifyCounter >= instru.notifyRate){
-            GPT.NotifyCounter -= instru.notifyRate; //To get right time
+        GPT.cnt_notify_rate = GPT.cnt_notify_rate + GPT.cnt_gpt_delta;
+        if(GPT.cnt_notify_rate >= instru.notifyRate){
+            GPT.cnt_notify_rate -= instru.notifyRate; //To get right time
             notify_flag = true;
             if (instru.eliteFxn == CURVE_UNI_PULSE) {
                 notify_flag = false;
@@ -436,6 +320,8 @@ static void uni_pulse_mode(void)
 
 static void mode_init_set(void)
 {
+    
+
     batteryADC_flag = false;
     volt_rec_en     = true;
     curr_rec_en     = true;
@@ -472,11 +358,15 @@ static void mode_init_set(void)
     IinADCGainCtrl(instru.IinADCGainLv);
     VoutGainControl(instru.VoutGainLv);
 
+    // if(instru.eliteFxn == CURVE_CALI) {
+    //     volt_rec_en     = true;
+    //     curr_rec_en     = true;
+    // }
     if (Ve1MatchVe2Mode()) {
         if (instru.Ve1 == instru.Ve2) {
-            DAC_outputV(Usercode_Correction_to_DAC(instru.VoutGainLv, instru.Ve1));
+            DAC0_W_T(Usercode_Correction_to_DAC(instru.VoutGainLv, 25000));
             PeriodicEvent = false;
-            PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
+            latch_single_ctrl(E_LATCH_HIGH_Z, 0); // 0: open highz;
             ModeLED(NO_EVENT);
         }
     }
@@ -495,15 +385,15 @@ static void mode_init_set(void)
  */
 static void SimpleBLEPeripheral_performPeriodicTask(void)
 {
-    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
+    // GPT_timerIncrement();
 
     if (IsPeriodicMode()) {
         if (mode_init) {
-            GPT.SampleRateCounter = instru.sampleRate - 10;
-            GPT.VscanRateCounter  = instru.VsetRate - 1;
             mode_init  = false;
             mode_init_set();
+            InitGPT();
+            GPT.cnt_adc_rate = instru.sampleRate - 10;
+            GPT.cnt_v_scan_rate  = instru.VsetRate - 1;
         }
 
         peri_mode();
@@ -515,6 +405,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(void)
         if (mode_init) {
             mode_init = false;
             mode_init_set();
+            InitGPT();
             calc_avg_en = false;
         }
 
@@ -527,6 +418,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(void)
         if (mode_init) {
             mode_init = false;
             mode_init_set();
+            InitGPT();
             calc_avg_en = false;
         }
 
@@ -539,6 +431,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(void)
         if (mode_init) {
             mode_init = false;
             mode_init_set();
+            InitGPT();
         }
 
         uni_pulse_mode();
@@ -628,18 +521,6 @@ static void EliteADCControl(uint32_t time)
             }
             break;
 
-        case CURVE_PULSE:
-            Iin_Vin_Vout_Plot(t);
-            if (curr_rec_en) {
-                InputNotify(NOTIFY_CURRENT, MEAS_CURR(wm));
-            }
-
-            if (volt_rec_en) {
-                InputNotify(NOTIFY_VOLT, MEAS_VIN(wm));
-                InputNotify(NOTIFY_IMPEDANCE, MEAS_VOUT(wm));
-            }
-            break;
-
         case CURVE_IT:
             Iin_Vin_Vout_Plot(t);
             if (curr_rec_en) {
@@ -685,13 +566,16 @@ static void EliteADCControl(uint32_t time)
             }
             break;
 
-        case CURVE_CALI_ADC:
+        case CURVE_CALI:
             if (instru.AdcChannel == RIS_ADC_IIN) {
                 cali_IT_plot();
+                
             } else if (instru.AdcChannel == RIS_ADC_VIN) {
                 cali_VT_plot();
+                
             } else if (instru.AdcChannel == RIS_DAC_VOUT) {
                 cali_Vout_plot();
+                
             }
             break;
 
@@ -743,9 +627,13 @@ static void mode_done(void)
         (instru.eliteFxn == CURVE_DPV) ||
         (instru.eliteFxn == CURVE_DPV_SMPRATE) ||
         (instru.eliteFxn == CURVE_DPV_ADVANCE) ||
-        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE)) {
+        (instru.eliteFxn == CURVE_DPV_ADVANCE_SMPRATE) ||
+        (instru.eliteFxn == CURVE_CALI)) 
+         {
         if (!PeriodicEvent) {
             finishMode = true;
+            
+            // if(!(instru.eliteFxn == CURVE_CALI))
             SendNotify();
             Eliteinterrupt();
         }

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

@@ -179,6 +179,8 @@ static void vo_vscan(void)
 }
 
 #define DELTAVOLTMAX 2000000 //2000000 = 10mV
+#define RESISTANCE_100R     1   // 100V/1A = 1[5nV]/50[pA]
+
 static void cc_vscan(void)
 {
     /* Transform setting CC into IUC
@@ -194,20 +196,27 @@ static void cc_vscan(void)
     int32_t deltaI;
     int32_t deltaV;
     int32_t Iin;
-    int32_t Vin;
+    int32_t Voutin;
+    uint8_t cc_cp_speed = instru.cc_cp_speed; // 0:low 1:normal 2:high
+    uint8_t cc_resistance = instru.cc_resistance; // 0:vout has 0R 1:vout has 100R
+    static int32_t i_set = 0;
 
     if (vscanReset) {
         Vset = 0;
 
         if (cc->_charge == 0) {
-            cc->_Iset = instru.constantCurrent * 200 * (-1);
-            //[50pA] //controller UI 15000uA => Elite 1500000 => 1500000 * 10 * 1000 / 50 [50pA];
+            i_set = cc->_Iset * (-1);
+        } else if(cc->_charge == 1) {
+            i_set = cc->_Iset;
         }
 
         Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        Vin = m->_measureVin * 200; //[5nV]
+        Voutin = m->_measureVout * 200; //[5nV]
 
-        Vset = Vin + cc->_Iset; //[5nV]
+        if (cc_resistance == 1) //vout has 100R
+            Vset = Voutin + (i_set * RESISTANCE_100R); //[5nV]
+        else
+            Vset = Voutin; //[5nV]
 
         if (Vset >= 1100000000) { // 5.5V
             Vset = 1100000000;
@@ -218,10 +227,17 @@ static void cc_vscan(void)
 
     if (!vscanReset) {
         Iin = m->_measureCurrent * 20; //[50pA]   nA => 50pA
-        deltaI = Iin - cc->_Iset;
+        deltaI = Iin - i_set;
 
         if (deltaI > 2000000 || deltaI < -2000000) { //100uA
-            divisionRate = 1;
+            if (instru.cc_cp_speed == 0) { // 0:low 1:normal 2:high
+                cc_cp_speed = 100;
+            } else if (instru.cc_cp_speed == 1) {
+                cc_cp_speed = 10;
+            } else {
+                cc_cp_speed = 1;
+            }
+            divisionRate = cc_cp_speed;
         } else {
             divisionRate = 20;
         }
@@ -698,118 +714,6 @@ static void dpv_advance_vscan(uint32_t time)
     return;
 }
 
-static void pulse_vscan(void)
-{
-    struct wm_pulse_ctx_t *pulse = (struct wm_pulse_ctx_t *)wm_get();
-    static uint16_t lastVolt;
-
-    if (stiFirstTime) {
-        stiFirstTime = false;
-        lastVolt = 25000;
-        pulse->_sti_t_flag = 1;
-        pulse->_sti_v = pulse->_sti_v1;
-        pulse->_sti_t = pulse->_sti_t1;
-        if (pulse->_sti_t == 1) {
-            pulse->_sti_v = lastVolt;
-        }
-    } else if(!stiFirstTime) {
-        if (GPT.StiCounter >= pulse->_sti_t) {
-            GPT.StiCounter -= pulse->_sti_t; //to get right time
-
-            if (pulse->_sti_lp > 0) {
-                if (pulse->_sti_cy > 0) {
-                    if (pulse->_sti_t_flag == 1) {
-                        pulse->_sti_t_flag = 2;
-                        pulse->_sti_v = pulse->_sti_v2;
-                        pulse->_sti_t = pulse->_sti_t2;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 2) {
-                        pulse->_sti_t_flag = 3;
-                        pulse->_sti_v = pulse->_sti_v3;
-                        pulse->_sti_t = pulse->_sti_t3;
-                        if (pulse->_sti_t == 1) {
-                            pulse->_sti_v = lastVolt;
-                        }
-                    } else if (pulse->_sti_t_flag == 3) {
-                        pulse->_sti_cy -- ;
-                        if (pulse->_sti_cy == 0) {
-                            pulse->_sti_t_flag = 4;
-                            pulse->_sti_v = pulse->_sti_v4;
-                            pulse->_sti_t = pulse->_sti_t4;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                } else if (pulse->_sti_cy <= 0){
-                    if (pulse->_sti_t_flag == 4) {
-                        pulse->_sti_lp -- ;
-                        if (pulse->_sti_lp > 0) {
-                            pulse->_sti_cy = instru.sti_cy;
-                            pulse->_sti_t_flag = 2;
-                            pulse->_sti_v = pulse->_sti_v2;
-                            pulse->_sti_t = pulse->_sti_t2;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        } else {
-                            pulse->_sti_t_flag = 5;
-                            pulse->_sti_v = pulse->_sti_v5;
-                            pulse->_sti_t = pulse->_sti_t5;
-                            if (pulse->_sti_t == 1) {
-                                pulse->_sti_v = lastVolt;
-                            }
-                        }
-                    }
-                }
-            } else if (pulse->_sti_lp <= 0) {
-                if (pulse->_sti_t_flag == 5) {
-                    pulse->_sti_t_flag = 6;
-                    pulse->_sti_v = pulse->_sti_v6;
-                    pulse->_sti_t = pulse->_sti_t6;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 6) {
-                    pulse->_sti_t_flag = 7;
-                    pulse->_sti_v = pulse->_sti_v7;
-                    pulse->_sti_t = pulse->_sti_t7;
-                    if (pulse->_sti_t == 1) {
-                        pulse->_sti_v = lastVolt;
-                    }
-                } else if (pulse->_sti_t_flag == 7) {
-                    pulse->_sti_v = 25000;
-                    PeriodicEvent  = false;
-                    PIN15_setOutputValue(HIGH_Z_MODE, 0); // 0: open highz;
-                    ModeLED(NO_EVENT);
-                }
-            }
-        }
-    }
-
-    if (lastVolt != pulse->_sti_v) {
-        lastVolt = pulse->_sti_v;
-        //if (pulse->_sti_v == 25000) {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 0);   // 1 => close high_z mode
-        //} else {
-        //    PIN15_setOutputValue(HIGH_Z_MODE, 1);   // 1 => close high_z mode
-        //}
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-        DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, pulse->_sti_v));
-    }
-
-    return;
-}
-
 static void chg_vo_para(uint16_t parameter, int32_t value)
 {
     uint16_t pa = parameter;

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

@@ -100,11 +100,37 @@
 
 #include "board.h"
 
-#include "simple_peripheral.h"
+// define for futher convention usage
+//
+#define REVERT_2_BYTE(_b)     ((_b) >> 8 | (((_b) & 0xFF) << 8))
+#define ENABLE       1
+#define DISABLE      0
+//
+
+
+#include "simple_peripheral.h"
+#include "driver/spi_ctrl.h"
+#include "hardware/led_APA_102.h" 
+#include "driver/timers.h" 
+#include "elite_task/elite_GPtimer.h"
+#include "hardware/dac_MAX5136.h"
+#include "hardware/adc_ads1118.h"
+#include "driver/gpio_edc15re.h"
+#include "elite_task/elite_latch.h"
+
+struct gptimer0_t GPT;
+static uint16_t ADC_rxbuf = 0;
 
-#include "EliteGPTimer.h"
 #include "headstage.h"
 
+void elite_gptimer_task(void)
+{
+    events |= SBP_PERIODIC_EVT;
+    Semaphore_post(semaphore);
+    GPT.cnt_gpt++;
+}
+
+
 #if defined(USE_FPGA) || defined(DEBUG_SW_TRACE)
 #include <driverlib/ioc.h>
 #endif  // USE_FPGA | DEBUG_SW_TRACE
@@ -542,27 +568,133 @@ static void SimpleBLEPeripheral_init(void) {
 // static Clock_Struct detectKeyClock;
 // static void detectKey_clockHandler(UArg arg);
 
+
+static bool power_on(uint32_t delta_time)
+{   
+    uint32_t t = delta_time;
+    bool elite_on = false;
+    static uint32_t keyTimer = 0;
+
+    keyTimer = keyTimer + t;
+
+    if (keyTimer >= 10000) {
+        latch_single_ctrl(E_LATCH_5V_ENABLE, 1);
+        latch_single_ctrl(E_LATCH_10V_ENABLE, 1);
+        
+        CPUdelay_us(320); // need delay 320us to stablize power
+        ModeLED(BT_WAIT);
+        //AD5940_Initialize();
+        elite_on = true;
+    }
+
+    return elite_on;
+}
+
+
+/*return the button status*/
+uint8_t pin_button_get(void)
+{
+    /*
+     * if btn = 0: press key
+     * if btn = 1: release key
+     */ 
+
+    uint8_t btn;
+    
+    btn = PIN_getInputValue(E_PIN_SHUT_DOWN);
+
+    return btn;
+}
+
+
+/* manage the button control*/
+static void key_manage(uint32_t delta_time) 
+{
+    uint32_t t = delta_time;
+    static uint32_t keyTimer = 0;
+    static bool byPass1sec = false;
+
+    if (pin_button_get()!=0) {
+        if (keyTimer > 0) {
+            checkFlafLED();
+            byPass1sec = false;
+        }
+        keyTimer = 0;
+        return;
+    }
+
+    keyTimer = keyTimer + t;
+    if (keyTimer >= 30000){
+        latch_single_ctrl(E_LATCH_5V_ENABLE, 0);
+
+    } else if (keyTimer >= 10000 && !byPass1sec) {
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_ORANGE);
+        byPass1sec = true;
+    }
+
+    return;
+}
+
+
+/* toggle 6994 to on*/
+static void toggle_6994(uint16_t counter6994) {
+    if(counter6994 == CLOCK_ONE_SECOND*5) {
+        latch_single_ctrl(E_LATCH_OFF, 0);  // OFF = 1 => turn off 6994
+    }
+}
+
 static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
-    uint8_t  key= 0;
-    bool     EliteOn = 0;
-    uint16_t counter6994 = 0;
+    uint8_t  key= 0;            
+     
+    bool     elite_on = false;
     batteryADC_flag = false;
 
+    uint32_t check_key_time = 0; 
+
     // Initialize application
     SimpleBLEPeripheral_init();
+
     ZM_init();
 
     // Application main loops
-    GPT.GptimerCounter0 = GPT.GptimerCounter;
+    InitGPT();                     
+
+    while(1) {
+        ModeLED(BT_WAIT);
+        if (events & SBP_PERIODIC_EVT) {
+            events &= ~SBP_PERIODIC_EVT;
+            
+            // GPT.cnt_gpt_delta = GPT.cnt_gpt - GPT.cnt_gpt0;
+            // GPT.cnt_gpt0 = GPT.cnt_gpt;
+            GPT_timerIncrement();
+
+            elite_on = power_on(GPT.cnt_gpt_delta);
+        }
+        if (elite_on)
+            break;
+    }
+
+    // Application main loops
+    GPT.cnt_gpt0 = GPT.cnt_gpt;
 
     headstage_battery_volt();
     headstage_init_device_info();
 
-    for (;;) {
+for (;;) {
         // Waits for a signal to the semaphore associated with the calling thread.
         // Note that the semaphore associated with a thread is signaled when a
         // message is queued to the message receive queue of the thread or when
         // ICall_signal() function is called onto the semaphore.
+
+        // GPT.cnt_gpt_delta = GPT.cnt_gpt - GPT.cnt_gpt0;
+        // GPT.cnt_gpt0 = GPT.cnt_gpt;
+        uint16_t counter6994 = 0; 
+        GPT_timerIncrement();
+        check_key_time = check_key_time + GPT.cnt_gpt_delta;
+        GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.cnt_gpt_delta;
+        GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.cnt_gpt_delta;
+
+        
         ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);  // let errno wait for infinite time, if periodicClock time up then execute below code
         if (errno == ICALL_ERRNO_SUCCESS) {
             ICall_EntityID    dest;
@@ -596,8 +728,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
             while (!Queue_empty(appMsgQueue)) {
                 sbpEvt_t *pMsg = (sbpEvt_t *)Util_dequeueMsg(appMsgQueue);
                 if (pMsg) {
-                    // Process message.
-                    //                    LED_color(0xf8, 0xfa, 0xfa, 0x0a);  // orange LED
+                    
                     SimpleBLEPeripheral_processAppMsg(pMsg);
 
                     // Free the space from the message.
@@ -608,25 +739,21 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
 
         if(events & SBP_PERIODIC_EVT){
             events &= ~SBP_PERIODIC_EVT;
+
+            /* routinely check the button status*/
+            if (check_key_time >= 200) {
+                key_manage(200);
+                check_key_time = 0;
+            }
+
             if (!PeriodicEvent) {                // if there is no periodic event
-                key = PIN_getInputValue(switch_on);
-                if (EliteOn) {
-                    if (counter6994 < CLOCK_ONE_SECOND*5) {  // counter6994 enable a IC after 35 counts
+
+                    if(counter6994 <= CLOCK_ONE_SECOND*5) {
+                        toggle_6994(counter6994);
                         counter6994++;
-                    } else if (counter6994 == CLOCK_ONE_SECOND*5) {
-                        PIN15_setOutputValue(shutdown_6994, 0);  // OFF = 1 => turn off 6994
-                        counter6994++;
-                    } else if (counter6994 > CLOCK_ONE_SECOND*5) {
-                        counter6994 = 0;
-                    }
-                    EliteKeyPress(key);
-
-                    GPT.DeltaGptimerCounter = GPT.GptimerCounter - GPT.GptimerCounter0;
-                    GPT.GptimerCounter0 = GPT.GptimerCounter;
-
-                    GPT.BatteryADCCounter = GPT.BatteryADCCounter + GPT.DeltaGptimerCounter;
-                    GPT.BatteryCheckCounter = GPT.BatteryCheckCounter + GPT.DeltaGptimerCounter;
+                    }                 
 
+                    key = PIN_getInputValue(E_PIN_SHUT_DOWN);   
                     if(key != 0){  //detect Elite battery power when no periodic event
                         measureBat();
                     }
@@ -635,10 +762,8 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                         InitEliteInstruction();
                         Free_Work_Mode = false;
                     }
-                } else {
-                    EliteOn = TurnOnElite(key);
-                }
             }
+
             else {                               // if there is periodic event
                 if(InitPeriodicEvent){
                     wm_init();
@@ -647,8 +772,6 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
 
                 // Perform periodic application task
                 SimpleBLEPeripheral_performPeriodicTask();
-                key = PIN_getInputValue(switch_on);
-                EliteKeyPress(key);  // onPress=> key = 0; 1.lighten LED 2.long press shut down 2650
             }
         }
 
@@ -821,15 +944,13 @@ static void SimpleBLEPeripheral_freeAttRsp(uint8_t status) {
  * @return  None.
  */
 static void SimpleBLEPeripheral_processAppMsg(sbpEvt_t *pMsg) {
-    //    LED_color(0xFA, 0xF0, 0x00, 0xE0);
     switch (pMsg->hdr.event) {
     case SBP_STATE_CHANGE_EVT:
         SimpleBLEPeripheral_processStateChangeEvt((gaprole_States_t)pMsg->hdr.state);
         break;
 
     case SBP_CHAR_CHANGE_EVT:
-        //        headstage_instruction_update_handle(pMsg->hdr.state);
-        //            LED_color(0xE6, 0xFF, 0xFA, 0x0A);
+    
         ZM_instruction_update_handle(pMsg->hdr.state);
 
         break;
@@ -933,7 +1054,6 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
         GAPRole_GetParameter(GAPROLE_CONNHANDLE, &cxnHandle);
 
         if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
-//            LED_color(DARKLED, 0xFF, 0x00, 0xFF);
         }
 
         // Use numActive to determine the connection handle of the last
@@ -975,7 +1095,10 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
 
     case GAPROLE_WAITING_AFTER_TIMEOUT:
         SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-        ModeLED(BT_WAIT);
+        led_color_set(LED_NB_MAX, LED_BR_LV1, LED_CLR_RED);
+
+
+        
 
 #ifdef PLUS_BROADCASTER
         // Reset flag for next connection.
@@ -1066,3 +1189,13 @@ static void SimpleBLEPeripheral_enqueueMsg(uint8_t event, uint8_t state) {
         Util_enqueueMsg(appMsgQueue, semaphore, (uint8 *)pMsg);
     }
 }
+
+
+#include "hardware/led_APA_102_c.h"
+#include "driver/spi_ctrl_c.h"
+#include "driver/timers_c.h" 
+#include "elite_task/elite_GPtimer_c.h"
+#include "hardware/DAC_MAX5136_c.h"
+#include "hardware/adc_ads1118_c.h"
+#include "driver/gpio_edc15re_c.h"
+#include "elite_task/elite_latch_c.h"