diff options
| -rw-r--r-- | core/ContextBase.cpp | 7 | ||||
| -rw-r--r-- | core/ContextBase.h | 2 | ||||
| -rw-r--r-- | core/LocApiBase.cpp | 4 | ||||
| -rw-r--r-- | core/LocApiBase.h | 2 | ||||
| -rw-r--r-- | gnss/GnssAdapter.cpp | 2 |
5 files changed, 1 insertions, 16 deletions
diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp index c71ca7a..fa87c3e 100644 --- a/core/ContextBase.cpp +++ b/core/ContextBase.cpp @@ -92,9 +92,7 @@ const loc_param_s_type ContextBase::mSap_conf_table[] = {"SENSOR_GYRO_BATCHES_PER_SEC_HIGH", &mSap_conf.SENSOR_GYRO_BATCHES_PER_SEC_HIGH, NULL, 'n'}, {"SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH", &mSap_conf.SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH, NULL, 'n'}, {"SENSOR_CONTROL_MODE", &mSap_conf.SENSOR_CONTROL_MODE, NULL, 'n'}, - {"SENSOR_USAGE", &mSap_conf.SENSOR_USAGE, NULL, 'n'}, - {"SENSOR_ALGORITHM_CONFIG_MASK", &mSap_conf.SENSOR_ALGORITHM_CONFIG_MASK, NULL, 'n'}, - {"SENSOR_PROVIDER", &mSap_conf.SENSOR_PROVIDER, NULL, 'n'} + {"SENSOR_ALGORITHM_CONFIG_MASK", &mSap_conf.SENSOR_ALGORITHM_CONFIG_MASK, NULL, 'n'} }; void ContextBase::readConfig() @@ -139,7 +137,6 @@ void ContextBase::readConfig() mSap_conf.SENSOR_GYRO_BATCHES_PER_SEC_HIGH = 4; mSap_conf.SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH = 25; mSap_conf.SENSOR_CONTROL_MODE = 0; /* AUTO */ - mSap_conf.SENSOR_USAGE = 0; /* Enabled */ mSap_conf.SENSOR_ALGORITHM_CONFIG_MASK = 0; /* INS Disabled = FALSE*/ /* Values MUST be set by OEMs in configuration for sensor-assisted navigation to work. There are NO default values */ @@ -152,8 +149,6 @@ void ContextBase::readConfig() mSap_conf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID = 0; mSap_conf.RATE_RANDOM_WALK_SPECTRAL_DENSITY_VALID = 0; mSap_conf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID = 0; - /* default provider is SSC */ - mSap_conf.SENSOR_PROVIDER = 1; /* None of the 10 slots for agps certificates are writable by default */ mGps_conf.AGPS_CERT_WRITABLE_MASK = 0; diff --git a/core/ContextBase.h b/core/ContextBase.h index 4ad6cb1..d268f5a 100644 --- a/core/ContextBase.h +++ b/core/ContextBase.h @@ -92,7 +92,6 @@ typedef struct uint32_t SENSOR_GYRO_BATCHES_PER_SEC_HIGH; uint32_t SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH; uint32_t SENSOR_CONTROL_MODE; - uint32_t SENSOR_USAGE; uint32_t SENSOR_ALGORITHM_CONFIG_MASK; uint8_t ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID; double ACCEL_RANDOM_WALK_SPECTRAL_DENSITY; @@ -102,7 +101,6 @@ typedef struct double RATE_RANDOM_WALK_SPECTRAL_DENSITY; uint8_t VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID; double VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY; - uint32_t SENSOR_PROVIDER; } loc_sap_cfg_s_type; namespace loc_core { diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index a82e30b..dd52ab6 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -522,10 +522,6 @@ LocationError LocApiBase:: setLPPConfigSync(GnssConfigLppProfile /*profile*/) DEFAULT_IMPL(LOCATION_ERROR_SUCCESS) -enum loc_api_adapter_err LocApiBase:: - setSensorControlConfigSync(int /*sensorUsage*/, - int /*sensorProvider*/) -DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) enum loc_api_adapter_err LocApiBase:: setSensorPropertiesSync(bool /*gyroBiasVarianceRandomWalk_valid*/, diff --git a/core/LocApiBase.h b/core/LocApiBase.h index b50a973..75b98a6 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -218,8 +218,6 @@ public: setNMEATypesSync(uint32_t typesMask); virtual LocationError setLPPConfigSync(GnssConfigLppProfile profile); virtual enum loc_api_adapter_err - setSensorControlConfigSync(int sensorUsage, int sensorProvider); - virtual enum loc_api_adapter_err setSensorPropertiesSync(bool gyroBiasVarianceRandomWalk_valid, float gyroBiasVarianceRandomWalk, bool accelBiasVarianceRandomWalk_valid, diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index f75febd..d155d6c 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -717,8 +717,6 @@ GnssAdapter::setConfigCommand() } } - adapter.mLocApi->setSensorControlConfigSync(sapConf.SENSOR_USAGE, - sapConf.SENSOR_PROVIDER); adapter.mLocApi->setLPPeProtocolCpSync( adapter.mLocApi->convertLppeCp(gpsConf.LPPE_CP_TECHNOLOGY)); adapter.mLocApi->setLPPeProtocolUpSync( |