aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StorageManager: enable use of a single storage region

Browse Source
This commit is contained in:
Andrew Tridgell 2019-05-27 11:31:16 +10:00
parent 1e66457755
commit d005f066a9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/StorageManager/StorageManager.cpp
View File

@ -30,6 +30,15 @@ extern const AP_HAL::HAL& hal;
compatibility with older firmwares compatibility with older firmwares
*/ */
#if STORAGE_NUM_AREAS == 1
/*
layout for peripherals
*/
const StorageManager::StorageArea StorageManager::layout_default[STORAGE_NUM_AREAS] = {
{ StorageParam, 0, HAL_STORAGE_SIZE}
};
#else
/* /*
layout for fixed wing and rovers layout for fixed wing and rovers
On PX4v1 this gives 309 waypoints, 30 rally points and 52 fence points On PX4v1 this gives 309 waypoints, 30 rally points and 52 fence points
@ -60,7 +69,6 @@ const StorageManager::StorageArea StorageManager::layout_default[STORAGE_NUM_ARE
#endif #endif
}; };
/* /*
layout for copter. layout for copter.
On PX4v1 this gives 303 waypoints, 26 rally points and 38 fence points On PX4v1 this gives 303 waypoints, 26 rally points and 38 fence points
@ -90,6 +98,7 @@ const StorageManager::StorageArea StorageManager::layout_copter[STORAGE_NUM_AREA
{ StorageMission, 10028, 6228}, // leave 128 byte gap for expansion { StorageMission, 10028, 6228}, // leave 128 byte gap for expansion
#endif #endif
}; };
#endif // STORAGE_NUM_AREAS == 1
// setup default layout // setup default layout
const StorageManager::StorageArea *StorageManager::layout = layout_default; const StorageManager::StorageArea *StorageManager::layout = layout_default;

2
libraries/StorageManager/StorageManager.h
View File

@ -34,6 +34,8 @@
#define STORAGE_NUM_AREAS 10 #define STORAGE_NUM_AREAS 10
#elif HAL_STORAGE_SIZE >= 4096 #elif HAL_STORAGE_SIZE >= 4096
#define STORAGE_NUM_AREAS 4 #define STORAGE_NUM_AREAS 4
#elif HAL_STORAGE_SIZE > 0
#define STORAGE_NUM_AREAS 1
#else #else
#error "Unsupported storage size" #error "Unsupported storage size"
#endif #endif