-
Notifications
You must be signed in to change notification settings - Fork 4.3k
GNSS Resilience with Septentrio #13009
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
Open
Louis-max-H
wants to merge
15
commits into
mavlink:master
Choose a base branch
from
Louis-max-H:pr-resilience
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+465
−27
Open
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
3d2b093
Update PR
Louis-max-H 8e7a994
Restore sub module and GPSIndicator.qml is now under src/QmlControls
Louis-max-H c47341f
Cmake and small improvements
Louis-max-H 92a055c
Add white color
Louis-max-H 69c843f
restore permissions
Louis-max-H 2617b25
tmp
Louis-max-H faddc06
backup
Louis-max-H b79a82e
Add GNSS quality indicators
Louis-max-H cdcbf30
Merge branch 'master' into pr-resilience
Louis-max-H 12e324d
Fix typos
Louis-max-H 7579bdc
Merge branch 'master' into pr-resilience
Louis-max-H a489ef0
Review suggestions applied
Tory9 1d086ab
Merge remote-tracking branch 'upstream/master' into pr-resilience
Tory9 da602fd
Refactor GPS authentication and interference indicators for improved …
Tory9 d5ba2f6
Refactor error handling in GPS indicator and remove redundant spoofin…
Tory9 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/**************************************************************************** | ||
* | ||
* (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> | ||
* | ||
* QGroundControl is licensed according to the terms in the file | ||
* COPYING.md in the root of the source code directory. | ||
* | ||
****************************************************************************/ | ||
|
||
import QtQuick | ||
import QtQuick.Layouts | ||
|
||
import QGroundControl | ||
import QGroundControl.Controls | ||
import QGroundControl.ScreenTools | ||
import QGroundControl.Palette | ||
|
||
//------------------------------------------------------------------------- | ||
//-- GPS Authentication Indicator | ||
Item { | ||
id: control | ||
width: height | ||
anchors.top: parent.top | ||
anchors.bottom: parent.bottom | ||
|
||
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle | ||
|
||
property bool showIndicator: _activeVehicle && _activeVehicle.gps.authenticationState.value > 0 | ||
|
||
function authenticationIconColor() { | ||
if(!_activeVehicle){ | ||
return qgcPal.colorGrey // Not connected | ||
} | ||
|
||
switch (_activeVehicle.gps.authenticationState.value) { | ||
case 1: // Initializing | ||
return qgcPal.colorYellow; | ||
case 2: // Error | ||
return qgcPal.colorRed; | ||
case 3: // OK | ||
return qgcPal.colorGreen; | ||
case 0: // Unknown | ||
case 4: // Disabled | ||
default: | ||
return qgcPal.colorGrey; | ||
} | ||
} | ||
|
||
QGCColoredImage { | ||
id: gpsAuthenticationIcon | ||
width: height | ||
anchors.top: parent.top | ||
anchors.bottom: parent.bottom | ||
source: "/qmlimages/GpsAuthentication.svg" | ||
fillMode: Image.PreserveAspectFit | ||
sourceSize.height: height | ||
opacity: 1 | ||
color: authenticationIconColor() | ||
} | ||
|
||
MouseArea { | ||
anchors.fill: parent | ||
onClicked: mainWindow.showIndicatorDrawer(authenticationContentComponent, control) | ||
} | ||
|
||
Component{ | ||
id: authenticationContentComponent | ||
|
||
ColumnLayout{ | ||
spacing: ScreenTools.defaultFontPixelHeight / 2 | ||
|
||
SettingsGroupLayout { | ||
heading: qsTr("GPS Authentication") | ||
contentSpacing: 0 | ||
showDividers: false | ||
|
||
LabelledLabel { | ||
label: qsTr("Status") | ||
labelText: _activeVehicle ? (_activeVehicle.gps.authenticationState.valueString || qsTr("n/a")) : qsTr("n/a") | ||
} | ||
} | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
/**************************************************************************** | ||
* | ||
* (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> | ||
* | ||
* QGroundControl is licensed according to the terms in the file | ||
* COPYING.md in the root of the source code directory. | ||
* | ||
****************************************************************************/ | ||
|
||
import QtQuick | ||
import QtQuick.Layouts | ||
|
||
import QGroundControl | ||
import QGroundControl.Controls | ||
import QGroundControl.ScreenTools | ||
import QGroundControl.Palette | ||
|
||
//------------------------------------------------------------------------- | ||
//-- GPS Interference Indicator | ||
Item { | ||
id: control | ||
width: height | ||
anchors.top: parent.top | ||
anchors.bottom: parent.bottom | ||
|
||
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle | ||
|
||
property bool showIndicator: _activeVehicle && (_activeVehicle.gps.spoofingState.value > 0 || _activeVehicle.gps.jammingState.value > 0) | ||
|
||
QGCColoredImage { | ||
id: gpsSpoofingIcon | ||
width: height | ||
anchors.top: parent.top | ||
anchors.bottom: parent.bottom | ||
source: "/qmlimages/GpsInterference.svg" | ||
fillMode: Image.PreserveAspectFit | ||
sourceSize.height: height | ||
opacity: 1 | ||
color: { | ||
if(!_activeVehicle){ | ||
return qgcPal.colorGrey | ||
} | ||
|
||
let maxState = Math.max(_activeVehicle.gps.spoofingState.value, _activeVehicle.gps.jammingState.value); | ||
|
||
switch (maxState) { | ||
case 3: | ||
return qgcPal.colorRed; | ||
case 2: | ||
return qgcPal.colorOrange; | ||
case 1: | ||
return qgcPal.colorWhite; | ||
default: | ||
return qgcPal.colorGrey; | ||
} | ||
} | ||
} | ||
|
||
MouseArea { | ||
anchors.fill: parent | ||
onClicked: mainWindow.showIndicatorDrawer(gpsSpoofingPopup, control) | ||
} | ||
|
||
Component { | ||
id: gpsSpoofingPopup | ||
|
||
ToolIndicatorPage { | ||
showExpand: expandedComponent ? true : false | ||
contentComponent: spoofingContentComponent | ||
} | ||
} | ||
|
||
Component{ | ||
id: spoofingContentComponent | ||
|
||
ColumnLayout{ | ||
spacing: ScreenTools.defaultFontPixelHeight / 2 | ||
|
||
SettingsGroupLayout { | ||
heading: qsTr("GPS Interference Status") | ||
showDividers: true | ||
|
||
LabelledLabel { | ||
label: qsTr("GPS Jamming") | ||
labelText: _activeVehicle ? (_activeVehicle.gps.jammingState.valueString || qsTr("n/a")) : qsTr("n/a") | ||
} | ||
|
||
LabelledLabel { | ||
label: qsTr("GPS Spoofing") | ||
labelText: _activeVehicle ? (_activeVehicle.gps.spoofingState.valueString || qsTr("n/a")) : qsTr("n/a") | ||
} | ||
} | ||
} | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the changes to MockLink?