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

Plane: merge Plane.cpp into ArduPlane.cpp

Browse Source
This commit is contained in:
Peter Barker 2024-06-05 13:17:05 +10:00 committed by Andrew Tridgell
parent 2851aaf76a
commit 9b96ae7811
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ArduPlane/ArduPlane.cpp
View File

@ -22,6 +22,12 @@
#include "Plane.h" #include "Plane.h"
#define FORCE_VERSION_H_INCLUDE
#include "version.h"
#undef FORCE_VERSION_H_INCLUDE
const AP_HAL::HAL& hal = AP_HAL::get_HAL();
#define SCHED_TASK(func, rate_hz, max_time_micros, priority) SCHED_TASK_CLASS(Plane, &plane, func, rate_hz, max_time_micros, priority) #define SCHED_TASK(func, rate_hz, max_time_micros, priority) SCHED_TASK_CLASS(Plane, &plane, func, rate_hz, max_time_micros, priority)
#define FAST_TASK(func) FAST_TASK_CLASS(Plane, &plane, func) #define FAST_TASK(func) FAST_TASK_CLASS(Plane, &plane, func)
@ -1049,4 +1055,16 @@ void Plane::update_quicktune(void)
} }
#endif #endif
/*
constructor for main Plane class
*/
Plane::Plane(void)
{
// C++11 doesn't allow in-class initialisation of bitfields
auto_state.takeoff_complete = true;
}
Plane plane;
AP_Vehicle& vehicle = plane;
AP_HAL_MAIN_CALLBACKS(&plane); AP_HAL_MAIN_CALLBACKS(&plane);

33
ArduPlane/Plane.cpp
View File

@ -1,33 +0,0 @@
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Plane.h"
#define FORCE_VERSION_H_INCLUDE
#include "version.h"
#undef FORCE_VERSION_H_INCLUDE
const AP_HAL::HAL& hal = AP_HAL::get_HAL();
/*
constructor for main Plane class
*/
Plane::Plane(void)
{
// C++11 doesn't allow in-class initialisation of bitfields
auto_state.takeoff_complete = true;
}
Plane plane;
AP_Vehicle& vehicle = plane;