error fix

get_date.sh

@@ -4,7 +4,7 @@
 #folder=$($path | awk -F"/" '{$NF}')
 folder=$(basename "$(pwd)")
 
-if [ "$folder" == "ti" ] ; then
+if [ "$folder" == "bioprocc2650" ]; then
     year=$(date +%-y)
     month=$(date +%-m)
     day=$(date +%-d)

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/lib_linker.cmd

@@ -3,6 +3,6 @@
  *                step by the lib_search utility
  */
 
-"/home/alan/ti/simplelink/ble_sdk_2_02_02_25/blelib/host/host_pxxx.a"
-"/home/alan/ti/simplelink/ble_sdk_2_02_02_25/blelib/ctrl/cc2640/cc2640_ctrl_pxxx_ext.a"
-"/home/alan/ti/simplelink/ble_sdk_2_02_02_25/blelib/hci_tl/cc26xx/cc26xx_hci_tl_none_v41_v42.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pxxx.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pxxx_ext.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none_v41_v42.a"

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/makefile.libs

@@ -1,6 +1,6 @@
 #
 # This file was generated based on the configuration script:
-#     /home/alan/ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/app_ble.cfg
+#     C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\app_ble.cfg
 #
 # This makefile may be included in other makefiles that need to build
 # the libraries containing the compiled source files generated as
@@ -14,9 +14,9 @@
 #
 # The absolute path to the generated source directory (at the time the
 # sources were generated) is:
-#    /home/alan/ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
+#    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/sysbios/makefile

@@ -1,29 +1,29 @@
 
-XOPTS = -I"/home/alan/ti/xdctools_3_32_01_22_core/packages/" -Dxdc_target_types__=/home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
 
-vpath % /home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c /home/alan/ti/xdctools_3_32_01_22_core/packages/
+vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
+vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
 
 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
 
-XDC_ROOT  = /home/alan/ti/xdctools_3_32_01_22_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/
 
-BIOS_ROOT = /home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
+BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
 
 BIOS_DEFS =  -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_knl_Task_moduleStateCheckFlag__D=FALSE -Dti_sysbios_knl_Task_objectCheckFlag__D=FALSE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=6 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=6 -Dti_sysbios_knl_Task_checkStackFlag__D=FALSE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_DYNAMIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=FALSE -Dxdc_runtime_Assert_DISABLE_ALL -Dxdc_runtime_Log_DISABLE_ALL
 
-BIOS_INC  = -I"/home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
+BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-TARGET_INC = -I"/home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
+TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="/home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/include" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="/home/alan/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="/home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -I/home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
 
-CC = /home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/bin/armcl -c $(CCOPTS) -I /home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/include
-ASM = /home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/bin/armcl -c $(CCOPTS) -I /home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/include
-AR = /home/alan/ti/ccs900/ccs/tools/compiler/ti-cgt-arm_20.2.1.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq
 
-DEL = rm -f
-CP = cp -f
+DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
 
 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)
@@ -100,8 +100,8 @@ rom_sysbios.obj: BIOS.c knl/Clock.c knl/Idle.c knl/Intrinsics.c knl/Event.c knl/
 rom_sysbios.aem3: rom_sysbios.obj m3_Hwi_asm.obj m3_Hwi_asm_switch.obj m3_IntrinsicsSupport_asm.obj m3_TaskSupport_asm.obj
 	@-$(call RM, $@)
 	@echo arem3 $^ ...
-	@$(AR) $@ $^ /home/alan/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/rom/cortexm/cc26xx/golden/CC26xx/rom_sysbios_config.obj
+	@$(AR) $@ $^ C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/rom/cortexm/cc26xx/golden/CC26xx/rom_sysbios_config.obj
 
 clean:
-	@$(DEL) ../makefile.libs
+	@$(DEL) ..\makefile.libs
 	@-$(call RM, *)

simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/hal_mcu.h

@@ -106,7 +106,7 @@
  */
 
 #ifdef USE_ICALL
-#include <icall.h>
+#include <ICall.h>
 
 typedef ICall_CSState halIntState_t;
 

simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/hal_rtc_wrapper.c

@@ -55,7 +55,7 @@
 #include <inc/hw_aon_rtc.h>
 #include <driverlib/aon_rtc.h>
 #include <driverlib/aon_event.h>
