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.

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

simulator: Do not kill every process with string 'px4' in the name. #6319

Closed
wants to merge 66 commits into from
Closed

simulator: Do not kill every process with string 'px4' in the name. #6319

wants to merge 66 commits into from

Conversation

jdzerve
Copy link
Contributor

@jdzerve jdzerve commented Jan 13, 2017

Do exact match instead.
Same for gazebo.

@dagar
Copy link
Member

dagar commented Jan 13, 2017

Now that I think of it, we do have a mechanism for generating binaries for different vehicles.
px4_solo, etc

Let me find it and see if anyone actually uses it.

@dagar
Copy link
Member

dagar commented Jan 14, 2017

Yes, the sitl binary could be px4 or px4_${model}.
https://github.com/PX4/Firmware/blob/master/src/firmware/posix/sitl_target.cmake#L98

Copy link
Member

@dagar dagar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

binary could be px4 or px4_${model}.

@jdzerve
Copy link
Contributor Author

jdzerve commented Jan 16, 2017

Default $model is iris but executable is still just 'px4'. I guess that's fine.

@LorenzMeier
Copy link
Member

They are not necessarily the same: https://dev.px4.io/simulation-gazebo.html#starting-gazebo-and-px4-separately

We need to have support for the $model case as well.

@jdzerve
Copy link
Contributor Author

jdzerve commented Jan 16, 2017

How is this possible that my commit broke compiler detection?
CMake Error: CMAKE_CXX_COMPILER not set, after EnableLanguage
CMake Error: CMAKE_C_COMPILER not set, after EnableLanguage
CMake Error: CMAKE_ASM_COMPILER not set, after EnableLanguage

@LorenzMeier
Copy link
Member

No. You can run make clean or make distclean to get back to a clean setup.

@jdzerve
Copy link
Contributor Author

jdzerve commented Jan 16, 2017

I'm talking about the failed automated CI test:
semaphoreci — The build failed on Semaphore.

@LorenzMeier
Copy link
Member

Try rebasing and pushing. That likely will fix it.

@dagar
Copy link
Member

dagar commented Jan 16, 2017

Yes you should be fine after a rebase. This is a case where the semaphoreci config not being stored in the repo causes problems.

@jdzerve
Copy link
Contributor Author

jdzerve commented Jan 16, 2017

Did not quite get it. (This is my first time with contributing to opensource)
So, I pull master from upstream, rebase and push on my fork?
I guess my mistake was not creating branch in my fork and using master for the fix.

bkueng and others added 16 commits January 18, 2017 10:26
Needed for the DriverFramework. Fixes the error:
15050 SPIDevObj start failed
15142 DevObj start failed
15185 Unable to open the device path:
ERROR [df_lsm9ds1_wrapper] LSM9DS1 start fail: -1
ERROR [df_lsm9ds1_wrapper] DfLsm9ds1Wrapper start failed
Command 'df_lsm9ds1_wrapper' failed, returned -1
 - pulls more of the travis-ci s3 deploy into the repo so we can potentially migrate to another CI system
 - fixed the sizes output and added verbose compiler version to cmake (#6322)
 - fixed filenames for firmware uploaded to s3 (was broken by the changes yesterday)
 - fixed some broken git version display in cmake
 - Makefile organization
 - simplified .travis.yml
 - added a print to know which config the nuttx patch was being applied to
 - docker_run.sh now respects PX4_DOCKER_REPO for setting the docker image, but defaults to the good production nuttx image
LorenzMeier and others added 27 commits January 18, 2017 10:26
… modes) (#6323)

* Fixed build error in Snapdragon Flight legacy driver mode (partially)

* Fixed build error in eagle_legacy_default mode (px4muorb.h generation issue)

* Fixed the snapdragon flight sanity test script (default and legacy driver modes)
 - this is to work around confusion between cygwin and windows native
   paths
 - closes #6332
the velocity controller was misusing the integral part to account for the constant gravitational force offset
the hover throttle from the parameter is now is now directly used as feed forward for the thrust in world z direction
the integrator compensates for inaccurate paarameter but should now be idealy zero
if we control manually and are still landed, we want to stay idle until the pilot rises the throttle
… z axis

until now the desired thrust was simply the absolute value of the thrust setpoint vector
but a multicopter is only capable of producing thrust in its (negative) body z axis
this leads to excess thrust during attitude tracking errors

one important use case is:
trying to land with minimal thrust in NED z axis against gravity
but the position controller still correcting some small horizontal estimation errors
then this prevents unwanted thrust in a completely wrong direction
…established.

This ensures the system does not tip over on landings. Tested in SITL with a GPS drift model.
* Fixed build error in Snapdragon Flight legacy driver mode (partially)

* Fixed build error in eagle_legacy_default mode (px4muorb.h generation issue)

* Fixed the snapdragon flight sanity test script (default and legacy driver modes)

* Fixed PX4 sanity test script (removed a check msg)
  F7 was missing in the CONFIG_xxx that controlled enableing the
  hardfault_log boot code that can save the fault log
…eck so it accepts a minimum of 5 channels. It seems that was the initial intention.
@jdzerve
Copy link
Contributor Author

jdzerve commented Jan 18, 2017

Closed due to failed CI tests. Followed up by #6377

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.