diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-30 08:08:14 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-30 08:08:14 +0200 |
| commit | 81525f6d8ad0c988cb666c0d8015e52ebdccaeb4 (patch) | |
| tree | 89b53acac3ce7d4018cc366a7d3a6723341bac65 /src/modules/dataman/dataman.h | |
| parent | 848c1c2552996281685d2691c1b394f25a4391b3 (diff) | |
| parent | e7ebcd6c572fe3550fd626530eb69b818e31be4a (diff) | |
| download | px4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.tar.gz px4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.tar.bz2 px4-firmware-81525f6d8ad0c988cb666c0d8015e52ebdccaeb4.zip | |
Merge branch 'master' of github.com:PX4/Firmware into ekf_params
Diffstat (limited to 'src/modules/dataman/dataman.h')
| -rw-r--r-- | src/modules/dataman/dataman.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index 33c9fcd15..4382baeb5 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -75,7 +75,8 @@ extern "C" { /* The reason for the last reset */ typedef enum { DM_INIT_REASON_POWER_ON = 0, /* Data survives resets */ - DM_INIT_REASON_IN_FLIGHT /* Data survives in-flight resets only */ + DM_INIT_REASON_IN_FLIGHT, /* Data survives in-flight resets only */ + DM_INIT_REASON_VOLATILE /* Data does not survive reset */ } dm_reset_reason; /* Maximum size in bytes of a single item instance */ @@ -100,7 +101,7 @@ extern "C" { size_t buflen /* Length in bytes of data to retrieve */ ); - /* Retrieve from the data manager store */ + /* Erase all items of this type */ __EXPORT int dm_clear( dm_item_t item /* The item type to clear */ |