Skip to content

Commit

Permalink
Merge branch 'master' into Fix-mavlink-inspector-unselection
Browse files Browse the repository at this point in the history
  • Loading branch information
vryabokon1705 authored Feb 27, 2025
2 parents e3c9f29 + c735118 commit a94165c
Show file tree
Hide file tree
Showing 143 changed files with 5,421 additions and 2,444 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/android-linux-qt6.6.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/android-linux-qt6.6.3.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/android-linux.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/android-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/android-macos.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/android-windows.yml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Crowdin - Download Guide Translations
# https://github.com/crowdin/github-action/tree/master

on:
schedule:
- cron: '0 0 * * 0' # Runs every Sunday at 00:00 UTC
workflow_dispatch:

permissions:
Expand All @@ -20,15 +22,16 @@ jobs:
- name: crowdin action
uses: crowdin/github-action@v2
with:
config: 'crowdin_docs.yml'
config: 'docs/crowdin_docs.yml'
upload_sources: false
upload_translations: false
download_translations: true
localization_branch_name: l10n_crowdin_docs_translations
crowdin_branch_name: master
create_pull_request: true
pull_request_title: 'New QGC guide translations (Crowdin)'
pull_request_body: 'New QGC guide Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
pull_request_base_branch_name: 'main'
pull_request_base_branch_name: 'master'
env:
# A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
GITHUB_TOKEN: ${{ secrets.PX4BUILDBOT_ACCESSTOKEN }}
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/crowdin_docs_upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Crowdin - Upload Guide sources (en)

# https://github.com/crowdin/github-action/tree/master

on:
push:
branches:
- master
paths:
- 'docs/en/**'
pull_request:
types:
- closed
branches:
- master
paths:
- 'docs/en/**'
workflow_dispatch:

jobs:
upload-to-crowdin:
if: github.event.pull_request.merged == true || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: crowdin push
uses: crowdin/github-action@v2
with:
config: 'docs/crowdin_docs.yml'
upload_sources: true
upload_translations: false
download_translations: false
crowdin_branch_name: master
env:
# A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
GITHUB_TOKEN: ${{ secrets.PX4BUILDBOT_ACCESSTOKEN }}

# A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_DOCS_PROJECT_ID }}

# Visit https://crowdin.com/settings#api-key to create this token
CROWDIN_PERSONAL_TOKEN: ${{ secrets.PX4BUILDBOT_CROWDIN_PERSONAL_TOKEN }}
2 changes: 2 additions & 0 deletions .github/workflows/docker-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/docker-linux.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/linux.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/macos.yml'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
- 'Stable*'
tags:
- 'v*'
paths-ignore:
- 'docs/**' # Do not trigger for any changes under docs
pull_request:
paths:
- '.github/workflows/windows.yml'
Expand Down
3 changes: 3 additions & 0 deletions cmake/find-modules/FindGStreamer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ endif()

if(ANDROID)
target_link_options(GStreamer::GStreamer INTERFACE "-Wl,-Bsymbolic")
if(${ANDROID_ABI} STREQUAL "armeabi-v7a" OR ${ANDROID_ABI} STREQUAL "x86")
target_link_options(GStreamer::GStreamer INTERFACE "-Wl,-z,notext")
endif()
endif()

if(QGC_GST_STATIC_BUILD)
Expand Down
2 changes: 1 addition & 1 deletion crowdin_docs.yml → docs/crowdin_docs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"project_id_env": "CROWDIN_PROJECT_ID"
"api_token_env": "CROWDIN_PERSONAL_TOKEN"
"base_path": "."
"base_path": "../"

"preserve_hierarchy": true

Expand Down
31 changes: 19 additions & 12 deletions docs/ko/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@

- [Overview](qgc-user-guide/index.md)
- [Quick Start](qgc-user-guide/getting_started/quick_start.md)
- [Download and Install](qgc-user-guide/getting_started/download_and_install.md)
- [Download and Install (Daily 5.0)](qgc-user-guide/releases/daily_builds.md)
- [Support](qgc-user-guide/support/support.md)

