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

change in sequence of IT_plot & VT_plot

Browse Source
This commit is contained in:
Roy
2021-07-22 10:28:12 +08:00
parent 7a0691a221
commit 04d4af4cad
2 changed files with 14 additions and 22 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_mode_ADC_DAC.h
+11 -19
View File
@@ -285,7 +285,6 @@ static void Iin_Vin_Vout_Plot(void)
if (ADC_cnt == 0) {
read_Iin_change_gain(IIN_VIN_VOUT_PLOT);
DACenable(AFTER_READ_I);
read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
} else if (ADC_cnt == 1) {
@@ -295,7 +294,6 @@ static void Iin_Vin_Vout_Plot(void)
} else if (ADC_cnt == 2) {
read_Vin_change_gain();
DACenable(AFTER_READ_V);
read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
} else if (ADC_cnt == 3) {
@@ -305,7 +303,6 @@ static void Iin_Vin_Vout_Plot(void)
} else if (ADC_cnt == 4) {
read_Vout_change_gain();
DACenable(AFTER_READ_V);
read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
} else if (ADC_cnt == 5) {
@@ -343,7 +340,6 @@ static void Iin_Vin_Plot(void)
if (ADC_cnt == 0) {
read_Iin_change_gain(IIN_VIN_PLOT);
DACenable(AFTER_READ_I);
read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
} else if (ADC_cnt == 1) {
@@ -353,7 +349,6 @@ static void Iin_Vin_Plot(void)
} else if (ADC_cnt == 2) {
read_Vin_change_gain();
DACenable(AFTER_READ_V);
read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
} else if (ADC_cnt == 3) {
@@ -385,13 +380,6 @@ static void IT_Plot(uint32_t time)
* 1 - read Iin and reset ADC_cnt
*/
if (ADC_cnt == 0) {
read_Iin_change_gain(IT_PLOT);
if (instru.eliteFxn == CURVE_UNI_PULSE && vscanReset == false) {
EliteCalcAvg(t);
}
DACenable(AFTER_READ_I);
read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
@@ -399,7 +387,13 @@ static void IT_Plot(uint32_t time)
}
if (ADC_cnt == 1) {
read_adc_raw_data(RIS_ADC_IIN, spi_ADC_rxbuf, spi_ADC_txbuf);
read_Iin_change_gain(IT_PLOT);
if (instru.eliteFxn == CURVE_UNI_PULSE && vscanReset == false) {
EliteCalcAvg(t);
}
DACenable(AFTER_READ_I);
ADC_cnt = 0;
return;
@@ -429,8 +423,6 @@ static void VT_Plot(void)
* 1 - read Vin and reset ADC_cnt
*/
if (ADC_cnt == 0) {
read_Vin_change_gain();
DACenable(AFTER_READ_V);
read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
@@ -438,7 +430,8 @@ static void VT_Plot(void)
}
if (ADC_cnt == 1) {
read_adc_raw_data(RIS_ADC_VIN, spi_ADC_rxbuf, spi_ADC_txbuf);
read_Vin_change_gain();
DACenable(AFTER_READ_V);
ADC_cnt = 0;
return;
@@ -467,8 +460,6 @@ static void Vout_Plot(void)
* 1 - read Vout and reset ADC_cnt
*/
if (ADC_cnt == 0) {
read_Vout_change_gain();
DACenable(AFTER_READ_V);
read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
ADC_cnt++;
@@ -476,7 +467,8 @@ static void Vout_Plot(void)
}
if (ADC_cnt == 1) {
read_adc_raw_data(RIS_ADC_VOUT, spi_ADC_rxbuf, spi_ADC_txbuf);
read_Vout_change_gain();
DACenable(AFTER_READ_V);
ADC_cnt = 0;
return;
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 7
#define VERSION_DATE_DAY 21
#define VERSION_DATE_HOUR 14
#define VERSION_DATE_MINUTE 15
#define VERSION_DATE_DAY 22
#define VERSION_DATE_HOUR 10
#define VERSION_DATE_MINUTE 28
// this is NOT the version hash !!
// it's the last version hash