mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-29 13:43:34 +08:00
PX4 System changes Supporting STM32H7
stm32:ToneAlarmInterfacePWM TIM15-TIM17 have a BDTR Register common:board_crashdump Add H7 support stm32/board_mcu_version:Support H7 PX4 ADC:Use 32 interface and resoution abstraction Added PX4 stm32h7 ADC driver stm32h7:adc fix ADC ready check fmu: handle BOARD_HAS_PWM==5 cmake: improve error handling for NuttX olddefconfig failures WorkQueueManager:Quiet loadmon stack warning camera_trigger:GPIO support < 6 GPIO Adjust stack sizes (under hw stack check) PX4 System changes Supporting STM32H7 PX4IO Driver aerotenna_ocpoc:ADC add px4_arch_adc_dn_fullcount init.cmake:Track Upstream change needing Make.def at config time PX4 System changes Supporting STM32H7 NuttX CMakeLists.txt Track upstream changes Common board_crashdump add header and px4 config NuttX simplify callinb make libapps Use UINT32_MAX for error return drivers:uavcannode NuttX chip is now hardware drivers:uavcanesc NuttX chip is now hardware px4io:Avoid Race on AP to PX4 IO upgrade
This commit is contained in:
committed by
Lorenz Meier
parent
58799dc7d1
commit
e847698c9f
@@ -1146,9 +1146,12 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
|
||||
break;
|
||||
}
|
||||
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 5
|
||||
|
||||
/* FALLTHROUGH */
|
||||
case PWM_SERVO_SET(4):
|
||||
if (_mode < MODE_5PWM1CAP) {
|
||||
if (_mode < MODE_5PWM) {
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
@@ -1216,9 +1219,12 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
|
||||
break;
|
||||
}
|
||||
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 5
|
||||
|
||||
/* FALLTHROUGH */
|
||||
case PWM_SERVO_GET(4):
|
||||
if (_mode < MODE_5PWM1CAP) {
|
||||
if (_mode < MODE_5PWM) {
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
@@ -1249,8 +1255,10 @@ PX4FMU::pwm_ioctl(file *filp, int cmd, unsigned long arg)
|
||||
case PWM_SERVO_GET_RATEGROUP(1):
|
||||
case PWM_SERVO_GET_RATEGROUP(2):
|
||||
case PWM_SERVO_GET_RATEGROUP(3):
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 6
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 5
|
||||
case PWM_SERVO_GET_RATEGROUP(4):
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 6
|
||||
case PWM_SERVO_GET_RATEGROUP(5):
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 8
|
||||
@@ -1677,6 +1685,9 @@ PX4FMU::fmu_new_mode(PortMode new_mode)
|
||||
/* select 4-pin PWM mode */
|
||||
servo_mode = PX4FMU::MODE_4PWM;
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM == 5
|
||||
servo_mode = PX4FMU::MODE_5PWM;
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM == 6
|
||||
servo_mode = PX4FMU::MODE_6PWM;
|
||||
#endif
|
||||
@@ -2109,6 +2120,9 @@ int PX4FMU::custom_command(int argc, char *argv[])
|
||||
} else if (!strcmp(verb, "mode_pwm6")) {
|
||||
new_mode = PORT_PWM6;
|
||||
|
||||
#endif
|
||||
#if defined(BOARD_HAS_PWM) && BOARD_HAS_PWM >= 5
|
||||
|
||||
} else if (!strcmp(verb, "mode_pwm5")) {
|
||||
new_mode = PORT_PWM5;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user