|
@@ -95,7 +95,7 @@ void WavePeakZeroPointFind(
|
|
|
deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
|
|
deepKalmanWave[0] = deepKalmanWave[size * 3 / 5];
|
|
|
for(i = size * 3 / 5; i < size * 4 / 5; i++)
|
|
for(i = size * 3 / 5; i < size * 4 / 5; i++)
|
|
|
tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
|
|
tempKalmanDiff += deepKalmanWave[i] - deepKalmanWave[size * 3 / 5];
|
|
|
- tempKalmanDiff /= (float)(size / 5.0f);
|
|
|
|
|
|
|
+ tempKalmanDiff /= (float)(size / 5.0);
|
|
|
deepKalmanWave[0] += tempKalmanDiff; // wave averange
|
|
deepKalmanWave[0] += tempKalmanDiff; // wave averange
|
|
|
// printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
|
|
// printf("\r\ndeepKalmanAve: %d\r\n", deepKalmanWave[0]);
|
|
|
|
|
|
|
@@ -307,7 +307,7 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
|
|
|
if(temp_kfpDeep.L_P == 1)
|
|
if(temp_kfpDeep.L_P == 1)
|
|
|
temp_kfpDeep.L_P = newSpace;
|
|
temp_kfpDeep.L_P = newSpace;
|
|
|
// carry, float to uint
|
|
// carry, float to uint
|
|
|
- wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6f;
|
|
|
|
|
|
|
+ wave_quarterSpace = ALGO_KalmanFilter1D(&temp_kfpDeep, (float)newSpace) + 0.6;
|
|
|
// printf("$%d %d;", newSpace, wave_quarterSpace);
|
|
// printf("$%d %d;", newSpace, wave_quarterSpace);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -325,8 +325,8 @@ void WaveParamCalc(uint16_t* peakZeroPoints, uint16_t firstWavePoint, uint16_t s
|
|
|
|
|
|
|
|
if(wave_quarterSpace > 0)
|
|
if(wave_quarterSpace > 0)
|
|
|
{
|
|
{
|
|
|
- wavePeriod = wave_quarterSpace * 4.0f * ADC_TIME_UNIT;
|
|
|
|
|
- waveFreq = 1000.0f / wavePeriod;
|
|
|
|
|
|
|
+ wavePeriod = wave_quarterSpace * 4.0 * ADC_TIME_UNIT;
|
|
|
|
|
+ waveFreq = 1000.0 / wavePeriod;
|
|
|
// printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
|
|
// printf("$%d %f %f;", wave_quarterSpace, wavePeriod, waveFreq);
|
|
|
|
|
|
|
|
peakZeroPoints[0] = wave_quarterSpace;
|
|
peakZeroPoints[0] = wave_quarterSpace;
|
|
@@ -361,7 +361,7 @@ void WaveVppCalc(uint16_t* kalmanWave, uint16_t* peakZeroPoints, uint16_t size)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f;
|
|
|
|
|
|
|
+ maxVppVoltagge = 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -429,10 +429,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
|
|
|
printf("%d ", wave_firstWavePeakPoint * 10);
|
|
printf("%d ", wave_firstWavePeakPoint * 10);
|
|
|
// printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
|
|
// printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
|
|
|
// printf("%d ", wave_quarterSpace);
|
|
// printf("%d ", wave_quarterSpace);
|
|
|
- // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
|
|
|
|
|
- // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
|
|
|
|
|
|
|
+ // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
|
|
|
|
|
+ // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
|
|
|
// printf("%d ", wave_maxVpp);
|
|
// printf("%d ", wave_maxVpp);
|
|
|
- // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
|
|
|
|
|
|
|
+ // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
|
|
|
printf(";");
|
|
printf(";");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -443,10 +443,10 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
|
|
|
// printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
|
|
// printf("%f ", wave_firstWavePeakPoint * ADC_TIME_UNIT);
|
|
|
printf("%d ", wave_quarterSpace * 40);
|
|
printf("%d ", wave_quarterSpace * 40);
|
|
|
// printf("%d ", wave_quarterSpace);
|
|
// printf("%d ", wave_quarterSpace);
|
|
|
- // printf("%f ", wave_quarterSpace * 4.0f * ADC_TIME_UNIT);
|
|
|
|
|
- // printf("%f ", 1000.0f / (wave_quarterSpace * 4.0f * ADC_TIME_UNIT));
|
|
|
|
|
|
|
+ // printf("%f ", wave_quarterSpace * 4.0 * ADC_TIME_UNIT);
|
|
|
|
|
+ // printf("%f ", 1000.0 / (wave_quarterSpace * 4.0 * ADC_TIME_UNIT));
|
|
|
printf("%d ", wave_maxVpp);
|
|
printf("%d ", wave_maxVpp);
|
|
|
- // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0f);
|
|
|
|
|
|
|
+ // printf("%f ", 2.5 * (wave_maxVpp * WAVE_KALMAN_ATTENUATION) / 4096.0);
|
|
|
printf(";");
|
|
printf(";");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -502,18 +502,18 @@ void WaveAnalyse_Test(uint16_t* testWaveDataIn, uint8_t WAVE_DISPLAY_FLAG)
|
|
|
// else if((mainReg.powerQuantity < FULL_BAT_VOLTAGE) && (mainReg.powerQuantity >= TWENTY_BAT_VOLTAGE))
|
|
// else if((mainReg.powerQuantity < FULL_BAT_VOLTAGE) && (mainReg.powerQuantity >= TWENTY_BAT_VOLTAGE))
|
|
|
// {
|
|
// {
|
|
|
// mainReg.powerQuantity =
|
|
// mainReg.powerQuantity =
|
|
|
-// ((17220.0f * (float)mainReg.powerQuantity / (float)mainReg.maxBatVoltage)
|
|
|
|
|
-// - ((8820.0f * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
|
|
|
|
|
|
|
+// ((17220.0 * (float)mainReg.powerQuantity / (float)mainReg.maxBatVoltage)
|
|
|
|
|
+// - ((8820.0 * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
|
|
|
// / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
|
|
// / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
|
|
|
-// - 8305.0f) * 100;
|
|
|
|
|
|
|
+// - 8305.0) * 100;
|
|
|
// }
|
|
// }
|
|
|
// else if((mainReg.powerQuantity < TWENTY_BAT_VOLTAGE) && (mainReg.powerQuantity > EMPTY_BAT_VOLTAGE))
|
|
// else if((mainReg.powerQuantity < TWENTY_BAT_VOLTAGE) && (mainReg.powerQuantity > EMPTY_BAT_VOLTAGE))
|
|
|
// {
|
|
// {
|
|
|
// mainReg.powerQuantity =
|
|
// mainReg.powerQuantity =
|
|
|
-// (((720.0f * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
|
|
|
|
|
|
|
+// (((720.0 * (float)mainReg.powerQuantity * (float)mainReg.powerQuantity)
|
|
|
// / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
|
|
// / ((float)mainReg.maxBatVoltage * (float)mainReg.maxBatVoltage))
|
|
|
-// - ((7200.0f * (float)mainReg.powerQuantity) / (7 * (float)mainReg.maxBatVoltage))
|
|
|
|
|
-// + (18000.0f / 49.0f)) * 100;
|
|
|
|
|
|
|
+// - ((7200.0 * (float)mainReg.powerQuantity) / (7 * (float)mainReg.maxBatVoltage))
|
|
|
|
|
+// + (18000.0 / 49.0)) * 100;
|
|
|
// }
|
|
// }
|
|
|
// else// if(mainReg.powerQuantity <= EMPTY_BAT_VOLTAGE)
|
|
// else// if(mainReg.powerQuantity <= EMPTY_BAT_VOLTAGE)
|
|
|
// {
|
|
// {
|