From c656eebcbc3be920f80f3bf5b22bb24b5590a50d Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 26 Nov 2020 22:48:53 +0800 Subject: [PATCH] [update] align notify (match megafly ui) --- .../simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h | 4 ++-- .../simple_peripheral/cc26xx/app/headstage/Elite_version.h | 4 ++-- .../simple_peripheral/cc26xx/app/headstage/headstage.h | 2 +- .../simple_peripheral/cc26xx/app/headstage/impedance_meter.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h index 61ff917cb..7030e325c 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/ElitePulseMode.h @@ -242,7 +242,7 @@ static void test_Vscan(PULSEMode *PULSE){ DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant)); DAC_outputV(Usercode_Correction_to_DAC(VOUT_GAIN_240K, INSTRUCTION.VoltConstant)); } - InputNotify(NOTIFY_IMPEDANCE, testV); + //InputNotify(NOTIFY_IMPEDANCE, testV); } else if(!firstTimeReset){ if(GPT.VscanRateCounter >= PULSE->_tTime){ @@ -334,7 +334,7 @@ static void test_Vscan(PULSEMode *PULSE){ ModeLED(NO_EVENT); } } - InputNotify(NOTIFY_IMPEDANCE, testV); + //InputNotify(NOTIFY_IMPEDANCE, testV); vscan_flag = false; } } diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h index 2258648e5..b5c74b558 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h @@ -5,8 +5,8 @@ #define VERSION_DATE_YEAR 20 #define VERSION_DATE_MONTH 11 #define VERSION_DATE_DAY 26 -#define VERSION_DATE_HOUR 16 -#define VERSION_DATE_MINUTE 14 +#define VERSION_DATE_HOUR 22 +#define VERSION_DATE_MINUTE 48 // this is NOT the version hash !! // it's the last version hash diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h index c3a55ee0f..678bacb16 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h @@ -441,7 +441,7 @@ characteristic change event #define MAJOR_PRODUCT_NUMBER 0 //0:Elite ,1:Neulive #define MINOR_PRODUCT_NUMBER 2 //1:Elite_legacy(Ori_Neulive) 2:Elite_zm 3:Elite_bat #define MAJOR_VERSION_NUMBER 1 -#define MINOR_VERSION_NUMBER 6 +#define MINOR_VERSION_NUMBER 7 #define ELITE_VERSION_1_4 //#define ELITE_VERSION_1_3 diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h index ce7cce0d2..9da5d9e5e 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h @@ -247,7 +247,7 @@ static void SimpleBLEPeripheral_performPeriodicTask(WorkMode *WorkModeData) { if (vscanReset) { DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000)); DAC_outputV(Usercode_Correction_to_DAC(INSTRUCTION.VoutGainLevel, 25000)); - vscanReset = false; + //vscanReset = false; }else{ test_Vscan(WorkModeData->PULSE); }