Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: examples: move starting of new logs into DataFlash

Browse Source
This commit is contained in:
Peter Barker 2017-07-01 09:42:33 +10:00 committed by Francisco Ferreira
parent dff026e30c
commit 31083653b2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp
View File

@ -71,8 +71,8 @@ public:
private: private:
AP_Int32 unused; AP_Int32 log_bitmask;
DataFlash_Class dataflash{"DF AllTypes 0.1", unused}; DataFlash_Class dataflash{"DF AllTypes 0.1", log_bitmask};
void print_mode(AP_HAL::BetterStream *port, uint8_t mode); void print_mode(AP_HAL::BetterStream *port, uint8_t mode);
void Log_Write_TypeMessages(); void Log_Write_TypeMessages();
@ -97,7 +97,6 @@ void DataFlashTest_AllTypes::flush_dataflash(DataFlash_Class &_dataflash)
void DataFlashTest_AllTypes::Log_Write_TypeMessages() void DataFlashTest_AllTypes::Log_Write_TypeMessages()
{ {
dataflash.StartUnstartedLogging();
log_num = dataflash.find_last_log(); log_num = dataflash.find_last_log();
hal.console->printf("Using log number %u\n", log_num); hal.console->printf("Using log number %u\n", log_num);
@ -144,7 +143,6 @@ void DataFlashTest_AllTypes::Log_Write_TypeMessages()
void DataFlashTest_AllTypes::Log_Write_TypeMessages_Log_Write() void DataFlashTest_AllTypes::Log_Write_TypeMessages_Log_Write()
{ {
dataflash.StartUnstartedLogging();
log_num = dataflash.find_last_log(); log_num = dataflash.find_last_log();
hal.console->printf("Using log number for Log_Write %u\n", log_num); hal.console->printf("Using log number for Log_Write %u\n", log_num);
@ -186,8 +184,10 @@ void DataFlashTest_AllTypes::setup(void)
{ {
hal.console->printf("Dataflash All Types 1.0\n"); hal.console->printf("Dataflash All Types 1.0\n");
log_bitmask = (uint32_t)-1;
dataflash.Init(log_structure, ARRAY_SIZE(log_structure)); dataflash.Init(log_structure, ARRAY_SIZE(log_structure));
dataflash.set_vehicle_armed(true); dataflash.set_vehicle_armed(true);
dataflash.Log_Write_Message("DataFlash Test");
// Test // Test
hal.scheduler->delay(20); hal.scheduler->delay(20);

11
libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp
View File

@ -35,8 +35,8 @@ public:
private: private:
AP_Int32 unused; AP_Int32 log_bitmask;
DataFlash_Class dataflash{"DF Test 0.1", unused}; DataFlash_Class dataflash{"DF Test 0.1", log_bitmask};
void print_mode(AP_HAL::BetterStream *port, uint8_t mode); void print_mode(AP_HAL::BetterStream *port, uint8_t mode);
}; };
@ -44,10 +44,12 @@ static DataFlashTest dataflashtest;
void DataFlashTest::setup(void) void DataFlashTest::setup(void)
{ {
hal.console->printf("Dataflash Log Test 1.0\n");
log_bitmask = (uint32_t)-1;
dataflash.Init(log_structure, ARRAY_SIZE(log_structure)); dataflash.Init(log_structure, ARRAY_SIZE(log_structure));
dataflash.set_vehicle_armed(true); dataflash.set_vehicle_armed(true);
dataflash.Log_Write_Message("DataFlash Test");
hal.console->printf("Dataflash Log Test 1.0\n");
// Test // Test
hal.scheduler->delay(20); hal.scheduler->delay(20);
@ -55,7 +57,6 @@ void DataFlashTest::setup(void)
// We start to write some info (sequentialy) starting from page 1 // We start to write some info (sequentialy) starting from page 1
// This is similar to what we will do... // This is similar to what we will do...
dataflash.StartUnstartedLogging();
log_num = dataflash.find_last_log(); log_num = dataflash.find_last_log();
hal.console->printf("Using log number %u\n", log_num); hal.console->printf("Using log number %u\n", log_num);
hal.console->printf("After testing perform erase before using DataFlash for logging!\n"); hal.console->printf("After testing perform erase before using DataFlash for logging!\n");