Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

commander: disarm system when safety enabled #674

Merged
merged 1 commit into from
Mar 3, 2014
Merged

commander: disarm system when safety enabled #674

merged 1 commit into from
Mar 3, 2014

Conversation

DrTon
Copy link
Contributor

@DrTon DrTon commented Feb 17, 2014

It's first step to fix issue #663. Also it allows to do clean logging stop on FW without ground station.

@julianoes
Copy link
Contributor

Thanks! Flown on fixedwing, working as it should! This doesn't break an in-air-restart, right?

@DrTon
Copy link
Contributor Author

DrTon commented Feb 23, 2014

In-air restart not tested yet, I hope I will test it tomorrow in MC, wait with merging.

@LorenzMeier
Copy link
Member

@DrTon Any news on testing?

@julianoes
Copy link
Contributor

In-air-restart tested on bench: While there seem to be some issues regarding in-air-restart, they don't depend on this pull request.
Therefore, merging!

julianoes added a commit that referenced this pull request Mar 3, 2014
@julianoes
Merge pull request #674 from PX4/safety_disarm
49fe131 
commander: disarm system when safety enabled
@julianoes julianoes merged commit 49fe131 into beta Mar 3, 2014
@julianoes julianoes deleted the safety_disarm branch March 3, 2014 09:59
PX4BuildBot pushed a commit that referenced this pull request Jul 11, 2018
PX4-NuttX/nuttx branch test: px4-master_auto_rebase
ddee2b8 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/px4-master_auto_rebase
 - PX4/NuttX@96cef4d

Changes from PX4-NuttX/nuttx (PX4/NuttX@d5c12b2) in current PX4/master (8b71bb4)
PX4/NuttX@d5c12b2...96cef4d

