Skip to content
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

Add configuration of Beidou and Glonass to M8, M9 and M10 gps modules #9124

Merged
merged 40 commits into from Jun 17, 2023

Conversation

mmosca
Copy link
Collaborator

@mmosca mmosca commented Jun 14, 2023

  • Add support for configuring Glonass and BeiDou constellations.
  • Detect ublox protocol version to facilitate version specific changes
  • Uses the ublox UBX-CFG-VALSET message to configure the values in CFG-SIGNAL for different GNSS constellations in M10 models as the old method was not supported.
  • Uses MON-GNSS polled message to check GNSS capabilities and status
  • As a bonus, status now displays what constellations are available and actually reported in use by the GPS module
GPS: HW Version: UBLOX10 Proto: 34.09 Baud: 230400
  GNSS Capabilities:
    GNSS Provider active/default
    GPS 1/1
    Galileo 1/1
    BeiDou 1/1
    Glonass 0/0
    Max concurrent: 3
  • Variables to control glonass and beidou:
gps_ublox_use_beidou
gps_ublox_use_glonass

@mmosca mmosca added this to the 7.0 milestone Jun 14, 2023
@mmosca mmosca changed the title Fix GNSS constelation on M8+ gps and Add configuration of Beidou and Glonass Fix GNSS constelation on M8+ gps and Add configuration of Beidou and Glonass to M9+ Jun 14, 2023
@@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
brew update
#brew update
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build was failing on dependencies. brew update would reinstall a lot of things and wastes a lot of time.

Commenting it out make the sitl build for mac much faster

@mmosca
Copy link
Collaborator Author

mmosca commented Jun 15, 2023

I am looking into the test failures.

Tests pass on gcc 12 in debian sid, fail on gcc 11 in ubuntu-latest.

(Fixed. Unit tests for the win!)

@mmosca mmosca changed the title Fix GNSS constelation on M8+ gps and Add configuration of Beidou and Glonass to M9+ Fix GNSS constelation on M8+ gps and Add configuration of Beidou and Glonass to M9/M10 Jun 15, 2023
@mmosca
Copy link
Collaborator Author

mmosca commented Jun 15, 2023

Add some GPS info to status on the CLI

GPS: HW Version: UBLOX8 Baud: 230400
  GNSS Capabilities:
    GPS
    Galileo (default: 0): 1
    BeiDou (default: 0): 0
    Glonass (default: 1): 1
    Max concurrent: 3

@mmosca mmosca changed the title Fix GNSS constelation on M8+ gps and Add configuration of Beidou and Glonass to M10 Fix GNSS constelation on M8+ gps and add configuration of Beidou and Glonass Jun 15, 2023
mmosca added a commit that referenced this pull request Jun 15, 2023
Should address Galileo setting for M8 and M9 GPS in #9123.

M10 requires additional changes in #9124.
@mmosca mmosca changed the title Fix GNSS constelation on M8+ gps and add configuration of Beidou and Glonass Add configuration of Beidou and Glonass to M8, M9 and M10 gps modules Jun 15, 2023
mmosca added a commit that referenced this pull request Jun 15, 2023
Fix version check and apply GNSS configuration for M8+ gps

Should address Galileo setting for M8 and M9 GPS in #9123.

M10 requires additional changes in #9124.

Just splitting the bug fix from #9124 since it probably requires more testing.
mmosca added a commit that referenced this pull request Jun 15, 2023
Should address Galileo setting for M8 and M9 GPS in #9123.

M10 requires additional changes in #9124.
@mmosca mmosca marked this pull request as draft June 16, 2023 22:19
@mmosca mmosca marked this pull request as ready for review June 16, 2023 22:48
@mmosca
Copy link
Collaborator Author

mmosca commented Jun 16, 2023

Ublox8 appears to work as well as 10.
if you select an invalid GNSS combination, the GNSS constellations revert to default (off)

@DzikuVx DzikuVx merged commit 7d93128 into master Jun 17, 2023
15 checks passed
@DzikuVx DzikuVx deleted the mmosca-gps-glonass branch June 17, 2023 14:41
@DzikuVx DzikuVx added the Release Notes Add this when a PR needs to be mentioned in the release notes label Jun 17, 2023
rmaia3d pushed a commit to rmaia3d/inav that referenced this pull request Jul 26, 2023
Add configuration of Beidou and Glonass to M8, M9 and M10 gps modules
rmaia3d pushed a commit to rmaia3d/inav that referenced this pull request Sep 9, 2023
…sion-check

Fix version check and apply GNSS configuration for M8+ gps

Should address Galileo setting for M8 and M9 GPS in iNavFlight#9123.

M10 requires additional changes in iNavFlight#9124.

Just splitting the bug fix from iNavFlight#9124 since it probably requires more testing.
rmaia3d pushed a commit to rmaia3d/inav that referenced this pull request Feb 19, 2024
…sion-check

Fix version check and apply GNSS configuration for M8+ gps

Should address Galileo setting for M8 and M9 GPS in iNavFlight#9123.

M10 requires additional changes in iNavFlight#9124.

Just splitting the bug fix from iNavFlight#9124 since it probably requires more testing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Release Notes Add this when a PR needs to be mentioned in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants