mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-21 11:55:41 +08:00
made control loops a seperate subsystem
This commit is contained in:
@@ -171,7 +171,7 @@
|
||||
</target>
|
||||
<target name="sim" board="pc" />
|
||||
<subsystem name="navigation"/>
|
||||
|
||||
<subsystem name="control"/>
|
||||
|
||||
<!-- Communication -->
|
||||
<subsystem name="telemetry" type="transparent">
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
<!-- Actuators -->
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
|
||||
<subsystem name="control"/>
|
||||
<!-- Sensors -->
|
||||
<subsystem name="gyro" type="roll"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
<subsystem name="navigation"/>
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
|
||||
<!-- Actuators -->
|
||||
<subsystem name="actuators" type="4015"/>
|
||||
|
||||
<subsystem name="control"/>
|
||||
<!-- Sensors -->
|
||||
<subsystem name="adc" type="generic">
|
||||
<param name="ADC_GENERIC1" value="ADC_7"/> <!-- current sensor -->
|
||||
|
||||
@@ -27,10 +27,11 @@
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
<subsystem name="airspeed" type="ets"/>
|
||||
<subsystem name="navigation"/>
|
||||
<subsystem name="navigation" type="extra"/>
|
||||
</firmware>
|
||||
|
||||
<firmware name="setup">
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
<subsystem name="navigation"/>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<!-- Actuators -->
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
|
||||
<subsystem name="control"/>
|
||||
<!-- Sensors -->
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
<!--<define name="TELEMETRY_MODE_FBW" value="1"/>-->
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
<subsystem name="navigation" type="extra"/>
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
<!-- Actuators -->
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
|
||||
<subsystem name="control"/>
|
||||
<!-- Sensors -->
|
||||
<subsystem name="gyro" type="roll"/>
|
||||
<subsystem name="attitude" type="infrared">
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gyro" type="roll"/>
|
||||
<subsystem name="gps" type="ublox_lea5h"/>
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
<subsystem name="actuators" type="4017"/>
|
||||
<subsystem name="control"/>
|
||||
<subsystem name="attitude" type="infrared"/>
|
||||
<subsystem name="gps" type="ublox_lea4p"/>
|
||||
<subsystem name="navigation"/>
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
</subsystem>
|
||||
<!-- Actuators -->
|
||||
<subsystem name="actuators" types="4015|4017|ppm"/>
|
||||
<subsystem name="control" types="NONE|adaptive|new"/>
|
||||
<!-- Sensors -->
|
||||
<subsystem name="gyro" types="roll|pitch">
|
||||
<param name="ADC_GYRO_ROLL" value="ADC_3"/><!-- this is already the default if not set, change if needed -->
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
# Standard fixed wing control loops
|
||||
|
||||
|
||||
ap.srcs += $(SRC_FIXEDWING)/fw_h_ctl.c $(SRC_FIXEDWING)/fw_v_ctl.c
|
||||
@@ -0,0 +1,4 @@
|
||||
# fixed wing control loops with adaptive horizontal control
|
||||
|
||||
|
||||
ap.srcs += $(SRC_FIXEDWING)/fw_h_ctl_a.c $(SRC_FIXEDWING)/fw_v_ctl.c
|
||||
@@ -0,0 +1,4 @@
|
||||
# new fixed wing control loops with merged auto pitch and auto throttle, adaptive horizontal control
|
||||
|
||||
|
||||
ap.srcs += $(SRC_FIXEDWING)/fw_h_ctl_a.c $(SRC_FIXEDWING)/fw_v_ctl_n.c
|
||||
@@ -4,7 +4,7 @@
|
||||
#add these to all targets
|
||||
|
||||
$(TARGET).CFLAGS += -DNAV
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav.c $(SRC_FIXEDWING)/fw_h_ctl.c $(SRC_FIXEDWING)/fw_v_ctl.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav_survey_rectangle.c $(SRC_FIXEDWING)/nav_line.c
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#add these to all targets
|
||||
|
||||
$(TARGET).CFLAGS += -DNAV
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav.c $(SRC_FIXEDWING)/fw_h_ctl.c $(SRC_FIXEDWING)/fw_v_ctl.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/nav_survey_rectangle.c $(SRC_FIXEDWING)/nav_line.c
|
||||
|
||||
|
||||
Reference in New Issue
Block a user