rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

OP-1739 Add "Default" setting to GNSSMode which skips the GNSS selection

Browse Source 
during autoconfig, e.g. for use with UBX6
This commit is contained in:
Erik Gustavsson 2015-02-28 13:17:22 +01:00
parent d6bc3878d3
commit 4ada3d90d9
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flight/modules/GPS/GPS.c
View File

@ -553,10 +553,14 @@ void updateGpsSettings(__attribute__((unused)) UAVObjEvent *ev)
newconfig.enableGPS = false;
newconfig.enableGLONASS = true;
break;
default:
case GPSSETTINGS_UBXGNSSMODE_GPS:
newconfig.enableGPS = true;
newconfig.enableGLONASS = false;
break;
default:
newconfig.enableGPS = false;
newconfig.enableGLONASS = false;
break;
}
ubx_autoconfig_set(newconfig);

9
flight/modules/GPS/ubx_autoconfig.c
View File

@ -296,8 +296,13 @@ static void configure(uint16_t *bytes_to_send)
config_nav(bytes_to_send);
break;
case LAST_CONFIG_SENT_START + 2:
config_gnss(bytes_to_send);
break;
if (status->currentSettings.enableGLONASS || status->currentSettings.enableGPS) {
config_gnss(bytes_to_send);
break;
} else {
// Skip and fall through to next step
status->lastConfigSent++;
}
case LAST_CONFIG_SENT_START + 3:
config_sbas(bytes_to_send);
if (!status->currentSettings.storeSettings) {

2
shared/uavobjectdefinition/gpssettings.xml
View File

@ -17,7 +17,7 @@
<field name="UbxSBASChannelsUsed" units="" type="uint8" elements="1" defaultvalue="3"/>
<field name="UbxSBASSats" units="" type="enum" elements="1" options="AutoScan,WAAS,EGNOS,MSAS,GAGAN,SDCM" defaultvalue="Auto-Scan" />
<!-- Ubx GNSS configuration, only applies to Ublox generation 7+ and GPS+GLONASS only to generation 8 -->
<field name="UbxGNSSMode" units="" type="enum" elements="1" options="GPS,GLONASS,GPS+GLONASS" defaultvalue="GPS" />
<field name="UbxGNSSMode" units="" type="enum" elements="1" options="Default,GPS,GLONASS,GPS+GLONASS" defaultvalue="Default" />
<access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
<telemetryflight acked="true" updatemode="onchange" period="0"/>