From de77662fe24830985bd2494baca59cfbb59fc742 Mon Sep 17 00:00:00 2001 From: Jani Hirvinen Date: Tue, 19 Nov 2024 21:42:59 +0200 Subject: [PATCH] Update hwdef.dat Moving serial port parameters from default.parm. Minor tidying. Current version is compiled and tested on physical hw. --- .../hwdef/HAKRCF405Wing/hwdef.dat | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HAKRCF405Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HAKRCF405Wing/hwdef.dat index aa1b40b566..c3181789cf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HAKRCF405Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HAKRCF405Wing/hwdef.dat @@ -3,7 +3,7 @@ # # Board : HAKRCF405-Wing, v1.1 # Created by : Jani Hirvinen https://github.com/jpkh -# Version : v1.1, 16.11.2024 +# Version : v1.2, 19.11.2024 # ####################################### @@ -41,13 +41,12 @@ define CH_CFG_ST_RESOLUTION 32 USB_STRING_MANUFACTURER "HakRC" USB_STRING_PRODUCT "HAKF405Wing v1.0" - # SPI devices # SPI1 (IMU) PA5 SPI1_SCK SPI1 PA6 SPI1_MISO SPI1 -PA7 SPI1_MOSI SPI1 +PA7 SPI1_MOSI SPI1 # SPI2 (OSD) PB13 SPI2_SCK SPI2 @@ -59,7 +58,6 @@ PB3 SPI3_SCK SPI3 PB5 SPI3_MOSI SPI3 PB4 SPI3_MISO SPI3 - # Chip select pins PC14 SDCARD_CS CS PB12 OSD1_CS CS @@ -72,7 +70,7 @@ define HAL_BUZZER_ON 1 define HAL_BUZZER_OFF 0 # SERIAL ports -SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 UART5 USART6 +SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 UART5 USART6 # PA10 IO-debug-console PA11 OTG_FS_DM OTG1 @@ -81,32 +79,35 @@ PA12 OTG_FS_DP OTG1 # USART1 (RCIN ELRS) PA10 USART1_RX USART1 # NODMA PA9 USART1_TX USART1 # NODMA -DEFAULT_SERIAL1_PROTOCOL SerialProtocol_RCIN +define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_RCIN +define DEFAULT_SERIAL1_BAUD 115 # USART2 TELEMETRY) PA3 USART2_RX USART2 # NODMA PA2 USART2_TX USART2 # NODMA -DEFAULT_SERIAL2_PROTOCOL SerialProtocol_None +define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_None +define DEFAULT_SERIAL2_BAUD 57 # USART3 (GPS) PC11 USART3_RX USART3 PC10 USART3_TX USART3 -DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS +define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MAVLink2 +define DEFAULT_SERIAL3_BAUD 57 # UART4 PA1 UART4_RX UART4 NODMA PA0 UART4_TX UART4 NODMA -DEFAULT_SERIAL4_PROTOCOL SerialProtocol_None +define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_DJI_FPV # UART5 PD2 UART5_RX UART5 NODMA PC12 UART5_TX UART5 NODMA -DEFAULT_SERIAL5_PROTOCOL SerialProtocol_None +define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_None # USART6 PC7 USART6_RX USART6 PC6 USART6_TX USART6 -DEFAULT_SERIAL6_PROTOCOL SerialProtocol_None +define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_None define HAL_USE_I2C TRUE define STM32_I2C_USE_I2C1 TRUE @@ -123,7 +124,9 @@ PB9 I2C1_SDA I2C1 BARO SPL06 I2C:0:0x76 # Mostly used baro sensor #BARO BMP280 I2C:0:0x76 # Not usually used but can be on some of the boards. -# Servos +# Battery monitor +# Generic settings for the battery monitor +define HAL_BATT_MONITOR_DEFAULT 4 # ADC ports # ADC1 @@ -144,9 +147,9 @@ define HAL_BATT_CURR_PIN 13 define HAL_BATT_CURR_SCALE 100.00 define HAL_BATT_VOLT_PIN 11 -define HAL_BATT_VOLT_SCALE 10.974 +define HAL_BATT_VOLT_SCALE 550 -# MOTORS +# MOTORS PB7 TIM4_CH2 TIM4 PWM(1) GPIO(50) # M1 PB6 TIM4_CH1 TIM4 PWM(2) GPIO(51) # M2 PB0 TIM3_CH3 TIM3 PWM(3) GPIO(52) # M3 @@ -156,21 +159,21 @@ PC9 TIM8_CH4 TIM8 PWM(6) GPIO(55) # M6 PB10 TIM2_CH3 TIM2 PWM(9) GPIO(56) # M7 PB11 TIM2_CH4 TIM2 PWM(10) GPIO(57) # M8 - +# Servos PA15 TIM2_CH1 TIM2 PWM(8) GPIO(58) # Servo1 PB14 TIM8_CH2N TIM8 PWM(7) GPIO(59) # Servo2 PB15 TIM1_CH3N TIM1 PWM(11) GPIO(60) # Servo3 - # LEDs # LED1 PC14, LED0 PC15 PA14 LED0 OUTPUT LOW GPIO(0) PA13 LED1 OUTPUT LOW GPIO(1) define HAL_GPIO_A_LED_PIN 0 define HAL_GPIO_B_LED_PIN 1 +define AP_NOTIFY_GPIO_LED_2_ENABLED 1 # LED Strip, PA8, Not defined yet -PA8 TIM1_CH1 TIM1 PWM(12) GPIO(61) +PA8 TIM1_CH1 TIM1 PWM(12) GPIO(61) # This board does not have VTX control, it is always powered # We keep this here for future expansions @@ -196,9 +199,9 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # IMU setup -# IMU on top side of the PCB, ICM marker pointing towards back. +# IMU on top side of the PCB, ICM marker pointing towards back. IMU Invensensev3 SPI:imu1 ROTATION_ROLL_180_YAW_270 -DMA_PRIORITY TIM3* TIM2* TIM8_UP SPI1* TIM1_UP +DMA_PRIORITY TIM4* TIM3* TIM8 SPI1* # no built-in compass, but probe the i2c bus for all possible # external compass types