Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00
Code Issues Wiki Activity

GPS: gps_nav_model replaced by gps_dyn_model with 3 settings - PEDESTRIAN, AIR_1G, AIR_4G with default of AIR_1G

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2016-05-11 11:23:11 +10:00
parent 6a4cde2c0b
commit 1f49891144
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/config/config.c
View file

@ -506,7 +506,7 @@ static void resetConf(void)
masterConfig.gpsConfig.sbasMode = SBAS_AUTO; masterConfig.gpsConfig.sbasMode = SBAS_AUTO;
masterConfig.gpsConfig.autoConfig = GPS_AUTOCONFIG_ON; masterConfig.gpsConfig.autoConfig = GPS_AUTOCONFIG_ON;
masterConfig.gpsConfig.autoBaud = GPS_AUTOBAUD_ON; masterConfig.gpsConfig.autoBaud = GPS_AUTOBAUD_ON;
masterConfig.gpsConfig.navModel = GPS_MODEL_LOW_G; masterConfig.gpsConfig.dynModel = GPS_DYNMODEL_AIR_1G;
#endif #endif
#ifdef NAV #ifdef NAV

9
src/main/io/gps.h
View file

@ -64,9 +64,10 @@ typedef enum {
} gpsAutoBaud_e; } gpsAutoBaud_e;
typedef enum { typedef enum {
GPS_MODEL_LOW_G = 0, GPS_DYNMODEL_PEDESTRIAN = 0,
GPS_MODEL_HIGH_G, GPS_DYNMODEL_AIR_1G,
} gpsNavModel_e; GPS_DYNMODEL_AIR_4G,
} gpsDynModel_e;
typedef enum { typedef enum {
GPS_NO_FIX = 0, GPS_NO_FIX = 0,
@ -81,7 +82,7 @@ typedef struct gpsConfig_s {
sbasMode_e sbasMode; sbasMode_e sbasMode;
gpsAutoConfig_e autoConfig; gpsAutoConfig_e autoConfig;
gpsAutoBaud_e autoBaud; gpsAutoBaud_e autoBaud;
gpsNavModel_e navModel; gpsDynModel_e dynModel;
} gpsConfig_t; } gpsConfig_t;
typedef struct gpsCoordinateDDDMMmmmm_s { typedef struct gpsCoordinateDDDMMmmmm_s {

17
src/main/io/gps_ublox.c
View file

@ -560,11 +560,18 @@ static bool gpsConfigure(void)
{ {
switch (gpsState.autoConfigStep) { switch (gpsState.autoConfigStep) {
case 0: // NAV5 case 0: // NAV5
if (gpsState.gpsConfig->navModel == GPS_MODEL_HIGH_G) switch (gpsState.gpsConfig->dynModel) {
ubxTransmitAutoConfigCommands(ubloxInit_NAV5_Airborne4G, sizeof(ubloxInit_NAV5_Airborne4G)); case GPS_DYNMODEL_PEDESTRIAN:
else ubxTransmitAutoConfigCommands(ubloxInit_NAV5_Pedestrian, sizeof(ubloxInit_NAV5_Pedestrian));
ubxTransmitAutoConfigCommands(ubloxInit_NAV5_Airborne1G, sizeof(ubloxInit_NAV5_Airborne1G)); break;
case GPS_DYNMODEL_AIR_1G: // Default to this
default:
ubxTransmitAutoConfigCommands(ubloxInit_NAV5_Airborne1G, sizeof(ubloxInit_NAV5_Airborne1G));
break;
case GPS_DYNMODEL_AIR_4G:
ubxTransmitAutoConfigCommands(ubloxInit_NAV5_Airborne4G, sizeof(ubloxInit_NAV5_Airborne4G));
break;
}
break; break;
case 1: // NAVX5 - skip case 1: // NAVX5 - skip

6
src/main/io/serial_cli.c
View file

@ -342,7 +342,7 @@ static const char * const lookupTableGPSSBASMode[] = {
}; };
static const char * const lookupTableGpsModel[] = { static const char * const lookupTableGpsModel[] = {
"LOW_G", "HIGH_G" "PEDESTRIAN", "AIR_1G", "AIR_4G"
}; };
#endif #endif
@ -412,7 +412,7 @@ typedef enum {
#ifdef GPS #ifdef GPS
TABLE_GPS_PROVIDER, TABLE_GPS_PROVIDER,
TABLE_GPS_SBAS_MODE, TABLE_GPS_SBAS_MODE,
TABLE_GPS_NAV_MODEL, TABLE_GPS_DYN_MODEL,
#endif #endif
#ifdef BLACKBOX #ifdef BLACKBOX
TABLE_BLACKBOX_DEVICE, TABLE_BLACKBOX_DEVICE,
@ -541,7 +541,7 @@ const clivalue_t valueTable[] = {
#ifdef GPS #ifdef GPS
{ "gps_provider", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.provider, .config.lookup = { TABLE_GPS_PROVIDER }, 0 }, { "gps_provider", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.provider, .config.lookup = { TABLE_GPS_PROVIDER }, 0 },
{ "gps_sbas_mode", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.sbasMode, .config.lookup = { TABLE_GPS_SBAS_MODE }, 0 }, { "gps_sbas_mode", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.sbasMode, .config.lookup = { TABLE_GPS_SBAS_MODE }, 0 },
{ "gps_nav_model", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.navModel, .config.lookup = { TABLE_GPS_NAV_MODEL }, 0 }, { "gps_dyn_model", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.dynModel, .config.lookup = { TABLE_GPS_DYN_MODEL }, 0 },
{ "gps_auto_config", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.autoConfig, .config.lookup = { TABLE_OFF_ON }, 0 }, { "gps_auto_config", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.autoConfig, .config.lookup = { TABLE_OFF_ON }, 0 },
{ "gps_auto_baud", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.autoBaud, .config.lookup = { TABLE_OFF_ON }, 0 }, { "gps_auto_baud", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.gpsConfig.autoBaud, .config.lookup = { TABLE_OFF_ON }, 0 },
#endif #endif