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

navigator: forbid READY -> RTL transition #680

Merged
merged 5 commits into from
Mar 2, 2014
Merged

navigator: forbid READY -> RTL transition #680

merged 5 commits into from
Mar 2, 2014

Conversation

DrTon
Copy link
Contributor

@DrTon DrTon commented Feb 18, 2014

No description provided.

@julianoes
Copy link
Contributor

Flown today on fixedwing, no problems observed.

@DrTon
Copy link
Contributor Author

DrTon commented Feb 23, 2014

Great! Also tested on MC HIL, can be merged, I think.

@julianoes
Copy link
Contributor

No, hang on, please don't merge yet. This breaks Mission and RTL for fixedwing.
Whenever you want to switch to Mission or RTL it just goes to AUTO_READY and shuts down the motor and glides down.

I guess we can only merge this if FW gets a land detector?

@DrTon
Copy link
Contributor Author

DrTon commented Feb 28, 2014

Hm, it can be caused by this: https://github.com/PX4/Firmware/blob/beta/src/modules/navigator/navigator_main.cpp#L1391
Need workaround for FW here, try to disable this for FW.

@julianoes
Copy link
Contributor

@DrTon: Thanks, I added this workaround, will test it today.

@julianoes
Copy link
Contributor

This has been flown on fixedwing: AUTO is working again.

@LorenzMeier
Copy link
Member

@julianoes When you have tested stuff (so did the review) and there is little hope someone else will fly very soon the state to cross check, please just go ahead and merge it. Having this level of review is the best we currently can get and already decent.
Thanks!

@julianoes
Copy link
Contributor

Ok, will do :)

julianoes added a commit that referenced this pull request Mar 2, 2014
@julianoes
Merge pull request #680 from PX4/ready_rtl_fix
85247e3 
navigator: forbid READY -> RTL transition
@julianoes julianoes merged commit 85247e3 into beta Mar 2, 2014
@DrTon DrTon deleted the ready_rtl_fix branch March 2, 2014 20:44
PX4BuildBot pushed a commit that referenced this pull request Jul 12, 2018
PX4-NuttX/nuttx branch test: px4-master_auto_rebase
8ee7dec 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/px4-master_auto_rebase
 - PX4/NuttX@561dbb1

Changes from PX4-NuttX/nuttx (PX4/NuttX@d5c12b2) in current PX4/master (e1a7472)
PX4/NuttX@d5c12b2...561dbb1

561dbb1 (HEAD, origin/px4-master_auto_rebase) [PX4: WIP] Fix transmission status handling in the serial interrupt
6318f81 [PX4: REJECTED] cstdint fix
0c1cdd8 [PX4: REJECTED] add math.h
8c89f92 [PX4: WIP] Jenkinsfile
15f07b8 (origin/master) Upate the NuttX.html 'About NuttX' document; update a README file.
6e6583f Merged in david_s5/nuttx/master_singlewire (pull request #680)
fbe5f56 Merged in david_s5/nuttx/master_singlewire (pull request #679)
ece1bda Merged in raiden00/nuttx_h7 (pull request #678)
c09efb2 arch/arm/src/stm32h7:  Correct naming of global variables that violations the naming requirements of the coding standard.
e569872 arch/arm/Kconfig:  Since the basic STM32H7 port is working, let's remove the EXPERIMENTAL dependency.

Apps:
 - https://github.com/PX4-NuttX/apps/tree/px4-master_auto_rebase
 - PX4/NuttX-apps@12277cf

Changes from PX4-NuttX/apps (PX4/NuttX-apps@36806ba) in current PX4/master (e1a7472)
PX4/NuttX-apps@36806ba...12277cf

12277cf (HEAD -> px4-master_auto_rebase, origin/px4-master_auto_rebase) [REJECTED] add-var-expansion-in-nsh-parse.patch
654ee7e (origin/master) apps/examples/elf, module, posix_spawn:  Correct naming of global variables that violations the naming requirements of the coding standard.
db9c56e 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.
PX4BuildBot added a commit that referenced this pull request Dec 31, 2020
@PX4BuildBot
Update submodule sitl_gazebo to latest Thu Dec 31 00:39:08 UTC 2020
9f130a7 
    - sitl_gazebo in PX4/Firmware (a34e57a): PX4/PX4-SITL_gazebo-classic@ca6c738
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@869225e
    - Changes: PX4/PX4-SITL_gazebo-classic@ca6c738...869225e

    869225e 2020-12-31 JaeyoungLim - Fix lightsource for high fidelity worlds (#680)
PX4BuildBot added a commit that referenced this pull request Jan 1, 2021
@PX4BuildBot
Update submodule sitl_gazebo to latest Fri Jan 1 12:39:16 UTC 2021
856e177 
    - sitl_gazebo in PX4/Firmware (a444d26): PX4/PX4-SITL_gazebo-classic@ca6c738
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@054e0a1
    - Changes: PX4/PX4-SITL_gazebo-classic@ca6c738...054e0a1

    054e0a1 2021-01-01 pjdewitte - Jinja generation: add protection against accidental overwriting (#682)
869225e 2020-12-31 JaeyoungLim - Fix lightsource for high fidelity worlds (#680)
@dagar dagar mentioned this pull request Jan 1, 2021
Merged
LorenzMeier pushed a commit that referenced this pull request Jan 1, 2021
@PX4BuildBot @LorenzMeier
Update submodule sitl_gazebo to latest Fri Jan 1 12:39:16 UTC 2021
a1b81df 
    - sitl_gazebo in PX4/Firmware (a444d26): PX4/PX4-SITL_gazebo-classic@ca6c738
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@054e0a1
    - Changes: PX4/PX4-SITL_gazebo-classic@ca6c738...054e0a1

    054e0a1 2021-01-01 pjdewitte - Jinja generation: add protection against accidental overwriting (#682)
869225e 2020-12-31 JaeyoungLim - Fix lightsource for high fidelity worlds (#680)
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