Merge remote-tracking branch 'paparazzi/link_device' into link_device

Conflicts:
	conf/modules/ahrs_chimu_uart.xml
This commit is contained in:
Gautier Hattenberger
2015-03-17 12:02:34 +01:00
2 changed files with 10 additions and 9 deletions
+2 -2
View File
@@ -17,8 +17,8 @@
<define name="USE_AHRS"/>
<define name="USE_INS_MODULE"/>
<define name="USE_UART$(CHIMU_UART_NR)" value="1"/>
<define name="INS_LINK" value="UART$(CHIMU_UART_NR)"/>
<define name="uart$(CHIMU_UART_NR)_BAUD" value="B115200"/>
<define name="INS_LINK" value="uart$(CHIMU_UART_NR)"/>
<define name="UART$(CHIMU_UART_NR)_BAUD" value="B115200"/>
<file name="ahrs_chimu_uart.c"/>
<file name="imu_chimu.c"/>
<file name="ahrs.c" dir="subsystems"/>