- [Fly](qgc-user-guide/fly_view/fly_view.md)
- [Fly View](qgc-user-guide/fly_view/fly_view.md)
- [Toolbar](qgc-user-guide/fly_view/fly_view_toolbar.md)
- [Fly Tools](qgc-user-guide/fly_view/fly_tools.md)
- [Instrument Panel](qgc-user-guide/fly_view/instrument_panel.md)
- [Attitude/Compass](qgc-user-guide/fly_view/hud.md)
- [Camera Tools](qgc-user-guide/fly_view/camera_tools.md)
- [Video](qgc-user-guide/fly_view/video.md)
- [Video Overlay](qgc-user-guide/fly_view/video_overlay.md)
- [Replay Flight Data](qgc-user-guide/fly_view/replay_flight_data.md)
- [Video Overlay](qgc-user-guide/fly_view/video_overlay.md)

- [Plan](qgc-user-guide/plan_view/plan_view.md)
- [Mavlink Actions](qgc-user-guide/custom_actions/custom_actions.md)

- [3D View](qgc-user-guide/viewer_3d/viewer_3d.md)

- [Plan Flight](qgc-user-guide/plan_view/plan_view.md)
- [GeoFence](qgc-user-guide/plan_view/plan_geofence.md)
- [Rally Points](qgc-user-guide/plan_view/plan_rally_points.md)
- [Pattern](qgc-user-guide/plan_view/pattern.md)
Expand All @@ -19,7 +29,7 @@
- [Fixed Wing Landing Pattern](qgc-user-guide/plan_view/pattern_fixed_wing_landing.md)
- [Pattern Presets](qgc-user-guide/plan_view/pattern_presets.md)

- [Vehicle Setup](qgc-user-guide/setup_view/setup_view.md)
- [Vehicle Configuration](qgc-user-guide/setup_view/setup_view.md)
- [Firmware](qgc-user-guide/setup_view/firmware.md)
- [Airframe](qgc-user-guide/setup_view/airframe.md)
- [Airframe (ArduPilot)](qgc-user-guide/setup_view/airframe_ardupilot.md)
Expand Down Expand Up @@ -61,15 +71,13 @@

- [Releases](qgc-user-guide/releases/index.md)
- [Release Notes](qgc-user-guide/releases/release_notes.md)
- [v4.0 (Additional Notes)](qgc-user-guide/releases/stable_v4.0_additional.md)
- [v3.3 (Detailed)](qgc-user-guide/releases/stable_v3.3_long.md)
- [v3.2 (Detailed)](qgc-user-guide/releases/stable_v3.2_long.md)
- [QGC v4 Release Notes](qgc-user-guide/releases/release_note_stable_v4.md)
- [QGC v3 Release Notes](qgc-user-guide/releases/release_note_stable_v3.md)
- [Daily Builds](qgc-user-guide/releases/daily_builds.md)
- [Daily Build New Features](qgc-user-guide/releases/daily_build_new_features.md)
- [Privacy Policy](qgc-user-guide/releases/privacy_policy.md)

- [Troubleshooting](qgc-user-guide/troubleshooting/index.md)

