[gentlenav] r3650 committed - MatrixPilot_wjp_helicalTurns: specify relative path for include when i...

[gent...@googlecode.com]

Revision: 3650
Author: robert.d...@gmail.com
Date: Sun Jun 7 12:06:34 2015 UTC
Log: MatrixPilot_wjp_helicalTurns: specify relative path for include
when it is an upwards dependency (which would ideally be removed). a few
tweaks to the makefile build system consistent with trunk development.

https://code.google.com/p/gentlenav/source/detail?r=3650

Modified:
/branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/gain_variables.h
/branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/helicalTurnCntrl.c
/branches/MatrixPilot_wjp_helicalTurns/device-AUAV3.mk
/branches/MatrixPilot_wjp_helicalTurns/libUDB/osd.c
/branches/MatrixPilot_wjp_helicalTurns/libUDB/uart.c
/branches/MatrixPilot_wjp_helicalTurns/target-MatrixPilot.mk

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/gain_variables.h Mon
Sep 23 03:37:09 2013 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/gain_variables.h Sun
Jun 7 12:06:34 2015 UTC
@@ -54,7 +54,7 @@
// ELEVATOR_BOOST is the additional gain multiplier for the manually
commanded elevator deflection
extern uint16_t pitchgain;
extern uint16_t pitchkd;
-extern uint16_t rudderElevMixGain;
+//extern uint16_t rudderElevMixGain;
extern uint16_t rollElevMixGain;
//#define ELEVATOR_BOOST 0.5

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/helicalTurnCntrl.c
Tue Jun 2 12:13:26 2015 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/MatrixPilot/helicalTurnCntrl.c
Sun Jun 7 12:06:34 2015 UTC
@@ -30,27 +30,27 @@

#ifndef RTL_PITCH_DOWN
#define RTL_PITCH_DOWN ( 0.0 )
-#endif // RLT_PITCH_DOWN
+#endif // RLT_PITCH_DOWN

#ifndef INVERTED_NEUTRAL_PITCH
#define INVERTED_NEUTRAL_PITCH ( 0.0 )
-#endif // INVERTED_NEUTRAL_PITCH
+#endif // INVERTED_NEUTRAL_PITCH

#ifndef ANGLE_OF_ATTACK_NORMAL
#define ANGLE_OF_ATTACK_NORMAL ( 0.0 )
-#endif // ANGLE_OF_ATTACK_NORMAL
+#endif // ANGLE_OF_ATTACK_NORMAL

#ifndef ANGLE_OF_ATTACK_INVERTED
#define ANGLE_OF_ATTACK_INVERTED ( 0.0 )
-#endif // ANGLE_OF_ATTACK_INVERTED
+#endif // ANGLE_OF_ATTACK_INVERTED

#ifndef ELEVATOR_TRIM_NORMAL
#define ELEVATOR_TRIM_NORMAL ( 0.0 )
-#endif // ELEVATOR_TRIM_NORMAL
+#endif // ELEVATOR_TRIM_NORMAL

#ifndef ELEVATOR_TRIM_INVERTED
#define ELEVATOR_TRIM_INVERTED ( 0.0 )
-#endif // ELEVATOR_TRIM_INVERTED
+#endif // ELEVATOR_TRIM_INVERTED

#ifndef CRUISE_SPEED
#define CRUISE_SPEED ( 12.0 )
@@ -81,12 +81,12 @@
#define MINIMUM_AIRSPEED ( 500 ) // minimum value of airspeed in cm/sec to
be used in tilt computation,
// mainly used for ground testing of turning tilt, which would go
to zero at zero airspeed

-int16_t tiltError[3] ;
-int16_t desiredRotationRateRadians[3] ;
-int16_t rotationRateError[3] ;
-int16_t angleOfAttack ;
-int16_t estimatedLift ;
-int16_t relativeLoading ;
+int16_t tiltError[3];
+int16_t desiredRotationRateRadians[3];
+int16_t rotationRateError[3];
+int16_t angleOfAttack;
+int16_t estimatedLift;
+int16_t relativeLoading;

// Compute estimated wing lift based on orientation.
// This information can be determined directly from the accelerometers,
=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/device-AUAV3.mk Sun Mar 15
04:48:47 2015 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/device-AUAV3.mk Sun Jun 7
12:06:34 2015 UTC
@@ -5,7 +5,7 @@
TARGET_TYPE := hex
CPU := 33EP512MU810

-modules += libUDB libFlashFS libVectorMatrix Microchip
+modules += libUDB libVectorMatrix libFlashFS Microchip
incpath += Microchip Microchip/Include libVectorMatrix
#cfgpath := Config

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/libUDB/osd.c Fri Dec 6 12:11:18
2013 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/libUDB/osd.c Sun Jun 7 12:06:34
2015 UTC
@@ -21,7 +21,7 @@

#include "libUDB_internal.h"
#include "oscillator.h"
-#include "defines.h"
+#include "../MatrixPilot/defines.h"
#include "osd_config.h"
#include "osd.h"

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/libUDB/uart.c Wed Jan 8
11:34:10 2014 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/libUDB/uart.c Sun Jun 7
12:06:34 2015 UTC
@@ -19,7 +19,7 @@
// along with MatrixPilot. If not, see <http://www.gnu.org/licenses/>.


-#include "defines.h"
+#include "../MatrixPilot/defines.h"
#include "oscillator.h"
#include "uart.h"

=======================================
--- /branches/MatrixPilot_wjp_helicalTurns/target-MatrixPilot.mk Sun Mar 15
05:45:20 2015 UTC
+++ /branches/MatrixPilot_wjp_helicalTurns/target-MatrixPilot.mk Sun Jun 7
12:06:34 2015 UTC
@@ -2,4 +2,4 @@

modules := MatrixPilot MAVLink libDCM
incpath := MAVLink/include
-cfgpath := MatrixPilot libUDB libFlashFS
+cfgpath := Config