Elite 1.4-re clean warning

This commit is contained in:
alan
2019-08-29 12:38:33 +08:00
parent 1b9aedf7a0
commit db2d8e4217
@@ -111,7 +111,6 @@ static uint16_t VoltScan() {
if (VoltOrigin == VoltFinal) {
// DAC_outputV(DACOUT, VoltOrigin); //delete 'command' parameter
DAC_outputV(VoltOrigin);
Voltage = VoltOrigin;
PeriodicEvent = false;
return VoltOrigin;
} else if (INSTRUCTION.eliteFxn == SQUARE_WAVE_VOLTAMMETRY) {
@@ -629,7 +628,7 @@ static void reset() {
Step = 10; // 10 = 0x0A ~= 3.05 mv ~= 3 mv
StepTime = 24; // 0x30 = 2'd48 ~= 2 second, 24 = 0x18
StepTimeCounter = 1;
SampleRate = 1;
SampleRate = 10;
SampleRate_counter = 1;
avg_number = 0;
ADCRealCurrent = 0;
@@ -759,15 +758,21 @@ static void SimpleBLEPeripheral_performPeriodicTask() {
} else if (INSTRUCTION.eliteFxn == VIS_RST) {
return;
} else {
if (StepTimeCounter == StepTime)
StepTimeCounter = 1;
else
StepTimeCounter++;
if (SampleRate_counter == SampleRate)
if (StepTimeCounter == StepTime){
StepTimeCounter = 1;
}
else{
StepTimeCounter++;
}
if (SampleRate_counter == SampleRate){
SampleRate_counter = 1;
else
}
else{
SampleRate_counter++;
}
// In IV, CV, and func-gen mode, DAC will output voltage
// else DAC do nothing.