Klagarge/Solar-Panel
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

voltage / current measure fixed

Browse Source
This commit is contained in:
Rémi Heredero
2023-03-03 13:11:20 +01:00
parent dd5912cc30
commit 5aa7d936f3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
solar_panel.X/measure.c
View File

@@ -42,7 +42,7 @@ uint16_t measure_voltage()
sum += measure_adc(VOLTAGE_CHANNEL);
}
sum /= AVERAGE_SAMPLES;
sum = (sum * ADC_RESOLUTION) / ADC_REFH;
sum = (sum * ADC_REFH) / ADC_RESOLUTION;
return (uint16_t)(sum);
}
@@ -52,9 +52,11 @@ uint16_t measure_current(uint16_t offset)
for(int i = 0; i< AVERAGE_SAMPLES; i++){
sum += measure_adc(CURRENT_CHANNEL);
}
uint32_t m = (sum / AVERAGE_SAMPLES);
uint32_t m = (sum / AVERAGE_SAMPLES); // m is bits
m = (m * ADC_REFH) / ADC_RESOLUTION; // m is mV
m *= 1000; // m is uV
m /= GAIN;
m /= RESISTOR;
m /= RESISTOR; // m is uA
if(m <= offset){
m = 0;
} else {