attempt to support "on change" for every register

DLE can not enable on linux CCS

Neulive_sti_cali.txt

@@ -0,0 +1,29 @@
+no	device	y=ax+b	MAC	a+	b+	a-	b-	avg
+1	c6be	c6be	1804ED37C6BE	2270	-7040	2259	-14129	4.15063496100114
+2	8cd0	8cd0	0081F9E48CD0	2199	-4616	2162	-16396	4.67288597901671
+3	c694	c694	1804ED37C694	2354	-12824	2354	-11216	4.34663132771076
+4	c6c7	c6c7	1804ED37C6C7	2199	-7238	2221	-15702	4.63164432837751
+5	9b97	9b97	0081F9E49B97	2227	-9846	2151	-26609	4.75015860006776
+6	c6df	c6df	1804ED37C6DF	2132	-3844	2054	-21545	4.89066238118665
+7	c652	c652	18:04:ED:37:C6:52	2024	-7687	2086	-11283	4.88850143182858
+8	c5ed	c5ed	18:04:ED:37:C5:ED	2231	-1711	2353	-70845	4.45265043545859
+9	9bef	9bef	0081F9E49BEF	2383	-8585	2415	-20347	4.2758539244186
+10	8b50	8b50	00:81:F9:E4:8B:50	2369	-11005	2360	-11797	4.30475635707671
+11	c641	c641	18:04:ED:37:C6:41	2090	4616	1997	-40665	5.07591391714942
+12	E8E6	E8E6	A4:DA:32:D4:E8:E6	2306	-88454	2418	-15140	4.2686494968089
+13	E73B	E73B	A4:DA:32:D4:E7:3B	2262	-564	2298	44746	4.35551198222141
+14	EEE2	EEE2	A4:DA:32:D4:EE:E2	2057	5980	2096	-21411	4.82094019052184
+15	E871	E871	A4:DA:32:D4:E8:71	2175	-4549	2220	31468	4.60684608395208
+16	EFC4	EFC4	A4:DA:32:D4:EF:C4	2348	-4371	2374	-26606	4.45106768611704
+17	EF85	EF85	A4:DA:32:D4:EF:85	2136	-3339	2189	-30040	4.61909624778354
+18	E7DA	E7DA	A4:DA:32:D4:E7:DA	2081	-3015	2122	-21543	4.79766509652981
+19	E6EA	E6EA	A4:DA:32:D4:E6:EA	2039	-262	2127	-47259	4.79384458739747
+20	EEDB	EEDB	A4:DA:32:D4:EE:DB	2214	-1170	2351	-24636	4.44485358085645
+21	E73A	E73A	A4:DA:32:D4:E7:3A	2210	-4855	2339	-16434	4.47776494604746
+22	E6CF	E6CF	A4:DA:32:D4:E6:CF	2135	-5206	2193	-30885	4.73462680884304
+23	E76A	E76A	A4:DA:32:D4:E7:6A	2076	1154	2096	-1073	4.840805202
+24	F0AC	F0AC	A4:DA:32:D4:F0:AC	2125	-6660	2170	-439	4.667508288
+25	E87C	E87C	A4:DA:32:D4:E8:7C	2265	6685	2230	2124	4.529796387
+26	EF39	EF39	A4:DA:32:D4:EF:39	1976	6641	2035	2834	5.071840495
+27	E91D	E91D	A4:DA:32:D4:E9:1D	2075	6344	2002	-5562	5.036438558
+28	E87A	E87A	A4:DA:32:D4:E8:7A	2180	6651	2254	136	4.60339152

get_date.sh

@@ -4,7 +4,7 @@
 #folder=$($path | awk -F"/" '{$NF}')
 folder=$(basename "$(pwd)")
 
-if [ "$folder" == "bioprocc2650" ]; then
+if [ "$folder" == "ti" ] ; 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
  */
 
-"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"
+"/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"

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:
-#     C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\app_ble.cfg
+#     /home/alan/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:
-#    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
+#    /home/alan/ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

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

@@ -1,29 +1,29 @@
 
-XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"/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
 
-vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
+vpath % /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/
 
 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
 
-XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/
+XDC_ROOT  = /home/alan/ti/xdctools_3_32_01_22_core/packages/
 
-BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
+BIOS_ROOT = /home/alan/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"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
+BIOS_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/"
+TARGET_INC = -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/ 
+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/ 
 
-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
+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
 
-DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
+DEL = rm -f
+CP = 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) $@ $^ 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
+	@$(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
 
 clean:
-	@$(DEL) ..\makefile.libs
+	@$(DEL) ../makefile.libs
 	@-$(call RM, *)

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.cproject

@@ -16,11 +16,11 @@
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd" preannouncebuildStep="" prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/"
                                 resourcePath="">
-                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.832046861"
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1245523372"
                                    name="TI Build Tools"
                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1662665503">
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.361513614"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1451981696">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.905558853"
                                     superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
                                 <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
                                 <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
@@ -32,44 +32,44 @@
                                 <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
                                 <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
                             </option>
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1409784186"
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.690267428"
                                     superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
                                     value="18.1.4.LTS" valueType="string"/>
                             <targetPlatform
-                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1097216259"
+                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.703901656"
                                     name="Platform"
                                     superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
                             <builder buildPath="${BuildDirectory}"
-                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.988453068"
+                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.578715889"
                                      name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
                                      superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.772298983"
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.124004045"
                                   name="ARM Compiler"
                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1310942383"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1471387206"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.746618886"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1989883015"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1515548706"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.26908680"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.607163911"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.161170469"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
                                         value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.318297824"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.202178130"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.631719280"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.477462079"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1577402438"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.2135144875"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
                                         valueType="includePath">
                                     <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
@@ -97,7 +97,7 @@
                                     <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
                                     <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.257493390"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1493730349"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
                                         valueType="definedSymbols">
                                     <listOptionValue builtIn="false" value="CC26XX"/>
@@ -121,67 +121,67 @@
                                     <listOptionValue builtIn="false" value="xTESTMODES"/>
                                     <listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.174341808"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1032660795"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.368319864"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1680463954"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
                                         valueType="stringList">
                                     <listOptionValue builtIn="false" value="48"/>
                                     <listOptionValue builtIn="false" value="16004"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1796876384"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1766518960"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
                                         valueType="stringList">
                                     <listOptionValue builtIn="false" value="225"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1202072403"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1804087261"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.746142779"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.733166450"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
                                         value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.2057721302"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1033506009"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
                                         valueType="stringList">
                                     <listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
                                     <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
                                 </option>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.193620484"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1352027396"
                                         name="C Sources"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1071304751"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1465774058"
                                         name="C++ Sources"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1900538416"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1739768713"
                                         name="Assembly Sources"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1395617758"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.79045750"
                                         name="Assembly Sources"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
                             </tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1662665503"
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1451981696"
                                   name="ARM Linker"
                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1043297041"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.816733227"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
                                         value="256" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.30321841"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1515084002"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
                                         value="0" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1098985537"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1765940845"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
                                         value="&quot;${ProjName}.map&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.207849780"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.272429594"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
                                         value="${ProjName}.out" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1730405570"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.2076163355"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
                                         valueType="libs">
                                     <listOptionValue builtIn="false" value="libc.a"/>
@@ -192,13 +192,13 @@
                                     <listOptionValue builtIn="false"
                                                      value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1642862213"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1967226591"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
                                         valueType="libPaths">
                                     <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
                                     <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.931842322"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.17239932"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
                                         valueType="stringList">
                                     <listOptionValue builtIn="false" value="16002-D"/>
@@ -206,49 +206,49 @@
                                     <listOptionValue builtIn="false" value="10325-D"/>
                                     <listOptionValue builtIn="false" value="10229-D"/>
                                 </option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.628793954"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.773340389"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1795637117"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.2126747201"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
                                         value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1568690558"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1785926765"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
                                         value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.790669318"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.683577056"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT"
                                         value="startup_entry" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.636942967"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1312810581"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
                                         valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1245052655"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1324674660"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
                                         valueType="enumerated"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1776037702"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1903606010"
                                         name="Linker Command Files"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.2125995458"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.872286488"
                                         name="Linker Command Files"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
                                 <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1674943097"
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1603687860"
                                         name="Generated Linker Command Files"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
                             </tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1597342378"
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1441542763"
                                   name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1896669298"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.210948887"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
                                         valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.2112595558"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.514543379"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
                                         valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1916629122"
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.2135898037"
                                         superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
                                         value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
                                         valueType="enumerated"/>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650em_stack.launch

@@ -12,7 +12,6 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -17,11 +17,6 @@
                     <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                 </choice>
             </property>
-            <property Type="choicelist" Value="1" id="Debug Probe Selection">
-                <choice Name="Select by serial number" value="0">
-                    <property Type="stringfield" Value="L1000537" id="-- Enter the serial number"/>
-                </choice>
-            </property>
             <platform XML_version="1.2" id="platform_0">
                 <instance XML_version="1.2" desc="CC2650F128_0" href="devices/cc2650f128.xml" id="CC2650F128_0" xml="cc2650f128.xml" xmlpath="devices"/>
             </platform>

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 ) );
+  return ( (unsigned char*)ltoa( l, (char *)buf, radix ) );
 #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

@@ -23,7 +23,7 @@ Instruction Specification
 
 file defined:
 