- [Setup Problems](qgc-user-guide/troubleshooting/qgc_setup.md)
- [Usage Problems](qgc-user-guide/troubleshooting/qgc_usage.md)
- [Connection problems](qgc-user-guide/troubleshooting/vehicle_connection.md)
Expand All @@ -80,11 +88,11 @@
- [Developer's Guide](qgc-dev-guide/index.md)
- [Getting Started with source & builds](qgc-dev-guide/getting_started/index.md)
- [Build using Containers](qgc-dev-guide/getting_started/container.md)
- [Using QGC on CentOS](qgc-dev-guide/getting_started/cent_os.md)
- [Navigating the Source Code](qgc-dev-guide/navigating_source.md)
- [Class Hierarchy](qgc-dev-guide/classes/index.md)
- [QGC Release/Branching Process](qgc-dev-guide/release_branching_process.md)
- [Communication Flow](qgc-dev-guide/communication_flow.md)
- [Plugin Architecture](qgc-dev-guide/firmware_plugin.md)
- [Class Hierarchy](qgc-dev-guide/classes/index.md)
- [User Interface Design](qgc-dev-guide/user_interface_design/index.md)
- [Multi-Device Design Pattern](qgc-dev-guide/user_interface_design/multi_device_pattern.md)
- [Font and Colour Palette](qgc-dev-guide/user_interface_design/font_palette.md)
Expand Down Expand Up @@ -114,7 +122,6 @@
- [Release/Branching Process For Custom Builds](qgc-dev-guide/custom_build/release_branching_process.md)
- [MAVLink](qgc-dev-guide/custom_build/mavlink.md)
- [Code Submission](qgc-dev-guide/contribute/index.md)
- [Developer Call](qgc-dev-guide/contribute/dev_call.md)
- [Coding Style](qgc-dev-guide/contribute/coding_style.md)
- [Unit Tests](qgc-dev-guide/contribute/unit_tests.md)
- [Pull Requests](qgc-dev-guide/contribute/pull_requests.md)
Expand Down
2 changes: 1 addition & 1 deletion docs/ko/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: home
hero:
name: QGroundControl Guide
name: QGroundControl Guide (Daily Build 5.0)
tagline: For beginners, experienced users, and developers
actions:
- theme: brand
Expand Down
20 changes: 10 additions & 10 deletions docs/ko/qgc-dev-guide/command_line_options.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ Linux Terminal:

The options/command line arguments are listed in the table below.

| Option | Description |
| --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
| `--clear-settings` | Clears the app settings (reverts _QGroundControl_ back to default settings). |
| `--logging:full` | Turns on full logging. See [Console Logging](../../qgc-user-guide/settings_view/console_logging.html#logging-from-the-command-line). |
| `--logging:full,LinkManagerVerboseLog,ParameterLoaderLog` | Turns on full logging and turns off the following listed comma-separated logging options. |
| `--logging:LinkManagerLog,ParameterLoaderLog` | Turns on the specified comma separated logging options |
| `--unittest:name` | (Debug builds only) Runs the specified unit test. Leave off `:name` to run all tests. |
| `--unittest-stress:name` | (Debug builds only) Runs the specified unit test 20 times in a row. Leave off :name to run all tests. |
| `--fake-mobile` | Simulates running on a mobile device. |
| `--test-high-dpi` | Simulates running _QGroundControl_ on a high DPI device. |
| Option | Description |
| --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| `--clear-settings` | Clears the app settings (reverts _QGroundControl_ back to default settings). |
| `--logging:full` | Turns on full logging. See [Console Logging](../../qgc-user-guide/settings_view/console_logging.html#logging-from-the-command-line). |
| `--logging:full,LinkManagerVerboseLog,ParameterLoaderLog` | Turns on full logging and turns off the following listed comma-separated logging options. |
| `--logging:LinkManagerLog,ParameterLoaderLog` | Turns on the specified comma separated logging options |
| `--unittest:name` | (Debug builds only) Runs the specified unit test. Leave off `:name` to run all tests. |
| `--unittest-stress:name` | (Debug builds only) Runs the specified unit test 20 times in a row. Leave off :name to run all tests. |
| `--fake-mobile` | Simulates running on a mobile device. |
| `--test-high-dpi` | Simulates running _QGroundControl_ on a high DPI device. |

Notes:

Expand Down
2 changes: 1 addition & 1 deletion docs/ko/qgc-dev-guide/custom_build/mavlink.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ In order to add support for a new set of messages you should add them to [develo
To modify the version of MAVLink used by QGC:

- Replace the pre-build C library at [/qgroundcontrol/libs/mavlink/include/mavlink](https://github.com/mavlink/qgroundcontrol/tree/master/libs/mavlink/include/mavlink).
- By default this is a submodule importing https\://github.com/mavlink/c_library_v2
- By default this is a submodule importing https://github.com/mavlink/c_library_v2
- You can change the submodule, or [build your own libraries](https://mavlink.io/en/getting_started/generate_libraries.html) using the MAVLink toolchain.
- You can change the whole dialect used by setting it in [`MAVLINK_CONF`](https://github.com/mavlink/qgroundcontrol/blob/master/QGCExternalLibs.pri#L52) when running _qmake_.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The best place to start is understanding the mechanism QGC uses to do it's own r

## Custom build/release types

Regular QGC has two main build types: Stable and Daily. The build type for a custom build is more complex. Throughout this discussion we will use the term "upstream" to refer to the main QGC repo (https\://github.com/mavlink/qgroundcontrol). Also when we talk about a "new" upstream stable release, this means a major/minor release, not a patch release.
Regular QGC has two main build types: Stable and Daily. The build type for a custom build is more complex. Throughout this discussion we will use the term "upstream" to refer to the main QGC repo (https://github.com/mavlink/qgroundcontrol). Also when we talk about a "new" upstream stable release, this means a major/minor release, not a patch release.

### Synchronized Stable

Expand Down
10 changes: 7 additions & 3 deletions docs/ko/qgc-dev-guide/custom_build/resource_override.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Resource Overrides

A "resource" in QGC source code terminology is anything found in the [qgroundcontrol.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/qgroundcontrol.qrc) and [qgcresources.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/qgcresources.qrc) file. By overriding a resource you can replace it with your own version of it. This could be as simple as a single icon, or as complex as replacing an entire Vehicle Setup page of qml ui code.
A "resource" in QGC source code terminology is anything found in Qt resources file:

Be aware that using resource overrides does not isolate you from upstream QGC changes like the plugin architecture does. In a sense you are directly modify the upstream QGC resources used by the main code.
- [qgroundcontrol.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/qgroundcontrol.qrc) and
- [qgcresources.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/qgcresources.qrc) file.
- [InstrumentValueIcons.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/resources/InstrumenValueIcons/InstrumentValueIcons.qrc)

By overriding a resource you can replace it with your own version of it. This could be as simple as a single icon, or as complex as replacing an entire Vehicle Setup page of qml ui code. Be aware that using resource overrides does not isolate you from upstream QGC changes like the plugin architecture does. In a sense you are directly modify the upstream QGC resources used by the main code.

## Exclusion Files

Expand All @@ -14,7 +18,7 @@ You must include the custom version of the overriden resouce in you custom build

## Generating the new modified versions of standard QGC resource file

This is done using the `updateqrc.py` python script. It will read the upstream `qgroundcontrol.qrc` and `qgcresources.qrc` file and the corresponding exclusion files and output new versions of these files in your custom directory. These new versions will not have the resources you specified to exclude in them. The build system for custom builds uses these generated files (if they exist) to build with instead of the upstream versions. The generated version of these file should be added to your repo. Also whenever you update the upstream portion of QGC in your custom repo you must re-run `python updateqrc.py` to generate new version of the files since the upstream resources may have changed.
This is done using the resource update python scripts:`python updateqrc.py` and `python updateinstrumentqrc.py`. It will read the upstream resouce files and the corresponding exclusion files and output new versions of these files in your custom directory. These new versions will not have the resources you specified to exclude in them. The build system for custom builds uses these generated files (if they exist) to build with instead of the upstream versions. The generated version of these file should be added to your repo. Also whenever you update the upstream portion of QGC in your custom repo you must re-run the scripts to generate new versions of the files since the upstream resources may have changed.

## Custom Build Example

Expand Down
Loading

0 comments on commit a94165c

Please sign in to comment.