From 6aefcbb6cf0975e53d20497fa7a8ba659e1c0660 Mon Sep 17 00:00:00 2001 From: Igor Misic Date: Mon, 23 May 2022 17:23:25 +0200 Subject: [PATCH] Revert "px4iofirmware: fix for bug introduced with #19558" This reverts commit 79a34b5aed8ee9eb10afda3ae83f1be02ad897a8. --- .../extras/cubepilot_io-v2_default.bin | Bin 39700 -> 39700 bytes .../extras/cubepilot_io-v2_default.bin | Bin 39700 -> 39700 bytes .../durandal-v1/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../pix32v5/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../mro/x21-777/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../px4/fmu-v2/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../px4/fmu-v3/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../fmu-v4pro/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../px4/fmu-v5/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../px4/fmu-v5x/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes .../px4/fmu-v6c/extras/px4_io-v2_default.bin | Bin 39920 -> 39952 bytes .../px4/fmu-v6x/extras/px4_io-v2_default.bin | Bin 39920 -> 39920 bytes src/modules/px4iofirmware/registers.c | 2 +- 13 files changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin b/boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin index ab1f3689a4173c39a267792323de12c4c69505ec..c75ca85285ec0cafc4b54bea788887dbd1187089 100755 GIT binary patch delta 16 YcmbQTjcLj@rVY`-j8`_t1n+PM06l>REdT%j delta 16 YcmbQTjcLj@rVY`-j8`|u1n+PM06m8XE&u=k diff --git a/boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin b/boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin index ab1f3689a4173c39a267792323de12c4c69505ec..c75ca85285ec0cafc4b54bea788887dbd1187089 100755 GIT binary patch delta 16 YcmbQTjcLj@rVY`-j8`_t1n+PM06l>REdT%j delta 16 YcmbQTjcLj@rVY`-j8`|u1n+PM06m8XE&u=k diff --git a/boards/holybro/durandal-v1/extras/px4_io-v2_default.bin b/boards/holybro/durandal-v1/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/holybro/pix32v5/extras/px4_io-v2_default.bin b/boards/holybro/pix32v5/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/mro/x21-777/extras/px4_io-v2_default.bin b/boards/mro/x21-777/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v2/extras/px4_io-v2_default.bin b/boards/px4/fmu-v2/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v3/extras/px4_io-v2_default.bin b/boards/px4/fmu-v3/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v4pro/extras/px4_io-v2_default.bin b/boards/px4/fmu-v4pro/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v5/extras/px4_io-v2_default.bin b/boards/px4/fmu-v5/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v5x/extras/px4_io-v2_default.bin b/boards/px4/fmu-v5x/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/boards/px4/fmu-v6c/extras/px4_io-v2_default.bin b/boards/px4/fmu-v6c/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..25a00e2357d781ece9c0d41447c3f4a52c6d19f6 100755 GIT binary patch delta 4572 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 diff --git a/boards/px4/fmu-v6x/extras/px4_io-v2_default.bin b/boards/px4/fmu-v6x/extras/px4_io-v2_default.bin index afbcfbec7e1dc1aca9a790e0c32d28d511abbe88..47e85b6bd08c4d3d9b31d298e01285e1ee28e44c 100755 GIT binary patch delta 16 Ycmeyco$14NrVaOl8Lw=95G>#U08MQONB{r; delta 16 Ycmeyco$14NrVaOl8Lw`B5G>#U08MiUNdN!< diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 3487ee34e3..1bf9b98763 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -413,7 +413,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) break; case PX4IO_P_SETUP_REBOOT_BL: - if (!(r_status_flags & PX4IO_P_STATUS_FLAGS_OUTPUTS_ARMED)) { + if (r_status_flags & PX4IO_P_STATUS_FLAGS_OUTPUTS_ARMED) { // don't allow reboot while armed break; }