-#include "icall.h"
+#include "ICall.h"
 
 /*******************************************************************************
  * MACROS

simplelink/ble_sdk_2_02_02_25/src/components/icall/src/icall_platform.h

@@ -48,7 +48,7 @@
 
 #include <stdint.h>
 
-#include "icall.h"
+#include "ICall.h"
 
 #ifdef __cplusplus
 extern "C" {

simplelink/ble_sdk_2_02_02_25/src/components/npi/src/inc/npi_ble.h

@@ -55,7 +55,7 @@ extern "C"
 // includes
 // ****************************************************************************
 #include "hal_types.h"
-#include "osal.h"
+#include "OSAL.h"
 
 // ****************************************************************************
 // defines

simplelink/ble_sdk_2_02_02_25/src/components/osal/src/common/osal.c

@@ -75,7 +75,7 @@
 #ifdef ICALL_JT
   #include "icall_JT.h"
 #else
-  #include <icall.h>
+  #include <ICall.h>
 #endif /* ICALL_JT */   
 #endif /* USE_ICALL */
 
@@ -405,7 +405,7 @@ uint32 osal_build_uint32( uint8 *swapped, uint8 len )
 unsigned char * _ltoa(unsigned long l, unsigned char *buf, unsigned char radix)
 {
 #if defined (__TI_COMPILER_VERSION) || defined (__TI_COMPILER_VERSION__)
-  return ( (unsigned char*)ltoa( l, (char *)buf, radix ) );
+  return ( (unsigned char*)ltoa( l, (char *)buf ) );
 #elif defined( __GNUC__ )
   return ( (char*)ltoa( l, buf, radix ) );
 #else

simplelink/ble_sdk_2_02_02_25/src/components/osal/src/common/osal_cbtimer.c

@@ -47,8 +47,8 @@
  Release Date: 2018-04-02 18:03:35
  *****************************************************************************/
 
-#include "osal.h"
-#include "osal_tasks.h"
+#include "OSAL.h"
+#include "OSAL_Tasks.h"
 
 #include "hal_mcu.h"
 #include "osal_cbtimer.h"

simplelink/ble_sdk_2_02_02_25/src/components/osal/src/common/osal_memory_icall.c

@@ -51,13 +51,13 @@
  */
 
 #include "comdef.h"
-#include "osal.h"
-#include "osal_memory.h"
+#include "OSAL.h"
+#include "OSAL_Memory.h"
 
 #ifdef ICALL_JT
 #include "icall_JT.h"
 #else
-#include <icall.h>
+#include <ICall.h>
 #endif /* ICALL_JT */   
 
 /**************************************************************************************************

simplelink/ble_sdk_2_02_02_25/src/components/osal/src/common/osal_pwrmgr.c

@@ -59,7 +59,7 @@
 #ifdef ICALL_JT
   #include "icall_JT.h"
 #else
-  #include <icall.h>
+  #include <ICall.h>
 #endif /* ICALL_JT */   
 #endif /* USE_ICALL */
 

simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc/osal.h

@@ -62,11 +62,11 @@ extern "C"
 #include <limits.h>
 
 #include "comdef.h"
-#include "osal_memory.h"
-#include "osal_timers.h"
+#include "OSAL_Memory.h"
+#include "OSAL_Timers.h"
 
 #ifdef USE_ICALL
-#include <icall.h>
+#include <ICall.h>
 #endif /* USE_ICALL */
 
 /*********************************************************************

simplelink/ble_sdk_2_02_02_25/src/components/services/src/nv/cc26xx/nvocop.c

@@ -80,7 +80,7 @@ the last entry in the page (higher memory address).
 #include "hal_flash.h"
 #include "hal_types.h"
 #include "pwrmon.h"
-#include "osal.h"
+#include "OSAL.h"
 #include "osal_snv.h"
 #include "hal_assert.h"
 #include <driverlib/vims.h>

simplelink/ble_sdk_2_02_02_25/src/examples/beacon_rfdriver/main_tirtos.c

@@ -52,7 +52,7 @@
 
 #include <inc/hw_fcfg1.h>
 
-#include "board.h"
+#include "Board.h"
 
 // RF Driver
 #include <ti/drivers/rf/RF.h>

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

@@ -114,11 +114,9 @@ typedef enum {
 static bool STI = false;
 static bool IsFirstData = true;
 static uint8_t spi_state_counter = 0;
-static uint8_t check_reg_counter = 0;
 static bool ConnectState = false;
 static bool ErrorRestart = false;
 static SPI_CB_MODE SPICallBack;
-static uint8 adc_spi_en_switch = 1;
 
 /*
 *  Let C = command, S = status;
@@ -240,17 +238,15 @@ extern ICall_Semaphore semaphore;
 #define INS_TYPE_CIS 0x70
 
 // VIS operator
+#define VIS_INT      0x60
+#define VIS_RST      0xF0
+#define VIS_START    0xC0
 #define VIS_REC      0x10
 #define VIS_STI      0x20
 #define VIS_STOP_REC 0x30
 #define VIS_STOP_STI 0x40
-#define VIS_ASK      0x50
-#define VIS_INT      0x60
-#define VIS_FAST_SET 0x70
-#define VIS_EN_ADC_CLK 0x80
 #define VIS_CAL      0xA0
-#define VIS_START    0xC0
-#define VIS_RST      0xF0
+#define VIS_ASK      0x50
 
 
 // CIS operator

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

@@ -14,29 +14,20 @@ static uint8_t check_ins(uint16_t trans_ins){
 }
 
 static void check_register(uint8_t register_to_check, uint16_t instruction_to_fit, NEU_WORK_STATE next_state){
-    if(check_reg_counter < 6){
+    if(spi_state_counter < 6){
         SPICallBack = CONTINUOUS_TRANS;
         spi_txbuf[0] = register_to_check & 0x7F;
-        spi_txbuf[1] = rec_sti_command;
-        spi_txbuf[2] = check_reg_counter;
+        spi_txbuf[1] = register_to_check;
+        spi_txbuf[2] = register_to_check;
 
-        check_reg_counter ++;
+        spi_state_counter ++;
         headstage_spi_transaction(3);
     }
     else{
-        check_reg_counter = 0;
+        spi_state_counter = 0;
         if(check_ins(instruction_to_fit)){
             NEULIVE_STATE.state = next_state;
             SPICallBack = ONE_SHOT_SPI;
-
-            // update rec_sti_command
-            if(!(rec_sti_command & ENABLE_STI)){
-               // close STI success
-               rec_sti_command &= ~STATUS_STI;
-            }
-//            if(rec_sti_command & ENABLE_STI){
-//                rec_sti_command |= STATUS_STI;
-//            }
         }
         else{
             // resend instruction
@@ -172,17 +163,17 @@ static void check_sti_t1_t5(NEU_WORK_STATE next_state){
 }
 
 static uint8_t check_sti_register(uint8_t address, uint16_t instruction_to_fit){
-    check_reg_counter = 0;
-    while(check_reg_counter < 6){
+    spi_state_counter = 0;
+    while(spi_state_counter < 6){
         SPICallBack = READ_REG;
         spi_txbuf[0] = address & 0x7F;
         spi_txbuf[1] = address;
         spi_txbuf[2] = address;
 
-        headstage_spi_transaction(3);   // check_reg_counter++ would be executed in SPI callback
+        headstage_spi_transaction(3);   // spi_state_counter++ would be executed in SPI callback
     }
 
-    check_reg_counter = 0;
+    spi_state_counter = 0;
 
     // success = 1; failed = 0
     return check_ins(instruction_to_fit);

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

@@ -133,7 +133,7 @@ static uint8_t headstage_led_set_color(uint16_t *ins_buf, uint8_t repeat, uint8_
 
 #ifdef HEADSTAGE_LED_USE_SPI
 
-#include <board.h>
+#include <Board.h>
 #include <ti/drivers/SPI.h>
 #include <ti/drivers/dma/UDMACC26XX.h>
 #include <ti/drivers/spi/SPICC26XXDMA.h>

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

@@ -379,6 +379,10 @@ static void headstage_neu_append_notify_data() {
     uint8_t data_size = headstage_notify_append_data(not_buf);
 
     if (data_size >= BLE_NOT_BUFF_SIZE) {
+        if(not_time_stamp % 200 == 0){
+            headstage_led_color(COLOR_GREEN);
+            headstage_led_color(COLOR_MAGENTA);
+        }
         headstage_notify_flip_buffer();
         headstage_notify_send();
     }
@@ -459,7 +463,7 @@ static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transacti
         }
 
         case READ_REG:{
-            check_reg_counter ++;
+            spi_state_counter ++;
             break;
         }
 
@@ -515,24 +519,20 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
 
         case NEU_MULTI_STI: {
             uint8_t  ch                = instruction[1];
-//            uint8_t  sti_cycles        = instruction[2];
-//            INSTRUCTION.sti_t1[ch]            = (instruction[3] << 8) | instruction[4];
-//            INSTRUCTION.sti_t2[ch]            = (instruction[5] << 8) | instruction[6];
-//            INSTRUCTION.sti_t3[ch]            = (instruction[7] << 8) | instruction[8];
-//            INSTRUCTION.sti_t4[ch]            = (0x00 << 24) | (instruction[9] << 16) | (instruction[10] << 8) | instruction[11];
-//            INSTRUCTION.sti_t5[ch]            = (instruction[12] << 8) | instruction[13];
-//            INSTRUCTION.current_sti_cycle[ch] = sti_cycles;
-
-            for(int i=0 ; i<8 ; i++){
-                uint8_t  sti_cycles        = instruction[2];
-                INSTRUCTION.sti_t1[i]            = (instruction[3] << 8) | instruction[4];
-                INSTRUCTION.sti_t2[i]            = (instruction[5] << 8) | instruction[6];
-                INSTRUCTION.sti_t3[i]            = (instruction[7] << 8) | instruction[8];
-                INSTRUCTION.sti_t4[i]            = (0x00 << 24) | (instruction[9] << 16) | (instruction[10] << 8) | instruction[11];
-                INSTRUCTION.sti_t5[i]            = (instruction[12] << 8) | instruction[13];
-                INSTRUCTION.current_sti_cycle[i] = sti_cycles;
-            }
+            uint8_t  sti_cycles        = instruction[2];
+            INSTRUCTION.sti_t1[ch]            = (instruction[3] << 8) | instruction[4];
+            INSTRUCTION.sti_t2[ch]            = (instruction[5] << 8) | instruction[6];
+            INSTRUCTION.sti_t3[ch]            = (instruction[7] << 8) | instruction[8];
+            INSTRUCTION.sti_t4[ch]            = (0x00 << 24) | (instruction[9] << 16) | (instruction[10] << 8) | instruction[11];
+            INSTRUCTION.sti_t5[ch]            = (instruction[12] << 8) | instruction[13];
+            INSTRUCTION.current_sti_cycle[ch] = sti_cycles;
 
+//            INSTRUCTION.sti_t1[n_ch]            = (instruction[3] << 8) | instruction[4];
+//            INSTRUCTION.sti_t2[n_ch]            = (instruction[5] << 8) | instruction[6];
+//            INSTRUCTION.sti_t3[n_ch]            = (instruction[7] << 8) | instruction[8];
+//            INSTRUCTION.sti_t4[n_ch]            = (0x00 << 24) | (instruction[9] << 16) | (instruction[10] << 8) | instruction[11];
+//            INSTRUCTION.sti_t5[n_ch]            = (instruction[12] << 8) | instruction[13];
+//            INSTRUCTION.current_sti_cycle[n_ch] = sti_cycles;
             break;
         }
 
@@ -568,7 +568,7 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             INSTRUCTION.vgr_intn             = 16;
             INSTRUCTION.vgr_int_old          = 16;
             INSTRUCTION.recording_channel    = 0b0000000001000010;
-            INSTRUCTION.adc_clock_ratio      = 50;
+            INSTRUCTION.adc_clock_ratio      = 100;
             INSTRUCTION.sys_clk_ratio        = 10;
             INSTRUCTION.sti_clock_ratio      = 10;
             INSTRUCTION.amplifier_gain       = 0;
@@ -590,7 +590,7 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             INSTRUCTION.current_sti_cycle[0] = 100;
             INSTRUCTION.current_sti_cycle[1] = 100;
             INSTRUCTION.current_sti_cycle[8] = 10;  // ch8 is volt ch
-            INSTRUCTION.sti_channel          = 0b0000000000000011;  // 0bxxxx_xxxv_cccc_cccc, c = current; v = volt, x = don't care
+            INSTRUCTION.sti_channel          = 0b0000000000000000;  // 0bxxxx_xxxv_cccc_cccc, c = current; v = volt, x = don't care
             INSTRUCTION.arbitrary_en         = 0;
             INSTRUCTION.arbitrary_index      = 0;
             INSTRUCTION.sti_mode             = 0;   // 1 = continuous mode; 0 = limit mode
@@ -639,62 +639,6 @@ static void headstage_update_vis_instruction(uint8_t vis_oper) {
             /**< stop spi transaction */
             break; /**< reset all the parameter */
         }
