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

Merge remote-tracking branch 'quic/location.lnx.3.0.c5' into

Browse source 
location.lnx.4.0

CRs-Fixed: 2282734

Change-Id: I5911f47d796591474eb19be527499daf758bff03
This commit is contained in:
Bhavna Sharma 2018-07-20 15:46:02 -07:00
commit 92e990faf8
5 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnss/GnssAdapter.cpp
View file

@ -352,27 +352,27 @@ GnssAdapter::convertLocationInfo(GnssLocationInfoNotification& out,
out.navSolutionMask = locationExtended.navSolutionMask;
}
if (GPS_LOCATION_EXTENDED_HAS_POS_TECH_MASK & locationExtended.flags) {
out.flags |= GPS_LOCATION_EXTENDED_HAS_POS_TECH_MASK;
out.flags |= GNSS_LOCATION_INFO_POS_TECH_MASK_BIT;
out.posTechMask = locationExtended.tech_mask;
}
if (GPS_LOCATION_EXTENDED_HAS_POS_DYNAMICS_DATA & locationExtended.flags) {
out.flags |= GPS_LOCATION_EXTENDED_HAS_POS_DYNAMICS_DATA;
if (locationExtended.bodyFrameData.bodyFrameDatamask &
if (locationExtended.bodyFrameData.bodyFrameDataMask &
LOCATION_NAV_DATA_HAS_LONG_ACCEL_BIT) {
out.bodyFrameData.bodyFrameDataMask |= LOCATION_NAV_DATA_HAS_LONG_ACCEL_BIT;
}
if (locationExtended.bodyFrameData.bodyFrameDatamask &
if (locationExtended.bodyFrameData.bodyFrameDataMask &
LOCATION_NAV_DATA_HAS_LAT_ACCEL_BIT) {
out.bodyFrameData.bodyFrameDataMask |= LOCATION_NAV_DATA_HAS_LAT_ACCEL_BIT;
}
if (locationExtended.bodyFrameData.bodyFrameDatamask &
if (locationExtended.bodyFrameData.bodyFrameDataMask &
LOCATION_NAV_DATA_HAS_VERT_ACCEL_BIT) {
out.bodyFrameData.bodyFrameDataMask |= LOCATION_NAV_DATA_HAS_VERT_ACCEL_BIT;
}
if (locationExtended.bodyFrameData.bodyFrameDatamask & LOCATION_NAV_DATA_HAS_YAW_RATE_BIT) {
if (locationExtended.bodyFrameData.bodyFrameDataMask & LOCATION_NAV_DATA_HAS_YAW_RATE_BIT) {
out.bodyFrameData.bodyFrameDataMask |= LOCATION_NAV_DATA_HAS_YAW_RATE_BIT;
}
if (locationExtended.bodyFrameData.bodyFrameDatamask & LOCATION_NAV_DATA_HAS_PITCH_BIT) {
if (locationExtended.bodyFrameData.bodyFrameDataMask & LOCATION_NAV_DATA_HAS_PITCH_BIT) {
out.bodyFrameData.bodyFrameDataMask |= LOCATION_NAV_DATA_HAS_PITCH_BIT;
}
out.bodyFrameData.longAccel = locationExtended.bodyFrameData.longAccel;
@ -1288,6 +1288,7 @@ GnssAdapter::gnssGetConfigCommand(GnssConfigFlagsMask configMask) {
mAdapter.reportResponse(index, errs, mIds);
delete[] errs;
}
};
@ -2682,6 +2683,7 @@ GnssAdapter::gnssNiResponseCommand(GnssNiResponse response, void* rawRequest)
inline virtual ~MsgGnssNiResponse() {
}
inline virtual void proc() const {
const void *rawPayload = mPayload;
mApi.informNiResponse(mResponse, mPayload);
}
};

1
gnss/GnssAdapter.h
View file

@ -227,6 +227,7 @@ public:
void setControlCallbacksCommand(LocationControlCallbacks& controlCallbacks);
void readConfigCommand();
void setConfigCommand();
void requestUlpCommand();
void initEngHubProxyCommand();
uint32_t* gnssUpdateConfigCommand(GnssConfig config);
uint32_t* gnssGetConfigCommand(GnssConfigFlagsMask mask);

17
location/LocationDataTypes.h
View file

@ -128,7 +128,17 @@ typedef enum {
LOCATION_NAV_DATA_HAS_LAT_ACCEL_BIT = (1<<1), // Navigation data has Sideward Acceleration
LOCATION_NAV_DATA_HAS_VERT_ACCEL_BIT = (1<<2), // Navigation data has Vertical Acceleration
LOCATION_NAV_DATA_HAS_YAW_RATE_BIT = (1<<3), // Navigation data has Heading Rate
LOCATION_NAV_DATA_HAS_PITCH_BIT = (1<<4) // Navigation data has Body pitch
LOCATION_NAV_DATA_HAS_PITCH_BIT = (1<<4), // Navigation data has Body pitch
// Navigation data has Forward Acceleration uncertainty
LOCATION_NAV_DATA_HAS_LONG_ACCEL_UNC_BIT = (1<<5),
// Navigation data has Sideward Acceleration uncertainty
LOCATION_NAV_DATA_HAS_LAT_ACCEL_UNC_BIT = (1<<6),
// Navigation data has Vertical Acceleration uncertainty
LOCATION_NAV_DATA_HAS_VERT_ACCEL_UNC_BIT = (1<<7),
// Navigation data has Heading Rate uncertainty
LOCATION_NAV_DATA_HAS_YAW_RATE_UNC_BIT = (1<<8),
// Navigation data has Body pitch uncertainty
LOCATION_NAV_DATA_HAS_PITCH_UNC_BIT = (1<<9)
} GnssLocationPosDataBits;
typedef uint32_t GnssLocationInfoFlagMask;
@ -725,6 +735,11 @@ typedef struct {
float vertAccel; // Vertical Acceleration in body frame (m/s2)
float yawRate; // Heading Rate (Radians/second)
float pitch; // Body pitch (Radians)
float longAccelUnc; // Uncertainty of Forward Acceleration in body frame
float latAccelUnc; // Uncertainty of Side-ward Acceleration in body frame
float vertAccelUnc; // Uncertainty of Vertical Acceleration in body frame
float yawRateUnc; // Uncertainty of Heading Rate
float pitchUnc; // Uncertainty of Body pitch
} GnssLocationPositionDynamics;
typedef struct {

2
utils/gps_extended_c.h
View file

@ -663,7 +663,7 @@ typedef struct {
/** SV Info source used in computing this fix */
LocSvInfoSource sv_source;
/** Body Frame Dynamics: 4wayAcceleration and pitch set with validity */
LocPositionDynamics bodyFrameData;
GnssLocationPositionDynamics bodyFrameData;
/** GPS Time */
GPSTimeStruct gpsTime;
GnssSystemTime gnssSystemTime;

2
utils/loc_cfg.h
View file

@ -37,7 +37,7 @@
#include <grp.h>
#define LOC_MAX_PARAM_NAME 80
#define LOC_MAX_PARAM_STRING 80
#define LOC_MAX_PARAM_STRING 170
#define LOC_MAX_PARAM_LINE (LOC_MAX_PARAM_NAME + LOC_MAX_PARAM_STRING)
#define LOC_FEATURE_MODE_DISABLED "DISABLED"