wisetop/past-project-past_code_cc2650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix notify data of dpv mode

Browse Source
This commit is contained in:
Roy
2021-12-16 21:06:27 +08:00
parent 52fa207cee
commit e4ae8ac2a8
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h
+3 -3
View File
@@ -4,9 +4,9 @@
#define VERSION_DATE_YEAR 21
#define VERSION_DATE_MONTH 12
#define VERSION_DATE_DAY 2
#define VERSION_DATE_HOUR 14
#define VERSION_DATE_MINUTE 57
#define VERSION_DATE_DAY 16
#define VERSION_DATE_HOUR 21
#define VERSION_DATE_MINUTE 6
// this is NOT the version hash !!
// it's the last version hash
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
+23 -18
View File
@@ -346,29 +346,34 @@ static void uni_pulse_mode(void)
PIN15_setOutputValue(enable_5v, 0);
}
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
if(GPT.NotifyCounter >= instru.notifyRate){
GPT.NotifyCounter -= instru.notifyRate; //To get right time
notify_flag = true;
if (instru.eliteFxn == CURVE_UNI_PULSE || instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
notify_flag = false;
}
if(vscanReset){
notify_flag = false;
}
if (instru.eliteFxn == CURVE_DPV || instru.eliteFxn == CURVE_DPV_ADVANCE) {
if (!volt_rec_en || !curr_rec_en) {
notify_flag = false;
}
} else {
//Notify counter(Notify control, check if we need to send notify)
//please don't put Notify counter before ADC counter, maybe get wrong data
GPT.NotifyCounter = GPT.NotifyCounter + GPT.DeltaGptimerCounter;
if(GPT.NotifyCounter >= instru.notifyRate){
GPT.NotifyCounter -= instru.notifyRate; //To get right time
notify_flag = true;
if (instru.eliteFxn == CURVE_UNI_PULSE) {
notify_flag = false;
}
if(vscanReset){
notify_flag = false;
}
if(notify_flag){
SendNotify();
notify_flag = false;
if (!volt_rec_en || !curr_rec_en) {
notify_flag = false;
}
if(notify_flag){
SendNotify();
notify_flag = false;
}
}
}
mode_done();
}