[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6018] some more naming fixes
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6018] some more naming fixes |
|
Date: |
Tue, 28 Sep 2010 16:40:42 +0000 |
Revision: 6018
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6018
Author: flixr
Date: 2010-09-28 16:40:39 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
some more naming fixes
Modified Paths:
--------------
paparazzi3/trunk/sw/airborne/boards/booz_1.0.h
paparazzi3/trunk/sw/airborne/booz/test/booz2_test_crista.c
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/battery.h
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/lpc21/imu_b2_arch.c
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/sim/imu_b2_arch.h
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu.h
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c
Modified: paparazzi3/trunk/sw/airborne/boards/booz_1.0.h
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/booz_1.0.h 2010-09-28 16:21:25 UTC
(rev 6017)
+++ paparazzi3/trunk/sw/airborne/boards/booz_1.0.h 2010-09-28 16:40:39 UTC
(rev 6018)
@@ -2,20 +2,20 @@
#define CONFIG_BOOZ2_V1_0_H
/* Master oscillator freq. */
-#define FOSC (12000000)
+#define FOSC (12000000)
/* PLL multiplier */
-#define PLL_MUL (5)
+#define PLL_MUL (5)
/* CPU clock freq. */
-#define CCLK (FOSC * PLL_MUL)
+#define CCLK (FOSC * PLL_MUL)
/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2 */
-#define PBSD_BITS 0x02
+#define PBSD_BITS 0x02
#define PBSD_VAL 2
/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL)
+#define PCLK (CCLK / PBSD_VAL)
/* Onboard LEDs */
#define LED_1_BANK 1
@@ -97,7 +97,7 @@
* Modem
*/
//#define MODEM_DEVICE Uart1
-//#define MODEM_UART_FLAG
+//#define MODEM_UART_FLAG
#endif /* CONFIG_BOOZ2_V1_0_H */
Modified: paparazzi3/trunk/sw/airborne/booz/test/booz2_test_crista.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/test/booz2_test_crista.c 2010-09-28
16:21:25 UTC (rev 6017)
+++ paparazzi3/trunk/sw/airborne/booz/test/booz2_test_crista.c 2010-09-28
16:40:39 UTC (rev 6018)
@@ -1,6 +1,6 @@
/*
* $Id$
- *
+ *
* Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
*
* 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.
*/
#include <inttypes.h>
@@ -31,7 +31,7 @@
#include "messages.h"
#include "downlink.h"
-#include "booz2_imu.h"
+#include <firmwares/rotorcraft/imu.h>
#include "interrupt_hw.h"
@@ -63,8 +63,8 @@
/* LED_ON(7); */
uart0_init();
- booz2_imu_impl_init();
- booz2_imu_init();
+ imu_impl_init();
+ imu_init();
int_enable();
}
@@ -79,19 +79,19 @@
// DOWNLINK_SEND_BOOT(&foo);
//#endif
// if (cpu_time_sec > 2)
-
- booz2_imu_periodic();
+
+ imu_periodic();
}
static inline void main_event_task( void ) {
- Booz2ImuEvent(on_imu_event);
+ ImuEvent(on_imu_event);
}
static inline void on_imu_event(void) {
- Booz2ImuScaleGyro();
- Booz2ImuScaleAccel();
+ ImuScaleGyro();
+ ImuScaleAccel();
// LED_TOGGLE(6);
static uint8_t cnt;
@@ -99,21 +99,21 @@
if (cnt > 15) cnt = 0;
if (cnt == 0) {
- DOWNLINK_SEND_IMU_GYRO_RAW(&booz2_imu_gyro_unscaled.x,
- &booz2_imu_gyro_unscaled.y,
- &booz2_imu_gyro_unscaled.z);
-
- DOWNLINK_SEND_IMU_ACCEL_RAW(&booz2_imu_accel_unscaled.x,
- &booz2_imu_accel_unscaled.y,
- &booz2_imu_accel_unscaled.z);
+ DOWNLINK_SEND_IMU_GYRO_RAW(&imu_gyro_unscaled.x,
+ &imu_gyro_unscaled.y,
+ &imu_gyro_unscaled.z);
+
+ DOWNLINK_SEND_IMU_ACCEL_RAW(&imu_accel_unscaled.x,
+ &imu_accel_unscaled.y,
+ &imu_accel_unscaled.z);
}
else if (cnt == 7) {
- DOWNLINK_SEND_BOOZ2_GYRO(&booz2_imu_gyro.x,
- &booz2_imu_gyro.y,
- &booz2_imu_gyro.z);
-
- DOWNLINK_SEND_BOOZ2_ACCEL(&booz2_imu_accel.x,
- &booz2_imu_accel.y,
- &booz2_imu_accel.z);
- }
+ DOWNLINK_SEND_BOOZ2_GYRO(&imu_gyro.x,
+ &imu_gyro.y,
+ &imu_gyro.z);
+
+ DOWNLINK_SEND_BOOZ2_ACCEL(&imu_accel.x,
+ &imu_accel.y,
+ &imu_accel.z);
+ }
}
Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/battery.h
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/battery.h 2010-09-28
16:21:25 UTC (rev 6017)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/battery.h 2010-09-28
16:40:39 UTC (rev 6018)
@@ -21,8 +21,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOOZ2_BATTERY_H
-#define BOOZ2_BATTERY_H
+#ifndef BATTERY_H
+#define BATTERY_H
#include "std.h"
@@ -40,4 +40,4 @@
extern void battery_init(void);
-#endif /* BOOZ2_BATTERY_H */
+#endif /* BATTERY_H */
Modified:
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/lpc21/imu_b2_arch.c
===================================================================
---
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/lpc21/imu_b2_arch.c
2010-09-28 16:21:25 UTC (rev 6017)
+++
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/lpc21/imu_b2_arch.c
2010-09-28 16:40:39 UTC (rev 6018)
@@ -107,11 +107,11 @@
static inline bool_t isr_try_mag(void) {
switch (micromag_status) {
case MS2001_IDLE :
- Booz2ImuSetSSP8bits();
+ ImuSetSSP8bits();
Ms2001SendReq();
return TRUE;
case MS2001_GOT_EOC:
- Booz2ImuSetSSP8bits();
+ ImuSetSSP8bits();
Ms2001ReadRes();
return TRUE;
}
@@ -121,17 +121,17 @@
static void SSP_ISR(void) {
ISR_ENTRY();
- switch (booz2_imu_ssp_status) {
- case BOOZ2_IMU_SSP_STA_BUSY_MAX1168:
+ switch (imu_ssp_status) {
+ case IMU_SSP_STA_BUSY_MAX1168:
Max1168OnSpiInt();
if (isr_try_mag())
- booz2_imu_ssp_status = BOOZ2_IMU_SSP_STA_BUSY_MS2100;
+ imu_ssp_status = IMU_SSP_STA_BUSY_MS2100;
else
- booz2_imu_ssp_status = BOOZ2_IMU_SSP_STA_IDLE;
+ imu_ssp_status = IMU_SSP_STA_IDLE;
break;
- case BOOZ2_IMU_SSP_STA_BUSY_MS2100:
+ case IMU_SSP_STA_BUSY_MS2100:
Ms2001OnSpiIt();
- booz2_imu_ssp_status = BOOZ2_IMU_SSP_STA_IDLE;
+ imu_ssp_status = IMU_SSP_STA_IDLE;
break;
default:
// spurious interrupt
Modified:
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/sim/imu_b2_arch.h
===================================================================
---
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/sim/imu_b2_arch.h
2010-09-28 16:21:25 UTC (rev 6017)
+++
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu/arch/sim/imu_b2_arch.h
2010-09-28 16:40:39 UTC (rev 6018)
@@ -26,12 +26,12 @@
* simulator plug for the booz2 v1 imu arch dependant functions
*
*/
-#ifndef BOOZ2_IMU_B2_ARCH_H
-#define BOOZ2_IMU_B2_ARCH_H
+#ifndef IMU_B2_ARCH_H
+#define IMU_B2_ARCH_H
extern void imu_feed_gyro_accel(void);
extern void imu_feed_mag(void);
-#endif /* BOOZ2_IMU_B2_HW_H */
+#endif /* IMU_B2_HW_H */
Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu.h
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu.h 2010-09-28
16:21:25 UTC (rev 6017)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/imu.h 2010-09-28
16:40:39 UTC (rev 6018)
@@ -100,4 +100,4 @@
#endif
-#endif /* BOOZ2_IMU_H */
+#endif /* IMU_H */
Modified:
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
===================================================================
---
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
2010-09-28 16:21:25 UTC (rev 6017)
+++
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
2010-09-28 16:40:39 UTC (rev 6018)
@@ -33,7 +33,7 @@
extern void stabilization_attitude_enter(void);
extern void stabilization_attitude_run(bool_t in_flight);
-#include "stabilization/stabilization_attitude_ref.h"
+#include <firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h>
#include STABILISATION_ATTITUDE_REF_H
extern void stabilization_attitude_ref_init(void);
extern void stabilization_attitude_ref_update(void);
@@ -43,4 +43,4 @@
stabilization_att_sum_err.phi = 0; \
}
-#endif /* BOOZ2_STABILIZATION_ATTITUDE_H */
+#endif /* STABILIZATION_ATTITUDE_H */
Modified:
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
===================================================================
---
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
2010-09-28 16:21:25 UTC (rev 6017)
+++
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
2010-09-28 16:40:39 UTC (rev 6018)
@@ -91,4 +91,4 @@
}
-#endif /* BOOZ2_STABILIZATION_ATTITUDE_REF_EULER_INT_H */
+#endif /* STABILIZATION_ATTITUDE_REF_EULER_INT_H */
Modified: paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c
===================================================================
--- paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c 2010-09-28
16:21:25 UTC (rev 6017)
+++ paparazzi3/trunk/sw/simulator/old_booz/booz2_sim_main.c 2010-09-28
16:40:39 UTC (rev 6018)
@@ -104,7 +104,7 @@
}
#include "booz2_analog_baro.h"
-#include "booz2_imu.h"
+#include "imu.h"
static gboolean booz2_sim_periodic(gpointer data __attribute__ ((unused))) {
@@ -161,7 +161,7 @@
#endif /* BYPASS_INS */
}
if (booz_sensors_model_gyro_available()) {
- booz2_imu_feed_data();
+ imu_feed_data();
main_event();
#ifdef BYPASS_AHRS
sim_overwrite_ahrs();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6018] some more naming fixes,
Felix Ruess <=