diff --git a/boards/x-mav/ap-h743r1/default.px4board b/boards/x-mav/ap-h743r1/default.px4board index d7ab7a9f9a..031e7520f4 100644 --- a/boards/x-mav/ap-h743r1/default.px4board +++ b/boards/x-mav/ap-h743r1/default.px4board @@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI270=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y +CONFIG_DRIVERS_MAGNETOMETER_QMC5883P=y CONFIG_COMMON_OSD=y CONFIG_DRIVERS_PWM_OUT=y CONFIG_DRIVERS_PX4IO=y diff --git a/boards/x-mav/ap-h743r1/init/rc.board_sensors b/boards/x-mav/ap-h743r1/init/rc.board_sensors index fbc41fa1cb..6ed8e80629 100644 --- a/boards/x-mav/ap-h743r1/init/rc.board_sensors +++ b/boards/x-mav/ap-h743r1/init/rc.board_sensors @@ -23,4 +23,4 @@ then fi # internal mag -ist8310 -I -R 6 start +qmc5883p -I -R 2 start diff --git a/boards/x-mav/ap-h743r1/nuttx-config/include/board_dma_map.h b/boards/x-mav/ap-h743r1/nuttx-config/include/board_dma_map.h index 657ad280d9..33219bffc1 100644 --- a/boards/x-mav/ap-h743r1/nuttx-config/include/board_dma_map.h +++ b/boards/x-mav/ap-h743r1/nuttx-config/include/board_dma_map.h @@ -42,20 +42,20 @@ #define DMAMAP_SPI2_RX DMAMAP_DMA12_SPI2RX_0 /* DMA1:39 */ #define DMAMAP_SPI2_TX DMAMAP_DMA12_SPI2TX_0 /* DMA1:40 */ -#define DMAMAP_SPI4_RX DMAMAP_DMA12_SPI4RX_0 /* 3 DMA1:83 IMU */ -#define DMAMAP_SPI4_TX DMAMAP_DMA12_SPI4TX_0 /* 4 DMA1:84 IMU */ +#define DMAMAP_SPI4_RX DMAMAP_DMA12_SPI4RX_1 /* 3 DMA2:83 IMU */ +#define DMAMAP_SPI4_TX DMAMAP_DMA12_SPI4TX_1 /* 4 DMA2:84 IMU */ -#define DMAMAP_USART1_RX DMAMAP_DMA12_USART1RX_0 /* DMA1:41 GPS1 */ -#define DMAMAP_USART1_TX DMAMAP_DMA12_USART1TX_0 /* DMA1:42 GPS1 */ +// #define DMAMAP_USART1_RX DMAMAP_DMA12_USART1RX_0 /* DMA1:41 GPS1 */ +// #define DMAMAP_USART1_TX DMAMAP_DMA12_USART1TX_0 /* DMA1:42 GPS1 */ -#define DMAMAP_USART2_RX DMAMAP_DMA12_USART2RX_0 /* DMA1:43 GPS2 */ -#define DMAMAP_USART2_TX DMAMAP_DMA12_USART2TX_0 /* DMA1:44 GPS2 */ +// #define DMAMAP_USART2_RX DMAMAP_DMA12_USART2RX_0 /* DMA1:43 GPS2 */ +// #define DMAMAP_USART2_TX DMAMAP_DMA12_USART2TX_0 /* DMA1:44 GPS2 */ #define DMAMAP_USART3_RX DMAMAP_DMA12_USART3RX_0 /* DMA1:45 TELEM1 */ #define DMAMAP_USART3_TX DMAMAP_DMA12_USART3TX_0 /* DMA1:46 TELEM1 */ -#define DMAMAP_UART4_RX DMAMAP_DMA12_UART4RX_1 /* DMA1:63 TELEM2 */ -#define DMAMAP_UART4_TX DMAMAP_DMA12_UART4TX_1 /* DMA1:64 TELEM2 */ +#define DMAMAP_UART4_RX DMAMAP_DMA12_UART4RX_1 /* DMA2:63 TELEM2 */ +#define DMAMAP_UART4_TX DMAMAP_DMA12_UART4TX_1 /* DMA2:64 TELEM2 */ #define DMAMAP_USART6_RX DMAMAP_DMA12_USART6RX_0 /* DMA1:71 PX4IO */ #define DMAMAP_USART6_TX DMAMAP_DMA12_USART6TX_0 /* DMA1:72 PX4IO */ diff --git a/boards/x-mav/ap-h743r1/nuttx-config/nsh/defconfig b/boards/x-mav/ap-h743r1/nuttx-config/nsh/defconfig index b75820d410..dc9d2800d1 100644 --- a/boards/x-mav/ap-h743r1/nuttx-config/nsh/defconfig +++ b/boards/x-mav/ap-h743r1/nuttx-config/nsh/defconfig @@ -247,14 +247,10 @@ CONFIG_UART8_SERIAL_CONSOLE=y CONFIG_UART8_TXBUFSIZE=3000 CONFIG_USART1_BAUD=57600 CONFIG_USART1_RXBUFSIZE=600 -CONFIG_USART1_RXDMA=y CONFIG_USART1_TXBUFSIZE=1500 -CONFIG_USART1_TXDMA=y CONFIG_USART2_BAUD=57600 CONFIG_USART2_RXBUFSIZE=600 -CONFIG_USART2_RXDMA=y CONFIG_USART2_TXBUFSIZE=3000 -CONFIG_USART2_TXDMA=y CONFIG_USART3_BAUD=57600 CONFIG_USART3_RXBUFSIZE=180 CONFIG_USART3_RXDMA=y diff --git a/docs/en/flight_controller/x-mav_ap-h743r1.md b/docs/en/flight_controller/x-mav_ap-h743r1.md index f527e9876d..e6ccabed17 100644 --- a/docs/en/flight_controller/x-mav_ap-h743r1.md +++ b/docs/en/flight_controller/x-mav_ap-h743r1.md @@ -25,7 +25,7 @@ These flight controllers are [manufacturer supported](../flight_controller/autop - 32 Bit Arm® Cortex®-M3, 72MHz, 20KB SRAM - On-board sensors - Accel/Gyro: ICM-42688-P\*2(Version1), BMI270\*2(Version2) - - Mag: IST8310 + - Mag: QMC5883P - Barometer: DPS310(Version1),SPL06(Version2) ### Interfaces diff --git a/docs/ko/flight_controller/x-mav_ap-h743r1.md b/docs/ko/flight_controller/x-mav_ap-h743r1.md index 58372bdd70..2e4c40c566 100644 --- a/docs/ko/flight_controller/x-mav_ap-h743r1.md +++ b/docs/ko/flight_controller/x-mav_ap-h743r1.md @@ -25,7 +25,7 @@ It brings you ultimate performance, stability, and reliability in every aspect. - 32 Bit Arm® Cortex®-M3, 72MHz, 20KB SRAM - 내장 센서 : - Accel/Gyro: ICM-42688-P\*2(Version1), BMI270\*2(Version2) - - 자력계: IST8310 + - 자력계: QMC5883P - Barometer: DPS310(Version1),SPL06(Version2) ### 인터페이스 diff --git a/docs/uk/flight_controller/x-mav_ap-h743r1.md b/docs/uk/flight_controller/x-mav_ap-h743r1.md index 4ae444f1fe..cde4247aac 100644 --- a/docs/uk/flight_controller/x-mav_ap-h743r1.md +++ b/docs/uk/flight_controller/x-mav_ap-h743r1.md @@ -25,7 +25,7 @@ These flight controllers are [manufacturer supported](../flight_controller/autop - 32 Bit Arm® Cortex®-M3, 72MHz, 20KB SRAM - Сенсори на платі - Accel/Gyro: ICM-42688-P\*2(Version1), BMI270\*2(Version2) - - Mag: IST8310 + - Mag: QMC5883P - Barometer: DPS310(Version1),SPL06(Version2) ### Інтерфейси diff --git a/docs/zh/flight_controller/x-mav_ap-h743r1.md b/docs/zh/flight_controller/x-mav_ap-h743r1.md index 5f140d9ac0..c60956e904 100644 --- a/docs/zh/flight_controller/x-mav_ap-h743r1.md +++ b/docs/zh/flight_controller/x-mav_ap-h743r1.md @@ -25,7 +25,7 @@ These flight controllers are [manufacturer supported](../flight_controller/autop - 32 Bit Arm® Cortex®-M3, 72MHz, 20KB SRAM - On-board sensors - Accel/Gyro: ICM-42688-P\*2(Version1), BMI270\*2(Version2) - - Mag: IST8310 + - Mag: QMC5883P - Barometer: DPS310(Version1),SPL06(Version2) ### 接口