-Bio_Pro_Sci / �� / Pi3/DataServer / CC2650 / CC2650���誘銵�
+Bio_Pro_Sci / 嚙踝蕭��赤 / Pi3/DataServer / CC2650 / CC2650嚙踐垓��蕭嚙踝隤嚙�
 
 ```
 struct instruction {
@@ -56,10 +56,10 @@ instruction operator
 | VIS_INT  | 0x60  | interrupt device         |
 |          | 0x70  | not used                 |
 |          | 0x80  | not used                 |
-| VIS_FUH  | 0x90  | not used                 |
+| VIS_STI  | 0x90  | en/disable stimulation   |
 | VIS_CAL  | 0xA0  | not used                 |
 |          | 0xB0  | not used                 |
-| VIS_STI  | 0xC0  | device start working     |
+| VIS_START| 0xC0  | device start working     |
 |          | 0xD0  | not used                 |
 |          | 0xE0  | not used                 |
 | VIS_RST  | 0xF0  | device reset             |
@@ -93,6 +93,63 @@ instruction operator
 #include <ti/sysbios/knl/Semaphore.h>
 #include "simple_gatt_profile.h"
 
+
+/** State for SPI (SPI callback to do task) **/
+typedef enum {
+    CLOSE_SPI,          // close SPI after MISO transmit
+    CONTINUOUS_TRANS,   // transmit DBS data
+    FLUSH_BUFFER,       // clean SPI buffer, used after a "write" SPI instruction (MISO)
+    FLUSH_BUFFER2,      // clean SPI buffer twice
+    READ_REG,           // read DBS register value, used after a "read" SPI instruction (MISO)
+    READ_REG2,          // read DBS register value, used after a "read" SPI instruction (MISO)
+    END_TRANSMIT,       // read DBS register value, used after a "read" SPI instruction (MISO)
+    ONE_SHOT_SPI,       // end spi instruction
+    READ_MOSI
+} SPI_CB_MODE;
+
+/*========================
+ ==== Global Variable ====
+ =========================*/
+
+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;
+*  StiCommand =  0b00CC_00SS
+*  The first C is record command, the second is sti
+*  The first S is record status, the second is sti
+*
+*  rec_sti_command   |             meaning                            |
+*       0x00         |  command = interrupt; status = idle            |
+*       0x01         |  command = interrupt; status = sti without rec |
+*       0x02         |  command = interrupt; status = rec without sti |
+*       0x03         |  command = interrupt; status = sti & rec       |
+*       0x10         |  command = start rec; status = idle            |
+*       0x11         |  command = start rec; status = sti without rec |
+*       0x12         |  command = start rec; status = rec without sti |
+*       0x13         |  command = start rec; status = sti & rec       |
+*       0x20         |  command = start sti; status = idle            |
+*       0x21         |  command = start sti; status = sti without rec |
+*       0x22         |  command = start sti; status = rec without sti |
+*       0x23         |  command = start sti; status = sti & rec       |
+*       0x30         |  command = rec & sti; status = idle            |
+*       0x31         |  command = rec & sti; status = sti without rec |
+*       0x32         |  command = rec & sti; status = rec without sti |
+*       0x33         |  command = rec & sti; status = sti & rec       |
+*/
+#define ENABLE_REC 0x20
+#define ENABLE_STI 0x10
+#define STATUS_REC  0x02
+#define STATUS_STI  0x01
+static uint8_t rec_sti_command = 0x00;  // 0=NOP; 0x01=stop; 2=start;
+
 /*======================
  ==== event control ====
  =====================*/
@@ -157,6 +214,7 @@ extern ICall_Semaphore semaphore;
 // command return characteristic
 #define BLE_CDR_BUFF_CHAR SIMPLEPROFILE_CHAR2
 #define BLE_CDR_BUFF_SIZE SIMPLEPROFILE_CHAR2_LEN
+#define BLE_CDR_SAMLL_SIZE 10
 
 // instruction input characteristic
 #define BLE_INS_BUFF_CHAR SIMPLEPROFILE_CHAR3
@@ -182,12 +240,18 @@ extern ICall_Semaphore semaphore;
 #define INS_TYPE_CIS 0x70
 
 // VIS operator
-#define VIS_ASK     0x30
-#define VIS_INT     0x60
-#define VIS_FUH     0x90
-#define VIS_CAL     0xA0
-#define VIS_STI     0xC0
-#define VIS_RST     0xF0
+#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
+
 
 // CIS operator
 #define CIS_NOP     0x00
@@ -292,7 +356,7 @@ static uint16_t CONNECT_HANDLE = 0;
 /**
  * command instruction buffer
  */
-static uint8_t cdr_buf[BLE_CDR_BUFF_SIZE] = {0};
+static uint8_t cdr_buf[BLE_CDR_SAMLL_SIZE] = {0};
 
 /*====================
  ==== event table ====
@@ -370,6 +434,8 @@ static void headstage_update_instruction(uint8_t *instruction) {
     uint8_t ins_oper = instruction[1] & 0xF0;
     uint8_t ins_len  = instruction[1] & 0x0F;
 
+
+
     switch (ins_type) {
         case INS_TYPE_RIS: {
             headstage_update_ris_instruction(ins_len, instruction + 2);

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

@@ -18,7 +18,7 @@ static uint8_t headstage_battery_percent() {
 }
 
 
-static uint8_t battery_volt = 256;
+static uint8_t battery_volt;
 static uint8_t headstage_battery_volt1() {
     uint8_t  internal_battery_percent;
     uint32_t internal_batt_sense = AONBatMonBatteryVoltageGet();

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

@@ -1,106 +0,0 @@
-
-#ifndef HEAD_BLAST_DATA
-#define HEAD_BLAST_DATA
-
-// L2CAP Header(2) + L2CAP CID(2) + ATT Opcode(1) + ATT handle(2)
-#define TOTAL_PACKET_OVERHEAD 7
-
-static void SimpleBLEPeripheral_performPeriodicTask();
-
-
-/*********************************************************************
- * @fn      SimpleBLEPeripheral_blastData
- *
- * @brief   Sends ATT notifications in a tight while loop to demo
- *          throughput
- *
- * @param   none
- *
- * @return  none
- */
-static void SimpleBLEPeripheral_blastData() {
-    // Subtract the total packet overhead of ATT and L2CAP layer from notification payload
-    uint16_t             len = MAX_PDU_SIZE - TOTAL_PACKET_OVERHEAD;
-    attHandleValueNoti_t noti;
-    bStatus_t            status;
-    noti.handle = 0x27;
-    noti.len    = len;
-
-    uint32_t not_time_stamp;
-
-    // Store hte connection handle for future reference
-    uint16_t connectionHandle;
-    GAPRole_GetParameter(GAPROLE_CONNHANDLE, &connectionHandle);
-
-    // If RTOS queue is not empty, process app message.
-    // We need to process the app message here in the case of a keypress
-    while (!Queue_empty(appMsgQueue)) {
-        sbpEvt_t *pMsg = (sbpEvt_t *)Util_dequeueMsg(appMsgQueue);
-        if (pMsg) {
-            // Process message.
-            SimpleBLEPeripheral_processAppMsg(pMsg);
-
-            // Free the space from the message.
-            ICall_free(pMsg);
-        }
-    }
-
-
-    not_time_stamp = Timestamp_get32() / 2;
-    noti.pValue = (uint8 *)GATT_bm_alloc(connectionHandle, ATT_HANDLE_VALUE_NOTI, GATT_MAX_MTU, &len);
-
-    if (noti.pValue != NULL)  // if allocated
-    {
-        // Place index
-        noti.pValue[2] = not_time_stamp & 0xFF;
-        noti.pValue[3] = (not_time_stamp >> 8) & 0xFF;
-        noti.pValue[4] = (not_time_stamp >> 16) & 0xFF;
-        noti.pValue[5] = (not_time_stamp >> 24) & 0xFF;
-        noti.pValue[6] = 100;
-        noti.pValue[7] = 0;
-
-
-        // Attempt to send the notification
-        status = GATT_Notification(connectionHandle, &noti, GATT_NO_AUTHENTICATION);
-        if (status != SUCCESS)  // if noti not sent
-        {
-//            PIN_setOutputValue(hSbpPins, Board_LED1, Board_LED_ON);
-            GATT_bm_free((gattMsg_t *)&noti, ATT_HANDLE_VALUE_NOTI);
-        } else {
-            // Notification is successfully sent, increment counters
-//            Display_print0(dispHandle, 4, 0, "success");
-//            PIN_setOutputValue(hSbpPins, Board_LED2, Board_LED_ON);
-            msg_counter++;
-        }
-    } else {
-        // bleNoResources was returned
-        asm(" NOP ");
-    }
-
-    // Reset debug pins
-//    PIN_setOutputValue(hSbpPins, Board_LED1, Board_LED_OFF);
-//    PIN_setOutputValue(hSbpPins, Board_LED2, Board_LED_OFF);
-}
-
-static void SimpleBLEPeripheral_performPeriodicTask(){
-    SimpleBLEPeripheral_blastData();
-}
-
-/*********************************************************************
- * @fn      SimpleBLEPeripheral_clockHandler
- *
- * @brief   Handler function for clock timeouts.
- *
- * @param   arg - event type
- *
- * @return  None.
- */
-static void SimpleBLEPeripheral_clockHandler(UArg arg) {
-    // Store the event.
-    events |= arg;
-
-    // Wake up the application.
-    Semaphore_post(sem);
-}
-
-#endif

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

@@ -23,26 +23,29 @@ static void CaliTable2u8(uint8_t* cali){
 *  - .......
 */
 static void SendCaliValue(uint8_t CaliNumber){
-    uint8_t ch, gain_offset;
-    uint8_t cdr_buf[10];
+    uint8_t ch, cali_buf[BLE_CDR_BUFF_SIZE];
 
-    ch = 2 * (CaliNumber % 4);
-    uint8_t gain_level = CaliNumber / 4;   // 0:gain, 1:offset
+//    ch = 2 * (CaliNumber % 4);
+//    uint8_t gain_level = CaliNumber / 4;   // 0:gain, 1:offset
+    uint8_t channel_number = 8, index = 1;
+    uint8_t gain_level = 0;
 
-    cdr_buf[0] = CHIP_ID;
+    if(CaliNumber < 4){
+        gain_level = CaliNumber;
+    }
 
-    cdr_buf[1] = (uint8_t) (CaliTable.Ch[ch].Gain[gain_level] >> 8) & 0xFF;
-    cdr_buf[2] = (uint8_t)  CaliTable.Ch[ch].Gain[gain_level] & 0x00FF;
-    cdr_buf[3] = (uint8_t) (CaliTable.Ch[ch].Offset[gain_level] >> 8) & 0xFF;
-    cdr_buf[4] = (uint8_t)  CaliTable.Ch[ch].Offset[gain_level] & 0x00FF;
-    cdr_buf[5] = (uint8_t) (CaliTable.Ch[ch+1].Gain[gain_level] >> 8) & 0xFF;
-    cdr_buf[6] = (uint8_t)  CaliTable.Ch[ch+1].Gain[gain_level] & 0x00FF;
-    cdr_buf[7] = (uint8_t) (CaliTable.Ch[ch+1].Offset[gain_level] >> 8) & 0xFF;
-    cdr_buf[8] = (uint8_t)  CaliTable.Ch[ch+1].Offset[gain_level] & 0x00FF;
+    cali_buf[0] = CHIP_ID;
+    for(int i=0 ; i<channel_number ; i++){
+        cali_buf[index++] = (uint8_t) (CaliTable.Ch[i].Gain[gain_level] >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ch[i].Gain[gain_level] & 0x00FF;
+        cali_buf[index++] = (uint8_t) (CaliTable.Ch[i].Offset[gain_level] >> 8) & 0xFF;
+        cali_buf[index++] = (uint8_t) CaliTable.Ch[i].Offset[gain_level] & 0x00FF;
+    }
 
-    cdr_buf[9] = 0; // don't care
-
-    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, BLE_CDR_BUFF_SIZE, cdr_buf);
+//    for(int i=1 ; i<BLE_CDR_BUFF_SIZE ; i++){
+//        cali_buf[i] = i;
+//    }
+    SimpleProfile_SetParameter(BLE_CDR_BUFF_CHAR, index, cali_buf);
 }
 
 #endif

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

@@ -0,0 +1,243 @@
+
+#ifndef NEU_CALI_STI_H
+#define NEU_CALI_STI_H
+
+#include "headstage_cali_table.h"
+
+typedef struct _StiCali{
+    uint16_t coefficient;
+    int16_t offset;
+}StiCali;
+
+struct _StiCaliStiTable{
+    StiCali p_ch;
+    StiCali n_ch;
+}StiCaliTable =
+
+#ifdef BOARD_TEST
+{
+    .p_ch.coefficient = 10000,
+    .p_ch.offset = 0,
+    .n_ch.coefficient = 10000,
+    .n_ch.offset = 0
+};
+
+#elif defined(BOARD_00_81_F9_E4_8C_D0)
+{
+    .p_ch.coefficient = 2199,
+    .p_ch.offset = -4615,
+    .n_ch.coefficient = 2162,
+    .n_ch.offset = -16395
+};
+
+#elif defined(BOARD_18_04_ED_37_C6_BE)
+{
+    .p_ch.coefficient = 2270,
+    .p_ch.offset = -7039,
+    .n_ch.coefficient = 2259,
+    .n_ch.offset = -14128
+};
+
+#elif defined(BOARD_18_04_ED_37_C6_41)
+{
+    .p_ch.coefficient = 2090,
+    .p_ch.offset = 4616,
+    .n_ch.coefficient = 1997,
+    .n_ch.offset = -40664
+};
+
+#elif defined(BOARD_18_04_ED_37_C6_DF)
+{
+    .p_ch.coefficient = 2132,
+    .p_ch.offset = -3843,
+    .n_ch.coefficient = 2054,
+    .n_ch.offset = -21544
+};
+
+#elif defined(BOARD_18_04_ED_37_C6_C7)
+{
+    .p_ch.coefficient = 2199,
+    .p_ch.offset = -7237,
+    .n_ch.coefficient = 2221,
+    .n_ch.offset = -15701
+};
+
+#elif defined(BOARD_00_81_F9_E4_8B_50)
+{
+    .p_ch.coefficient = 2369,
+    .p_ch.offset = -11004,
+    .n_ch.coefficient = 2360,
+    .n_ch.offset = -11796
+};
+
+#elif defined(BOARD_00_81_F9_E4_9B_97)
+{
+    .p_ch.coefficient = 2227,
+    .p_ch.offset = -9845,
+    .n_ch.coefficient = 2151,
+    .n_ch.offset = -26608
+};
+
+#elif defined(BOARD_18_04_ED_37_C6_52)
+{
+    .p_ch.coefficient = 2024,
+    .p_ch.offset = -7686,
+    .n_ch.coefficient = 2086,
+    .n_ch.offset = -11282
+};
+
+#elif defined(BOARD_00_81_F9_E4_9B_EF)
+{
+    .p_ch.coefficient = 2383,
+    .p_ch.offset = -8584,
+    .n_ch.coefficient = 2415,
+    .n_ch.offset = -20346
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E9_1D)
+{
+    .p_ch.coefficient = 2075,
+    .p_ch.offset = 6344,
+    .n_ch.coefficient = 2002,
+    .n_ch.offset = -5562
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E8_7A)
+{
+    .p_ch.coefficient = 2180,
+    .p_ch.offset = 6651,
+    .n_ch.coefficient = 2254,
+    .n_ch.offset = 136
+};
+
+#elif defined(BOARD_A4_DA_32_D4_F0_AC)
+{
+    .p_ch.coefficient = 2125,
+    .p_ch.offset = -6660,
+    .n_ch.coefficient = 2170,
+    .n_ch.offset = -439
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E8_7C)
+{
+    .p_ch.coefficient = 2265,
+    .p_ch.offset = 6685,
+    .n_ch.coefficient = 2230,
+    .n_ch.offset = 2124
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EF_39)
+{
+    .p_ch.coefficient = 1976,
+    .p_ch.offset = 6641,
+    .n_ch.coefficient = 2035,
+    .n_ch.offset = 2834
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_6A)
+{
+    .p_ch.coefficient = 2076,
+    .p_ch.offset = 1154,
+    .n_ch.coefficient = 2096,
+    .n_ch.offset = -1073
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E8_E6)
+{
+    .p_ch.coefficient = 2306,
+    .p_ch.offset = -88454,
+    .n_ch.coefficient = 2418,
+    .n_ch.offset = -15140
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_3B)
+{
+    .p_ch.coefficient = 2262,
+    .p_ch.offset = -564,
+    .n_ch.coefficient = 2298,
+    .n_ch.offset = 44746
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EE_E2)
+{
+    .p_ch.coefficient = 2057,
+    .p_ch.offset = 5980,
+    .n_ch.coefficient = 2096,
+    .n_ch.offset = -21411
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E8_71)
+{
+    .p_ch.coefficient = 2175,
+    .p_ch.offset = -4549,
+    .n_ch.coefficient = 2220,
+    .n_ch.offset = 31468
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EF_C4)
+{
+    .p_ch.coefficient = 2348,
+    .p_ch.offset = -5830,
+    .n_ch.coefficient = 2374,
+    .n_ch.offset = -26403
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EF_85)
+{
+    .p_ch.coefficient = 2136,
+    .p_ch.offset = -3339,
+    .n_ch.coefficient = 2189,
+    .n_ch.offset = -30040
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_DA)
+{
+    .p_ch.coefficient = 2081,
+    .p_ch.offset = -3015,
+    .n_ch.coefficient = 2122,
+    .n_ch.offset = -21543
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E6_EA)
+{
+    .p_ch.coefficient = 2039,
+    .p_ch.offset = -262,
+    .n_ch.coefficient = 2127,
+    .n_ch.offset = -47259
+};
+
+#elif defined(BOARD_A4_DA_32_D4_EE_DB)
+{
+    .p_ch.coefficient = 2214,
+    .p_ch.offset = -1170,
+    .n_ch.coefficient = 2351,
+    .n_ch.offset = -24636
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E7_3A)
+{
+    .p_ch.coefficient = 2210,
+    .p_ch.offset = -4855,
+    .n_ch.coefficient = 2339,
+    .n_ch.offset = -16434
+};
+
+#elif defined(BOARD_A4_DA_32_D4_E6_CF)
+{
+    .p_ch.coefficient = 2135,
+    .p_ch.offset = -5206,
+    .n_ch.coefficient = 2193,
+    .n_ch.offset = -30885
+};
+
+#else
+{
+    .p_ch.coefficient = 10000,
+    .p_ch.offset = 0,
+    .n_ch.coefficient = 10000,
+    .n_ch.offset = 0
+};
+
+#endif
+
+#endif

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

@@ -1,6 +1,7 @@
 
 #ifndef NEU_CHECK_INSTRUCTION
 #define NEU_CHECK_INSTRUCTION
+
 #include "headstage_instruction.h"
 #include "neu/headstage_spi.h"
 #include "neu/headstage_reset.h"
@@ -12,36 +13,63 @@ static uint8_t check_ins(uint16_t trans_ins){
     return (trans_ins == recv_ins);
 }
 
-static void check_register(uint8_t register_to_check, uint16_t instruction_to_fit, uint8_t next_state){
-    if(spi_state_counter < 6){
+static void check_register(uint8_t register_to_check, uint16_t instruction_to_fit, NEU_WORK_STATE next_state){
+    if(check_reg_counter < 6){
         SPICallBack = CONTINUOUS_TRANS;
-        spi_txbuf[0] = register_to_check;
-        spi_txbuf[1] = register_to_check;
-        spi_txbuf[2] = register_to_check;
+        spi_txbuf[0] = register_to_check & 0x7F;
+        spi_txbuf[1] = rec_sti_command;
+        spi_txbuf[2] = check_reg_counter;
 
-        spi_state_counter ++;
+        check_reg_counter ++;
         headstage_spi_transaction(3);
     }
     else{
-        spi_state_counter = 0;
+        check_reg_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
             SPI_close(headstage_spi_handle);
-            DBSReset();
-//            NEULIVE_STATE.state = NEU_WRITE_INSTRUCTION;
-//            NEULIVE_STATE.config_type = NEU_SET_STI_CUR;
-//            if(STI){
-//                INSTRUCTION.ins_opcode        = T_ZE;
-//            }
-//            else{
-//                INSTRUCTION.ins_opcode        = BIAS_ONE;
-//            }
+//            DBSReset();
+
+            // start recording failed
+            if( (rec_sti_command & ENABLE_REC) && !(rec_sti_command & STATUS_REC) ){
+                NEULIVE_STATE.state       = NEU_WRITE_REC_INS;
+                NEULIVE_STATE.config_type = NEU_WARM_UP;
+                INSTRUCTION.ins_opcode    = BIAS_ONE;
+            }
+
+            // start sti failed
+            else if( (rec_sti_command & ENABLE_STI) && !(rec_sti_command & STATUS_STI) ){
+                NEULIVE_STATE.state       = NEU_WRITE_STI_INS;
+                NEULIVE_STATE.config_type = NEU_WARM_UP;
+                INSTRUCTION.ins_opcode    = T_ZE;
+
+                // make sure rec can restart
+                not_buf_offset = NOT_BUF_OFFSET_INIT;
+                IsFirstData = true;
+            }
+
+            // stop sti failed
+            else if( !(rec_sti_command & ENABLE_STI) && (rec_sti_command & STATUS_STI) ){
+                NEULIVE_STATE.state       = NEU_STI_INT;
+
+                // make sure rec can restart
+                not_buf_offset = NOT_BUF_OFFSET_INIT;
+                IsFirstData = true;
+            }
 
-            NEULIVE_STATE.state = NEU_DATA_RATE_TEST;
             SPICallBack = ONE_SHOT_SPI;
             ReopenSPI();
         }
@@ -49,4 +77,115 @@ static void check_register(uint8_t register_to_check, uint16_t instruction_to_fi
     }
 }
 
+static uint8_t check_sti_register(uint8_t address, uint16_t instruction_to_fit);
+
+static void check_sti_t1_t5(NEU_WORK_STATE next_state){
+    // get sti channel
+    uint8_t index, sti_channel[9];
+
+    for(index=0 ; index<9 ; index++){
+        sti_channel[index] = 0xFF;
+    }
+
+    // sti_channel will be [active_ch1, active_ch2, ..., 0xFF, 0xFF]
+    // where active_ch is the sti channel; 0xFF is used as an EOF
+    index = 0;
+    for(int i=0 ; i<8 ; i++){
+        if( (1 << i) & INSTRUCTION.sti_channel ){
+            sti_channel[index++] = i;
+        }
+    }
+
+    uint8_t register_address[5], register_index, success;    // this is t1~t5 and sti_cycle number register address
+    uint16_t value_to_fit;
+
+    // check every active channel alternatively
+    for(index = 0 ; sti_channel[index]!=0xFF ; index++){
+
+        // check t1~t5 and sti-cycle register
+        for(register_index = 0 ; register_index < 5 ; register_index++){
+
+            // get register address
+            if(register_index < 4){
+                register_address[register_index] = sti_channel[index] * 4 + register_index + 1;
+            }
+            else{
+                register_address[register_index] = (sti_channel[index] / 2) + 42; // sti_cycle address
+            }
+
+            // get value to fit
+            if(register_index == 0){
+                uint16_t t1 = INSTRUCTION.sti_t1[sti_channel[index]];
+                uint16_t t21 = (INSTRUCTION.sti_t2[sti_channel[index]] & 0x003F) << 10;
+                value_to_fit = (t21) | (t1);
+            }
+            else if(register_index == 1){
+                uint16_t t22 = (INSTRUCTION.sti_t2[sti_channel[index]] >> 6) & 0x000F;
+                uint16_t t3 = INSTRUCTION.sti_t3[sti_channel[index]] << 4;
+                uint16_t t41 = (INSTRUCTION.sti_t4[sti_channel[index]] & 0x03) << 14;
+                value_to_fit = t41 | t3 | t22;
+            }
+            else if(register_index == 2){
+                uint16_t t42 = (INSTRUCTION.sti_t4[sti_channel[index]] >> 2) & 0xFFFF;
+                value_to_fit = t42;
+            }
+            else if(register_index == 3){
+                uint16_t t5 = (INSTRUCTION.sti_t5[sti_channel[index]]) & 0x03FF;
+                value_to_fit = t5;
+            }
+            else{
+                uint8_t odd_even       = sti_channel[index] % 2;
+                if (!odd_even){
+                    value_to_fit = (INSTRUCTION.current_sti_cycle[sti_channel[index] + 1] << 8) | (INSTRUCTION.current_sti_cycle[sti_channel[index]]);
+                }
+                else{
+                    value_to_fit = (INSTRUCTION.current_sti_cycle[sti_channel[index]] << 8) | (INSTRUCTION.current_sti_cycle[sti_channel[index] - 1]);
+                }
+            }
+
+            success = check_sti_register(register_address[register_index], value_to_fit);
+
+            if(!success){
+                break;
+            }
+        }
+        if(!success){
+            break;
+        }
+    }
+    if(!success){
+        SPI_close(headstage_spi_handle);
+        NEULIVE_STATE.state       = NEU_WRITE_STI_INS;
+        NEULIVE_STATE.config_type = NEU_WARM_UP;
+        INSTRUCTION.ins_opcode    = T_ZE;
+
+        // make sure rec can restart
+        not_buf_offset = NOT_BUF_OFFSET_INIT;
+        IsFirstData = true;
+        ReopenSPI();
+    }
+    else{
+        NEULIVE_STATE.state       = next_state;
+    }
+    SPICallBack = ONE_SHOT_SPI;
+    headstage_spi_transaction(3);
+}
+
+static uint8_t check_sti_register(uint8_t address, uint16_t instruction_to_fit){
+    check_reg_counter = 0;
+    while(check_reg_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
+    }
+
+    check_reg_counter = 0;
+
+    // success = 1; failed = 0
+    return check_ins(instruction_to_fit);
+}
+
 #endif

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

@@ -0,0 +1,138 @@
+
+#ifndef DBS_OBJECT_H
+#define DBS_OBJECT_H
+
+#include "neu/headstage_spi.h"
+
+#define SYS_RESERVED_INDEX       0
+#define SYS_GENERAL_ENABLE_INDEX 1
+#define SYS_LNA_BIOS1_INDEX      2
+#define SYS_LNA_BIOS2_INDEX      3
+
+#define REC_CHANNEL_INDEX      0
+#define REC_GAIN_INDEX         1
+#define REC_ADC_CLOCK_INDEX    2
+
+#define STI_ENABLE_INDEX        0
+#define STI_DURATION0_INDEX     1
+#define STI_DURATION1_INDEX     2
+#define STI_DURATION2_INDEX     3
+#define STI_DURATION3_INDEX     4
+#define STI_AMP_POS_INDEX       5
+#define STI_AMP_NEG_INDEX       6
+#define STI_POLARITY_INDEX      7
+#define STI_CYCLE_CH01_INDEX    8
+#define STI_CYCLE_CH23_INDEX    9
+#define STI_CYCLE_CH45_INDEX   10
+#define STI_CYCLE_CH67_INDEX   11
+#define STI_CLK_RATIO_INDEX    12
+#define STI_ARBITRARY_EN_INDEX 13
+#define STI_MODE_INDEX         14
+
+//#define DBS_REGISTER                                            \
+//    uint8_t address;                                            \
+//    void (*write_reg) (DBSRegister *self, uint32_t reg_value);  \
+//    uint32_t (*read_reg) (DBSRegister *self)
+
+typedef struct _DBSRegister{
+    uint8_t address;
+    bool WriteRegister, CheckRegister;
+    void (*write_reg) (struct _DBSRegister *self, uint16_t reg_value);
+    void (*read_reg) (struct  _DBSRegister *self);
+}DBSRegister;
+
+void write_reg(DBSRegister *self, uint16_t reg_value){
+    spi_txbuf[0] = 0x80 | self->address;
+    spi_txbuf[1] = (reg_value >> 8) & 0xFF ;
+    spi_txbuf[2] = reg_value & 0xFF;
+    SPICallBack = ONE_SHOT_SPI;
+    headstage_spi_transaction(SPI_BUFFER_SIZE);
+}
+
+void read_reg(DBSRegister *self){
+    spi_txbuf[0] = 0x7F & self->address;
+    spi_txbuf[1] = 0x7F & self->address; // it's don't care actually
+    spi_txbuf[2] = 0x7F & self->address; // it's don't care actually
+    SPICallBack = READ_REG;
+    headstage_spi_transaction(SPI_BUFFER_SIZE);
+}
+
+
+static uint16_t sys_register_default_value[4] = {
+    0x0000,
+    0x40F2,
+    0x0210,
+    0x4210
+};
+static uint16_t rec_register_value[3];
+static uint16_t sti_register_value[15];
+
+static DBSRegister sys_register[4];
+static DBSRegister rec_register[3];
+static DBSRegister sti_register[15];
+
+static void InitSysRegister(){
+    sys_register[SYS_RESERVED_INDEX].address = 0x00;
+    sys_register[SYS_GENERAL_ENABLE_INDEX].address = 47; // general enable
+    sys_register[SYS_LNA_BIOS1_INDEX].address = 57;
+    sys_register[SYS_LNA_BIOS2_INDEX].address = 58;
+
+    for(int i=0 ; i<sizeof(sys_register)/sizeof(DBSRegister) ; i++){
+        sys_register[i].WriteRegister = false;
+        sys_register[i].CheckRegister = false;
+        sys_register[i].write_reg = &write_reg;
+        sys_register[i].read_reg = &read_reg;
+    }
+}
+
+static void InitRecRegister(){
+    rec_register[REC_CHANNEL_INDEX].address = 48;
+    rec_register[REC_GAIN_INDEX].address = 49;
+    rec_register[REC_ADC_CLOCK_INDEX].address = 51;     // sampling rate
+
+    for(int i=0 ; i<sizeof(rec_register)/sizeof(DBSRegister) ; i++){
+        rec_register[i].WriteRegister = false;
+        rec_register[i].CheckRegister = false;
+        rec_register[i].write_reg = &write_reg;
+        rec_register[i].read_reg = &read_reg;
+    }
+}
+
+static void InitStiRegister(){
+    sti_register[STI_ENABLE_INDEX].address = 46;
+    sti_register[STI_DURATION0_INDEX].address = 1;
+    sti_register[STI_DURATION1_INDEX].address = 2;
+    sti_register[STI_DURATION2_INDEX].address = 3;
+    sti_register[STI_DURATION3_INDEX].address = 4;
+    sti_register[STI_AMP_POS_INDEX].address = 37;
+    sti_register[STI_AMP_NEG_INDEX].address = 38;
+    sti_register[STI_POLARITY_INDEX].address = 40;
+    sti_register[STI_CYCLE_CH01_INDEX].address = 42;
+    sti_register[STI_CYCLE_CH23_INDEX].address = 43;
+    sti_register[STI_CYCLE_CH45_INDEX].address = 44;
+    sti_register[STI_CYCLE_CH67_INDEX].address = 45;
+    sti_register[STI_CLK_RATIO_INDEX].address = 52;
+    sti_register[STI_ARBITRARY_EN_INDEX].address = 54;
+    sti_register[STI_MODE_INDEX].address = 56;
+
+    for(int i=0 ; i<sizeof(sti_register)/sizeof(DBSRegister) ; i++){
+        sti_register[i].WriteRegister = false;
+        sti_register[i].CheckRegister = false;
+        sti_register[i].write_reg = &write_reg;
+        sti_register[i].read_reg = &read_reg;
+    }
+}
+
+static void InitDBSRegister(){
+    InitSysRegister();
+    InitRecRegister();
+    InitStiRegister();
+
+//    for(int i=1 ; i<sizeof(sys_register)/sizeof(DBSRegister) ; i++){
+    for(int i=1 ; i<4 ; i++){
+        sys_register[i].WriteRegister = true;
+    }
+    flag_notify(EVT_NEU_SPI);
+}
+
+#endif

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

@@ -44,11 +44,11 @@ struct HEADSTAGE_PARAMETER_TABLE {
                              *  -----------
                              */
     /**< these parameter define the bias voltage of amplifier. */
-    uint8_t vgrp;
-    uint8_t vgrn;
-    uint8_t vgr_int_old;
-    uint8_t vgr_intp;
-    uint8_t vgr_intn;
+    uint16_t vgrp;
+    uint16_t vgrn;
+    uint16_t vgr_int_old;
+    uint16_t vgr_intp;
+    uint16_t vgr_intn;
 
     uint8_t ins_opcode; /**< check instruction opcode which is transmitted to DBS. */
 
@@ -62,6 +62,9 @@ struct HEADSTAGE_PARAMETER_TABLE {
     uint16_t sti_amplitude_h; /**< positive side amplitude. */
     uint16_t sti_amplitude_l; /**< negative side amplitude. */
 
+    uint16_t sti_amplitude_h_cali;
+    uint16_t sti_amplitude_l_cali;
+
     uint16_t sys_clk_ratio;   /**< frequency divider ratio for digital core clock. */
     uint16_t adc_clock_ratio; /**< frequency divider ratio for adc clock. */
     uint16_t sti_clock_ratio; /**< frequency divider ratio for stimulation clock. */
@@ -81,16 +84,11 @@ struct HEADSTAGE_PARAMETER_TABLE {
  *   manage which operation to be conducted
  */
 struct HEADSTAGE_STATE {
-    uint8_t state;
+    NEU_WORK_STATE state;
 
-    uint8_t config_type;
+    NEU_CONFIG_TYPE config_type;
 
     uint8_t index;
-} NEULIVE_STATE = {0};
-
-static bool STI = false;
-static uint8_t spi_state_counter = 0;
-static bool ConnectState = false;
-static bool IsFirstData = true;
+} NEULIVE_STATE={NEU_IDLE, NEU_WARM_UP, 0};
 
 #endif

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

@@ -115,7 +115,7 @@ static uint8_t headstage_led_set_color(uint16_t *ins_buf, uint8_t repeat, uint8_
             parameter = (LEDParameter){.luminance = 0xE1, .red = 0x0F, .green = 0x7F, .blue = 0x1F};
             break;
         case COLOR_PURPLE:
-            parameter = (LEDParameter){.luminance = 0xE1, .red = 0x98, .green = 0x33, .blue = 0xFA};
+            parameter = (LEDParameter){.luminance = 0xE1, .red = 0x7F, .green = 0x0F, .blue = 0x7F};
             break;
         default:
         case COLOR_BLACK:
@@ -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>
@@ -228,4 +228,29 @@ static void headstage_led_spi_color(uint8_t color) {
 
 #endif  // HEADSTAGE_LED_USE_GPIO
 
+static void headstage_led_control(){
+    if( (rec_sti_command & STATUS_REC) && (rec_sti_command & STATUS_STI) ){
+        headstage_led_color(COLOR_MAGENTA);
+    }
+    else if((rec_sti_command & STATUS_REC)){
+        headstage_led_color(COLOR_BLUE);
+    }
+    else if((rec_sti_command & STATUS_STI)){
+        headstage_led_color(COLOR_ORANGE);
+    }
+    else{
+        if(ErrorRestart){
+            headstage_led_color(COLOR_RED);
+        }
+        else if(ConnectState){
+            headstage_led_color(COLOR_CYAN);
+        }
+        else{
+            headstage_led_color(COLOR_GREEN);  // color green
+        }
+    }
+}
+
+
+
 #endif  // HEADSTAGE_LED_H

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_rec_ins.h

@@ -0,0 +1,103 @@
+
+#ifndef NEU_REC_INS_H
+#define NEU_REC_INS_H
+
+#include "headstage_instruction.h"
+
+/**
+ *  @fn build amplifier bias
+ */
+
+static bool build_amp_bias(uint32_t* value) {
+    uint8_t ins_opcode = INSTRUCTION.ins_opcode;
+    switch (ins_opcode) {
+        case BIAS_ONE: {
+            *value                 = (0x01 << 23) | (0x39 << 16) | NEU_LNA_BIAS_ONE;
+            INSTRUCTION.ins_opcode = BIAS_TWO;
+            return false;
+        }
+        case BIAS_TWO: {
+            *value                 = (0x01 << 23) | (0x3A << 16) | NEU_LNA_BIAS_TWO;
+            INSTRUCTION.ins_opcode = BIAS_TWO;
+            return true;
+        }
+        default: {
+            return false;
+        }
+    }
+}
+
+static NEU_CONFIG_TYPE build_rec_ins(NEU_CONFIG_TYPE config_type, uint32_t* value) {
+    bool done;
+    switch (config_type) {
+        /* These are recording parameter */
+        case NEU_WARM_UP:{
+            *value = (0x00 << 23) | (0x01 << 16) | 1;
+            return NEU_WARM_UP2;
+        }
+        case NEU_WARM_UP2:{
+            *value = (0x00 << 23) | (0x01 << 16) | 2;
+            return NEU_WARM_UP3;
+        }
+        case NEU_WARM_UP3:{
+            *value = (0x00 << 23) | (0x01 << 16) | 3;
+            return NEU_SET_GENERAL_EN;
+        }
+
+        case NEU_SET_GENERAL_EN: {
+            *value = (0x01 << 23) | (0x2F << 16) | NEU_GENERAL_EN;
+            return NEU_SET_REC_CHANNEL;
+        }
+        case NEU_SET_REC_CHANNEL: {
+            *value = (0x01 << 23) | (0x30 << 16) | INSTRUCTION.recording_channel;
+            return NEU_SET_AMP_GAIN;
+        }
+        case NEU_SET_AMP_GAIN: {
+            *value = (0x01 << 23) | (0x31 << 16) | INSTRUCTION.amplifier_gain;
+            return NEU_SET_VGRP;
+        }
+        case NEU_SET_VGRP:{
+            *value = (0x01 << 23) | (0x39 << 16) | (INSTRUCTION.vgrp << 5) | INSTRUCTION.vgrn;
+            return NEU_SET_VGRP_OLD;
+        }
+        case NEU_SET_VGRP_OLD:{
+            *value = (0x01 << 23) | (0x3A << 16) | (INSTRUCTION.vgr_int_old << 10) | (INSTRUCTION.vgr_intp << 5) | INSTRUCTION.vgr_intn;
+            return NEU_SETUP_DONE;
+        }
+
+//        case NEU_SET_SYS_CLK: {
+//            *value = (0x01 << 23) | (0x32 << 16) | INSTRUCTION.sys_clk_ratio;
+//            return NEU_SET_ADC_CLK;
+//        }
+        case NEU_SET_ADC_CLK: {
+            if(INSTRUCTION.adc_clock_ratio < 28){
+                INSTRUCTION.adc_clock_ratio = 28;
+            }
+            *value = (0x01 << 23) | (0x33 << 16) | INSTRUCTION.adc_clock_ratio;
+//            *value = (0x01 << 23) | (0x33 << 16) | 0x00C8;
+            return NEU_SET_AMP_BIAS;
+        }
+        case NEU_SET_AMP_BIAS: {
+            done = build_amp_bias(value);
+            if (done){
+                return NEU_SETUP_DONE;
+            }
+            else{
+                return NEU_SET_AMP_BIAS;
+            }
+        }
+
+//        case NEU_SET_CHOPPER: {
+//            *value = (0x01 << 23) | (0x3B << 16) | INSTRUCTION.chopper_ratio;
+//            return NEU_SETUP_DONE;
+//        }
+
+        default: {
+            return NEU_WARM_UP;
+        }
+    }
+}
+
+
+
+#endif

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

@@ -0,0 +1,30 @@
+
+#ifndef STI_CALI_H
+#define STI_CALI_H
+
+#include "headstage_cali_sti.h"
+
+static uint16_t UserCode2StiCode(uint16_t amp, uint8_t positive_ch){
+    // get real current value (uA)
+    uint32_t sti_code, real_amp = amp * 5;
+
+    if(StiCaliTable.p_ch.coefficient == 10000 && StiCaliTable.p_ch.offset == 0){
+        return amp;
+    }
+    if(StiCaliTable.n_ch.coefficient == 10000 && StiCaliTable.n_ch.offset == 0){
+        return amp;
+    }
+
+    // trans into sti code
+    if(positive_ch){
+        sti_code = StiCaliTable.p_ch.coefficient * real_amp + StiCaliTable.p_ch.offset;
+    }
+    else{
+        sti_code = StiCaliTable.n_ch.coefficient * real_amp + StiCaliTable.n_ch.offset;
+    }
+
+    sti_code = sti_code / 10000;
+    return (uint16_t) (sti_code);
+}
+
+#endif

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

@@ -0,0 +1,213 @@
+
+#ifndef NEU_STI_INS_H
+#define NEU_STI_INS_H
+
+#include "headstage_sti_cali.h"
+#include "headstage_instruction.h"
+
+/**
+ *  @fn get_sti_channel
+ */
+#define ALL_STI_CH_CONFIG_DONE 0xFF
+static uint8_t get_sti_channel(uint8_t sti_channel, uint8_t ch_number_config_done) {
+    uint8_t sti_ch;
+
+    uint8_t total_sti_ch_number = BitCount(sti_channel);
+    if(ch_number_config_done == total_sti_ch_number){ return ALL_STI_CH_CONFIG_DONE; }
+
+    for (uint8_t i = 0; i < NEU_STI_CHANNEL_COUNTS-1 ; i++) {
+        if ( (1 << i) & sti_channel) {
+            if(ch_number_config_done > 0){
+                ch_number_config_done --;
+            }
+            else{
+                sti_ch = i;
+                return sti_ch;
+            }
+        }
+    }
+    return 9;
+}
+
+/**
+ *  @fn build sti instruction with channel information
+ */
+static bool build_sti_cur_instruction(uint8_t sti_channel, uint32_t* value) {
+    uint8_t ins_opcode = INSTRUCTION.ins_opcode;
+    uint8_t op_neu; /** this is the final opcode to write register table in DBS */
+    switch (ins_opcode) {
+        case T_ZE:{
+            // sending garbage SPI (want to warm up SPI)
+            op_neu                 = 1;
+            *value                 = (0x00 << 23) | (op_neu << 16) | 1;
+            INSTRUCTION.ins_opcode = T_ST;
+            return false;
+        }
+        case T_ST: {
+            op_neu                 = sti_channel * 4 + 1;
+            uint16_t t1 = INSTRUCTION.sti_t1[sti_channel];
+            uint16_t t21 = (INSTRUCTION.sti_t2[sti_channel] & 0x003F) << 10;
+            *value                 = (0x01 << 23) | (op_neu << 16) | (t21) | (t1);
+            INSTRUCTION.ins_opcode = T_ND;
+            return false;
+        }
+        case T_ND: {
+            op_neu = sti_channel * 4 + 2;
+            uint16_t t22 = (INSTRUCTION.sti_t2[sti_channel] >> 6) & 0x000F;
+            uint16_t t3 = INSTRUCTION.sti_t3[sti_channel] << 4;
+            uint16_t t41 = (INSTRUCTION.sti_t4[sti_channel] & 0x03) << 14;
+            *value = (0x01 << 23) | (op_neu << 16) | t41 | t3 | t22;
+            INSTRUCTION.ins_opcode = T_RD;
+            return false;
+        }
+        case T_RD: {
+            op_neu                 = sti_channel * 4 + 3;
+            uint16_t t42 = (INSTRUCTION.sti_t4[sti_channel] >> 2) & 0xFFFF;
+            *value                 = (0x01 << 23) | (op_neu << 16) | t42;
+            INSTRUCTION.ins_opcode = T_FT;
+            return false;
+        }
+        case T_FT: {
+            op_neu                 = sti_channel * 4 + 4;
+            uint16_t t5 = (INSTRUCTION.sti_t5[sti_channel]) & 0x03FF;
+            *value                 = (0x01 << 23) | (op_neu << 16) | t5;
+            INSTRUCTION.ins_opcode = STI_CYCLE;
+            return false;
+        }
+        case STI_CYCLE: {
+            op_neu                 = (sti_channel / 2) + 42;
+            uint8_t odd_even       = sti_channel % 2;
+            INSTRUCTION.ins_opcode = T_ZE;
+//            if (NEULIVE_STATE.config_type == NEU_SET_STI_VOLT) INSTRUCTION.ins_opcode = HIGH_SIDE;
+            if(sti_channel == 8){
+                // voltage stimulate
+                op_neu = 41;
+                *value = (0x01 << 23) | (op_neu << 16) | (0x00 << 8) | (INSTRUCTION.current_sti_cycle[sti_channel]);
+                return true;
+            }
+
+            if (!odd_even){
+                *value = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.current_sti_cycle[sti_channel + 1] << 8) | (INSTRUCTION.current_sti_cycle[sti_channel]);
+            }
+            else{
+                *value = (0x01 << 23) | (op_neu << 16) | (INSTRUCTION.current_sti_cycle[sti_channel] << 8) | (INSTRUCTION.current_sti_cycle[sti_channel - 1]);
+            }
+            return true;
+        }
+        default: {
+            INSTRUCTION.ins_opcode = T_ZE;
+            return false;
+        }
+    }
+}
+
+
+/**
+ *   @fn build stimulation voltage
+ */
+
+static bool build_sti_amplitude(uint32_t* value) {
+    uint8_t ins_opcode = INSTRUCTION.ins_opcode;
+    switch (ins_opcode) {
+        case HIGH_SIDE: {
+            *value                 = (0x01 << 23) | (0x25 << 16) | INSTRUCTION.sti_amplitude_h_cali;
+            INSTRUCTION.ins_opcode = LOW_SIDE;
+            return false;
+        }
+        case LOW_SIDE: {
+            *value                 = (0x01 << 23) | (0x26 << 16) | INSTRUCTION.sti_amplitude_l_cali;
+//            INSTRUCTION.ins_opcode = VOLT_MODE_AMP;
+            INSTRUCTION.ins_opcode = BIAS_ONE;
+//            return false;
+            return true;
+        }
+        case VOLT_MODE_AMP: {
+            *value                 = (0x01 << 23) | (0x27 << 16) | INSTRUCTION.voltage_sti_amplitude;
+            INSTRUCTION.ins_opcode = BIAS_ONE;
+            return true;
+        }
+        default: {
+            return false;
+        }
+    }
+}
+
+static NEU_CONFIG_TYPE build_sti_ins(NEU_CONFIG_TYPE config_type, uint32_t* value){
+    bool single_ch_config_done;
+    bool done;
+    switch (config_type) {
+        /* These are recording parameter */
+        case NEU_WARM_UP:{
+            *value = (0x00 << 23) | (0x01 << 16) | 1;
+            return NEU_WARM_UP2;
+        }
+        case NEU_WARM_UP2:{
+            *value = (0x00 << 23) | (0x01 << 16) | 2;
+            return NEU_WARM_UP3;
+        }
+        case NEU_WARM_UP3:{
+            *value = (0x00 << 23) | (0x01 << 16) | 3;
+            return NEU_SET_STI_CUR;
+        }
+
+        // set stimulate t1~t5
+        case NEU_SET_STI_CUR: {
+            uint8_t sti_channel = get_sti_channel(INSTRUCTION.sti_channel, INSTRUCTION.sti_ch_config_done);
+
+            // go to config sti amplitude
+            if (sti_channel == ALL_STI_CH_CONFIG_DONE) {
+                INSTRUCTION.sti_ch_config_done = 0;
+
+                INSTRUCTION.ins_opcode = HIGH_SIDE;
+
+                // get correct amplitude sti code
+                INSTRUCTION.sti_amplitude_h_cali = UserCode2StiCode(INSTRUCTION.sti_amplitude_h, POSITIVE_CHANNEL);
+                INSTRUCTION.sti_amplitude_l_cali = UserCode2StiCode(INSTRUCTION.sti_amplitude_l, NEGATIVE_CHANNEL);
+                return NEU_SET_STI_VOLT;
+            }
+
+            // config next sti channel
+            else {
+                single_ch_config_done = build_sti_cur_instruction(sti_channel, value);
+                if(single_ch_config_done){ INSTRUCTION.sti_ch_config_done++; }
+                return NEU_SET_STI_CUR;
+            }
+        }
+
+        // config sti amplitude
+        case NEU_SET_STI_VOLT: {
+            done = build_sti_amplitude(value);
+            if (done) {
+                return NEU_SET_POLARITY;
+            } else {
+                return NEU_SET_STI_VOLT;
+            }
+        }
+        case NEU_SET_POLARITY: {
+            *value = (0x01 << 23) | (0x28 << 16) | INSTRUCTION.current_sti_polarity;
+            return NEU_SET_STI_CLK;
+        }
+        case NEU_SET_STI_CLK: {
+            *value = (0x01 << 23) | (0x34 << 16) | INSTRUCTION.sti_clock_ratio;
+            *value = (0x01 << 23) | (0x34 << 16) | 2;
+            return NEU_SET_STI_MODE;
+        }
+//        case NEU_SET_ARBITRARY: {
+//            *value = (0x01 << 23) | (0x36 << 16) | INSTRUCTION.arbitrary_en;
+//            return NEU_SET_ARB_INDEX;
+//        }
+//        case NEU_SET_ARB_INDEX: {
+//            *value = (0x01 << 23) | (0x37 << 16) | INSTRUCTION.arbitrary_index;
+//            return NEU_SET_STI_MODE;
+//        }
+        case NEU_SET_STI_MODE: {
+            *value = (0x01 << 23) | (0x38 << 16) | (INSTRUCTION.sti_mode << 2) | (INSTRUCTION.sti_h_bridge << 1) | (INSTRUCTION.sti_ref);
+            return NEU_SETUP_DONE;
+        }
+
+        default: {
+            return NEU_WARM_UP;
+        }
+    }
+}
+#endif

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

@@ -3,14 +3,42 @@
 #define VERSION_DATE
 
 #define VERSION_DATE_YEAR      20
-#define VERSION_DATE_MONTH     4
-#define VERSION_DATE_DAY       24
-#define VERSION_DATE_HOUR      11
-#define VERSION_DATE_MINUTE    53
+#define VERSION_DATE_MONTH     9
+#define VERSION_DATE_DAY       9
+#define VERSION_DATE_HOUR      10
+#define VERSION_DATE_MINUTE    26
 
 // this is NOT the version hash !!
 // it's the last version hash
-#define VERSION_HASH           404d8d8d9d0b04eb9ed6fcc656ba52180d13d8c8
-#define VERSION_GIT_BRANCH     neulive20_blastData
+#define VERSION_HASH           b9c9cc0bbcdb1ad375f9f5966577ca34ef3fd6d1
+#define VERSION_GIT_BRANCH     neulive20_development_without_central
+
+static void get_board_name(char *board_name_ch, uint8 *board_name_int, uint8 name_size){
+    uint8 name_offset = 18;
+
+    for(int i=0, k=0; i<name_size+1 ; i++){
+        if('0' <= board_name_ch[name_offset + i] && board_name_ch[name_offset + i] <= '9'){
+            board_name_int[k++] = board_name_ch[name_offset + i] - '0';
+        }
+        else if('A' <= board_name_ch[name_offset + i] && board_name_ch[name_offset + i] <= 'F'){
+            board_name_int[k++] = board_name_ch[name_offset + i] - 'A' + 10;
+        }
+        else if(board_name_ch[name_offset + i] == '_'){
+            continue;
+        }
+        else{
+            // error occur
+            for(int j=0 ; j<name_size/2 ; j++){
+                board_name_int[j] = 0xFF;
+            }
+            return;
+        }
+    }
+
+    for(int i=0 ; i<name_size/2 ; i++){
+        board_name_int[i] = (board_name_int[2*i] << 4) | (board_name_int[2*i + 1]);
+    }
+
+}
 
 #endif

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

@@ -12,21 +12,65 @@
 
 static uint8_t not_buf_offset = NOT_BUF_OFFSET_INIT;
 static uint32_t not_time_stamp = 0;
-static uint32_t data_counter = 0;
+
+static void headstage_notify_set_timestamp();
+static void headstage_notify_flip_buffer();
+static uint8_t headstage_notify_append_data(uint8_t *data_value);
+
+/**
+ *   @fn headstage_neu_append_notify_data
+ */
+#define CHANNEL_VALID (INSTRUCTION.recording_channel & (0x0001 << channel))
+static void headstage_neu_append_notify_data() {
+
+    uint8_t channel = spi_rxbuf[0];
+
+    // close-reopen SPI, if the first channel received is invalid
+    if(IsFirstData){
+        // start record
+        if((INSTRUCTION.recording_channel & (0x0001 << channel)) && (channel < 16)){
+            IsFirstData = false;
+        }
+        // restart SPI
+        else{
+            SPI_close(headstage_spi_handle);
+            ReopenSPI();
+            IsFirstData = true;
+            return;
+        }
+    }
+
+    // discard illegal channel
+//    uint16_t valid_channel = INSTRUCTION.recording_channel & (0x0001 << channel);
+    if(!(INSTRUCTION.recording_channel & (0x0001 << channel)) || (channel > 15)){
+        // illegal channel
+        return;
+    }
+
+    uint8_t not_buf[3];
+    not_buf[0] = channel; // ch
+    not_buf[1] = spi_rxbuf[1];
+    not_buf[2] = spi_rxbuf[2];
+
+//    not_buf[1] = (INSTRUCTION.recording_channel | 0xFF00) >> 8;
+//    not_buf[2] = (INSTRUCTION.recording_channel | 0x00FF);
+
+    uint8_t data_size = headstage_notify_append_data(not_buf);
+
+    if (data_size >= BLE_NOT_BUFF_SIZE) {
+        headstage_notify_flip_buffer();
+        headstage_notify_send();
+    }
+}
+
 
 static void headstage_notify_set_timestamp() {
     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[5] = data_counter & 0xFF;
-    headstage_notify_buffer[4] = (data_counter >> 8) & 0xFF;
-    headstage_notify_buffer[3] = (data_counter >> 16) & 0xFF;
-    headstage_notify_buffer[2] = (data_counter >> 24) & 0xFF;
-    data_counter ++;
+    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;
 }
 
 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

@@ -12,12 +12,15 @@ static void MCUReset(){
     ResetINSTRUCTION();
 
     // global variable reset
-    IsFirstData = true;
     STI = false;
+    rec_sti_command = 0;
+    IsFirstData = true;
 
     // 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;
@@ -30,7 +33,7 @@ static void MCUReset(){
     }
 
     // CIS buffer reset
-    for(int i=0 ; i<BLE_CDR_BUFF_SIZE ; i++){
+    for(int i=0 ; i<BLE_CDR_SAMLL_SIZE ; i++){
         cdr_buf[i] = 0;
     }
 
@@ -42,7 +45,10 @@ static void MCUReset(){
     not_time_stamp = 0;
 
 
-    if(ConnectState){
+    if(ErrorRestart){
+        headstage_led_color(COLOR_RED);
+    }
+    else if(ConnectState){
         headstage_led_color(COLOR_CYAN);
     }
     else{
@@ -78,32 +84,34 @@ static void ResetINSTRUCTION(){
     INSTRUCTION.sti_clock_ratio      = 10;
     INSTRUCTION.amplifier_gain       = 0;
     INSTRUCTION.chopper_ratio        = 2;
-    INSTRUCTION.sti_t1[1]            = 1;
+    INSTRUCTION.sti_t1[1]            = 0;
     INSTRUCTION.sti_t2[1]            = 0;
     INSTRUCTION.sti_t3[1]            = 0;
     INSTRUCTION.sti_t4[1]            = 0;
     INSTRUCTION.sti_t5[1]            = 0;
-    INSTRUCTION.sti_channel          = 2;
+    INSTRUCTION.sti_channel          = 0;
     INSTRUCTION.arbitrary_en         = 0;
     INSTRUCTION.arbitrary_index      = 0;
     INSTRUCTION.sti_h_bridge         = 0;
     INSTRUCTION.sti_mode             = 0;
     INSTRUCTION.sti_ref              = 0;
-    INSTRUCTION.current_sti_polarity = 2;
+    INSTRUCTION.current_sti_polarity = 0;
     INSTRUCTION.sti_amplitude_h      = 0;
     INSTRUCTION.sti_amplitude_l      = 0;
+    INSTRUCTION.sti_amplitude_h_cali = 0;
+    INSTRUCTION.sti_amplitude_l_cali = 0;
     INSTRUCTION.ins_opcode           = BIAS_ONE;
     INSTRUCTION.sti_ch_config_done   = 0;
 
-    uint8_t voltage_sti_channel = 0;
-    uint8_t voltage_sti_amplitude = 0;
+//    uint8_t voltage_sti_channel = 0;
+//    uint8_t voltage_sti_amplitude = 0;
 
     for(int i=0 ; i<NEU_STI_CHANNEL_COUNTS ; i++){
         INSTRUCTION.current_sti_cycle[i] = 0;
     }
 
     NEULIVE_STATE.state = NEU_IDLE;
-    NEULIVE_STATE.config_type = 0;
+    NEULIVE_STATE.config_type = NEU_WARM_UP;
     NEULIVE_STATE.index = 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>
@@ -22,7 +22,6 @@ static SPI_Handle headstage_spi_handle = NULL;
 static SPI_Transaction headstage_spi_transaction;
 
 static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transaction);
-static bool OpenSPI = false;
 
 // SPI parameters initialize
 #define headstage_spi_open()                                                      \
@@ -121,4 +120,72 @@ static void AppendSPITX(uint8_t index, uint32_t value){
     }
 }
 
+/**
+ *  @fn headstage_spi_callback
+ *
+ *  description: callback function to deal with data transmission between DBS and CC2650
+ */
+static void headstage_spi_callback(SPI_Handle handle, SPI_Transaction* transaction) {
+    switch(SPICallBack){
+        case CONTINUOUS_TRANS:{
+            for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+               spi_txbuf[i] = 0x00;
+            }
+            flag_notify(EVT_NEU_SPI);
+            break;
+        }
+        case FLUSH_BUFFER:{
+            SPICallBack = FLUSH_BUFFER2;
+            for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+                spi_txbuf[i] = 0x00;
+            }
+            headstage_spi_transaction(SPI_BUFFER_SIZE);
+            break;
+        }
+        case FLUSH_BUFFER2:{
+           SPICallBack = ONE_SHOT_SPI;
+           for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+               spi_txbuf[i] = 0x00;
+           }
+           flag_notify(EVT_NEU_SPI);
+//           headstage_spi_transaction(SPI_BUFFER_SIZE);
+           break;
+       }
+        case ONE_SHOT_SPI:{
+            SPICallBack = FLUSH_BUFFER;
+            for(int i=0 ; i<SPI_BUFFER_SIZE ; i++){
+                spi_txbuf[i] = 0x00;
+            }
+            headstage_spi_transaction(SPI_BUFFER_SIZE);
+            break;
+        }
+
+        case READ_MOSI:{
+            flag_notify(EVT_NEU_SPI);
+            break;
+        }
+
+        case READ_REG:{
+            check_reg_counter ++;
+            flag_notify(EVT_NEU_SPI);
+            break;
+        }
+
+        case CLOSE_SPI:{
+            SPICallBack = ONE_SHOT_SPI;
+            SPI_close(headstage_spi_handle);
+            break;
+        }
+
+        case END_TRANSMIT:{
+            tx_put_u24(0, 0);
+            SPICallBack = CONTINUOUS_TRANS;
+            break;
+        }
+        default:{
+            break;
+        }
+    }
+}
+
 #endif

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

@@ -114,29 +114,28 @@
 #ifndef FEATURE_OAD
 // Minimum connection interval (units of 1.25ms, 80=100ms) if automatic
 // parameter update request is enabled
-//#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 6
-#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 6
+#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 8
+//#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 14
 
 // Maximum connection interval (units of 1.25ms, 800=1000ms) if automatic
 // parameter update request is enabled
 //#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 6
-#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 320
+#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 30
 
 #else  //! FEATURE_OAD
 // Minimum connection interval (units of 1.25ms, 8=10ms) if automatic
 // parameter update request is enabled
-//#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 80
-#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 8
+#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 80
+//#define DEFAULT_DESIRED_MIN_CONN_INTERVAL 14
 
 // Maximum connection interval (units of 1.25ms, 8=10ms) if automatic
 // parameter update request is enabled
-//#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 80
-#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 16
+#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 80
+//#define DEFAULT_DESIRED_MAX_CONN_INTERVAL 25
 
 #endif  // FEATURE_OAD
 
-//#define SBP_PERIODIC_EVT_PERIOD DEFAULT_DESIRED_MIN_CONN_INTERVAL*1.25 + 2
-#define SBP_PERIODIC_EVT_PERIOD 8
+#define SBP_PERIODIC_EVT_PERIOD DEFAULT_DESIRED_MIN_CONN_INTERVAL + 2
 
 // Slave latency to use if automatic parameter update request is enabled
 #define DEFAULT_DESIRED_SLAVE_LATENCY 0
@@ -189,16 +188,12 @@ typedef struct {
  * LOCAL VARIABLES
  */
 
-
 // Entity ID globally used to check for source and/or destination of messages
 static ICall_EntityID self;
 
 // Semaphore globally used to post events to the application thread
 ICall_Semaphore semaphore;
 
-// Clock instances for internal periodic events.
-static Clock_Struct periodicClock;
-
 // Queue object used for app messages
 static Queue_Struct application_message;
 static Queue_Handle application_message_queue;
@@ -209,9 +204,6 @@ static Queue_Struct oad_queue;
 static Queue_Handle oad_queue_handle;
 #endif  // FEATURE_OAD
 
-// events flag for internal application events.
-static uint16_t events;
-
 // Task configuration
 Task_Struct sbpTask;
 Char        sbpTaskStack[SBP_TASK_STACK_SIZE];
@@ -238,10 +230,6 @@ static void    SimpleBLEPeripheral_freeAttRsp(uint8_t status);
 static void    SimpleBLEPeripheral_stateChangeCB(gaprole_States_t newState);
 static void    SimpleBLEPeripheral_enqueueMsg(uint8_t event, uint8_t state);
 
-static void    SimpleBLEPeripheral_performPeriodicTask(void);
-static void    SimpleBLEPeripheral_clockHandler(UArg arg);
-
-
 #ifndef FEATURE_OAD_ONCHIP
 static void SimpleBLEPeripheral_charValueChangeCB(uint8_t paramID);
 #endif  //! FEATURE_OAD_ONCHIP
@@ -336,9 +324,6 @@ static void SimpleBLEPeripheral_init(void) {
     // Create an RTOS queue for message from profile to be sent to app.
     application_message_queue = Util_constructQueue(&application_message);
 
-//    Util_constructClock(&periodicClock, SimpleBLEPeripheral_clockHandler, SBP_PERIODIC_EVT_PERIOD, 0, false, SBP_PERIODIC_EVT);
-//    Util_constructClock(&periodicClock, SimpleBLEPeripheral_clockHandler, 100, 0, false, SBP_PERIODIC_EVT);
-
     // Setup the GAP
     GAP_SetParamValue(TGAP_CONN_PAUSE_PERIPHERAL, DEFAULT_CONN_PAUSE_PERIPHERAL);
 
@@ -431,9 +416,9 @@ static void SimpleBLEPeripheral_init(void) {
     // Register for GATT local events and ATT Responses pending for transmission
     GATT_RegisterForMsgs(self);
 
-    HCI_LE_WriteSuggestedDefaultDataLenCmd(251, 2120);  // this is used for data length extension
+//    HCI_LE_ReadMaxDataLenCmd();
 //
-    HCI_LE_ReadMaxDataLenCmd();
+//    HCI_LE_WriteSuggestedDefaultDataLenCmd(251, 2120);  // this is used for data length extension
 
 }
 
@@ -576,6 +561,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
     headstage_init_device_info();
 
     headstage_init();
+    InitDBSRegister();
 
     for (;;) {
         // Waits for a signal to the semaphore associated with the calling thread.
@@ -630,7 +616,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
 //        if (events & SBP_PERIODIC_EVT) {
 //            events &= ~SBP_PERIODIC_EVT;
 //
-//             Util_startClock(&periodicClock);
+//            // Util_startClock(&periodicClock);
 //
 //            // Perform periodic application task
 //            SimpleBLEPeripheral_performPeriodicTask();
@@ -714,7 +700,6 @@ static uint8_t SimpleBLEPeripheral_processGATTMsg(gattMsgEvent_t *message) {
 
     } else if (message->method == ATT_MTU_UPDATED_EVENT) {
         // MTU size updated
-
     } else if (message->method == ATT_HANDLE_VALUE_CFM) {
         // quick pass
     }
@@ -801,7 +786,6 @@ static void SimpleBLEPeripheral_processAppMsg(sbpEvt_t *message) {
             break;
 
         case SBP_CHAR_CHANGE_EVT:
-//            Util_startClock(&periodicClock);
             headstage_characteristic_updated(message->hdr.state);
             break;
     }
@@ -870,7 +854,7 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
 
             if (SUCCESS == HCI_LE_SetDataLenCmd(cxnHandle, requestedPDUSize, requestTxTime)) {
                 ConnectState = true;
-//                headstage_led_color(COLOR_CYAN);
+                headstage_led_color(COLOR_CYAN);
             }
             // Use numActive to determine the connection handle of the last
             // connection
@@ -886,16 +870,22 @@ static void SimpleBLEPeripheral_processStateChangeEvt(gaprole_States_t newState)
             //  Device is started but not advertising, is in waiting period before advertising again
             SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
             ConnectState = false;
-            headstage_led_color(COLOR_GREEN);
+            if(ErrorRestart){
+                headstage_led_color(COLOR_RED);
+            }
+            else{
+                headstage_led_color(COLOR_GREEN);
+            }
             break;
 
         case GAPROLE_WAITING_AFTER_TIMEOUT:
             // Device just timed out from a connection but is not yet advertising, is in waiting period before advertising again
             // disconnected
             SimpleBLEPeripheral_freeAttRsp(bleNotConnected);
-            headstage_led_color(COLOR_RED);
+            ErrorRestart = true;
             CONNECT_HANDLE = 0xFFFF;
             flag_notify(EVT_DISCONNECTED);
+            headstage_led_color(COLOR_RED);
             break;
         case GAPROLE_ERROR:  // Error occurred - invalid state
             headstage_led_color(COLOR_RED);
@@ -980,25 +970,3 @@ static void SimpleBLEPeripheral_enqueueMsg(uint8_t event, uint8_t state) {
         Util_enqueueMsg(application_message_queue, semaphore, (uint8 *)message);
     }
 }
-
-static void SimpleBLEPeripheral_performPeriodicTask(){
-    SimpleBLEPeripheral_blastData();
-}
-
-/*********************************************************************
- * @fn      SimpleBLEPeripheral_clockHandler
- *
- * @brief   Handler function for clock timeouts.
- *
- * @param   arg - event type
- *
- * @return  None.
- */
-static void SimpleBLEPeripheral_clockHandler(UArg arg) {
-    // Store the event.
-    events |= arg;
-
-    // Wake up the application.
-    Semaphore_post(semaphore);
-}
-

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"

simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h

@@ -82,7 +82,7 @@ extern "C" {
 
 // Length of Characteristic 5 in bytes
 #define SIMPLEPROFILE_CHAR1_LEN 2
-#define SIMPLEPROFILE_CHAR2_LEN 10
+#define SIMPLEPROFILE_CHAR2_LEN 50
 #define SIMPLEPROFILE_CHAR3_LEN 20
 #define SIMPLEPROFILE_CHAR4_LEN 200
 //#define SIMPLEPROFILE_CHAR4_LEN 20

update_sti_cali.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+folder=$(basename "$(pwd)")
+
+if [ "$folder" == "bioprocc2650" ]; then
+
+input="./Neulive_sti_cali.txt"
+output="./simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_cali_sti.h"
+
+#variable
+declare -i current_line=96
+declare -i col_index=0
+declare -i row_index=0
+
+#constant
+declare -i COL_MAX=8
+declare -i START_ROW=27
+declare -i UN_USED_ROW=$START_ROW-1
+
+MAC="MAC"
+
+while read -r line; do
+    for word in $line; do
+        # get device MAC
+        if [ $row_index -gt $UN_USED_ROW ] && [ $col_index -eq 3 ];then
+          MAC=$word
+          sed -i "${current_line} i \\\n#elif defined(BOARD_${MAC})\\n{" "$output"
+          sed -i 's/:/_/g' "$output"
+          current_line=$current_line+3
+        fi
+
+        # get device positive channel coeff and offset
+        if [ $row_index -gt $UN_USED_ROW ] && [ $col_index -eq 4 ];then
+          sed -i "${current_line} i \    .p_ch.coefficient = $word," "$output"
+          current_line=$current_line+1
+        fi
+
+        if [ $row_index -gt $UN_USED_ROW ] && [ $col_index -eq 5 ];then
+          sed -i "${current_line} i \    .p_ch.offset = $word," "$output"
+          current_line=$current_line+1
+        fi
+
+        # get device negative channel coeff and offset
+        if [ $row_index -gt $UN_USED_ROW ] && [ $col_index -eq 6 ];then
+          sed -i "${current_line} i \    .n_ch.coefficient = $word," "$output"
+          current_line=$current_line+1
+        fi
+
+        if [ $row_index -gt $UN_USED_ROW ] && [ $col_index -eq 7 ];then
+          sed -i "${current_line} i \    .n_ch.offset = $word" "$output"
+          current_line=$current_line+1
+          sed -i "${current_line} i };" "$output"
+          current_line=$current_line+1
+        fi
+
+        #update index
+        if [ $col_index -lt $COL_MAX ];then
+          col_index=$col_index+1
+        else
+          col_index=0
+          row_index=$row_index+1
+        fi
+    done
+done < $input
+
+else
+  echo "This script should be executed on CC2650 periperal only"
+fi