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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2012-02-11 23:39:19 -08:00
parent 4a64952606 6d140c82c8
commit 0d99fa2e81
11 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
conf/airframes/TestHardware/Tiny_2.11_fw.xml
+2
View File
@@ -0,0 +1,2 @@
<airframe name="TestConfig">
</airframe>
sw/airborne/arch/stm32/mcu_arch.c
+2 -2
View File
@@ -47,7 +47,7 @@ void mcu_arch_init(void) {
return; return;
#else // !USE_OPENCM3 #else // !USE_OPENCM3
#ifdef HSE_TYPE_EXT_CLK #ifdef HSE_TYPE_EXT_CLK
#warning Info: Using external clock #pragma message "Using external clock."
/* Setup the microcontroller system. /* Setup the microcontroller system.
* Initialize the Embedded Flash Interface, * Initialize the Embedded Flash Interface,
* initialize the PLL and update the SystemFrequency variable. * initialize the PLL and update the SystemFrequency variable.
@@ -85,7 +85,7 @@ void mcu_arch_init(void) {
while(RCC_GetSYSCLKSource() != 0x08) {} while(RCC_GetSYSCLKSource() != 0x08) {}
} }
#else /* HSE_TYPE_EXT_CLK */ #else /* HSE_TYPE_EXT_CLK */
#warning Using normal system clock setup #pragma message "Using normal system clock setup."
SystemInit(); SystemInit();
#endif /* HSE_TYPE_EXT_CLK */ #endif /* HSE_TYPE_EXT_CLK */
/* Set the Vector Table base location at 0x08000000 */ /* Set the Vector Table base location at 0x08000000 */
sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
+2 -2
View File
@@ -87,10 +87,10 @@ typedef struct SpektrumStateStruct SpektrumStateType;
SpektrumStateType PrimarySpektrumState = {1,0,0,0,0,0,0,0,0}; SpektrumStateType PrimarySpektrumState = {1,0,0,0,0,0,0,0,0};
#ifdef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT #ifdef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
#warning "Using secondary spektrum receiver." #pragma message "Using secondary spektrum receiver."
SpektrumStateType SecondarySpektrumState = {1,0,0,0,0,0,0,0,0}; SpektrumStateType SecondarySpektrumState = {1,0,0,0,0,0,0,0,0};
#else #else
#warning "NOT using secondary spektrum receiver." #pragma message "NOT using secondary spektrum receiver."
#endif #endif
int16_t SpektrumBuf[SPEKTRUM_CHANNELS_PER_FRAME*MAX_SPEKTRUM_FRAMES]; int16_t SpektrumBuf[SPEKTRUM_CHANNELS_PER_FRAME*MAX_SPEKTRUM_FRAMES];
sw/airborne/modules/ins/ins_xsens.c
+2 -2
View File
@@ -266,14 +266,14 @@ void ins_periodic_task( void ) {
case 13: case 13:
#ifdef AHRS_H_X #ifdef AHRS_H_X
#warning Sending XSens Magnetic Declination #pragma message "Sending XSens Magnetic Declination."
xsens_declination = atan2(AHRS_H_Y, AHRS_H_X); xsens_declination = atan2(AHRS_H_Y, AHRS_H_X);
XSENS_SetMagneticDeclination(xsens_declination); XSENS_SetMagneticDeclination(xsens_declination);
#endif #endif
break; break;
case 12: case 12:
#ifdef GPS_IMU_LEVER_ARM_X #ifdef GPS_IMU_LEVER_ARM_X
#warning Sending XSens GPS Arm #pragma message "Sending XSens GPS Arm."
XSENS_SetLeverArmGps(GPS_IMU_LEVER_ARM_X,GPS_IMU_LEVER_ARM_Y,GPS_IMU_LEVER_ARM_Z); XSENS_SetLeverArmGps(GPS_IMU_LEVER_ARM_X,GPS_IMU_LEVER_ARM_Y,GPS_IMU_LEVER_ARM_Z);
#endif #endif
break; break;
sw/airborne/modules/sensors/imu_ppzuav.c
+2 -2
View File
@@ -73,10 +73,10 @@ void imu_impl_init(void)
#if PERIODIC_FREQUENCY == 60 #if PERIODIC_FREQUENCY == 60
/* set gyro range to 2000deg/s and low pass at 20Hz (< 60Hz/2) internal sampling at 1kHz */ /* set gyro range to 2000deg/s and low pass at 20Hz (< 60Hz/2) internal sampling at 1kHz */
ppzuavimu_itg3200.buf[1] = (0x03<<3) | (0x04<<0); ppzuavimu_itg3200.buf[1] = (0x03<<3) | (0x04<<0);
# warning Info: ITG3200 read at 50Hz # pragma message "ITG3200 read at 50Hz."
#else #else
# if PERIODIC_FREQUENCY == 120 # if PERIODIC_FREQUENCY == 120
# warning Info: ITG3200 read at 100Hz # pragma message "ITG3200 read at 100Hz."
/* set gyro range to 2000deg/s and low pass at 42Hz (< 120Hz/2) internal sampling at 1kHz */ /* set gyro range to 2000deg/s and low pass at 42Hz (< 120Hz/2) internal sampling at 1kHz */
ppzuavimu_itg3200.buf[1] = (0x03<<3) | (0x03<<0); ppzuavimu_itg3200.buf[1] = (0x03<<3) | (0x03<<0);
# else # else