fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 01:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

dataman: remove obsolete persistence and reset reason

Browse Source
This commit is contained in:
Daniel Agar
2021-12-12 12:06:35 -05:00
committed by GitHub
parent ad1bfb5410
commit 986cf288da
10 changed files with 61 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tests/test_dataman.c
+7 -23
View File
@@ -85,7 +85,8 @@ task_main(int argc, char *argv[])
}
srand(hrt_absolute_time() ^ my_id);
unsigned hit = 0, miss = 0;
unsigned hit = 0;
unsigned miss = 0;
hrt_abstime wstart = hrt_absolute_time();
for (unsigned i = 0; i < NUM_MISSIONS_TEST; i++) {
@@ -94,11 +95,11 @@ task_main(int argc, char *argv[])
unsigned hash = i ^ my_id;
unsigned len = (hash % (DM_MAX_DATA_SIZE / 2)) + 2;
int ret = dm_write(DM_KEY_WAYPOINTS_OFFBOARD_1, hash, DM_PERSIST_IN_FLIGHT_RESET, buffer, len);
int ret = dm_write(DM_KEY_WAYPOINTS_OFFBOARD_1, hash, buffer, len);
//PX4_INFO("ret: %d", ret);
if (ret != len) {
PX4_WARN("task %d: write failed (%d), index %d, length %d", my_id, ret, hash, len);
PX4_WARN("task %d: write failed ret=%d, index: %d, length: %d", my_id, ret, hash, len);
goto fail;
}
@@ -114,11 +115,11 @@ task_main(int argc, char *argv[])
for (unsigned i = 0; i < NUM_MISSIONS_TEST; i++) {
unsigned hash = i ^ my_id;
ssize_t len2;
ssize_t len2 = dm_read(DM_KEY_WAYPOINTS_OFFBOARD_1, hash, buffer, sizeof(buffer));
ssize_t len = (hash % (DM_MAX_DATA_SIZE / 2)) + 2;
if ((len2 = dm_read(DM_KEY_WAYPOINTS_OFFBOARD_1, hash, buffer, sizeof(buffer))) < 2) {
PX4_WARN("task %d: read failed length test, index %d", my_id, hash);
if (len2 != len) {
PX4_WARN("task %d: read failed length test, index %d, ret=%zu, len=%zu", my_id, hash, len2, len);
goto fail;
}
@@ -208,28 +209,11 @@ int test_dataman(int argc, char *argv[])
return -1;
}
dm_restart(DM_INIT_REASON_IN_FLIGHT);
for (i = 0; i < NUM_MISSIONS_TEST; i++) {
if (dm_read(DM_KEY_WAYPOINTS_OFFBOARD_1, i, buffer, sizeof(buffer)) != 0) {
break;
}
}
if (i >= NUM_MISSIONS_TEST) {
PX4_ERR("Restart in-flight failed");
return -1;
}
dm_restart(DM_INIT_REASON_POWER_ON);
for (i = 0; i < NUM_MISSIONS_TEST; i++) {
if (dm_read(DM_KEY_WAYPOINTS_OFFBOARD_1, i, buffer, sizeof(buffer)) != 0) {
PX4_ERR("Restart power-on failed");
return -1;
}
}
return 0;
}