[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6032] move booz2_debug to pprz_debug under airborne
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6032] move booz2_debug to pprz_debug under airborne, not sure if it is used... |
|
Date: |
Wed, 29 Sep 2010 22:35:12 +0000 |
Revision: 6032
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6032
Author: flixr
Date: 2010-09-29 22:35:11 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
move booz2_debug to pprz_debug under airborne, not sure if it is used...
Modified Paths:
--------------
paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
paparazzi3/trunk/conf/messages.xml
paparazzi3/trunk/conf/telemetry/booz.xml
paparazzi3/trunk/sw/airborne/arch/lpc21/max1167_hw.h
paparazzi3/trunk/sw/airborne/arch/lpc21/scp1000_hw.h
Added Paths:
-----------
paparazzi3/trunk/sw/airborne/pprz_debug.c
paparazzi3/trunk/sw/airborne/pprz_debug.h
Removed Paths:
-------------
paparazzi3/trunk/sw/airborne/booz/booz2_debug.c
paparazzi3/trunk/sw/airborne/booz/booz2_debug.h
Modified: paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile 2010-09-29
22:34:59 UTC (rev 6031)
+++ paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile 2010-09-29
22:35:11 UTC (rev 6032)
@@ -93,7 +93,7 @@
test_micromag.srcs += downlink.c pprz_transport.c
#test_micromag.CFLAGS += -I$(BOOZ)
-#test_micromag.srcs += $(BOOZ)/booz_debug.c
+#test_micromag.srcs += pprz_debug.c
test_micromag.CFLAGS += -DMICROMAG_DRDY_VIC_SLOT=8 -DSSP_VIC_SLOT=9
test_micromag.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
Modified: paparazzi3/trunk/conf/messages.xml
===================================================================
--- paparazzi3/trunk/conf/messages.xml 2010-09-29 22:34:59 UTC (rev 6031)
+++ paparazzi3/trunk/conf/messages.xml 2010-09-29 22:35:11 UTC (rev 6032)
@@ -1652,7 +1652,7 @@
<field name="erno" type="uint8"/>
</message>
- <message name="BOOZ_ERROR" id="247">
+ <message name="PPRZ_DEBUG" id="247">
<field name="module" type="uint8"/>
<field name="errno" type="uint8"/>
</message>
Modified: paparazzi3/trunk/conf/telemetry/booz.xml
===================================================================
--- paparazzi3/trunk/conf/telemetry/booz.xml 2010-09-29 22:34:59 UTC (rev
6031)
+++ paparazzi3/trunk/conf/telemetry/booz.xml 2010-09-29 22:35:11 UTC (rev
6032)
@@ -9,7 +9,7 @@
<message name="ROTORCRAFT_STATUS" period=".5"/>
<!-- <message name="RC" period="0.5"/> -->
<!-- <message name="BOOZ_FD" period="0.05"/> -->
-<!-- <message name="BOOZ_DEBUG" period="0.25"/> -->
+<!-- <message name="PPRZ_DEBUG" period="0.25"/> -->
<message name="ACTUATORS" period="0.5"/>
<!-- <message name="BOOZ_HOV_LOOP" period="0.05"/> -->
<!-- <message name="BOOZ_VERT_LOOP" period="0.05"/> -->
@@ -30,7 +30,7 @@
<mode name="default">
<!-- <message name="IMU_GYRO_LP" period=".017"/> -->
<message name="AHRS_STATE" period=".5"/>
- <message name="AHRS_COV" period=".5"/>
+ <message name="AHRS_COV" period=".5"/>
<message name="AHRS_MEASURE" period=".5"/>
<!-- <message name="IMU_ACCEL_RAW" period=".02"/> -->
<message name="IMU_ACCEL" period=".5"/>
@@ -51,7 +51,7 @@
</mode>
<mode name="simulation">
-<!-- <message name="BOOZ_DEBUG" period=".1"/>-->
+<!-- <message name="PPRZ_DEBUG" period=".1"/>-->
<message name="AHRS_STATE" period=".1"/>
<message name="AHRS_COV" period=".1"/>
<message name="IMU_GYRO" period=".017"/>
Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/max1167_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/max1167_hw.h 2010-09-29
22:34:59 UTC (rev 6031)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/max1167_hw.h 2010-09-29
22:35:11 UTC (rev 6032)
@@ -12,7 +12,7 @@
#include "interrupt_hw.h"
#include "spi_hw.h"
-//#include "booz_debug.h"
+//#include "pprz_debug.h"
#define MAX1167_ERR_ISR_STATUS 0
#define MAX1167_ERR_READ_OVERUN 1
Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/scp1000_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/scp1000_hw.h 2010-09-29
22:34:59 UTC (rev 6031)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/scp1000_hw.h 2010-09-29
22:35:11 UTC (rev 6032)
@@ -6,7 +6,7 @@
#include "interrupt_hw.h"
#include "spi_hw.h"
-#include "booz_debug.h"
+#include "pprz_debug.h"
/* FIXME : polling mode cause I'm loosing EOC interrupt */
#define SCP1000_NO_EINT
Deleted: paparazzi3/trunk/sw/airborne/booz/booz2_debug.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_debug.c 2010-09-29 22:34:59 UTC
(rev 6031)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_debug.c 2010-09-29 22:35:11 UTC
(rev 6032)
@@ -1,29 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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.
- */
-
-#include "booz2_debug.h"
-
-#ifdef BOOZ_DEBUG
-uint8_t booz_debug_mod;
-uint8_t booz_debug_err;
-#endif
Deleted: paparazzi3/trunk/sw/airborne/booz/booz2_debug.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_debug.h 2010-09-29 22:34:59 UTC
(rev 6031)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_debug.h 2010-09-29 22:35:11 UTC
(rev 6032)
@@ -1,59 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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.
- */
-
-#ifndef BOOZ2_DEBUG_H
-#define BOOZ2_DEBUG_H
-
-#define MY_ASSERT(cond) { \
- if (!(cond)) while(1); \
- }
-
-#ifdef BOOZ_DEBUG
-
-#include "std.h"
-#include "uart.h"
-#include "messages.h"
-#include "downlink.h"
-
-extern uint8_t booz_debug_mod;
-extern uint8_t booz_debug_err;
-
-#define DEBUG_IMU 0
-#define DEBUG_MAX_1117 1
-#define DEBUG_SCP1000 2
-#define DEBUG_LINK_MCU_IMU 3
-
-
-#define ASSERT(cond, mod, err) { \
- if (!(cond)) { \
- booz_debug_mod = mod; \
- booz_debug_err = err; \
- DOWNLINK_SEND_BOOZ_ERROR(&booz_debug_mod, &booz_debug_err); \
- } \
- }
-#else
-#define ASSERT(cond, mod, err) {}
-#endif
-
-
-#endif /* BOOZ2_DEBUG_H */
Copied: paparazzi3/trunk/sw/airborne/pprz_debug.c (from rev 6031,
paparazzi3/trunk/sw/airborne/booz/booz2_debug.c)
===================================================================
--- paparazzi3/trunk/sw/airborne/pprz_debug.c (rev 0)
+++ paparazzi3/trunk/sw/airborne/pprz_debug.c 2010-09-29 22:35:11 UTC (rev
6032)
@@ -0,0 +1,29 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#include "booz2_debug.h"
+
+#ifdef PPRZ_DEBUG
+uint8_t pprz_debug_mod;
+uint8_t pprz_debug_err;
+#endif
Copied: paparazzi3/trunk/sw/airborne/pprz_debug.h (from rev 6031,
paparazzi3/trunk/sw/airborne/booz/booz2_debug.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/pprz_debug.h (rev 0)
+++ paparazzi3/trunk/sw/airborne/pprz_debug.h 2010-09-29 22:35:11 UTC (rev
6032)
@@ -0,0 +1,59 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifndef PPRZ_DEBUG_H
+#define PPRZ_DEBUG_H
+
+#define MY_ASSERT(cond) { \
+ if (!(cond)) while(1); \
+ }
+
+#ifdef PPRZ_DEBUG
+
+#include "std.h"
+#include "uart.h"
+#include "messages.h"
+#include "downlink.h"
+
+extern uint8_t pprz_debug_mod;
+extern uint8_t pprz_debug_err;
+
+#define DEBUG_IMU 0
+#define DEBUG_MAX_1117 1
+#define DEBUG_SCP1000 2
+#define DEBUG_LINK_MCU_IMU 3
+
+
+#define ASSERT(cond, mod, err) { \
+ if (!(cond)) { \
+ pprz_debug_mod = mod; \
+ pprz_debug_err = err; \
+ DOWNLINK_SEND_PPRZ_DEBUG(&pprz_debug_mod, &pprz_debug_err); \
+ } \
+ }
+#else
+#define ASSERT(cond, mod, err) {}
+#endif
+
+
+#endif /* PPRZ_DEBUG_H */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6032] move booz2_debug to pprz_debug under airborne, not sure if it is used...,
Felix Ruess <=