diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-14 14:14:52 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-14 14:14:52 +0100 |
| commit | 1f5eda37abffc10b51e4bcd94efa18c1dc76d21f (patch) | |
| tree | 2062a4f53896d5ccf19eaee158962c2a11276cf8 /src/modules/uORB/topics/battery_status.h | |
| parent | c4dc310ebda8f79ec13c68745408444661b32fe1 (diff) | |
| parent | b529e112b8ffaa92274f9dc5d94a1fce581a358e (diff) | |
| download | px4-firmware-1f5eda37abffc10b51e4bcd94efa18c1dc76d21f.tar.gz px4-firmware-1f5eda37abffc10b51e4bcd94efa18c1dc76d21f.tar.bz2 px4-firmware-1f5eda37abffc10b51e4bcd94efa18c1dc76d21f.zip | |
Merge branch 'master' into pubsub_cleanup
Diffstat (limited to 'src/modules/uORB/topics/battery_status.h')
| -rw-r--r-- | src/modules/uORB/topics/battery_status.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/uORB/topics/battery_status.h b/src/modules/uORB/topics/battery_status.h index c40d0d4e5..d473dff3f 100644 --- a/src/modules/uORB/topics/battery_status.h +++ b/src/modules/uORB/topics/battery_status.h @@ -53,9 +53,10 @@ */ struct battery_status_s { uint64_t timestamp; /**< microseconds since system boot, needed to integrate */ - float voltage_v; /**< Battery voltage in volts, filtered */ - float current_a; /**< Battery current in amperes, filtered, -1 if unknown */ - float discharged_mah; /**< Discharged amount in mAh, filtered, -1 if unknown */ + float voltage_v; /**< Battery voltage in volts, 0 if unknown */ + float voltage_filtered_v; /**< Battery voltage in volts, filtered, 0 if unknown */ + float current_a; /**< Battery current in amperes, -1 if unknown */ + float discharged_mah; /**< Discharged amount in mAh, -1 if unknown */ }; /** @@ -65,4 +66,4 @@ struct battery_status_s { /* register this as object request broker structure */ ORB_DECLARE(battery_status); -#endif
\ No newline at end of file +#endif |