search

mavlink / qgroundcontrol

Cross-platform ground control station for drones (Android, iOS, Mac OS, Linux, Windows)
http://qgroundcontrol.io
3.29k stars 3.62k forks source link

Sync master and v4.0 #8513

Closed andrewvoznytsa closed 4 years ago

andrewvoznytsa commented 4 years ago

Tried bringing master up to date with Stable_4.0 by syncing it across. I ran into multiple problems: There are merge conflicts in video code which I'm not sure how to resolve. Master is broken again with video disabled so I can't built what I end up with anyway. Can you put together a pull which merges Stable_V4.0 branch into master and fix it up and submit? You run into a merge conflict in SurveyComplexItem with regards to _vehicle. Just change it to _controllerVehicle. https://px4.slack.com/archives/CT171PZH7/p1583607386045000

andrewvoznytsa commented 4 years ago

https://github.com/mavlink/qgroundcontrol/pull/8529 (and preceding https://github.com/mavlink/qgroundcontrol/pull/8455) supersede Stable_4.0 video. Also 8529 should fix DISABLE_VIDEOSTREAMING. I propose to merge 8529 (it will greatly reduce amount of useless code to review) and then I can try to bring master up to date with Stable_4.0.

IMHO there is no sense to fix DISABLE_VIDEOSTREAMING and sync with Stable_4.0 before 8529 - it will only create merging conflicts. If you see some reasons to delay 8529 then let me know and I'll fix DISABLE_VIDEOSTREAMING and prepare merge without 8529.

andrewvoznytsa commented 4 years ago

Closing because https://github.com/mavlink/qgroundcontrol/pull/8529 was merged into master. No need to sync.