96cef4d (HEAD, origin/px4-master_auto_rebase) [PX4: WIP] Fix transmission status handling in the serial interrupt
d9e74f8 [PX4: REJECTED] cstdint fix
d6169e8 [PX4: REJECTED] add math.h
10be4d6 [PX4: WIP] Jenkinsfile
b866599 (origin/master) Revert 0eff3d5:  This removes the  kx224, bh1749nuc and bh1790glc.  These are very nicely written drivers, but they are based on some external sequencer logic which is not available to everyone.  Hence, these are inapropriate to carry in the NuttX repository.
6368a0d Fix trivial coding standard issue
639d75c Merged in raiden00/nuttx_h7 (pull request #674)
235d580 drivers/sensors/bh1749nuc.c, bh1790glc.c, and x224.c:  From review of commit 0eff3d5, remove dependency on the CXD56_SCU, modify inclusions and some naming for compatibility with other sensor drivers.
8432164 arch/arm/src/stm32l4/chip/: Corrects some mistakes in pin definitions for the STM32L4 family.  According to datasheet of STM32L496xx, STM32L475xx and STM32L443XX the AF2 of PE14 is  TIM1_BKIN2 not TIM2_BKIN.
0eff3d5 Merged in jutava/nuttx (pull request #673)

Apps:
 - https://github.com/PX4-NuttX/apps/tree/px4-master_auto_rebase
 - PX4/NuttX-apps@94741ff

Changes from PX4-NuttX/apps (PX4/NuttX-apps@36806ba) in current PX4/master (8b71bb4)
PX4/NuttX-apps@36806ba...94741ff

94741ff (HEAD -> px4-master_auto_rebase, origin/px4-master_auto_rebase) [REJECTED] add-var-expansion-in-nsh-parse.patch
db9c56e (origin/master) apps/examples/powerled:  Eliminate a warning about an uninitialized variable.
e66470d Merged in raiden00/apps (pull request #143)
db77b1e apps/examples/tcpblaster:  Fix an error in time calculation.
19b8a52 apps/examples/tcpblaster/tcpblaster_server.c:  Start time was not being initialized on the server side on the first pass through loop so the first output record had a crazy time.
749eccb Squashed commit of the following:
4d8b8fa apps/netutils/dhcpc:  Activates BINDTODEVICE if available, and break up some long lines
0abe341 Merged in raiden00/apps (pull request #142)
3403b1b apps/nshlib/README.txt:  Clarify arguments to the mkrd command.
abcb66c Remove apps/interpreters/micropthon.  There are several reasons for this.  (1) the current version 1.3.8 is very old and no one is supporting it.  (2) the port only includes the core micropython logic and none of the Python libraries.  As such it is useless in any real application.  (3) There have recently been compile failures reported.  It looks like this is due to changes in newlib based toolchains that now bring in incompatible newlib header files.  See issue 104 at https://bitbucket.org/nuttx/nuttx/issues/104/build-micropython-138-error.  With no one dedicated to the support of micropython, it can no longer be carried in the NuttX apps/ repository.
PX4BuildBot pushed a commit that referenced this pull request Jul 12, 2018
PX4-NuttX/nuttx branch test: px4-master_auto_rebase
c62f8af 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/px4-master_auto_rebase
 - PX4/NuttX@8c9aa18

Changes from PX4-NuttX/nuttx (PX4/NuttX@d5c12b2) in current PX4/master (21cc34b)
PX4/NuttX@d5c12b2...8c9aa18

8c9aa18 (HEAD, origin/px4-master_auto_rebase) [PX4: WIP] Fix transmission status handling in the serial interrupt
86e33ce [PX4: REJECTED] cstdint fix
4d17b00 [PX4: REJECTED] add math.h
1cab441 [PX4: WIP] Jenkinsfile
5626373 (origin/master) Merged in masayuki2009/nuttx.nuttx/lc832450_elf_test (pull request #675)
b866599 Revert 0eff3d5:  This removes the  kx224, bh1749nuc and bh1790glc.  These are very nicely written drivers, but they are based on some external sequencer logic which is not available to everyone.  Hence, these are inapropriate to carry in the NuttX repository.
6368a0d Fix trivial coding standard issue
639d75c Merged in raiden00/nuttx_h7 (pull request #674)
235d580 drivers/sensors/bh1749nuc.c, bh1790glc.c, and x224.c:  From review of commit 0eff3d5, remove dependency on the CXD56_SCU, modify inclusions and some naming for compatibility with other sensor drivers.
8432164 arch/arm/src/stm32l4/chip/: Corrects some mistakes in pin definitions for the STM32L4 family.  According to datasheet of STM32L496xx, STM32L475xx and STM32L443XX the AF2 of PE14 is  TIM1_BKIN2 not TIM2_BKIN.

Apps:
 - https://github.com/PX4-NuttX/apps/tree/px4-master_auto_rebase
 - PX4/NuttX-apps@94741ff

Changes from PX4-NuttX/apps (PX4/NuttX-apps@36806ba) in current PX4/master (21cc34b)
PX4/NuttX-apps@36806ba...94741ff

94741ff (HEAD -> px4-master_auto_rebase, origin/px4-master_auto_rebase) [REJECTED] add-var-expansion-in-nsh-parse.patch
db9c56e (origin/master) apps/examples/powerled:  Eliminate a warning about an uninitialized variable.
e66470d Merged in raiden00/apps (pull request #143)
db77b1e apps/examples/tcpblaster:  Fix an error in time calculation.
19b8a52 apps/examples/tcpblaster/tcpblaster_server.c:  Start time was not being initialized on the server side on the first pass through loop so the first output record had a crazy time.
749eccb Squashed commit of the following:
4d8b8fa apps/netutils/dhcpc:  Activates BINDTODEVICE if available, and break up some long lines
0abe341 Merged in raiden00/apps (pull request #142)
3403b1b apps/nshlib/README.txt:  Clarify arguments to the mkrd command.
abcb66c Remove apps/interpreters/micropthon.  There are several reasons for this.  (1) the current version 1.3.8 is very old and no one is supporting it.  (2) the port only includes the core micropython logic and none of the Python libraries.  As such it is useless in any real application.  (3) There have recently been compile failures reported.  It looks like this is due to changes in newlib based toolchains that now bring in incompatible newlib header files.  See issue 104 at https://bitbucket.org/nuttx/nuttx/issues/104/build-micropython-138-error.  With no one dedicated to the support of micropython, it can no longer be carried in the NuttX apps/ repository.
PX4BuildBot added a commit that referenced this pull request Dec 17, 2020
@PX4BuildBot
Update submodule sitl_gazebo to latest Thu Dec 17 12:39:37 UTC 2020
e721330 
    - sitl_gazebo in PX4/Firmware (90f61c2): PX4/PX4-SITL_gazebo-classic@19981d6
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@0e2d63a
    - Changes: PX4/PX4-SITL_gazebo-classic@19981d6...0e2d63a

    0e2d63a 2020-12-17 JaeyoungLim - Fix wind transmormations for motor model (#674)
e5d0d65 2020-12-13 JaeyoungLim - Update container versions for tests (#672)
bccb487 2020-12-12 BazookaJoe1900 - mavlink_interface: rename serial link related function to include 'serial' (#670)
PX4BuildBot added a commit that referenced this pull request Dec 17, 2020
@PX4BuildBot
Update submodule sitl_gazebo to latest Thu Dec 17 23:05:03 UTC 2020
3600b2a 
    - sitl_gazebo in PX4/Firmware (90f61c2): PX4/PX4-SITL_gazebo-classic@19981d6
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@563f087
    - Changes: PX4/PX4-SITL_gazebo-classic@19981d6...563f087

    563f087 2020-12-17 JaeyoungLim - Fix tiltrotor model (#675)
0e2d63a 2020-12-17 JaeyoungLim - Fix wind transmormations for motor model (#674)
e5d0d65 2020-12-13 JaeyoungLim - Update container versions for tests (#672)
bccb487 2020-12-12 BazookaJoe1900 - mavlink_interface: rename serial link related function to include 'serial' (#670)
@dagar dagar mentioned this pull request Dec 17, 2020
Merged
dagar pushed a commit that referenced this pull request Dec 17, 2020
@PX4BuildBot @dagar
Update submodule sitl_gazebo to latest Thu Dec 17 23:05:03 UTC 2020
2a187a7 
    - sitl_gazebo in PX4/Firmware (90f61c2): PX4/PX4-SITL_gazebo-classic@19981d6
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@563f087
    - Changes: PX4/PX4-SITL_gazebo-classic@19981d6...563f087

    563f087 2020-12-17 JaeyoungLim - Fix tiltrotor model (#675)
0e2d63a 2020-12-17 JaeyoungLim - Fix wind transmormations for motor model (#674)
e5d0d65 2020-12-13 JaeyoungLim - Update container versions for tests (#672)
bccb487 2020-12-12 BazookaJoe1900 - mavlink_interface: rename serial link related function to include 'serial' (#670)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DrTon @julianoes @LorenzMeier