Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9f351ba
WIP Add network position provider
Withalion Jan 26, 2026
9d2f8e3
Fix UDP issues
Withalion Jan 30, 2026
75357b5
Fix external provider recreation bug
Withalion Jan 30, 2026
389492f
Fix another restart provider bug
Withalion Jan 30, 2026
ba8b801
Add Alias field for network provider
Withalion Feb 16, 2026
68d463a
Refactor NmeaParser
Withalion Feb 17, 2026
c0f609f
Fix breaking bluetooth include
Withalion Feb 17, 2026
5ae1d6c
Update tests
Withalion Feb 17, 2026
57e0710
Fix merge leftovers
Withalion Feb 17, 2026
0220d3d
Remove debug logs
Withalion Feb 17, 2026
2cd278e
Fix android merge error
Withalion Feb 18, 2026
1d57f50
Add position processing for network provider
Withalion Feb 18, 2026
880ce50
Add processing tests
Withalion Feb 18, 2026
3310a84
Fix formatting
Withalion Feb 18, 2026
c5d8805
Fix provider removal crash + minor cleanup
Withalion Mar 11, 2026
c415f60
Added bluetooth and network provider icons
gabriel-bolbotina Mar 12, 2026
66e9bff
Fixed rebase conflicts
gabriel-bolbotina Mar 12, 2026
314f321
Modified message
gabriel-bolbotina Mar 16, 2026
db4dfae
Updated text descriptions
gabriel-bolbotina Mar 26, 2026
d295478
Modified the external device description in position provider drawer
gabriel-bolbotina Apr 2, 2026
3eb777d
Fix minor UI things
Withalion Apr 28, 2026
d14fa28
Merge branch 'master' into feature/network-provider
Withalion Apr 28, 2026
005f055
Fix cpp check
Withalion Apr 28, 2026
2368557
Add unique default names for network position providers
Withalion Apr 28, 2026
eafd434
Fix position for local geoids
Withalion Apr 29, 2026
8a0438c
Fix crash on app exit
Withalion Apr 29, 2026
1fb9741
Fix bug where we changed BT providers to IP on restart
Withalion Apr 29, 2026
2051a18
Improve code
Withalion Apr 29, 2026
a466c7b
Fixed first round of review findings
gabriel-bolbotina May 5, 2026
d9433cf
Refactored Position provider page
gabriel-bolbotina May 6, 2026
3900d27
Simplified QML according to the review findings
gabriel-bolbotina May 8, 2026
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
4 changes: 4 additions & 0 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ set(MM_SRCS
ios/iosutils.cpp
position/providers/abstractpositionprovider.cpp
position/providers/internalpositionprovider.cpp
position/providers/networkpositionprovider.cpp
position/providers/positionprovidersmodel.cpp
position/providers/simulatedpositionprovider.cpp
position/providers/nmeaparser.cpp
position/tracking/abstracttrackingbackend.cpp
position/tracking/internaltrackingbackend.cpp
position/tracking/positiontrackinghighlight.cpp
Expand Down Expand Up @@ -126,8 +128,10 @@ set(MM_HDRS
ios/iosutils.h
position/providers/abstractpositionprovider.h
position/providers/internalpositionprovider.h
position/providers/networkpositionprovider.h
position/providers/positionprovidersmodel.h
position/providers/simulatedpositionprovider.h
position/providers/nmeaparser.h
position/tracking/abstracttrackingbackend.h
position/tracking/internaltrackingbackend.h
position/tracking/positiontrackinghighlight.h
Expand Down
8 changes: 5 additions & 3 deletions app/appsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ QVariantList AppSettings::savedPositionProviders() const
QStringList provider;
provider << settings.value( "providerName" ).toString();
provider << settings.value( "providerAddress" ).toString();
provider << settings.value( "providerType" ).toString();
providers.push_back( provider );
}

Expand All @@ -238,15 +239,16 @@ void AppSettings::savePositionProviders( const QVariantList &providers )
{
QVariantList provider = providers[i].toList();

if ( provider.length() < 2 )
if ( provider.length() < 3 )
{
CoreUtils::log( QStringLiteral( "AppSettings" ), QStringLiteral( "Tried to save provider without sufficient data" ) );
continue;
}
settings.setArrayIndex( i );

settings.setValue( "providerName", providers[i].toList()[0] );
settings.setValue( "providerAddress", providers[i].toList()[1] );
settings.setValue( "providerName", provider[0] );
settings.setValue( "providerAddress", provider[1] );
settings.setValue( "providerType", provider[2] );
}
settings.endArray();
}
Expand Down
3 changes: 3 additions & 0 deletions app/icons/Bluetooth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/icons/Network.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<file>ArrowLinkRight.svg</file>
<file>ArrowUp.svg</file>
<file>Back.svg</file>
<file>Bluetooth.svg</file>
<file>Briefcase.svg</file>
<file>Calendar.svg</file>
<file>Checkmark.svg</file>
Expand Down Expand Up @@ -58,6 +59,7 @@
<file>Mouth.svg</file>
<file>NaturalResources.svg</file>
<file>Next.svg</file>
<file>Network.svg</file>
<file>Other.svg</file>
<file>Others.svg</file>
<file>Personal.svg</file>
Expand Down
274 changes: 274 additions & 0 deletions app/images/ExternalBluetoothProvider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions app/images/ExternalGpsGreen.svg

This file was deleted.

Loading
Loading