Merge branch 'neulive/development' into release/neulive

# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.cproject

README.md

@@ -26,8 +26,7 @@ BioPro Device
 3.  Neulive 1.3
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neulive.h`
-    [docs](simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx\app/headstage/uni/Neulive13.md)
-    
+
 4.  EliteZM
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_zm.h`
@@ -36,10 +35,6 @@ BioPro Device
 
     `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_sti.h`
 
-6.  Neulive 2.0
-
-    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neu.h`
-    
 ### Notable source code
     
 *   gpio table
@@ -65,4 +60,30 @@ major source code path:
 
 -----------------------------------------------
 
+#optional
+
+###external tools:
+
+1. doxygen: tool to help documenting code, extract document from comments
+ 
+    1. download from main page http://www.doxygen.nl/download.html
+
+    2. according to different OS, download corresponding version.
+    
+    3. set up external tool in intellij  
+    
+        4. press keyboard 'ctrl' + 'shift' + 'a' to search external tool, select 'external tools-setting'
+    
+        5. add external tool by pressing '+'
+            
+        6. name this external tool in the column 'name'
+        
+        7. set the path of doxygen execute file in the column 'program'
+        
+        8. set the repository we want to generate document automatically in the column 'working directory'
+        
+        9. set hotkey of doxygen to run : 'File' -> 'Setting' -> 'Keymap' -> 'external tools' 
+            
+    10. press the hotkey to run doxygen
+
 Copyright (c) 2019. BioPro. Scientific.

ccs910/ccs/eclipse/configuration/org.eclipse.core.runtime/.manager/.fileTable.26

@@ -1,10 +0,0 @@
-#safe table
-#Sat Feb 15 20:42:11 CST 2020
-.contributors=19
-.mainData=19
-.table=19
-.namespaces=19
-.orphans=19
-.contributions=19
-.extraData=19
-.crc1820b878.v1

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/.manager/.fileTable.11

@@ -1,4 +0,0 @@
-#safe table
-#Wed Feb 19 22:45:58 CST 2020
-framework.info=10
-.crcb678e773.v1

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/.manager/.fileTable.12

@@ -1,4 +0,0 @@
-#safe table
-#Wed Feb 19 22:46:38 CST 2020
-framework.info=11
-.crc93736921.v1

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/149/0/.cp/resources/dvtviews.js

@@ -1,147 +0,0 @@
-importPackage(Packages.com.ti.ccstudio.scripting.gss)
-
-/**
- * Exports the visible contents of a DVT table view to a CSV(comma separated values) file.
- * Note: This function only works on a DVT table views currently.
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.exportAll("c:/rawlogs.csv");
- * @param fileName the complete path directory path and filename of the file data will be exported to - example: 'c:/myfile.csv'
- * @service DVT Analysis UI scripting commands
- */
- function exportAll(fileName) {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
-  
-/**
- * Applies or removes a filter to/from a DVT data view.
- * Sample Usage:
- *    v = openView("Raw Logs");
- *   v.applyFilter('formattedMsg like ".*swi.*"');
- *    v.applyFilter('(seqID> 8653) && (formattedMsg like ".*swi.*")');
- *    v.applyFilter(''); //to remove filter
- *    v.applyFilter(null); // to remove filter
- * @param dvtExpression the expression to be used when filtering - please search for "DVT expression" in main CCS help for the syntax
- * @service DVT Analysis UI scripting commands
- */
- function applyFilter(dvtExpression) {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
-/**
- * Get the number of records in this view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getRecordCount();
- * @returns integer
- * @service DVT Analysis UI scripting commands
- */
- function getRecordCount() {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
- /**
- * Get the fieldNames in the buffer connected to this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getFieldNames();
- * @returns String[]
- * @service DVT Analysis UI scripting commands
- */
- function getFieldNames() {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
- /**
- * Get a record in the buffer connected to this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getRecord(0);
- * @param recordIndex - zero based
- * @returns Object[]
- * @service DVT Analysis UI scripting commands
- */
- function getRecord(recordIndex) {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
- /**
- * Get the value of field in a record in the buffer connected to this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getValue(1, "currentThread");
- * @param rowNumber - starting from 1
- * @param columnName 
- * @returns Object
- * @service DVT Analysis UI scripting commands
- */
- function getValue(rowNumber, columnName) {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
-
- /**
- * Get the textual string value of a field in a record in the buffer connected to this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getValue(2, "currentThread");
- * @param rowNumber - starting from 1
- * @param columnName 
- * @returns String
- * @service DVT Analysis UI scripting commands
- */
- function getText(rowNumber, columnName) {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
-/**
- * Get the status message in the bottom left side of this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getStatus();
- * @returns String
- * @service DVT Analysis UI scripting commands
- */
- function getStatus() {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
-/**
- * Get the progress text in the bottom right side of this data view
- * Sample Usage:
- *    myview = openView("Raw Logs");
- *    myview.getProgress();
- * @returns String
- * @service DVT Analysis UI scripting commands
- */
- function getProgress() {
- 	; // this function is only provided for scripting console help purposes - the actual implementation is in Java code
- }
- 
- 
-/**
- * opens an Analysis View.  E.g. to open a single time graph, openAnalysisView('Single Time','C:\\abc.graphProp')
- * @param viewID Name of the view. Please see feature specific view names
- * For CCS Graphs Feature: 'Single Time', 'Dual Time',  'FFT Magnitude', 'FFT Magnitude Phase', 'Complex FFT', 'FFT Waterfall'
- * @param arg See feature specific interpretation of this argument
- *      For CCS Graphs: Used as a property file from which to load the graph property values
-  * @service DVT Analysis UI scripting commands
- */
- function openAnalysisView(viewID, arg) {
- 	wb = GSSScripting.getInstance().getActiveWorkbenchWindow();
-	view = wb.openView(viewID, arg, 0);
-	return view;
- }
- 
- /**
-  * Opens(/Activates) a  view using both primary and secondary IDs  
-  * @param primaryID (example: com.ti.dvt.ui.views.dvtgraph )
-  * @param secondaryID (example:  dvtviewname)
-  * @service DVT Analysis UI scripting commands 
-  */
-  function openView2(primaryID, secondaryID) {
- 	wb = GSSScripting.getInstance().getActiveWorkbenchWindow();
-	wb.openView(primaryID,  secondaryID, 1); //1:  IWorkbenchPage.VIEW_ACTIVATE ( 2: VIEW_VISIBLE, 3:VIEW_CREATE )
- }
-
- 
- 

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/373/data/1444367851/artifacts.xml

@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?artifactRepository version='1.1.0'?>
-<repository name='C:\ti\ccs910\ccs\eclipse\.eclipseextension' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
-  <properties size='3'>
-    <property name='p2.timestamp' value='1582123682247'/>
-    <property name='org.eclipse.update.site.policy' value='USER-EXCLUDE'/>
-    <property name='org.eclipse.update.site.list' value=''/>
-  </properties>
-  <mappings size='3'>
-    <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
-    <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
-    <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
-  </mappings>
-  <artifacts size='1'>
-    <artifact classifier='osgi.bundle' id='com.ti.cc2538' version='2.0.4.11'>
-      <repositoryProperties size='3'>
-        <property name='artifact.folder' value='true'/>
-        <property name='artifact.reference' value='file:/C:/ti/ccs910/ccs/eclipse/plugins/com.ti.cc2538_2.00.04.11/'/>
-        <property name='file.name' value='C:\ti\ccs910\ccs\eclipse\plugins\com.ti.cc2538_2.00.04.11'/>
-      </repositoryProperties>
-    </artifact>
-  </artifacts>
-</repository>

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/381/data/cache.timestamps

@@ -1,6 +0,0 @@
-#Sat Feb 15 19:49:19 CST 2020
-C\:\\ti\\ccs910\\ccs\\eclipse\\links=0
-C\:\\ti\\ccs910\\ccs\\eclipse\\plugins=1565848658658
-C\:\\ti\\ccs910\\ccs\\eclipse\\configuration\\org.eclipse.update\\platform.xml=1565848659942
-C\:\\ti\\ccs910\\ccs\\eclipse\\features=1565848658716
-C\:\\ti\\ccs910\\ccs\\eclipse\\dropins=1565844995326

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/381/data/timestamps905166002

@@ -1,5 +0,0 @@
-#Timestamps for epp.package.cpp
-#Sat Feb 15 19:49:19 CST 2020
-file\:/C\:/ti/ccs910/ccs/eclipse/configuration/org.eclipse.osgi/381/data/listener_1925729951/=1581767358447
-PROFILE=1581767359473
-file\:/C\:/ti/ccs910/ccs/eclipse/.eclipseextension=1581767359204

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/393/data/-434122426/artifacts.xml

@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?artifactRepository version='1.1.0'?>
-<repository name='update site: file:/C:/ti/ccs910/ccs/eclipse/configuration/org.eclipse.osgi/381/data/listener_1925729951/' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1581767358483'/>
-    <property name='site.checksum' value='0'/>
-  </properties>
-  <mappings size='3'>
-    <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
-    <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
-    <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
-  </mappings>
-  <artifacts size='0'/>
-</repository>

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/393/data/-434122426/content.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?metadataRepository version='1.2.0'?>
-<repository name='update site: file:/C:/ti/ccs910/ccs/eclipse/configuration/org.eclipse.osgi/381/data/listener_1925729951/' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
-  <properties size='2'>
-    <property name='p2.timestamp' value='1581767358431'/>
-    <property name='site.checksum' value='0'/>
-  </properties>
-</repository>

ccs910/ccs/eclipse/configuration/org.eclipse.osgi/46/0/.cp/META-INF/MANIFEST.MF

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: com.ti.ccstudio.builddefinitions.generator; singl
- eton:=true
-Export-Package: com.ti.ccstudio.builddefinitions.generator;x-friends:=
- com.ti.ccstudio.project.core,com.ti.ccstudio.builddefinitions.generat
- or.internal;x-internal:=true,com.ti.ccstudio.builddefinitions.generat
- or.internal.legacy;x-internal:=true,com.ti.ccstudio.builddefinitions.
- generator.internal.model;x-internal:=true,com.ti.ccstudio.builddefini
- tions.generator.internal.util;x-internal:=true
-Bundle-Name: CCS Build Definitions Generator
-Bundle-Version: 9.1.0.201905231800
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Texas Instruments
-
-