Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
---
BasedOnStyle: Google
AccessModifierOffset: -4
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: Inline
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 120
IncludeBlocks: Preserve
IndentWidth: 4
Language: Cpp
PackConstructorInitializers: Never
PenaltyBreakAssignment: 80
SortIncludes: true
SpacesBeforeTrailingComments: 1
Standard: c++17
34 changes: 0 additions & 34 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
---
Checks: >
clang-diagnostic-*,
clang-analyzer-*,
bugprone-*,
cppcoreguidelines-*,
google-*,
llvm-*,
misc-*,
modernize-*,
performance-*,
portability-*,
readability-*,
-bugprone-easily-swappable-parameters,
-cppcoreguidelines-avoid-c-arrays,
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-static-cast-downcast,
-cppcoreguidelines-pro-type-vararg,
-cppcoreguidelines-special-member-functions,
-google-readability-todo,
-llvm-header-guard,
-llvm-include-order,
-misc-include-cleaner,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-misc-use-internal-linkage,
-modernize-avoid-c-arrays,
-modernize-use-trailing-return-type,
-readability-convert-member-functions-to-static,
-readability-function-cognitive-complexity,
-readability-identifier-length,
-readability-redundant-access-specifiers,
-readability-uppercase-literal-suffix
WarningsAsErrors: '*'
HeaderFilterRegex: '^((?!vendor).)*$'
...
3 changes: 3 additions & 0 deletions .clangd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Diagnostics:
UnusedIncludes: None
MissingIncludes: None
7 changes: 4 additions & 3 deletions .cmake-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
format:
tab_size: 4
line_width: 100
line_width: 120
tab_size: 4
max_prefix_chars: 40
use_tabchars: false
6 changes: 2 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Ignore Git repository files
.git
.gitignore
.gitattributes

# Ignore node_modules or other build artifacts
node_modules
Expand All @@ -10,8 +11,5 @@ build
Dockerfile*
docker-compose.yml

# Ignore OS-specific files
.DS_Store
*.swp

README.md
CMakeLists.txt.user*
11 changes: 3 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: daily
groups:
github-actions:
patterns:
- '*'
open-pull-requests-limit: 5
interval: "weekly"
18 changes: 18 additions & 0 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: clang-format Check
on: [workflow_dispatch]
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
strategy:
matrix:
path:
- 'src'
- 'test'
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C++ Source Files.
uses: jidicula/clang-format-action@main
with:
clang-format-version: '17'
check-path: ${{ matrix.path }}
16 changes: 16 additions & 0 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: flatpak
on: [workflow_dispatch]
jobs:
flatpak-builder:
name: Flatpak
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-47
options: --privileged
steps:
- uses: actions/checkout@v4
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
with:
bundle: org.mavlink.qgroundcontrol.flatpak
manifest-path: ./deploy/flatpak/org.mavlink.qgroundcontrol.yml
cache-key: flatpak-builder-${{ github.sha }}
11 changes: 11 additions & 0 deletions .github/workflows/spelling.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Typos
on: [workflow_dispatch]
jobs:
typos:
name: Spell Check with Typos
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v4
- name: Check spelling
uses: crate-ci/typos@master
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ repos:
hooks:
- id: check-yaml
args: [--allow-multiple-documents, --unsafe]
- id: check-json
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,6 @@ elseif(ANDROID)
# QT_ANDROID_SDK_BUILD_TOOLS_REVISION
# QT_ANDROID_SYSTEM_LIBS_PREFIX
)
elseif(LINUX)

endif()

add_compile_definitions(
Expand Down
9 changes: 6 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
codecov:
notify:
require_ci_to_pass: yes

coverage:
round: down
precision: 1
status:
project:
default:
threshold: 1%
target: 10%
threshold: 5%
Binary file removed deploy/android/GooglePlayDailyIcon.png
Binary file not shown.
Binary file removed deploy/android/GooglePlayFeatureGraphic.png
Binary file not shown.
Binary file removed deploy/android/GooglePlayScreenShot1.jpg
Binary file not shown.
Binary file removed deploy/android/GooglePlayScreenShot2.jpg
Binary file not shown.
91 changes: 0 additions & 91 deletions deploy/android/GooglePlayUpload.py

This file was deleted.

Binary file not shown.
23 changes: 23 additions & 0 deletions deploy/linux/appimagecraft.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 1

project:
name: QGroundControl
version: Daily

build:
cmake:
source_dir: src/
extra_variables:
- Qt6_ROOT=/home/runner/work/_temp/Qt/6.8.1/gcc_64
environment:
BUILD_TYPE: Release

appimage:
linuxdeploy:
plugins:
- qt
raw_environment:
QML_SOURCES_PATHS: "\"$PROJECT_ROOT\"/src/qmlcomponents/"
environment:
EXTRA_PLATFORM_PLUGINS: "libqwayland-egl.so;libqwayland-generic.so"
EXTRA_QT_PLUGINS: "waylandcompositor"
39 changes: 39 additions & 0 deletions deploy/linux/org.mavlink.qgroundcontrol.flatpak.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
app-id: org.mavlink.qgroundcontrol
runtime: org.gnome.Platform
runtime-version: 47
sdk: org.gnome.Sdk
command: QGroundControl
rename-appdata-file: org.mavlink.qgroundcontrol.metainfo.xml

finish-args:
- --socket=wayland
- --socket=fallback-x11
- --socket=pulseaudio
- --device=all # allow access USB Serial
- --share=ipc
- --share=network
- --filesystem=home
- --filesystem=xdg-run/gvfs # GVfs
- --filesystem=/media # automount via udisks
- --filesystem=/run/udev:ro # enables firmware upload & auto connecting

modules:
- name: QGroundControl
sources:
- type: git
url: https://github.com/mavlink/qgroundcontrol.git
tag: master
commit: 35f7efd36e0d14e39378cc3acdbcb003b8c57921
buildsystem: cmake-ninja
builddir: true
config-opts:
- -D BUILD_SHARED_LIBS=OFF
- -D BUILD_TESTING=OFF
cleanup:
- /include
- /bin/dbf*
- /bin/shp*
- /lib/cmake
- /share/shapelib
- '*.a'
- '*.cmake'
Loading