Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 18:27:05 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Revert:Pull downs - bad levels cause motor spins

Browse Source
This commit is contained in:
David Sidrane
2021-06-01 08:07:24 -07:00
committed by Daniel Agar
parent dfa5964719
commit 32e92ba817
25 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/av/x-v1/src/init.c
+1 -1
View File
@@ -90,7 +90,7 @@ static int configure_switch(void);
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/cuav/nora/src/init.c
+1 -1
View File
@@ -106,7 +106,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/cuav/x7pro/src/init.c
+1 -1
View File
@@ -106,7 +106,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/cubepilot/cubeorange/src/init.c
+1 -1
View File
@@ -97,7 +97,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/cubepilot/cubeyellow/src/init.c
+1 -1
View File
@@ -97,7 +97,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/holybro/durandal-v1/src/init.c
+1 -1
View File
@@ -138,7 +138,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/holybro/kakutef7/src/init.c
+1 -1
View File
@@ -120,7 +120,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/holybro/pix32v5/src/init.c
+1 -1
View File
@@ -139,7 +139,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/modalai/fc-v1/src/init.c
+1 -1
View File
@@ -137,7 +137,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/modalai/fc-v2/src/init.c
+1 -1
View File
@@ -135,7 +135,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/mro/ctrl-zero-f7-oem/src/init.c
+1 -1
View File
@@ -128,7 +128,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/mro/ctrl-zero-f7/src/init.c
+1 -1
View File
@@ -128,7 +128,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/mro/ctrl-zero-h7-oem/src/init.c
+1 -1
View File
@@ -100,7 +100,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/mro/ctrl-zero-h7/src/init.c
+1 -1
View File
@@ -100,7 +100,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/mro/pixracerpro/src/init.c
+1 -1
View File
@@ -100,7 +100,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/nxp/fmuk66-e/src/init.c
+1 -1
View File
@@ -117,7 +117,7 @@ __END_DECLS
void board_on_reset(int status) void board_on_reset(int status)
{ {
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 6; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/nxp/fmuk66-v3/src/init.c
+1 -1
View File
@@ -117,7 +117,7 @@ __END_DECLS
void board_on_reset(int status) void board_on_reset(int status)
{ {
for (int i = 0; i < 6; ++i) { for (int i = 0; i < 6; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/px4/fmu-v5/src/init.c
+1 -1
View File
@@ -139,7 +139,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/px4/fmu-v5x/src/init.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/px4/fmu-v6u/src/init.c
+1 -1
View File
@@ -140,7 +140,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/px4/fmu-v6x/src/init.c
+1 -1
View File
@@ -140,7 +140,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
boards/spracing/h7extreme/src/init.c
+1 -1
View File
@@ -121,7 +121,7 @@ __EXPORT void board_peripheral_reset(int ms)
__EXPORT void board_on_reset(int status) __EXPORT void board_on_reset(int status)
{ {
for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) { for (int i = 0; i < DIRECT_PWM_OUTPUT_CHANNELS; ++i) {
px4_arch_configgpio(PX4_MAKE_GPIO_INPUT_PULL_DOWN(io_timer_channel_get_as_pwm_input(i))); px4_arch_configgpio(PX4_MAKE_GPIO_INPUT(io_timer_channel_get_as_pwm_input(i)));
} }
if (status >= 0) { if (status >= 0) {
platforms/nuttx/src/px4/nxp/k66/include/px4_arch/micro_hal.h
+2 -3
View File
@@ -112,8 +112,7 @@ int kinetis_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge, boo
#define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) kinetis_gpiosetevent(pinset,r,f,e,fp,a) #define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) kinetis_gpiosetevent(pinset,r,f,e,fp,a)
#define _PX4_MAKE_GPIO(pin_ftmx, io) ((((uint32_t)(pin_ftmx)) & ~(_PIN_MODE_MASK | _PIN_OPTIONS_MASK)) |(io)) #define _PX4_MAKE_GPIO(pin_ftmx, io) ((((uint32_t)(pin_ftmx)) & ~(_PIN_MODE_MASK | _PIN_OPTIONS_MASK)) |(io))
#define PX4_MAKE_GPIO_INPUT(gpio) _PX4_MAKE_GPIO((gpio), GPIO_PULLUP) #define PX4_MAKE_GPIO_INPUT(gpio) _PX4_MAKE_GPIO(gpio, GPIO_PULLUP)
#define PX4_MAKE_GPIO_INPUT_PULL_DOWN(gpio) _PX4_MAKE_GPIO((gpio), GPIO_PULLDOWN) #define PX4_MAKE_GPIO_OUTPUT(gpio) _PX4_MAKE_GPIO(gpio, GPIO_HIGHDRIVE)
#define PX4_MAKE_GPIO_OUTPUT(gpio) _PX4_MAKE_GPIO((gpio), GPIO_HIGHDRIVE)
__END_DECLS __END_DECLS
platforms/nuttx/src/px4/nxp/rt106x/include/px4_arch/micro_hal.h
-1
View File
@@ -105,7 +105,6 @@ int imxrt_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge, bool
#define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) imxrt_gpiosetevent(pinset,r,f,e,fp,a) #define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) imxrt_gpiosetevent(pinset,r,f,e,fp,a)
#define PX4_MAKE_GPIO_INPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT | IOMUX_SCHMITT_TRIGGER | IOMUX_PULL_UP_47K | IOMUX_DRIVE_HIZ)) #define PX4_MAKE_GPIO_INPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT | IOMUX_SCHMITT_TRIGGER | IOMUX_PULL_UP_47K | IOMUX_DRIVE_HIZ))
#define PX4_MAKE_GPIO_INPUT_PULL_DOWN(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT | IOMUX_SCHMITT_TRIGGER | IOMUX_PULL_DOWN_100K | IOMUX_DRIVE_HIZ))
#define PX4_MAKE_GPIO_OUTPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_CMOS_OUTPUT | IOMUX_PULL_KEEP | IOMUX_DRIVE_33OHM | IOMUX_SPEED_MEDIUM | IOMUX_SLEW_FAST)) #define PX4_MAKE_GPIO_OUTPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_CMOS_OUTPUT | IOMUX_PULL_KEEP | IOMUX_DRIVE_33OHM | IOMUX_SPEED_MEDIUM | IOMUX_SLEW_FAST))
__END_DECLS __END_DECLS
platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/micro_hal.h
-1
View File
@@ -103,7 +103,6 @@ __BEGIN_DECLS
#define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) stm32_gpiosetevent(pinset,r,f,e,fp,a) #define px4_arch_gpiosetevent(pinset,r,f,e,fp,a) stm32_gpiosetevent(pinset,r,f,e,fp,a)
#define PX4_MAKE_GPIO_INPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_PULLUP)) #define PX4_MAKE_GPIO_INPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_PULLUP))
#define PX4_MAKE_GPIO_INPUT_PULL_DOWN(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_PULLDOWN))
#define PX4_MAKE_GPIO_OUTPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR)) #define PX4_MAKE_GPIO_OUTPUT(gpio) (((gpio) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR))
#define PX4_GPIO_PIN_OFF(def) (((def) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_2MHz)) #define PX4_GPIO_PIN_OFF(def) (((def) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_2MHz))