search

ethz-asl / fw_qgc

QGroundControl Ground Control Station
http://qgroundcontrol.org
Other
8 stars 7 forks source link

Feature v3/merge upstream master #20

Closed tstastny closed 7 years ago

tstastny commented 7 years ago

This merges upstream QGC v3 through some relevant commits in between release 3.1 and 3.2. Some bug fixes, and a nice new FW landing pattern creator in the editor. We should freeze for now at this particular commit, as any further in the upstream master currently breaks QGC. We can revisit an upstream merge once v3.2 is officially released.

tstastny commented 7 years ago

New merge from upstream. Works with 5.5.1 build. But I had to put the build folder in the same level as the src folder.. otherwise some ":/filename" calls in the code caused segment faults when running the app. Not sure why.. but heads up to anyone who likes having separate build folders outside their repo directory.

@mhugentobler can you please check that this branch also runs for you?

mhugentobler commented 7 years ago

Builds and runs for me as well

tstastny commented 7 years ago

addresses #24