projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools/ao-eeprom: Add altitude data for baro values
[fw/altos]
/
ao-tools
/
ao-eeprom
/
ao-eeprom.c
diff --git
a/ao-tools/ao-eeprom/ao-eeprom.c
b/ao-tools/ao-eeprom/ao-eeprom.c
index 0c0500f9fbec6cdeff4cdd1e4357aea0c47fe598..0a4db823f50b9eaef71fe1b5cf9f6fc8f06b6459 100644
(file)
--- a/
ao-tools/ao-eeprom/ao-eeprom.c
+++ b/
ao-tools/ao-eeprom/ao-eeprom.c
@@
-22,6
+22,7
@@
#include <unistd.h>
#include <getopt.h>
#include <ao-eeprom-read.h>
#include <unistd.h>
#include <getopt.h>
#include <ao-eeprom-read.h>
+#include <ao-atmosphere.h>
static const struct option options[] = {
{ .name = "raw", .has_arg = 0, .val = 'r' },
static const struct option options[] = {
{ .name = "raw", .has_arg = 0, .val = 'r' },
@@
-55,11
+56,12
@@
ao_ms5607(uint32_t pres, uint32_t temp, struct ao_eeprom *eeprom, bool is_ms5611
ao_ms5607_convert(&ms5607_sample, &ms5607_value,
&eeprom->ms5607_prom, is_ms5611);
ao_ms5607_convert(&ms5607_sample, &ms5607_value,
&eeprom->ms5607_prom, is_ms5611);
- printf(" pres %9u temp %9u (%7.3f kPa %6.2f°C)",
+ printf(" pres %9u temp %9u (%7.3f kPa %6.2f°C
%7.1f m
)",
pres,
temp,
ms5607_value.pres / 1000.0,
pres,
temp,
ms5607_value.pres / 1000.0,
- ms5607_value.temp / 100.0);
+ ms5607_value.temp / 100.0,
+ ao_pressure_to_altitude(ms5607_value.pres));
}
#define GRAVITY 9.80665
}
#define GRAVITY 9.80665