fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 12:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

reboot: Add reboot to ISP option

Browse Source
This commit is contained in:
Peter van der Perk
2024-01-04 11:17:16 -05:00
committed by Daniel Agar
parent 8ba18a78af
commit 84093a07a2
13 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/src/px4/common/cdc_acm_check.cpp
+2 -2
View File
@@ -187,7 +187,7 @@ static void mavlink_usb_check(void *arg)
if (param1 == 1) {
// 1: Reboot autopilot
px4_reboot_request(false, 0);
px4_reboot_request(REBOOT_REQUEST, 0);
} else if (param1 == 2) {
// 2: Shutdown autopilot
@@ -197,7 +197,7 @@ static void mavlink_usb_check(void *arg)
} else if (param1 == 3) {
// 3: Reboot autopilot and keep it in the bootloader until upgraded.
px4_reboot_request(true, 0);
px4_reboot_request(REBOOT_TO_BOOTLOADER, 0);
}
}
}
platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp
+2 -1
View File
@@ -38,6 +38,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <errno.h>
#include <nuttx/board.h>
#include <arm_internal.h>
@@ -61,7 +62,7 @@ static int board_reset_enter_bootloader()
int board_reset(int status)
{
if (status == 1) {
if (status == REBOOT_TO_BOOTLOADER) {
board_reset_enter_bootloader();
}
platforms/nuttx/src/px4/nxp/kinetis/board_reset/board_reset.cpp
+2 -1
View File
@@ -38,6 +38,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <errno.h>
#include <nuttx/board.h>
@@ -72,7 +73,7 @@ static int board_reset_enter_bootloader()
int board_reset(int status)
{
if (status == 1) {
if (status == REBOOT_TO_BOOTLOADER) {
board_reset_enter_bootloader();
}
platforms/nuttx/src/px4/nxp/s32k1xx/board_reset/board_reset.cpp
+2 -1
View File
@@ -39,6 +39,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <systemlib/px4_macros.h>
#include <errno.h>
#include <nuttx/board.h>
@@ -96,7 +97,7 @@ int board_configure_reset(reset_mode_e mode, uint32_t arg)
int board_reset(int status)
{
if (status == 1) {
if (status == REBOOT_TO_BOOTLOADER) {
board_reset_enter_bootloader();
}
platforms/nuttx/src/px4/nxp/s32k3xx/board_reset/board_reset.cpp
+1
View File
@@ -39,6 +39,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <errno.h>
#include <nuttx/board.h>
#include <hardware/s32k3xx_mc_me.h>
platforms/nuttx/src/px4/rpi/rpi_common/board_reset/board_reset.cpp
+2 -1
View File
@@ -38,6 +38,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <systemlib/px4_macros.h>
#include <errno.h>
@@ -119,7 +120,7 @@
int board_reset(int status)
{
if (status == 1) {
if (status == REBOOT_TO_BOOTLOADER) {
// board_configure_reset(BOARD_RESET_MODE_BOOT_TO_BL, 0);
}
platforms/nuttx/src/px4/stm/stm32_common/board_reset/board_reset.cpp
+2 -1
View File
@@ -38,6 +38,7 @@
*/
#include <px4_platform_common/px4_config.h>
#include <px4_platform_common/shutdown.h>
#include <systemlib/px4_macros.h>
#include <errno.h>
#include <stm32_pwr.h>
@@ -117,7 +118,7 @@ int board_configure_reset(reset_mode_e mode, uint32_t arg)
int board_reset(int status)
{
if (status == 1) {
if (status == REBOOT_TO_BOOTLOADER) {
board_configure_reset(BOARD_RESET_MODE_BOOT_TO_BL, 0);
}