AP_Mount: replace header guard with pragma once

This commit is contained in:
Lucas De Marchi 2016-02-17 23:25:38 -02:00 committed by Andrew Tridgell
parent 7d9153feb8
commit 3a771bf0e3
10 changed files with 10 additions and 48 deletions

View File

@ -19,8 +19,7 @@
* Comments: All angles in degrees * 100, distances in meters*
* unless otherwise stated. *
************************************************************/
#ifndef __AP_MOUNT_H__
#define __AP_MOUNT_H__
#pragma once
#include <AP_Math/AP_Math.h>
#include <AP_Common/AP_Common.h>
@ -186,5 +185,3 @@ protected:
DataFlash_Class *_dataflash;
};
#endif // __AP_MOUNT_H__

View File

@ -3,9 +3,7 @@
/*
Alexmos Serial controlled mount backend class
*/
#ifndef __AP_MOUNT_ALEXMOS_H__
#define __AP_MOUNT_ALEXMOS_H__
#pragma once
#include "AP_Mount.h"
#include <AP_HAL/AP_HAL.h>
@ -319,5 +317,3 @@ private:
// confirmed that last command was ok
bool _last_command_confirmed : 1;
};
#endif

View File

@ -18,9 +18,7 @@
Mount driver backend class. Each supported mount type
needs to have an object derived from this class.
*/
#ifndef __AP_MOUNT_BACKEND_H__
#define __AP_MOUNT_BACKEND_H__
#pragma once
#include <AP_Common/AP_Common.h>
#include "AP_Mount.h"
@ -100,5 +98,3 @@ protected:
uint8_t _instance; // this instance's number
Vector3f _angle_ef_target_rad; // desired earth-frame roll, tilt and vehicle-relative pan angles in radians
};
#endif // __AP_MOUNT_BACKEND_H__

View File

@ -3,9 +3,7 @@
/*
SToRM32 mount backend class
*/
#ifndef __AP_MOUNT_STORM32_H__
#define __AP_MOUNT_STORM32_H__
#pragma once
#include <AP_HAL/AP_HAL.h>
#include <AP_AHRS/AP_AHRS.h>
@ -58,5 +56,3 @@ private:
mavlink_channel_t _chan; // mavlink channel used to communicate with gimbal. Currently hard-coded to Telem2
uint32_t _last_send; // system time of last do_mount_control sent to gimbal
};
#endif // __AP_MOUNT_STORM32_H__

View File

@ -3,9 +3,7 @@
/*
SToRM32 mount using serial protocol backend class
*/
#ifndef __AP_MOUNT_STORM32_SERIAL_H__
#define __AP_MOUNT_STORM32_SERIAL_H__
#pragma once
#include <AP_HAL/AP_HAL.h>
#include <AP_AHRS/AP_AHRS.h>
@ -153,5 +151,3 @@ private:
// keep the last _current_angle values
Vector3l _current_angle;
};
#endif // __AP_MOUNT_STORM32_SERIAL_H__

View File

@ -3,9 +3,7 @@
/*
Servo controlled mount backend class
*/
#ifndef __AP_MOUNT_SERVO_H__
#define __AP_MOUNT_SERVO_H__
#pragma once
#include <AP_Math/AP_Math.h>
#include <AP_Common/AP_Common.h>
@ -80,5 +78,3 @@ private:
uint32_t _last_check_servo_map_ms; // system time of latest call to check_servo_map function
};
#endif // __AP_MOUNT_SERVO_H__

View File

@ -3,9 +3,7 @@
/*
MAVLink enabled mount backend class
*/
#ifndef __AP_MOUNT_SOLOGIMBAL_H__
#define __AP_MOUNT_SOLOGIMBAL_H__
#pragma once
#include <AP_HAL/AP_HAL.h>
@ -66,5 +64,3 @@ private:
};
#endif // AP_AHRS_NAVEKF_AVAILABLE
#endif // __AP_MOUNT_SOLOGIMBAL_H__

View File

@ -6,8 +6,7 @@
* Author: Arthur Benemann, Paul Riseborough; *
* *
************************************************************/
#ifndef __SOLOGIMBAL_H__
#define __SOLOGIMBAL_H__
#pragma once
#include <AP_HAL/AP_HAL.h>
#include <AP_AHRS/AP_AHRS.h>
@ -158,5 +157,3 @@ private:
};
#endif // AP_AHRS_NAVEKF_AVAILABLE
#endif // __AP_MOUNT_H__

View File

@ -17,9 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SOLO_GIMBAL_EKF_
#define _SOLO_GIMBAL_EKF_
#pragma once
#include <AP_Math/AP_Math.h>
#include <AP_InertialSensor/AP_InertialSensor.h>
@ -172,5 +170,3 @@ private:
// Force symmmetry and non-negative diagonals on state covarinace matrix
void fixCovariance();
};
#endif // _SOLO_GIMBAL_EKF_

View File

@ -1,5 +1,4 @@
#ifndef __SOLOGIMBAL_PARAMETERS__
#define __SOLOGIMBAL_PARAMETERS__
#pragma once
#include <AP_Math/AP_Math.h>
#include <AP_Common/AP_Common.h>
#include <GCS_MAVLink/GCS_MAVLink.h>
@ -89,6 +88,3 @@ private:
mavlink_channel_t _chan;
};
#endif // __SOLOGIMBAL_PARAMETERS__