Skip to content

Commit

Permalink
[apogee] fix apogee example file compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Apr 22, 2014
1 parent d07cb6f commit 41adf3d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
15 changes: 6 additions & 9 deletions conf/airframes/ENAC/fixed-wing/apogee.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
<define name="USE_GYRO_PITCH_RATE"/>
<configure name="PERIODIC_FREQUENCY" value="100"/>

<target name="sim" board="pc"/>
<target name="ap" board="apogee_1.0_chibios"/>
<target name="sim" board="pc">
<subsystem name="radio_control" type="ppm"/>
</target>
<target name="ap" board="apogee_1.0_chibios">
<subsystem name="radio_control" type="sbus"/>
</target>

<subsystem name="radio_control" type="sbus"/>

<!-- Communication -->
<subsystem name="telemetry" type="xbee_api"/>
Expand All @@ -48,12 +51,6 @@
<!--subsystem name="spi_master"/-->
</firmware>

<firmware name="lisa_test_progs">
<target name="test_led" board="apogee_1.0_chibios">
<define name="BOARD_LISA_M"/>
</target>
</firmware>

<!-- commands section -->
<servos>
<servo name="MOTOR" no="0" min="1040" neutral="1040" max="2000"/>
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/extra_dl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<file name="extra_pprz_dl.h"/>
</header>
<event fun="ExtraDatalinkEvent()"/>
<makefile>
<makefile target="ap">
<define name="EXTRA_DOWNLINK_DEVICE" value="$(EXTRA_DL_PORT)"/>
<define name="EXTRA_PPRZ_UART" value="$(EXTRA_DL_PORT)"/>
<define name="USE_$(EXTRA_DL_PORT)"/>
Expand Down
2 changes: 1 addition & 1 deletion conf/modules/meteo_france_DAQ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<periodic fun="mf_daq_send_state()" freq="10."/>
<periodic fun="mf_daq_send_report()" freq="1." autorun="TRUE"/>
<datalink message="PAYLOAD_FLOAT" fun="parse_mf_daq_msg()"/>
<makefile>
<makefile target="ap">
<file name="meteo_france_DAQ.c"/>
</makefile>
</module>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "usbStorage.h"
#include "pprz_stub.h"
#include "rtcAccess.h"
#include "airframe.h"
#include "generated/airframe.h"
#include "chibios_init.h"

// Delay before starting SD log
Expand Down

0 comments on commit 41adf3d

Please sign in to comment.