MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Added support for AGC"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-25 15:20:33 -07:00 committed by Gerrit - the friendly Code Review server
commit e72716080e
4 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/location_api/MeasurementAPIClient.cpp
View file

@ -166,6 +166,8 @@ static void convertGnssMeasurement(GnssMeasurementsData& in,
out.flags |= IGnssMeasurementCallback::GnssMeasurementFlags::HAS_CARRIER_PHASE;
if (in.flags & GNSS_MEASUREMENTS_DATA_CARRIER_PHASE_UNCERTAINTY_BIT)
out.flags |= IGnssMeasurementCallback::GnssMeasurementFlags::HAS_CARRIER_PHASE_UNCERTAINTY;
if (in.flags & GNSS_MEASUREMENTS_DATA_AUTOMATIC_GAIN_CONTROL_BIT)
out.flags |= IGnssMeasurementCallback::GnssMeasurementFlags::HAS_AUTOMATIC_GAIN_CONTROL;
out.svid = in.svId;
convertGnssConstellationType(in.svType, out.constellation);
out.timeOffsetNs = in.timeOffsetNs;
@ -226,6 +228,7 @@ static void convertGnssMeasurement(GnssMeasurementsData& in,
out.multipathIndicator =
static_cast<IGnssMeasurementCallback::GnssMultipathIndicator>(indicator);
out.snrDb = in.signalToNoiseRatioDb;
out.agcLevelDb = in.agcLevelDb;
}
static void convertGnssClock(GnssMeasurementsClock& in, IGnssMeasurementCallback::GnssClock& out)

38
core/SystemStatus.cpp
View file

@ -128,6 +128,10 @@ public:
uint32_t mJammerBds; // x10
uint32_t mJammerGal; // x11
uint32_t mRecErrorRecovery; // x12
double mAgcGps; // x13
double mAgcGlo; // x14
double mAgcBds; // x15
double mAgcGal; // x16
};
// parser
@ -155,6 +159,10 @@ private:
eJammerBds = 16,
eJammerGal = 17,
eRecErrorRecovery = 18,
eAgcGps = 19,
eAgcGlo = 20,
eAgcBds = 21,
eAgcGal = 22,
eMax = eRecErrorRecovery
};
SystemStatusPQWM1 mM1;
@ -177,6 +185,10 @@ public:
inline uint32_t getJammerGlo() { return mM1.mJammerGlo; }
inline uint32_t getJammerBds() { return mM1.mJammerBds; }
inline uint32_t getJammerGal() { return mM1.mJammerGal; }
inline uint32_t getAgcGps() { return mM1.mAgcGps; }
inline uint32_t getAgcGlo() { return mM1.mAgcGlo; }
inline uint32_t getAgcBds() { return mM1.mAgcBds; }
inline uint32_t getAgcGal() { return mM1.mAgcGal; }
inline uint32_t getRecErrorRecovery() { return mM1.mRecErrorRecovery; }
SystemStatusPQWM1parser(const char *str_in, uint32_t len_in)
@ -209,6 +221,10 @@ public:
mM1.mJammerBds = atoi(mField[eJammerBds].c_str());
mM1.mJammerGal = atoi(mField[eJammerGal].c_str());
mM1.mRecErrorRecovery = atoi(mField[eRecErrorRecovery].c_str());
mM1.mAgcGps = atof(mField[eAgcGps].c_str());
mM1.mAgcGlo = atof(mField[eAgcGlo].c_str());
mM1.mAgcBds = atof(mField[eAgcBds].c_str());
mM1.mAgcGal = atof(mField[eAgcGal].c_str());
}
inline SystemStatusPQWM1& get() { return mM1;} //getparser
@ -725,7 +741,11 @@ SystemStatusRfAndParams::SystemStatusRfAndParams(const SystemStatusPQWM1& nmea)
mJammerGps(nmea.mJammerGps),
mJammerGlo(nmea.mJammerGlo),
mJammerBds(nmea.mJammerBds),
mJammerGal(nmea.mJammerGal)
mJammerGal(nmea.mJammerGal),
mAgcGps(nmea.mAgcGps),
mAgcGlo(nmea.mAgcGlo),
mAgcBds(nmea.mAgcBds),
mAgcGal(nmea.mAgcGal)
{
}
@ -739,7 +759,11 @@ bool SystemStatusRfAndParams::equals(SystemStatusRfAndParams& peer)
(mJammerGps != peer.mJammerGps) ||
(mJammerGlo != peer.mJammerGlo) ||
(mJammerBds != peer.mJammerBds) ||
(mJammerGal != peer.mJammerGal)) {
(mJammerGal != peer.mJammerGal) ||
(mAgcGps != peer.mAgcGps) ||
(mAgcGlo != peer.mAgcGlo) ||
(mAgcBds != peer.mAgcBds) ||
(mAgcGal != peer.mAgcGal)) {
return false;
}
return true;
@ -747,7 +771,9 @@ bool SystemStatusRfAndParams::equals(SystemStatusRfAndParams& peer)
void SystemStatusRfAndParams::dump()
{
LOC_LOGV("RfAndParams: u=%ld:%ld p=%d bi=%d bq=%d ai=%d aq=%d gp=%d gl=%d bd=%d ga=%d",
LOC_LOGV("RfAndParams: u=%ld:%ld p=%d bi=%d bq=%d ai=%d aq=%d "
"jgp=%d jgl=%d jbd=%d jga=%d "
"agp=%lf agl=%lf abd=%lf aga=%lf",
mUtcTime.tv_sec, mUtcTime.tv_nsec,
mPgaGain,
mGpsBpAmpI,
@ -757,7 +783,11 @@ void SystemStatusRfAndParams::dump()
mJammerGps,
mJammerGlo,
mJammerBds,
mJammerGal);
mJammerGal,
mAgcGps,
mAgcGlo,
mAgcBds,
mAgcGal);
return;
}

4
core/SystemStatus.h
View file

@ -107,6 +107,10 @@ public:
uint32_t mJammerGlo;
uint32_t mJammerBds;
uint32_t mJammerGal;
double mAgcGps;
double mAgcGlo;
double mAgcBds;
double mAgcGal;
SystemStatusRfAndParams(const SystemStatusPQWM1& nmea);
bool equals(SystemStatusRfAndParams& peer);
void dump(void);

2
location/LocationAPI.h
View file

@ -295,6 +295,7 @@ typedef enum {
GNSS_MEASUREMENTS_DATA_CARRIER_PHASE_UNCERTAINTY_BIT = (1<<14),
GNSS_MEASUREMENTS_DATA_MULTIPATH_INDICATOR_BIT = (1<<15),
GNSS_MEASUREMENTS_DATA_SIGNAL_TO_NOISE_RATIO_BIT = (1<<16),
GNSS_MEASUREMENTS_DATA_AUTOMATIC_GAIN_CONTROL_BIT = (1<<17),
} GnssMeasurementsDataFlagsBits;
typedef uint32_t GnssMeasurementsStateMask;
@ -503,6 +504,7 @@ typedef struct {
double carrierPhaseUncertainty;
GnssMeasurementsMultipathIndicator multipathIndicator;
double signalToNoiseRatioDb;
double agcLevelDb;
} GnssMeasurementsData;
typedef struct {