mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-17 21:35:44 +03:00
Moved rx drivers into drivers/rx/
.
This commit is contained in:
parent
ff21932ef9
commit
b928950598
30 changed files with 83 additions and 85 deletions
|
@ -32,7 +32,7 @@ MCU_EXCLUDES = \
|
|||
drivers/serial_uart.c \
|
||||
drivers/serial_uart_init.c \
|
||||
drivers/serial_uart_pinconfig.c \
|
||||
drivers/rx_xn297.c \
|
||||
drivers/rx/rx_xn297.c \
|
||||
drivers/display_ug2864hsweg01.c \
|
||||
telemetry/crsf.c \
|
||||
telemetry/srxl.c \
|
||||
|
|
|
@ -82,12 +82,12 @@ FC_SRC = \
|
|||
fc/controlrate_profile.c \
|
||||
drivers/camera_control.c \
|
||||
drivers/accgyro/gyro_sync.c \
|
||||
drivers/rx_nrf24l01.c \
|
||||
drivers/rx_spi.c \
|
||||
drivers/rx_xn297.c \
|
||||
drivers/pwm_esc_detect.c \
|
||||
drivers/pwm_output.c \
|
||||
drivers/rx_pwm.c \
|
||||
drivers/rx/rx_nrf24l01.c \
|
||||
drivers/rx/rx_spi.c \
|
||||
drivers/rx/rx_xn297.c \
|
||||
drivers/rx/rx_pwm.c \
|
||||
drivers/serial_softserial.c \
|
||||
fc/fc_core.c \
|
||||
fc/fc_rc.c \
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "drivers/io_types.h"
|
||||
|
||||
#ifndef ADC_INSTANCE
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
#ifdef USE_RX_FLYSKY
|
||||
|
||||
#include "drivers/rx_a7105.h"
|
||||
#include "drivers/bus_spi.h"
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/exti.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/io_impl.h"
|
||||
#include "drivers/nvic.h"
|
||||
#include "drivers/exti.h"
|
||||
#include "drivers/rx/rx_a7105.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/time.h"
|
||||
|
||||
#ifdef RX_PA_TXEN_PIN
|
|
@ -29,7 +29,7 @@
|
|||
#include "build/build_config.h"
|
||||
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rx_spi.h"
|
||||
#include "rx/rx_spi.h"
|
||||
|
||||
enum {
|
||||
CC2500_00_IOCFG2 = 0x00, // GDO2 output pin configuration
|
|
@ -31,10 +31,11 @@
|
|||
#include "drivers/bus_spi.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/io_impl.h"
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/rx_nrf24l01.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/time.h"
|
||||
|
||||
#include "rx_nrf24l01.h"
|
||||
|
||||
#define NRF24_CE_HI() {IOHi(DEFIO_IO(RX_CE_PIN));}
|
||||
#define NRF24_CE_LO() {IOLo(DEFIO_IO(RX_CE_PIN));}
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rx_spi.h"
|
||||
#include "rx/rx_spi.h"
|
||||
|
||||
#define NRF24L01_MAX_PAYLOAD_SIZE 32
|
||||
|
|
@ -29,13 +29,14 @@
|
|||
#include "build/build_config.h"
|
||||
|
||||
#include "drivers/bus_spi.h"
|
||||
#include "bus_spi_soft.h"
|
||||
#include "drivers/bus_spi_soft.h"
|
||||
#include "drivers/io.h"
|
||||
#include "io_impl.h"
|
||||
#include "rcc.h"
|
||||
#include "rx_spi.h"
|
||||
#include "drivers/io_impl.h"
|
||||
#include "drivers/rcc.h"
|
||||
#include "drivers/system.h"
|
||||
|
||||
#include "rx_spi.h"
|
||||
|
||||
#define DISABLE_RX() {IOHi(DEFIO_IO(RX_NSS_PIN));}
|
||||
#define ENABLE_RX() {IOLo(DEFIO_IO(RX_NSS_PIN));}
|
||||
|
|
@ -21,10 +21,11 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rx_spi.h"
|
||||
#include "rx_nrf24l01.h"
|
||||
#include "common/crc.h"
|
||||
|
||||
#include "drivers/rx/rx_nrf24l01.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
|
||||
|
||||
static const uint8_t xn297_data_scramble[30] = {
|
||||
0xbc, 0xe5, 0x66, 0x0d, 0xae, 0x8c, 0x88, 0x12,
|
|
@ -49,7 +49,7 @@
|
|||
#include "drivers/max7456.h"
|
||||
#include "drivers/pwm_esc_detect.h"
|
||||
#include "drivers/pwm_output.h"
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/sensor.h"
|
||||
#include "drivers/sound_beeper.h"
|
||||
#include "drivers/system.h"
|
||||
|
|
|
@ -34,37 +34,37 @@
|
|||
#include "cms/cms.h"
|
||||
#include "cms/cms_types.h"
|
||||
|
||||
#include "drivers/nvic.h"
|
||||
#include "drivers/sensor.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
#include "drivers/dma.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/light_led.h"
|
||||
#include "drivers/sound_beeper.h"
|
||||
#include "drivers/timer.h"
|
||||
#include "drivers/serial.h"
|
||||
#include "drivers/serial_softserial.h"
|
||||
#include "drivers/serial_uart.h"
|
||||
#include "drivers/accgyro/accgyro.h"
|
||||
#include "drivers/compass/compass.h"
|
||||
#include "drivers/pwm_esc_detect.h"
|
||||
#include "drivers/rx_pwm.h"
|
||||
#include "drivers/pwm_output.h"
|
||||
#include "drivers/adc.h"
|
||||
#include "drivers/bus.h"
|
||||
#include "drivers/bus_i2c.h"
|
||||
#include "drivers/bus_spi.h"
|
||||
#include "drivers/buttons.h"
|
||||
#include "drivers/inverter.h"
|
||||
#include "drivers/flash_m25p16.h"
|
||||
#include "drivers/sdcard.h"
|
||||
#include "drivers/usb_io.h"
|
||||
#include "drivers/transponder_ir.h"
|
||||
#include "drivers/exti.h"
|
||||
#include "drivers/vtx_rtc6705.h"
|
||||
#include "drivers/vtx_common.h"
|
||||
#include "drivers/camera_control.h"
|
||||
#include "drivers/compass/compass.h"
|
||||
#include "drivers/dma.h"
|
||||
#include "drivers/exti.h"
|
||||
#include "drivers/flash_m25p16.h"
|
||||
#include "drivers/inverter.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/light_led.h"
|
||||
#include "drivers/nvic.h"
|
||||
#include "drivers/pwm_esc_detect.h"
|
||||
#include "drivers/pwm_output.h"
|
||||
#include "drivers/rx/rx_pwm.h"
|
||||
#include "drivers/sensor.h"
|
||||
#include "drivers/serial.h"
|
||||
#include "drivers/serial_softserial.h"
|
||||
#include "drivers/serial_uart.h"
|
||||
#include "drivers/sdcard.h"
|
||||
#include "drivers/sound_beeper.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
#include "drivers/timer.h"
|
||||
#include "drivers/transponder_ir.h"
|
||||
#include "drivers/usb_io.h"
|
||||
#include "drivers/vtx_common.h"
|
||||
#include "drivers/vtx_rtc6705.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
#include "fc/fc_init.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/nvic.h"
|
||||
#include "drivers/rx_pwm.h"
|
||||
#include "drivers/rx/rx_pwm.h"
|
||||
#include "drivers/timer.h"
|
||||
|
||||
#include "pg/pg.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "drivers/io_types.h"
|
||||
#include "drivers/rx_pwm.h"
|
||||
#include "drivers/rx/rx_pwm.h"
|
||||
|
||||
#include "pg/pg.h"
|
||||
|
||||
|
|
|
@ -31,16 +31,13 @@
|
|||
#include "common/utils.h"
|
||||
|
||||
#include "drivers/adc.h"
|
||||
#include "drivers/rx_cc2500.h"
|
||||
#include "drivers/rx/rx_cc2500.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
|
||||
#include "config/feature.h"
|
||||
#include "pg/pg_ids.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
#include "rx/rx_spi.h"
|
||||
#include "rx/cc2500_frsky_common.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "common/maths.h"
|
||||
|
||||
#include "drivers/rx_cc2500.h"
|
||||
#include "drivers/rx/rx_cc2500.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/time.h"
|
||||
|
||||
|
|
|
@ -25,15 +25,11 @@
|
|||
#include "build/build_config.h"
|
||||
#include "build/debug.h"
|
||||
|
||||
#include "config/feature.h"
|
||||
#include "pg/pg.h"
|
||||
#include "pg/pg_ids.h"
|
||||
|
||||
#include "common/maths.h"
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "drivers/adc.h"
|
||||
#include "drivers/rx_cc2500.h"
|
||||
#include "drivers/rx/rx_cc2500.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/io_def.h"
|
||||
#include "drivers/io_types.h"
|
||||
|
|
|
@ -25,22 +25,25 @@
|
|||
|
||||
#include "common/maths.h"
|
||||
#include "common/utils.h"
|
||||
#include "config/config_eeprom.h"
|
||||
#include "pg/pg_ids.h"
|
||||
#include "fc/config.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
#include "rx/rx_spi.h"
|
||||
#include "rx/flysky.h"
|
||||
#include "rx/flysky_defs.h"
|
||||
|
||||
#include "drivers/rx_a7105.h"
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/rx/rx_a7105.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
#include "drivers/io.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
|
||||
#include "rx/flysky_defs.h"
|
||||
#include "rx/rx.h"
|
||||
#include "rx/rx_spi.h"
|
||||
|
||||
#include "pg/pg.h"
|
||||
#include "pg/pg_ids.h"
|
||||
|
||||
#include "sensors/battery.h"
|
||||
|
||||
#include "flysky.h"
|
||||
|
||||
#if FLYSKY_CHANNEL_COUNT > MAX_FLYSKY_CHANNEL_COUNT
|
||||
#error "FlySky AFHDS protocol support 8 channel max"
|
||||
#endif
|
||||
|
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
#if defined(USE_PWM) || defined(USE_PPM)
|
||||
|
||||
#include "drivers/rx_pwm.h"
|
||||
|
||||
#include "common/utils.h"
|
||||
|
||||
#include "config/feature.h"
|
||||
|
||||
#include "drivers/rx/rx_pwm.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
|
|
@ -31,12 +31,10 @@
|
|||
|
||||
#include "config/config_reset.h"
|
||||
#include "config/feature.h"
|
||||
#include "pg/pg.h"
|
||||
#include "pg/pg_ids.h"
|
||||
|
||||
#include "drivers/adc.h"
|
||||
#include "drivers/rx_pwm.h"
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/rx/rx_pwm.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/time.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
|
@ -47,6 +45,9 @@
|
|||
|
||||
#include "io/serial.h"
|
||||
|
||||
#include "pg/pg.h"
|
||||
#include "pg/pg_ids.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
#include "rx/pwm.h"
|
||||
#include "rx/fport.h"
|
||||
|
|
|
@ -28,15 +28,15 @@
|
|||
|
||||
#include "config/feature.h"
|
||||
|
||||
#include "drivers/rx_spi.h"
|
||||
#include "drivers/rx_nrf24l01.h"
|
||||
#include "drivers/rx/rx_spi.h"
|
||||
#include "drivers/rx/rx_nrf24l01.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
#include "rx/rx_spi.h"
|
||||
#include "cc2500_frsky_d.h"
|
||||
#include "cc2500_frsky_x.h"
|
||||
#include "rx/cc2500_frsky_d.h"
|
||||
#include "rx/cc2500_frsky_x.h"
|
||||
#include "rx/nrf24_cx10.h"
|
||||
#include "rx/nrf24_syma.h"
|
||||
#include "rx/nrf24_v202.h"
|
||||
|
|
|
@ -17,8 +17,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include "rx/rx.h"
|
||||
|
||||
typedef enum {
|
||||
RX_SPI_NRF24_V202_250K = 0,
|
||||
|
|
|
@ -16,17 +16,14 @@
|
|||
#include "common/color.h"
|
||||
#include "common/maths.h"
|
||||
|
||||
|
||||
#include "drivers/sensor.h"
|
||||
#include "drivers/accgyro/accgyro.h"
|
||||
#include "drivers/compass/compass.h"
|
||||
|
||||
#include "drivers/serial.h"
|
||||
#include "drivers/bus_i2c.h"
|
||||
#include "drivers/sensor.h"
|
||||
#include "drivers/serial.h"
|
||||
#include "drivers/system.h"
|
||||
#include "drivers/time.h"
|
||||
#include "drivers/timer.h"
|
||||
#include "drivers/rx_pwm.h"
|
||||
|
||||
#include "fc/config.h"
|
||||
#include "fc/controlrate_profile.h"
|
||||
|
|
|
@ -7,5 +7,5 @@ TARGET_SRC = \
|
|||
drivers/accgyro/accgyro_spi_mpu6500.c \
|
||||
drivers/barometer/barometer_bmp280.c \
|
||||
drivers/barometer/barometer_ms5611.c \
|
||||
drivers/rx_a7105.c \
|
||||
drivers/rx/rx_a7105.c \
|
||||
rx/flysky.c
|
||||
|
|
|
@ -5,7 +5,7 @@ FEATURES = VCP SDCARD
|
|||
TARGET_SRC = \
|
||||
drivers/accgyro/accgyro_mpu.c \
|
||||
drivers/accgyro/accgyro_mpu6050.c \
|
||||
drivers/rx_cc2500.c \
|
||||
drivers/rx/rx_cc2500.c \
|
||||
rx/cc2500_frsky_shared.c \
|
||||
rx/cc2500_frsky_d.c \
|
||||
rx/cc2500_frsky_x.c
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue