Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 23:49:00 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

another rename and whitespace cleanup

Browse Source
This commit is contained in:
Felix Ruess
2010-09-27 22:55:41 +00:00
parent ab451dcd26
commit 60d2562e92
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/firmwares/rotorcraft/autopilot.c
+1 -1
View File
@@ -239,7 +239,7 @@ static inline void autopilot_check_motors_on( void ) {
void autopilot_on_rc_frame(void) {
uint8_t new_autopilot_mode = 0;
BOOZ_AP_MODE_OF_PPRZ(radio_control.values[RADIO_CONTROL_MODE], new_autopilot_mode);
AP_MODE_OF_PPRZ(radio_control.values[RADIO_CONTROL_MODE], new_autopilot_mode);
autopilot_set_mode(new_autopilot_mode);
#ifdef RADIO_CONTROL_KILL_SWITCH
sw/airborne/firmwares/rotorcraft/autopilot.h
+14 -14
View File
@@ -80,26 +80,26 @@ extern uint16_t autopilot_flight_time;
#define TRESHOLD_1_PPRZ (MIN_PPRZ / 2)
#define TRESHOLD_2_PPRZ (MAX_PPRZ / 2)
#define BOOZ_AP_MODE_OF_PPRZ(_rc, _booz_mode) { \
if (_rc > TRESHOLD_2_PPRZ) \
_booz_mode = autopilot_mode_auto2; \
#define AP_MODE_OF_PPRZ(_rc, _mode) { \
if (_rc > TRESHOLD_2_PPRZ) \
_mode = autopilot_mode_auto2; \
else if (_rc > TRESHOLD_1_PPRZ) \
_booz_mode = MODE_AUTO1; \
else \
_booz_mode = MODE_MANUAL; \
_mode = MODE_AUTO1; \
else \
_mode = MODE_MANUAL; \
}
#define autopilot_KillThrottle(_v) { \
kill_throttle = _v; \
#define autopilot_KillThrottle(_v) { \
kill_throttle = _v; \
if (kill_throttle) autopilot_motors_on = FALSE; \
else autopilot_motors_on = TRUE; \
else autopilot_motors_on = TRUE; \
}
#define autopilot_SetPowerSwitch(_v) { \
autopilot_power_switch = _v; \
if (_v) { LED_OFF(POWER_SWITCH_LED); } \
else { LED_ON(POWER_SWITCH_LED); } \
}
#define autopilot_SetPowerSwitch(_v) { \
autopilot_power_switch = _v; \
if (_v) { LED_OFF(POWER_SWITCH_LED); } \
else { LED_ON(POWER_SWITCH_LED); } \
}
#ifndef TRESHOLD_GROUND_DETECT
#define TRESHOLD_GROUND_DETECT ACCEL_BFP_OF_REAL(15.)
sw/airborne/firmwares/rotorcraft/main.h
+2 -2
View File
@@ -1,6 +1,6 @@
/*
* $Id$
*
*
* Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
*
* This file is part of paparazzi.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with paparazzi; see the file COPYING. If not, write to
* the Free Software Foundation, 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
* Boston, MA 02111-1307, USA.
*/
#ifndef BOOZ2_MAIN_H