Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-10 06:59:54 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

[modules] move radio control to modules

Browse Source
This commit is contained in:
Gautier Hattenberger
2021-11-10 17:03:28 +01:00
parent 445383e0fc
commit f638a40b83
126 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/rotorcraft_autopilot.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<include name="navigation.h"/>
<include name="guidance.h"/>
<include name="stabilization/stabilization_attitude.h"/>
<include name="subsystems/radio_control.h"/>
<include name="modules/radio_control/radio_control.h"/>
<include name="subsystems/gps.h"/>
<include name="subsystems/actuators.h"/>
<include name="subsystems/actuators/motor_mixing.h"/>
conf/autopilot/rover.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<include name="subsystems/actuators.h"/>
<include name="navigation.h"/>
<include name="guidance/rover_guidance.h"/>
<include name="subsystems/radio_control.h"/>
<include name="modules/radio_control/radio_control.h"/>
<define name="RCLost()" value="(radio_control.status == RC_REALLY_LOST)"/>
</includes>
conf/autopilot/rover_holonomic.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<include name="subsystems/actuators.h"/>
<include name="navigation.h"/>
<include name="guidance/rover_guidance_holonomic.h"/>
<include name="subsystems/radio_control.h"/>
<include name="modules/radio_control/radio_control.h"/>
<define name="RCLost()" value="(radio_control.status == RC_REALLY_LOST)"/>
</includes>
conf/flight_plans/quadshot_delft.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<flight_plan alt="40" ground_alt="0" lat0="52.170867" lon0="4.412194" max_dist_from_home="1000" name="Transitioning test" security_height="2">
<header>
#include "autopilot.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/electrical.h"
#include "subsystems/actuators.h"
#include "firmwares/rotorcraft/guidance/guidance_h.h"
conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<header>
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
#define NPS_GAZEBO_WORLD "cyberzoo_orange_poles.world"
</header>
conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<header>
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
#define NPS_GAZEBO_WORLD "cyberzoo_orange_poles.world"
#include "autopilot.h"
conf/flight_plans/tudelft/delft_basic.xml
+1 -1
View File
@@ -5,7 +5,7 @@
#include "autopilot.h"
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
</header>
<waypoints>
<waypoint name="HOME" x="0.0" y="0.0"/>
conf/flight_plans/tudelft/delft_bebop.xml
+1 -1
View File
@@ -5,7 +5,7 @@
#include "autopilot.h"
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
</header>
<waypoints>
<waypoint name="HOME" x="0.0" y="0.0"/>
conf/flight_plans/tudelft/nederdrone_cyberzoo.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<header>
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
#include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h"
#include "firmwares/rotorcraft/navigation.h"
conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<header>
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
#define NPS_GAZEBO_WORLD "cyberzoo2019_ralphthesis2020.world" <!-- Current world is based on "cyberzoo2019_orange_poles_panels_mats.world" and replaced the original "cyberzoo_orange_poles.world" that was used here -->
conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml
+1 -1
View File
@@ -4,7 +4,7 @@
max_dist_from_home="8" name="Test flight plan" security_height="0.4">
<header>
#include "autopilot.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
#include "subsystems/electrical.h"
#include "subsystems/datalink/datalink.h"
conf/flight_plans/tudelft/train_safe_zoo.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<header>
#include "subsystems/datalink/datalink.h"
#include "subsystems/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/ahrs.h"
</header>
<waypoints>
conf/modules/intermcu_uart.xml
+1 -1
View File
@@ -68,7 +68,7 @@
<define name="SECONDARY_GPS" value="GPS_IMCU" cond="ifneq (,$(findstring $(SECONDARY_GPS), imcu))"/>
<define name="IMCU_GPS" cond="ifneq (,$(findstring $(SECONDARY_GPS), imcu))"/>
<file name="intermcu_ap.c" dir="subsystems/intermcu"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="radio_control.c" dir="modules/radio_control"/>
</makefile>
<makefile target="ap|fbw" firmware="rotorcraft">
<configure name="INTERMCU_BAUD" default="B230400"/>
conf/modules/radio_control_cc2500_frsky.xml
+16 -16
View File
@@ -1,6 +1,6 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="radio_control_cc2500_frsky" dir="radio_control/cc2500_frsky" task="radio_control">
<module name="radio_control_cc2500_frsky" dir="radio_control" task="radio_control">
<doc>
<description>
Software implementation of Frsky radio control protocol for onboard CC2500 receiver.
@@ -41,12 +41,12 @@
</dep>
<header>
<file name="cc2500.h" dir="peripherals"/>
<file name="cc2500_paparazzi.h" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_settings.h" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_frsky/cc2500_paparazzi.h"/>
<file name="cc2500_frsky/cc2500_settings.h"/>
</header>
<init fun="cc2500_init()"/>
<makefile target="ap|fbw|sim|nps">
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/cc2500_frsky/cc2500_paparazzi.h" type="string"/>
<configure name="CC2500_SPI_DEV" default="SPI3" case="upper|lower"/>
<configure name="CC2500_SPI_SLAVE_IDX" default="2"/>
</makefile>
@@ -56,21 +56,21 @@
<define name="USE_SPI_SLAVE$(CC2500_SPI_SLAVE_IDX)"/>
<define name="CC2500_SPI_DEV" value="$(CC2500_SPI_DEV_LOWER)"/>
<define name="CC2500_SPI_SLAVE_IDX" value="$(CC2500_SPI_SLAVE_IDX)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="radio_control.c"/>
<file name="cc2500.c" dir="peripherals"/>
<file name="cc2500_paparazzi.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_settings.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_compat.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_common.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_rx.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_rx_spi.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_rx_spi_common.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_frsky_shared.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_frsky_x.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_smartport.c" dir="subsystems/radio_control/cc2500_frsky"/>
<file name="cc2500_frsky/cc2500_paparazzi.c"/>
<file name="cc2500_frsky/cc2500_settings.c"/>
<file name="cc2500_frsky/cc2500_compat.c"/>
<file name="cc2500_frsky/cc2500_common.c"/>
<file name="cc2500_frsky/cc2500_rx.c"/>
<file name="cc2500_frsky/cc2500_rx_spi.c"/>
<file name="cc2500_frsky/cc2500_rx_spi_common.c"/>
<file name="cc2500_frsky/cc2500_frsky_shared.c"/>
<file name="cc2500_frsky/cc2500_frsky_x.c"/>
<file name="cc2500_frsky/cc2500_smartport.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/cc2500_frsky/cc2500_paparazzi.h" type="string"/>
<define name="CC2500_SPI_DEV" value="spi1"/>
<define name="CC2500_SPI_SLAVE_IDX" value="2"/>
<define name="USE_SPI1"/>
conf/modules/radio_control_datalink.xml
+7 -7
View File
@@ -12,30 +12,30 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="rc_datalink.h" dir="subsystems/radio_control"/>
<file name="rc_datalink.h"/>
</header>
<makefile target="ap|fbw|sim|nps">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="RADIO_CONTROL_DATALINK_LED" default="none"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_DATALINK_LED" value="$(RADIO_CONTROL_DATALINK_LED)" cond="ifneq ($(RADIO_CONTROL_DATALINK_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/rc_datalink.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/rc_datalink.h" type="string"/>
</makefile>
<makefile target="fbw|sim|nps">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_DATALINK"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="rc_datalink.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="rc_datalink.c"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_DATALINK"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="rc_datalink.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="rc_datalink.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_DATALINK"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/rc_datalink.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/rc_datalink.h" type="string"/>
</test>
</makefile>
</module>
conf/modules/radio_control_hott.xml
+9 -9
View File
@@ -13,13 +13,13 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="hott.h" dir="subsystems/radio_control"/>
<file name="hott.h"/>
</header>
<makefile target="ap|fbw">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="HOTT_UART" value="$(HOTT_PORT)" case="upper|lower"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/hott.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/hott.h" type="string"/>
</makefile>
<makefile target="fbw">
<define name="RADIO_CONTROL"/>
@@ -27,9 +27,9 @@
<define name="USE_$(HOTT_UART_UPPER)"/>
<define name="$(HOTT_UART_UPPER)_BAUD" value="B115200"/>
<define name="HOTT_UART_DEV" value="$(HOTT_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="hott.c" dir="subsystems/radio_control"/>
<file name="hott_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="hott.c"/>
<file name="hott_common.c"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
@@ -37,13 +37,13 @@
<define name="USE_$(HOTT_UART_UPPER)"/>
<define name="$(HOTT_UART_UPPER)_BAUD" value="B115200"/>
<define name="HOTT_UART_DEV" value="$(HOTT_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="hott.c" dir="subsystems/radio_control"/>
<file name="hott_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="hott.c"/>
<file name="hott_common.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_HOTT"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/hott.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/hott.h" type="string"/>
<define name="HOTT_UART_DEV" value="uart5"/>
<define name="USE_UART5"/>
</test>
conf/modules/radio_control_ppm.xml
+9 -9
View File
@@ -17,31 +17,31 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="ppm.h" dir="subsystems/radio_control"/>
<file name="ppm.h"/>
</header>
<makefile target="ap|fbw|sim|nps|hitl">
<configure name="RADIO_CONTROL_LED" default="none"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/ppm.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/ppm.h" type="string"/>
<define name="PPM_CONFIG" value="$(PPM_CONFIG)" cond="ifdef PPM_CONFIG"/>
</makefile>
<makefile target="fbw|sim|nps|hitl">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_PPM"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="ppm.c" dir="subsystems/radio_control"/>
<file_arch name="ppm_arch.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="ppm.c"/>
<file_arch name="ppm_arch.c"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_PPM"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="ppm.c" dir="subsystems/radio_control"/>
<file_arch name="ppm_arch.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="ppm.c"/>
<file_arch name="ppm_arch.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_PPM"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/ppm.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/ppm.h" type="string"/>
</test>
</makefile>
</module>
conf/modules/radio_control_sbus.xml
+9 -9
View File
@@ -13,13 +13,13 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="sbus.h" dir="subsystems/radio_control"/>
<file name="sbus.h"/>
</header>
<makefile target="ap|fbw">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="SBUS_UART" value="$(SBUS_PORT)" case="upper|lower"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/sbus.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/sbus.h" type="string"/>
</makefile>
<makefile target="fbw">
<define name="RADIO_CONTROL"/>
@@ -28,9 +28,9 @@
<define name="USE_$(SBUS_UART_UPPER)_TX" value="FALSE"/>
<define name="$(SBUS_UART_UPPER)_BAUD" value="B100000"/>
<define name="SBUS_UART_DEV" value="$(SBUS_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="sbus.c" dir="subsystems/radio_control"/>
<file name="sbus_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="sbus.c"/>
<file name="sbus_common.c"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
@@ -39,13 +39,13 @@
<define name="USE_$(SBUS_UART_UPPER)_TX" value="FALSE"/>
<define name="$(SBUS_UART_UPPER)_BAUD" value="B100000"/>
<define name="SBUS_UART_DEV" value="$(SBUS_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="sbus.c" dir="subsystems/radio_control"/>
<file name="sbus_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="sbus.c"/>
<file name="sbus_common.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_SBUS"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/sbus.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/sbus.h" type="string"/>
<define name="SBUS_UART_DEV" value="uart4"/>
<define name="USE_UART4"/>
</test>
conf/modules/radio_control_sbus_dual.xml
+9 -9
View File
@@ -14,14 +14,14 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="sbus_dual.h" dir="subsystems/radio_control"/>
<file name="sbus_dual.h"/>
</header>
<makefile target="ap|fbw">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="SBUS1_UART" value="$(SBUS1_PORT)" case="upper|lower"/>
<configure name="SBUS2_UART" value="$(SBUS2_PORT)" case="upper|lower"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/sbus_dual.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/sbus_dual.h" type="string"/>
</makefile>
<makefile target="fbw">
<define name="RADIO_CONTROL"/>
@@ -32,9 +32,9 @@
<define name="$(SBUS2_UART_UPPER)_BAUD" value="B100000"/>
<define name="SBUS1_UART_DEV" value="$(SBUS1_UART_LOWER)"/>
<define name="SBUS2_UART_DEV" value="$(SBUS2_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="sbus_dual.c" dir="subsystems/radio_control"/>
<file name="sbus_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="sbus_dual.c"/>
<file name="sbus_common.c"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
@@ -45,13 +45,13 @@
<define name="$(SBUS2_UART_UPPER)_BAUD" value="B100000"/>
<define name="SBUS1_UART_DEV" value="$(SBUS1_UART_LOWER)"/>
<define name="SBUS2_UART_DEV" value="$(SBUS2_UART_LOWER)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="sbus_dual.c" dir="subsystems/radio_control"/>
<file name="sbus_common.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="sbus_dual.c"/>
<file name="sbus_common.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_SBUS"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/sbus_dual.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/sbus_dual.h" type="string"/>
<define name="SBUS1_UART_DEV" value="uart4"/>
<define name="SBUS2_UART_DEV" value="uart5"/>
<define name="USE_UART4"/>
conf/modules/radio_control_spektrum.xml
+12 -12
View File
@@ -19,7 +19,7 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="spektrum.h" dir="subsystems/radio_control"/>
<file name="spektrum.h"/>
</header>
<makefile target="ap|fbw|sim|nps|test_radio_control">
<configure name="RADIO_CONTROL_LED" default="none"/>
@@ -27,7 +27,7 @@
</makefile>
<makefile target="fbw|test_radio_control">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/spektrum.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/spektrum.h" type="string"/>
<define name="RADIO_CONTROL_BIND_IMPL_FUNC" value="spektrum_try_bind"/>
<configure name="SPEKTRUM_PRIMARY_UART" value="$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)" case="upper|lower"/>
@@ -45,11 +45,11 @@
<define name="$(SPEKTRUM_SECONDARY_UART_UPPER)_BAUD" value="B115200" cond="ifneq ($(USE_SECONDARY_SPEKTRUM_RECEIVER),0)"/>
<define name="USE_$(SPEKTRUM_SECONDARY_UART_UPPER)_TX" value="FALSE" cond="ifneq ($(USE_SECONDARY_SPEKTRUM_RECEIVER),0)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="spektrum.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="spektrum.c"/>
</makefile>
<makefile target="ap">
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/spektrum.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/spektrum.h" type="string"/>
</makefile>
<makefile target="ap" cond="ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE))">
<define name="RADIO_CONTROL"/>
@@ -70,11 +70,11 @@
<define name="$(SPEKTRUM_SECONDARY_UART_UPPER)_BAUD" value="B115200" cond="ifneq ($(USE_SECONDARY_SPEKTRUM_RECEIVER),0)"/>
<define name="USE_$(SPEKTRUM_SECONDARY_UART_UPPER)_TX" value="FALSE" cond="ifneq ($(USE_SECONDARY_SPEKTRUM_RECEIVER),0)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="spektrum.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="spektrum.c"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/spektrum.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/spektrum.h" type="string"/>
<define name="SPEKTRUM_PRIMARY_UART" value="uart2"/>
<define name="SPEKTRUM_SECONDARY_UART" value="uart3"/>
<define name="USE_UART2"/>
@@ -87,12 +87,12 @@
</makefile>
<makefile target="sim|nps|hitl">
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/spektrum_arch.h" type="string"/>
<file name="radio_control.c" dir="subsystems"/>
<file_arch name="spektrum_arch.c" dir="subsystems/radio_control"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/spektrum_arch.h" type="string"/>
<file name="radio_control.c"/>
<file_arch name="spektrum_arch.c" dir="modules/radio_control"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/spektrum.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/spektrum.h" type="string"/>
</test>
</makefile>
</module>
conf/modules/radio_control_superbitrf_rc.xml
+8 -8
View File
@@ -12,7 +12,7 @@
<settings>
<dl_settings>
<dl_settings NAME="Superbit">
<dl_setting var="settings_store_flag" min="1" step="1" max="1" shortname="store" handler="StoreSettings" module="subsystems/settings" values="Store"/>
<dl_setting var="settings_store_flag" min="1" step="1" max="1" shortname="store" handler="StoreSettings" module="modules/core" values="Store"/>
<dl_setting var="superbitrf.bind_mfg_id32" type="uint32" min="0" step="1" max="4294967295" shortname ="mfg_id" persistent="true" module="subsystems/datalink/superbitrf" handler="set_mfg_id"/>
<dl_setting var="superbitrf.num_channels" type="uint8" min="0" step="1" max="14" shortname ="#chan" persistent="true" module="subsystems/datalink/superbitrf"/>
<dl_setting var="superbitrf.protocol" type="uint8" min="0" step="1" max="32" shortname ="prot" persistent="true" module="subsystems/datalink/superbitrf" handler="set_protocol"/>
@@ -24,14 +24,14 @@
<provides>radio_control</provides>
</dep>
<header>
<file name="superbitrf_rc.h" dir="subsystems/radio_control"/>
<file name="superbitrf_rc.h"/>
</header>
<makefile target="ap|fbw|sim|nps">
<configure name="RADIO_CONTROL_LED" default="none"/>
<configure name="SUPERBITRF_SPI_DEV" default="SPI2"/>
<configure name="SUPERBITRF_SPI_SLAVE_IDX" default="2"/>
<define name="RADIO_CONTROL_LED" value="$(RADIO_CONTROL_LED)" cond="ifneq ($(RADIO_CONTROL_LED),none)"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/superbitrf_rc.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/superbitrf_rc.h" type="string"/>
</makefile>
<makefile target="fbw">
<define name="RADIO_CONTROL"/>
@@ -39,8 +39,8 @@
<define name="USE_SUPERBITRF"/>
<define name="USE_$(SUPERBITRF_SPI_DEV)"/>
<define name="USE_SPI_SLAVE$(SUPERBITRF_SPI_SLAVE_IDX)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="superbitrf_rc.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="superbitrf_rc.c"/>
<file name="superbitrf.c" dir="subsystems/datalink"/>
<file name="cyrf6936.c" dir="peripherals"/>
</makefile>
@@ -50,15 +50,15 @@
<define name="USE_SUPERBITRF"/>
<define name="USE_$(SUPERBITRF_SPI_DEV)"/>
<define name="USE_SPI_SLAVE$(SUPERBITRF_SPI_SLAVE_IDX)"/>
<file name="radio_control.c" dir="subsystems"/>
<file name="superbitrf_rc.c" dir="subsystems/radio_control"/>
<file name="radio_control.c"/>
<file name="superbitrf_rc.c"/>
<file name="superbitrf.c" dir="subsystems/datalink"/>
<file name="cyrf6936.c" dir="peripherals"/>
<test>
<define name="RADIO_CONTROL"/>
<define name="RADIO_CONTROL_TYPE_SUPERBITRF"/>
<define name="USE_SUPERBITRF"/>
<define name="RADIO_CONTROL_TYPE_H" value="subsystems/radio_control/superbitrf_rc.h" type="string"/>
<define name="RADIO_CONTROL_TYPE_H" value="modules/radio_control/superbitrf_rc.h" type="string"/>
<define name="SUPERBITRF_SPI_DEV" value="spi2"/>
<define name="USE_SPI2"/>
<define name="SPI_MASTER"/>
sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.c → sw/airborne/arch/chibios/modules/radio_control/ppm_arch.c
+3 -3
View File
@@ -24,13 +24,13 @@
* Boston, MA 02111-1307, USA.
*/
/**
* @file arch/chibios/subsystems/radio_control/ppm_arch.c
* @file arch/chibios/modules/radio_control/ppm_arch.c
* PPM interface between ChibiOS and Paparazzi
*
* Input capture configuration has to be defined in board.h
*/
#include "subsystems/radio_control.h"
#include "subsystems/radio_control/ppm.h"
#include "modules/radio_control/radio_control.h"
#include "modules/radio_control/ppm.h"
uint8_t ppm_cur_pulse;
uint32_t ppm_last_pulse_time;
sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.h → sw/airborne/arch/chibios/modules/radio_control/ppm_arch.h
+1 -1
View File
@@ -24,7 +24,7 @@
* Boston, MA 02111-1307, USA.
*/
/**
* @file arch/chibios/subsystems/radio_control/ppm_arch.h
* @file arch/chibios/modules/radio_control/ppm_arch.h
* PPM interface between ChibiOS and Paparazzi
*
* Input capture configuration has to be defined in the board.h
sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c → sw/airborne/arch/sim/modules/radio_control/ppm_arch.c
+3 -3
View File
@@ -19,14 +19,14 @@
*/
/**
* @file arch/sim/subsystems/radio_control/ppm_arch.c
* @file arch/sim/modules/radio_control/ppm_arch.c
*
* PPM radio control, simulator specific.
*
*/
#include "subsystems/radio_control.h"
#include "subsystems/radio_control/ppm.h"
#include "modules/radio_control/radio_control.h"
#include "modules/radio_control/ppm.h"
#include <inttypes.h>
sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h → sw/airborne/arch/sim/modules/radio_control/ppm_arch.h
+1 -1
View File
@@ -19,7 +19,7 @@
*/
/**
* @file arch/sim/subsystems/radio_control/ppm_arch.h
* @file arch/sim/modules/radio_control/ppm_arch.h
*
* PPM radio control, simulator specific.
*
sw/airborne/arch/sim/subsystems/radio_control/rc_datalink.c → sw/airborne/arch/sim/modules/radio_control/rc_datalink.c
+1 -1
View File
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include <inttypes.h>
#include <caml/mlvalues.h>
sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.c → sw/airborne/arch/sim/modules/radio_control/spektrum_arch.c
+4 -4
View File
@@ -20,15 +20,15 @@
*/
/**
* @file arch/sim/subsystems/radio_control/spektrum_arch.c
* @file arch/sim/modules/radio_control/spektrum_arch.c
*
* Simulator implementation for spektrum radio control.
*
*/
#include "subsystems/radio_control.h"
#include "subsystems/radio_control/spektrum_arch.h"
#include "subsystems/radio_control/spektrum.h"
#include "modules/radio_control/radio_control.h"
#include "modules/radio_control/spektrum_arch.h"
#include "modules/radio_control/spektrum.h"
#include "std.h"
#include <inttypes.h>
sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.h → sw/airborne/arch/sim/modules/radio_control/spektrum_arch.h
+1 -1
View File
@@ -23,7 +23,7 @@
#ifndef RADIO_CONTROL_SPEKTRUM_ARCH_H
#define RADIO_CONTROL_SPEKTRUM_ARCH_H
#include "subsystems/radio_control/spektrum_radio.h"
#include "modules/radio_control/spektrum_radio.h"
#define RadioControlEventImp spektrum_event
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c → sw/airborne/arch/stm32/modules/radio_control/ppm_arch.c
+3 -3
View File
@@ -19,7 +19,7 @@
*/
/**
* @file arch/stm32/subsystems/radio_control/ppm_arch.c
* @file arch/stm32/modules/radio_control/ppm_arch.c
* @ingroup stm32_arch
*
* STM32 ppm decoder.
@@ -30,8 +30,8 @@
*
*/
#include "subsystems/radio_control.h"
#include "subsystems/radio_control/ppm.h"
#include "modules/radio_control/radio_control.h"
#include "modules/radio_control/ppm.h"
#include BOARD_CONFIG
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h → sw/airborne/arch/stm32/modules/radio_control/ppm_arch.h
+1 -1
View File
@@ -19,7 +19,7 @@
*/
/**
* @file arch/stm32/subsystems/radio_control/ppm_arch.h
* @file arch/stm32/modules/radio_control/ppm_arch.h
* @ingroup stm32_arch
*
* STM32 ppm decoder.
sw/airborne/autopilot.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "mcu_periph/uart.h"
#include "mcu_periph/sys_time.h"
#include "mcu_periph/gpio.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "modules/core/commands.h"
#include "subsystems/actuators.h"
//#include "modules/energy/electrical.h"
sw/airborne/firmwares/fixedwing/autopilot_generated.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "firmwares/fixedwing/autopilot_generated.h"
#include "autopilot.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "modules/core/commands.h"
#include "subsystems/actuators.h"
#include "modules/core/settings.h"
sw/airborne/firmwares/fixedwing/autopilot_rc_helpers.h
+1 -1
View File
@@ -28,7 +28,7 @@
#define AUTOPILOT_RC_HELPERS_H
#include "generated/airframe.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
/** RC mode switch position helper
* switch positions threshold are evenly spaced
sw/airborne/firmwares/fixedwing/main_fbw.c
+1 -1
View File
@@ -39,7 +39,7 @@
#include "modules/core/commands.h"
#include "subsystems/actuators.h"
#include "modules/energy/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "autopilot.h"
#include "paparazzi.h"
#include "mcu_periph/i2c.h"
sw/airborne/firmwares/rotorcraft/autopilot_firmware.c
+1 -1
View File
@@ -34,7 +34,7 @@
//#include "mcu_periph/sys_time.h"
#include "modules/energy/electrical.h"
#include "subsystems/datalink/telemetry.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#if USE_GPS
#include "subsystems/gps.h"
sw/airborne/firmwares/rotorcraft/autopilot_generated.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "autopilot.h"
#include "autopilot_arming.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "modules/core/commands.h"
#include "subsystems/actuators.h"
#include "modules/core/settings.h"
sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h
+1 -1
View File
@@ -29,7 +29,7 @@
#define AUTOPILOT_RC_HELPERS_H
#include "generated/airframe.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#define AUTOPILOT_THROTTLE_THRESHOLD (MAX_PPRZ / 20)
#define AUTOPILOT_YAW_THRESHOLD (MAX_PPRZ * 19 / 20)
sw/airborne/firmwares/rotorcraft/autopilot_static.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "autopilot.h"
#include "autopilot_arming.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "modules/core/commands.h"
#include "subsystems/actuators.h"
#include "modules/energy/electrical.h"
sw/airborne/firmwares/rotorcraft/autopilot_utils.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "autopilot.h"
#include "firmwares/rotorcraft/autopilot_rc_helpers.h"
#include "state.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
/** Display descent speed in failsafe mode if needed */
PRINT_CONFIG_VAR(FAILSAFE_DESCENT_SPEED)
sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
+1 -1
View File
@@ -33,7 +33,7 @@
#include "firmwares/rotorcraft/stabilization.h"
#include "firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h"
#include "firmwares/rotorcraft/navigation.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#if GUIDANCE_INDI_HYBRID
#include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h"
#else
sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c
+1 -1
View File
@@ -34,7 +34,7 @@
#include "firmwares/rotorcraft/guidance/guidance_hybrid.h"
#include "firmwares/rotorcraft/guidance/guidance_h.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "firmwares/rotorcraft/stabilization/stabilization_attitude.h"
/* for guidance_v_thrust_coeff */
sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.c
+1 -1
View File
@@ -34,7 +34,7 @@
#include "generated/airframe.h"
#include "firmwares/rotorcraft/guidance/guidance_indi.h"
#include "subsystems/ins/ins_int.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "state.h"
#include "subsystems/imu.h"
#include "firmwares/rotorcraft/guidance/guidance_h.h"
sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "generated/airframe.h"
#include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h"
#include "subsystems/ins/ins_int.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "state.h"
#include "subsystems/imu.h"
#include "firmwares/rotorcraft/guidance/guidance_h.h"
sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "firmwares/rotorcraft/guidance/guidance_module.h"
#include "firmwares/rotorcraft/guidance/guidance_hybrid.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "firmwares/rotorcraft/stabilization.h"
#include "firmwares/rotorcraft/navigation.h"
sw/airborne/firmwares/rotorcraft/main_ap.c
+1 -1
View File
@@ -33,7 +33,7 @@
#include <inttypes.h>
#include "led.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "firmwares/rotorcraft/main_ap.h"
sw/airborne/firmwares/rotorcraft/main_fbw.c
+1 -1
View File
@@ -38,7 +38,7 @@
#endif
#include "modules/energy/electrical.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/intermcu/intermcu_fbw.h"
#include "firmwares/rotorcraft/main_fbw.h"
#include "firmwares/rotorcraft/autopilot_rc_helpers.h"
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
+1 -1
View File
@@ -26,7 +26,7 @@
#include "firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h"
#include "generated/airframe.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "state.h"
#include "firmwares/rotorcraft/stabilization/stabilization_attitude.h"
#include "firmwares/rotorcraft/autopilot_rc_helpers.h"
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include "math/pprz_algebra_float.h"
#include "state.h"
#include "generated/airframe.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "subsystems/actuators.h"
#include "modules/core/abi.h"
#include "filters/low_pass_filter.h"
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c
+1 -1
View File
@@ -38,7 +38,7 @@
#include "state.h"
#include "generated/airframe.h"
#include "paparazzi.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "filters/low_pass_filter.h"
#if !defined(STABILIZATION_INDI_ACT_DYN_P) && !defined(STABILIZATION_INDI_ACT_DYN_Q) && !defined(STABILIZATION_INDI_ACT_DYN_R)
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "firmwares/rotorcraft/stabilization.h"
#include "firmwares/rotorcraft/stabilization/stabilization_none.h"
#include "subsystems/radio_control.h"
#include "modules/radio_control/radio_control.h"
#include "generated/airframe.h"
struct Int32Rates stabilization_none_rc_cmd;

Some files were not shown because too many files have changed in this diff Show More