Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 13:55:40 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[boards] ardone2: correct voltage scale, thx Eric

Browse Source
This commit is contained in:
Felix Ruess
2013-07-30 14:10:40 +02:00
parent 58842b839b
commit 4196580afb
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/boards/ardrone/electrical_raw.c
+4 -9
View File
@@ -89,14 +89,9 @@ void electrical_periodic(void) {
// we know from spec sheet that ADCIN0 has no prescaler // we know from spec sheet that ADCIN0 has no prescaler
// so that the max voltage range is 1.5 volt // so that the max voltage range is 1.5 volt
// multiply by ten to get decivolts // multiply by ten to get decivolts
electrical.vsupply = 10 * electrical_calculate_voltage(raw_voltage, 1.5);
}
float electrical_calculate_voltage(int raw, float range_max) //from raw measurement we got quite a lineair response
{ //9.0V=662, 9.5V=698, 10.0V=737,10.5V=774, 11.0V=811, 11.5V=848, 12.0V=886, 12.5V=923
float step_size = 1.5/(pow(2,10)-1); //leading to our 0.13595166 magic number for decivolts conversion
float R = ( 1.5 / range_max ); electrical.vsupply = raw_voltage*0.13595166;
float output = (float)raw * ( step_size / R );
return 6.6 + (3 * output); // todo improve this line to get more accurate voltage readings
} }
sw/airborne/boards/ardrone/electrical_raw.h
-1
View File
@@ -32,6 +32,5 @@
#include "subsystems/electrical.h" #include "subsystems/electrical.h"
void electrical_setup(void); void electrical_setup(void);
float electrical_calculate_voltage(int raw, float range_max);
#endif /* ELECTRICAL_RAW_H_ */ #endif /* ELECTRICAL_RAW_H_ */