From 88467a5b8b4db7ce2ab9b78bada81fe826432b9c Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Sat, 11 Feb 2012 14:41:37 +1100 Subject: [PATCH 1/3] Adding place holders for test hardware configs. --- conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml | 0 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml | 0 conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml | 0 conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml | 0 conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml | 0 conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml | 0 conf/airframes/TestHardware/Tiny_2.11_fw.xml | 0 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml create mode 100644 conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml create mode 100644 conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml create mode 100644 conf/airframes/TestHardware/Tiny_2.11_fw.xml diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/airframes/TestHardware/Tiny_2.11_fw.xml b/conf/airframes/TestHardware/Tiny_2.11_fw.xml new file mode 100644 index 0000000000..e69de29bb2 From 85d7eb9398ba6d7435363f4863ce54f1ec2b6773 Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Sat, 11 Feb 2012 15:55:32 +1100 Subject: [PATCH 2/3] Some very basic content for the airframe test hardware configs. --- conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml | 0 .../airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml | 2 ++ .../airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml | 2 ++ conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml | 0 conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml | 2 ++ conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml | 2 ++ conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml | 2 ++ conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml | 2 ++ conf/airframes/TestHardware/Tiny_2.11_fw.xml | 2 ++ 9 files changed, 14 insertions(+) delete mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml create mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml delete mode 100644 conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml new file mode 100644 index 0000000000..ab07cfb2b8 --- /dev/null +++ b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml new file mode 100644 index 0000000000..ab07cfb2b8 --- /dev/null +++ b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml index e69de29bb2..ab07cfb2b8 100644 --- a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml +++ b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml index e69de29bb2..ab07cfb2b8 100644 --- a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml +++ b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml index e69de29bb2..ab07cfb2b8 100644 --- a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml +++ b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml index e69de29bb2..ab07cfb2b8 100644 --- a/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml +++ b/conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml @@ -0,0 +1,2 @@ + + diff --git a/conf/airframes/TestHardware/Tiny_2.11_fw.xml b/conf/airframes/TestHardware/Tiny_2.11_fw.xml index e69de29bb2..ab07cfb2b8 100644 --- a/conf/airframes/TestHardware/Tiny_2.11_fw.xml +++ b/conf/airframes/TestHardware/Tiny_2.11_fw.xml @@ -0,0 +1,2 @@ + + From 6d140c82c8947107d7a737787d4c7d0b228393ec Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Sat, 11 Feb 2012 23:37:07 -0800 Subject: [PATCH 3/3] Changed some informational warnings to pragma message. --- sw/airborne/arch/stm32/mcu_arch.c | 4 ++-- .../arch/stm32/subsystems/radio_control/spektrum_arch.c | 4 ++-- sw/airborne/modules/ins/ins_xsens.c | 4 ++-- sw/airborne/modules/sensors/imu_ppzuav.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sw/airborne/arch/stm32/mcu_arch.c b/sw/airborne/arch/stm32/mcu_arch.c index 22ea358a60..326a2b20df 100644 --- a/sw/airborne/arch/stm32/mcu_arch.c +++ b/sw/airborne/arch/stm32/mcu_arch.c @@ -47,7 +47,7 @@ void mcu_arch_init(void) { return; #endif #ifdef HSE_TYPE_EXT_CLK -#warning Info: Using external clock +#pragma message "Using external clock." /* Setup the microcontroller system. * Initialize the Embedded Flash Interface, * initialize the PLL and update the SystemFrequency variable. @@ -85,7 +85,7 @@ void mcu_arch_init(void) { while(RCC_GetSYSCLKSource() != 0x08) {} } #else /* HSE_TYPE_EXT_CLK */ -#warning Using normal system clock setup +#pragma message "Using normal system clock setup." SystemInit(); #endif /* HSE_TYPE_EXT_CLK */ /* Set the Vector Table base location at 0x08000000 */ diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c index e56c2e7a3d..f366f8c6f3 100644 --- a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c +++ b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c @@ -87,10 +87,10 @@ typedef struct SpektrumStateStruct SpektrumStateType; SpektrumStateType PrimarySpektrumState = {1,0,0,0,0,0,0,0,0}; #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}; #else -#warning "NOT using secondary spektrum receiver." +#pragma message "NOT using secondary spektrum receiver." #endif int16_t SpektrumBuf[SPEKTRUM_CHANNELS_PER_FRAME*MAX_SPEKTRUM_FRAMES]; diff --git a/sw/airborne/modules/ins/ins_xsens.c b/sw/airborne/modules/ins/ins_xsens.c index f16d597a69..cce76a36ac 100644 --- a/sw/airborne/modules/ins/ins_xsens.c +++ b/sw/airborne/modules/ins/ins_xsens.c @@ -251,14 +251,14 @@ void ins_periodic_task( void ) { case 13: #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_SetMagneticDeclination(xsens_declination); #endif break; case 12: #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); #endif break; diff --git a/sw/airborne/modules/sensors/imu_ppzuav.c b/sw/airborne/modules/sensors/imu_ppzuav.c index ba8b137cc8..71e84757e9 100644 --- a/sw/airborne/modules/sensors/imu_ppzuav.c +++ b/sw/airborne/modules/sensors/imu_ppzuav.c @@ -73,10 +73,10 @@ void imu_impl_init(void) #if PERIODIC_FREQUENCY == 60 /* 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); -# warning Info: ITG3200 read at 50Hz +# pragma message "ITG3200 read at 50Hz." #else # 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 */ ppzuavimu_itg3200.buf[1] = (0x03<<3) | (0x03<<0); # else