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

move booz2_debug to pprz_debug under airborne, not sure if it is used...

Browse Source
This commit is contained in:
Felix Ruess
2010-09-29 22:35:11 +00:00
parent 02792e5c6b
commit 2c53011bc6
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/booz2_test_progs.makefile
+1 -1
View File
@@ -93,7 +93,7 @@ test_micromag.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK
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
conf/messages.xml
+1 -1
View File
@@ -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>
conf/telemetry/booz.xml
+3 -3
View File
@@ -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"/>
sw/airborne/arch/lpc21/max1167_hw.h
+1 -1
View File
@@ -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
sw/airborne/arch/lpc21/scp1000_hw.h
+1 -1
View File
@@ -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
sw/airborne/booz/booz2_debug.c → sw/airborne/pprz_debug.c
+3 -3
View File
@@ -23,7 +23,7 @@
#include "booz2_debug.h"
#ifdef BOOZ_DEBUG
uint8_t booz_debug_mod;
uint8_t booz_debug_err;
#ifdef PPRZ_DEBUG
uint8_t pprz_debug_mod;
uint8_t pprz_debug_err;
#endif
sw/airborne/booz/booz2_debug.h → sw/airborne/pprz_debug.h
+9 -9
View File
@@ -21,22 +21,22 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef BOOZ2_DEBUG_H
#define BOOZ2_DEBUG_H
#ifndef PPRZ_DEBUG_H
#define PPRZ_DEBUG_H
#define MY_ASSERT(cond) { \
if (!(cond)) while(1); \
}
#ifdef BOOZ_DEBUG
#ifdef PPRZ_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;
extern uint8_t pprz_debug_mod;
extern uint8_t pprz_debug_err;
#define DEBUG_IMU 0
#define DEBUG_MAX_1117 1
@@ -46,9 +46,9 @@ extern uint8_t booz_debug_err;
#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); \
pprz_debug_mod = mod; \
pprz_debug_err = err; \
DOWNLINK_SEND_PPRZ_DEBUG(&pprz_debug_mod, &pprz_debug_err); \
} \
}
#else
@@ -56,4 +56,4 @@ extern uint8_t booz_debug_err;
#endif
#endif /* BOOZ2_DEBUG_H */
#endif /* PPRZ_DEBUG_H */