Merge "Remove Redundant Log"
This commit is contained in:
commit
3aa99e9fc5
2 changed files with 26 additions and 23 deletions
|
@ -232,6 +232,17 @@ void LocApiBase::reportPosition(UlpLocation &location,
|
||||||
enum loc_sess_status status,
|
enum loc_sess_status status,
|
||||||
LocPosTechMask loc_technology_mask)
|
LocPosTechMask loc_technology_mask)
|
||||||
{
|
{
|
||||||
|
// print the location info before delivering
|
||||||
|
LOC_LOGV("flags: %d\n source: %d\n latitude: %f\n longitude: %f\n "
|
||||||
|
"altitude: %f\n speed: %f\n bearing: %f\n accuracy: %f\n "
|
||||||
|
"timestamp: %lld\n rawDataSize: %d\n rawData: %p\n "
|
||||||
|
"Session status: %d\n Technology mask: %u",
|
||||||
|
location.gpsLocation.flags, location.position_source,
|
||||||
|
location.gpsLocation.latitude, location.gpsLocation.longitude,
|
||||||
|
location.gpsLocation.altitude, location.gpsLocation.speed,
|
||||||
|
location.gpsLocation.bearing, location.gpsLocation.accuracy,
|
||||||
|
location.gpsLocation.timestamp, location.rawDataSize,
|
||||||
|
location.rawData, status, loc_technology_mask);
|
||||||
// loop through adapters, and deliver to all adapters.
|
// loop through adapters, and deliver to all adapters.
|
||||||
TO_ALL_LOCADAPTERS(
|
TO_ALL_LOCADAPTERS(
|
||||||
mLocAdapters[i]->reportPosition(location,
|
mLocAdapters[i]->reportPosition(location,
|
||||||
|
@ -246,6 +257,19 @@ void LocApiBase::reportSv(GpsSvStatus &svStatus,
|
||||||
GpsLocationExtended &locationExtended,
|
GpsLocationExtended &locationExtended,
|
||||||
void* svExt)
|
void* svExt)
|
||||||
{
|
{
|
||||||
|
// print the SV info before delivering
|
||||||
|
LOC_LOGV("num sv: %d\n ephemeris mask: %dxn almanac mask: %x\n used"
|
||||||
|
" in fix mask: %x\n sv: prn snr elevation azimuth",
|
||||||
|
svStatus.num_svs, svStatus.ephemeris_mask,
|
||||||
|
svStatus.almanac_mask, svStatus.used_in_fix_mask);
|
||||||
|
for (int i = 0; i < svStatus.num_svs && i < GPS_MAX_SVS; i++) {
|
||||||
|
LOC_LOGV(" %d: %d %f %f %f",
|
||||||
|
i,
|
||||||
|
svStatus.sv_list[i].prn,
|
||||||
|
svStatus.sv_list[i].snr,
|
||||||
|
svStatus.sv_list[i].elevation,
|
||||||
|
svStatus.sv_list[i].azimuth);
|
||||||
|
}
|
||||||
// loop through adapters, and deliver to all adapters.
|
// loop through adapters, and deliver to all adapters.
|
||||||
TO_ALL_LOCADAPTERS(
|
TO_ALL_LOCADAPTERS(
|
||||||
mLocAdapters[i]->reportSv(svStatus,
|
mLocAdapters[i]->reportSv(svStatus,
|
||||||
|
|
|
@ -839,16 +839,7 @@ void LocEngReportPosition::proc() const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void LocEngReportPosition::locallog() const {
|
void LocEngReportPosition::locallog() const {
|
||||||
LOC_LOGV("flags: %d\n source: %d\n latitude: %f\n longitude: %f\n "
|
LOC_LOGV("LocEngReportPosition");
|
||||||
"altitude: %f\n speed: %f\n bearing: %f\n accuracy: %f\n "
|
|
||||||
"timestamp: %lld\n rawDataSize: %d\n rawData: %p\n Session"
|
|
||||||
" status: %d\n Technology mask: %u",
|
|
||||||
mLocation.gpsLocation.flags, mLocation.position_source,
|
|
||||||
mLocation.gpsLocation.latitude, mLocation.gpsLocation.longitude,
|
|
||||||
mLocation.gpsLocation.altitude, mLocation.gpsLocation.speed,
|
|
||||||
mLocation.gpsLocation.bearing, mLocation.gpsLocation.accuracy,
|
|
||||||
mLocation.gpsLocation.timestamp, mLocation.rawDataSize,
|
|
||||||
mLocation.rawData, mStatus, mTechMask);
|
|
||||||
}
|
}
|
||||||
void LocEngReportPosition::log() const {
|
void LocEngReportPosition::log() const {
|
||||||
locallog();
|
locallog();
|
||||||
|
@ -889,19 +880,7 @@ void LocEngReportSv::proc() const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void LocEngReportSv::locallog() const {
|
void LocEngReportSv::locallog() const {
|
||||||
LOC_LOGV("num sv: %d\n ephemeris mask: %dxn almanac mask: %x\n "
|
LOC_LOGV("%s:%d] LocEngReportSv",__func__, __LINE__);
|
||||||
"used in fix mask: %x\n sv: prn snr "
|
|
||||||
"elevation azimuth",
|
|
||||||
mSvStatus.num_svs, mSvStatus.ephemeris_mask,
|
|
||||||
mSvStatus.almanac_mask, mSvStatus.used_in_fix_mask);
|
|
||||||
for (int i = 0; i < mSvStatus.num_svs && i < GPS_MAX_SVS; i++) {
|
|
||||||
LOC_LOGV(" %d: %d %f %f %f\n ",
|
|
||||||
i,
|
|
||||||
mSvStatus.sv_list[i].prn,
|
|
||||||
mSvStatus.sv_list[i].snr,
|
|
||||||
mSvStatus.sv_list[i].elevation,
|
|
||||||
mSvStatus.sv_list[i].azimuth);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
inline void LocEngReportSv::log() const {
|
inline void LocEngReportSv::log() const {
|
||||||
locallog();
|
locallog();
|
||||||
|
|
Loading…
Reference in a new issue