set common defines for all targets of fixedwing firmware in example airframes

This commit is contained in:
Felix Ruess
2010-11-11 15:48:32 +01:00
parent 75be6cff96
commit a3811c4969
11 changed files with 103 additions and 139 deletions
+31 -33
View File
@@ -1,5 +1,36 @@
<airframe name="BOOZ2_F1"> <airframe name="BOOZ2_F1">
<firmware name="rotorcraft">
<target name="ap" board="booz_1.0">
<!--<define name="KILL_MOTORS"/>--> <!-- prevent motors from ever starting -->
<!--<define name="RADIO_CONTROL_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>-->
<define name="USE_GPS_ACC4R"/>
<define name="USE_INS_NAV_INIT"/>
</target>
<target name="sim" board="pc">
<subsystem name="fdm" type="nps"/>
</target>
<define name="USE_ADAPT_HOVER"/>
<define name="GUIDANCE_H_USE_REF"/>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.0"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff">
<define name="GPS_LAG=0.2"/>
</subsystem>
</firmware>
<firmware name="booz_test_progs">
<target name="test_telemetry" board="booz_1.0"/>
<target name="test_baro" board="booz_1.0"/>
<target name="test_spektrum" board="booz_1.0"/>
</firmware>
<modules main_freq="512"> <modules main_freq="512">
<load name="booz_drop.xml"/> <load name="booz_drop.xml"/>
<load name="sys_mon.xml"/> <load name="sys_mon.xml"/>
@@ -219,39 +250,6 @@
#empty #empty
</makefile> </makefile>
<firmware name="rotorcraft">
<target name="ap" board="booz_1.0">
<param name="FLASH_MODE" value="IAP"/> <!-- that is the default for the board but I'm putting it here as example-->
<define name="MODEM_BAUD" value="B57600"/><!-- that is the default for the board but I'm putting it here as example-->
<!--<define name="KILL_MOTORS"/>--> <!-- prevent motors from ever starting -->
<!--<define name="RADIO_CONTROL_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>-->
<define name="USE_ADAPT_HOVER"/>
<define name="USE_GPS_ACC4R"/>
<define name="GUIDANCE_H_USE_REF"/>
<define name="USE_INS_NAV_INIT"/>
</target>
<target name="sim" board="pc">
<define name="USE_ADAPT_HOVER"/>
<define name="GUIDANCE_H_USE_REF"/>
<subsystem name="fdm" type="nps"/>
</target>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.0"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff">
<define name="GPS_LAG=0.2"/>
</subsystem>
</firmware>
<firmware name="booz_test_progs">
<target name="test_telemetry" board="booz_1.0"/>
<target name="test_baro" board="booz_1.0"/>
<target name="test_spektrum" board="booz_1.0"/>
</firmware>
<makefile target="closure" location="after"> <makefile target="closure" location="after">
ap.srcs += $(SRC_BOOZ_ARCH)/booz2_pwm_hw.c ap.srcs += $(SRC_BOOZ_ARCH)/booz2_pwm_hw.c
sim.srcs += $(SRC_BOOZ_SIM)/booz2_pwm_hw.c sim.srcs += $(SRC_BOOZ_SIM)/booz2_pwm_hw.c
+2 -2
View File
@@ -152,11 +152,11 @@
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="sim" board="pc"/> <target name="sim" board="pc"/>
<target name="ap" board="tiny_0.99"> <target name="ap" board="tiny_0.99"/>
<define name="AGR_CLIMB" /> <define name="AGR_CLIMB" />
<define name="LOITER_TRIM" /> <define name="LOITER_TRIM" />
<define name="ALT_KALMAN" /> <define name="ALT_KALMAN" />
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
+2 -10
View File
@@ -10,23 +10,15 @@
<airframe name="EasyStar2 - TWOG v1"> <airframe name="EasyStar2 - TWOG v1">
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="ap" board="twog_1.0"> <target name="ap" board="twog_1.0"/>
<define name="AGR_CLIMB"/> <target name="sim" board="pc"/>
<define name="LOITER_TRIM"/>
<define name="WIND_INFO"/>
<define name="ALT_KALMAN"/>
<define name="USE_I2C0"/>
<define name="USE_AIRSPEED"/>
</target>
<target name="sim" board="pc">
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="WIND_INFO"/> <define name="WIND_INFO"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
<define name="USE_I2C0"/> <define name="USE_I2C0"/>
<define name="USE_AIRSPEED"/> <define name="USE_AIRSPEED"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="transparent"/> <subsystem name="telemetry" type="transparent"/>
+2 -2
View File
@@ -12,11 +12,11 @@
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="sim" board="pc"/> <target name="sim" board="pc"/>
<target name="ap" board="tiny_2.11"> <target name="ap" board="tiny_2.11"/>
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="joystick"/> <subsystem name="joystick"/>
+2 -2
View File
@@ -12,11 +12,11 @@
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="sim" board="pc"/> <target name="sim" board="pc"/>
<target name="ap" board="tiny_2.11"> <target name="ap" board="tiny_2.11"/>
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="joystick"/> <subsystem name="joystick"/>
+3 -15
View File
@@ -10,26 +10,14 @@
<airframe name="Mentor Twog AkaModell"> <airframe name="Mentor Twog AkaModell">
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="ap" board="twog_1.0"> <target name="ap" board="twog_1.0"/>
<define name="AGR_CLIMB"/> <target name="sim" board="pc"/>
<define name="LOITER_TRIM"/> <target name="jsbsim" board="pc"/>
<define name="WIND_INFO"/>
<define name="ALT_KALMAN"/>
</target>
<target name="sim" board="pc">
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="WIND_INFO"/> <define name="WIND_INFO"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
</target>
<target name="jsbsim" board="pc">
<define name="AGR_CLIMB"/>
<define name="LOITER_TRIM"/>
<define name="WIND_INFO"/>
<define name="ALT_KALMAN"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<!--<define name="TELEMETRY_MODE_FBW" value="1"/>--> <!--<define name="TELEMETRY_MODE_FBW" value="1"/>-->
+2 -2
View File
@@ -161,11 +161,11 @@
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="sim" board="pc" /> <target name="sim" board="pc" />
<target name="ap" board="tiny_1.1"> <target name="ap" board="tiny_1.1"/>
<define name="AGR_CLIMB" /> <define name="AGR_CLIMB" />
<define name="LOITER_TRIM" /> <define name="LOITER_TRIM" />
<define name="ALT_KALMAN" /> <define name="ALT_KALMAN" />
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
+1 -1
View File
@@ -7,7 +7,7 @@
Transparent modem Transparent modem
This airframe demonstrate the old raw makefile syntax This airframe demonstrate the old raw makefile syntax
Look at conf/airframes/microjet_xml_only.xml for equivalent new syntax Look at conf/airframes/microjet_example.xml for equivalent new syntax
--> -->
<airframe name="microjet raw makefile"> <airframe name="microjet raw makefile">
+2 -7
View File
@@ -11,17 +11,12 @@
<airframe name="Twinjet"> <airframe name="Twinjet">
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="ap" board="twog_1.0"> <target name="ap" board="twog_1.0"/>
<define name="LOITER_TRIM"/> <target name="sim" board="pc"/>
<define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/>
</target>
<target name="sim" board="pc">
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="transparent"/> <subsystem name="telemetry" type="transparent"/>
+2 -6
View File
@@ -12,25 +12,21 @@
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="ap" board="twog_1.0"> <target name="ap" board="twog_1.0">
<define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/>
<define name="UBX_EXTERNAL"/> <define name="UBX_EXTERNAL"/>
<define name="USE_ADC_GENERIC"/> <define name="USE_ADC_GENERIC"/>
</target> </target>
<target name="sim" board="pc"> <target name="sim" board="pc"/>
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
</target>
<subsystem name="adc" type="generic"> <subsystem name="adc" type="generic">
<param name="ADC_GENERIC1" value="ADC_3"/> <param name="ADC_GENERIC1" value="ADC_3"/>
<param name="ADC_GENERIC2" value="ADC_5"/> <param name="ADC_GENERIC2" value="ADC_5"/>
</subsystem> </subsystem>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="transparent"/> <subsystem name="telemetry" type="transparent"/>
<subsystem name="control"/> <subsystem name="control"/>
+2 -7
View File
@@ -12,17 +12,12 @@
<airframe name="Twinstar"> <airframe name="Twinstar">
<firmware name="fixedwing"> <firmware name="fixedwing">
<target name="ap" board="twog_1.0"> <target name="ap" board="twog_1.0"/>
<define name="LOITER_TRIM"/> <target name="sim" board="pc"/>
<define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/>
</target>
<target name="sim" board="pc">
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="ALT_KALMAN"/> <define name="ALT_KALMAN"/>
<define name="AGR_CLIMB"/> <define name="AGR_CLIMB"/>
</target>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="transparent"/> <subsystem name="telemetry" type="transparent"/>