Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DataFlash: correct examples

This commit is contained in:
Peter Barker 2017-06-28 20:42:03 +10:00 committed by Francisco Ferreira
parent 9c2a2a3d94
commit 7b3db490be
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,8 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <DataFlash/DataFlash.h> #include <DataFlash/DataFlash.h>
#include <GCS_MAVLink/GCS.h>
#include <stdio.h>
const AP_HAL::HAL& hal = AP_HAL::get_HAL(); const AP_HAL::HAL& hal = AP_HAL::get_HAL();
@ -69,7 +71,8 @@ public:
private: private:
DataFlash_Class dataflash{"DF AllTypes 0.1"}; AP_Int32 unused;
DataFlash_Class dataflash{"DF AllTypes 0.1", unused};
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();
@ -202,6 +205,15 @@ void DataFlashTest_AllTypes::loop(void)
hal.scheduler->delay(1000); hal.scheduler->delay(1000);
} }
class GCS_Dataflash_AllTypes : public GCS
{
void send_statustext(MAV_SEVERITY severity, uint8_t dest_bitmask, const char *text) override {
::fprintf(stderr, "GCS: %s\n", text);
}
};
GCS_Dataflash_AllTypes _gcs;
static DataFlashTest_AllTypes dataflashtest; static DataFlashTest_AllTypes dataflashtest;
AP_HAL_MAIN_CALLBACKS(&dataflashtest); AP_HAL_MAIN_CALLBACKS(&dataflashtest);

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

@ -5,6 +5,8 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <DataFlash/DataFlash.h> #include <DataFlash/DataFlash.h>
#include <GCS_MAVLink/GCS.h>
#include <stdio.h>
const AP_HAL::HAL& hal = AP_HAL::get_HAL(); const AP_HAL::HAL& hal = AP_HAL::get_HAL();
@ -33,7 +35,8 @@ public:
private: private:
DataFlash_Class dataflash{"DF Test 0.1"}; AP_Int32 unused;
DataFlash_Class dataflash{"DF Test 0.1", unused};
void print_mode(AP_HAL::BetterStream *port, uint8_t mode); void print_mode(AP_HAL::BetterStream *port, uint8_t mode);
}; };
@ -126,4 +129,12 @@ void loop()
dataflashtest.loop(); dataflashtest.loop();
} }
class GCS_Dataflash_test : public GCS
{
void send_statustext(MAV_SEVERITY severity, uint8_t dest_bitmask, const char *text) override {
::fprintf(stderr, "GCS: %s\n", text);
}
};
GCS_Dataflash_test _gcs;
AP_HAL_MAIN(); AP_HAL_MAIN();