fix average

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

@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../config/src
+GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

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

@@ -1,12 +1,12 @@
 
-XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
 
 vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
+vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
 
 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
 
-XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/
 
 BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
 
@@ -16,14 +16,14 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
 
 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
 
-DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f
+DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
 
 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)

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

@@ -3,10 +3,7 @@
 #define EliteDAC
 
 static bool DACreset = true;
-/* DAC reset parameter */
-#define DACzero 0x85B2
-#define DACposMax 0x0000
-#define DACnegMax 0xFFFF
+
 
 #ifdef ELITE_VERSION_1_3
 #define DACOUT 0x30

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

@@ -36,8 +36,8 @@
 
 typedef struct _formula{
 
-    int32_t coeff = 0;
-    int32_t offset = 0;
+    int32_t coeff;
+    int32_t offset;
 
 }Formula;
 

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

@@ -402,21 +402,12 @@ characteristic change event
 #endif  // ICALL_EVENTS
 #include <ti/sysbios/hal/Hwi.h>
 #include <ti/sysbios/knl/Queue.h>
-#include "EliteADC.h"
-#include "EliteDAC.h"
-#include "EliteSPI.h"
-#include "Elite_PIN.h"
-
 
 #define DARKLED 0xE1
 #define LIGHTLED 0xE8
 static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
 #define LEDPowerON() LED_color(DARKLED, 0x00, 0xFA, 0x00)
 
-#ifdef ELITE_VERSION_1_4
-#include "EliteI2C.h"
-#endif
-
 #ifdef USE_ICALL
 #include <icall.h>
 #else
@@ -426,11 +417,11 @@ static void LED_color(uint8_t bright, uint8_t red, uint8_t green, uint8_t blue);
 // Internal Events for RTOS application
 #ifndef RTOSPARA
 #define RTOSPARA
-#define SBP_STATE_CHANGE_EVT    0x0001
-#define SBP_CHAR_CHANGE_EVT     0x0002
-#define SBP_PERIODIC_EVT        0x0004
-#define SBP_CONN_EVT_END_EVT    0x0008
-#define SBP_KEY_CHANGE_EVT      0x0010
+#define SBP_STATE_CHANGE_EVT 0x0001
+#define SBP_CHAR_CHANGE_EVT 0x0002
+#define SBP_PERIODIC_EVT 0x0004
+#define SBP_CONN_EVT_END_EVT 0x0008
+#define SBP_KEY_CHANGE_EVT 0x0010
 #endif
 
 static Clock_Struct periodicClock;
@@ -600,7 +591,7 @@ static void    ADCChannelSelect(uint8_t ADCChannel);
 static int32_t DecodeADCVolt(uint16_t ADC_measure);
 static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure);
 static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw);
-static void ADC_overflow(uint8_t gain, uint8_t *rawdata);
+static void    ADC_overflow(uint8_t gain, uint8_t *rawdata);
 
 // DAC function
 static uint16_t Usercode_Correction_to_DAC(uint16_t usercode);
@@ -662,6 +653,12 @@ static void set_update_instruction_callback(update_instruction_callback_type cal
 static void    DAC_outputV(uint16_t voltLV);
 static int32_t DAC_to_realV(uint16_t DACcode);
 
+
+/* DAC reset parameter */
+#define DACzero 0x85B2
+#define DACposMax 0x0000
+#define DACnegMax 0xFFFF
+
 // input parameter
 static uint16_t VoltOrigin = DACzero;
 static uint16_t VoltFinal  = DACposMax;
@@ -677,7 +674,7 @@ static int32_t ADCRealCurrent = 0;
 static long long ADCRealCurrent_long = 0;
 
 #define GAIN_200K 0x00
-#define GAIN_10K  0x01
+#define GAIN_10K 0x01
 #define GAIN_200R 0x02
 #define GAIN_AUTO 0x03
 static uint8_t ADCGainLevel = GAIN_200K;
@@ -697,9 +694,9 @@ static uint8_t  StepTimeCounter = 1;
 static uint16_t VoltScan();                   // used in I-V and cyclic
 static void     Notify_IV(uint16_t Voltage);  // send notify voltage after VoltScan()
 
-static void fxn_Gen();
-static void ZT_plot(uint16_t outV, uint16_t inV);
-static void VT_Plot();
+static void    fxn_Gen();
+static void    ZT_plot(uint16_t outV, uint16_t inV);
+static void    VT_Plot();
 static int32_t IT_Plot();
 
 // the following fxn do the same thing
@@ -725,6 +722,19 @@ static void SendNotify();
 static bool If10Von = false;
 static void TurnOn10V();
 
+#include "EliteADC.h"
+#include "EliteDAC.h"
+#include "EliteSPI.h"
+#include "Elite_PIN.h"
+
+#ifdef ELITE_VERSION_1_4
+#include "EliteI2C.h"
+#endif
+
+#include "EliteDeviceCorrection.h"
+#include "EliteNotify.h"
+#include "impedance_meter.h"
+
 // update instruction for Z meter
 static void update_ZM_instruction(uint8 *ins) {
     uint8_t ins_type    = ins[0] & 0b11110000;
@@ -750,7 +760,7 @@ static void update_ZM_instruction(uint8 *ins) {
             DACreset             = true;
             SampleRate           = 10;
 
-            if (ins[3] | ins[4]) {
+                if (ins[3] | ins[4]) {
                 VoltOrigin = ((uint16_t)(ins[3]) << 8) | (uint16_t)(ins[4]);
                 VoltOrigin = Usercode_Correction_to_DAC(VoltOrigin);
             }
@@ -899,8 +909,7 @@ static void update_ZM_instruction(uint8 *ins) {
             CleanBuffer();
             INSTRUCTION.eliteFxn = ITCurve;
             StepTime             = 0x01;
-//            IT_Plot(); // enable 10v = 1
-
+            //            IT_Plot(); // enable 10v = 1
 
             break;
         }
@@ -1167,9 +1176,8 @@ static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26X
 /*=======================================
  ==== headstage specific declaration ====
  ======================================*/
-#include "EliteDeviceCorrection.h"
-#include "EliteNotify.h"
-#include "impedance_meter.h"
+
+
 
 /*========================
  ==== gap information ====