-
-        case VIS_FAST_SET:{
-            INSTRUCTION.sti_t1[7]            = 25;
-            INSTRUCTION.sti_t2[7]            = 0;
-            INSTRUCTION.sti_t3[7]            = 25;
-            INSTRUCTION.sti_t4[7]            = 0;
-            INSTRUCTION.sti_t5[7]            = 0;
-
-            INSTRUCTION.sti_t1[7]            = 25;
-            INSTRUCTION.sti_t2[7]            = 0;
-            INSTRUCTION.sti_t3[7]            = 25;
-            INSTRUCTION.sti_t4[7]            = 0;
-            INSTRUCTION.sti_t5[7]            = 0;
-
-            INSTRUCTION.current_sti_cycle[7] = 0;
-            INSTRUCTION.current_sti_cycle[8] = 10;  // ch8 is volt ch
-            INSTRUCTION.sti_channel          = 0b0000000010000000;  // 0bxxxx_xxxv_cccc_cccc, c = current; v = volt, x = don't care
-            INSTRUCTION.arbitrary_en         = 0;
-            INSTRUCTION.arbitrary_index      = 0;
-            INSTRUCTION.sti_mode             = 0;   // 1 = continuous mode; 0 = limit mode
-            INSTRUCTION.sti_h_bridge         = 0;   // voltage sti must use H-bridge
-            INSTRUCTION.sti_ref              = 0;   // 1 = GND; 0 = Vref
-
-            /* the first byte decide current sti polarity */
-            //  e.g. 0b0000_0101 => ch0, ch2 positive, others negative
-
-            /* the second byte decide voltage sti polarity */
-            //  for the second byte, 0bxxxx_XXXX, decide voltage sti p & n channel;
-            //  xxxx is p-channel (16 choose 1), XXXX is n-channel
-            INSTRUCTION.current_sti_polarity = 0b1000000000000000;
-            INSTRUCTION.sti_amplitude_h      = 0x0000;  // it's t1 amplitude
-            INSTRUCTION.sti_amplitude_l      = 0x0000;  // it's t3 amplitude
-            INSTRUCTION.voltage_sti_amplitude = 0x0F;
-
-            rec_sti_command |= ENABLE_STI;
-            NEULIVE_STATE.state = NEU_WRITE_STI_INS;
-            NEULIVE_STATE.config_type = NEU_WARM_UP;
-            SPICallBack = ONE_SHOT_SPI;
-            INSTRUCTION.ins_opcode = T_ZE;
-
-            // is neu wording now?
-            if( (rec_sti_command & STATUS_STI) || (rec_sti_command & STATUS_REC) ){
-                // nothing to do
-            }
-            else{
-                flag_notify(EVT_NEU_SPI);
-            }
-            break;
-        }
-
-        case VIS_EN_ADC_CLK:{
-            adc_spi_en_switch ^= 1;
-            headstage_pin_output(PIN_EN_ADC_SPI_CLK, adc_spi_en_switch);
-            break;
-        }
-
         case VIS_START: {
 //            for(int i=0 ; i<12 ; i++){
 //                FlushNotify();
@@ -1238,6 +1182,7 @@ static void headstage_neu_state_spi() {
         }
 
         case NEU_CHECK_STI_INT: {
+            rec_sti_command &= ~STATUS_STI;
 
             if(rec_sti_command & STATUS_REC){
                 check_register(STI_CHANNEL_REG, 0, NEU_PREPARE_READ);

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

@@ -3,7 +3,7 @@
 #ifndef HEADSTAGE_PIN_H
 #define HEADSTAGE_PIN_H
 
-#include <board.h>
+#include <Board.h>
 #include <ti/drivers/PIN.h>
 
 #if defined(HEADSTAGE_TNI_H)

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

@@ -23,12 +23,7 @@ static uint16_t UserCode2StiCode(uint16_t amp, uint8_t positive_ch){
         sti_code = StiCaliTable.n_ch.coefficient * real_amp + StiCaliTable.n_ch.offset;
     }
 
-    sti_code = (sti_code + 5000) / 10000;
-
-    if(sti_code < 1){
-        sti_code = 1;
-    }
-
+    sti_code = sti_code / 10000;
     return (uint16_t) (sti_code);
 }
 

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

@@ -3,15 +3,15 @@
 #define VERSION_DATE
 
 #define VERSION_DATE_YEAR      20
-#define VERSION_DATE_MONTH     11
-#define VERSION_DATE_DAY       19
-#define VERSION_DATE_HOUR      18
-#define VERSION_DATE_MINUTE    32
+#define VERSION_DATE_MONTH     7
+#define VERSION_DATE_DAY       3
+#define VERSION_DATE_HOUR      10
+#define VERSION_DATE_MINUTE    24
 
 // this is NOT the version hash !!
 // it's the last version hash
-#define VERSION_HASH           bf672b26327776ad4612260ce8713ba917411a7d
-#define VERSION_GIT_BRANCH     Neulive20_hostTest
+#define VERSION_HASH           0d8b548a31813f9b04de280259ae78e8263c72b3
+#define VERSION_GIT_BRANCH     CentralDataRateTest_neulive2
 
 static void get_board_name(char *board_name_ch, uint8 *board_name_int, uint8 name_size){
     uint8 name_offset = 18;

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

@@ -3,7 +3,7 @@
 #ifndef HEADSTAGE_WATCHDOG
 #define HEADSTAGE_WATCHDOG
 
-#include <board.h>
+#include <Board.h>
 #include <ti/drivers/Watchdog.h>
 #include <ti/drivers/watchdog/WatchdogCC26XX.h>
 

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

@@ -14,12 +14,13 @@ static uint8_t not_buf_offset = NOT_BUF_OFFSET_INIT;
 static uint32_t not_time_stamp = 0;
 
 static void headstage_notify_set_timestamp() {
-    not_time_stamp = headstage_time_stamp_us();
+//    not_time_stamp = headstage_time_stamp_us();
 
-    headstage_notify_buffer[2] = not_time_stamp & 0xFF;
-    headstage_notify_buffer[3] = (not_time_stamp >> 8) & 0xFF;
-    headstage_notify_buffer[4] = (not_time_stamp >> 16) & 0xFF;
-    headstage_notify_buffer[5] = (not_time_stamp >> 24) & 0xFF;
+    headstage_notify_buffer[2] = (not_time_stamp >> 24) & 0xFF;
+    headstage_notify_buffer[3] = (not_time_stamp >> 16) & 0xFF;
+    headstage_notify_buffer[4] = (not_time_stamp >> 8) & 0xFF;
+    headstage_notify_buffer[5] = not_time_stamp & 0xFF;
+    not_time_stamp ++;
 }
 
 static void headstage_notify_flip_buffer() {

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

@@ -79,7 +79,7 @@ static PIN_Config headstage_pin_configuration[] = {  //
     PIN_DC_DC | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
     PIN_BATT_HALF | PIN_INPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
     PIN_STI_CLK | PIN_INPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    // TODO : add PIN_IRQ for STI clock to detect STI status (update LED & resend STI command if failed before)
+    //
     PIN_TERMINATE};
 
 #endif  // HEADSTAGE_PIN_UNI_H

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

@@ -3,7 +3,7 @@
 #ifndef HEADSTAGE_PWM_H
 #define HEADSTAGE_PWM_H
 
-#include <board.h>
+#include <Board.h>
 #include <ti/drivers/PWM.h>
 
 static PWM_Handle headstage_system_pwm_handle = NULL;

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

@@ -19,8 +19,6 @@ static void MCUReset(){
     // SPI reset
     SPI_close(headstage_spi_handle);
     spi_state_counter = 0;
-    check_reg_counter = 0;
-
     for(int i=0 ; i<SPI_BUFFER_SIZE ; i++ ){
         spi_txbuf[i] = 0;
         spi_rxbuf[i] = 0;

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

@@ -7,7 +7,7 @@
 #error "put HEADSTAGE_MA_USE_SPI2 in predefined"
 #endif
 
-#include <board.h>
+#include <Board.h>
 #include <ti/drivers/SPI.h>
 #include <ti/drivers/dma/UDMACC26XX.h>
 #include <ti/drivers/spi/SPICC26XXDMA.h>

simplelink/ble_sdk_2_02_02_25/src/icall/app/ble_user_config.c

@@ -51,7 +51,7 @@
 
 #include "hal_types.h"
 #include "ble_user_config.h"
-#include <ti/drivers/rf/RF.h>
+#include <ti/drivers/rf/rf.h>
 
 #if defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & SECURE_CONNS_CFG)
 #include "ecc/ECCROMCC26XX.h"