quiet down navdump a lot

pull/143/merge
bert hubert 2022-03-07 13:07:22 +01:00
parent f4256dac8b
commit c10bce3a2c
1 changed files with 24 additions and 16 deletions

View File

@ -258,6 +258,8 @@ try
bool doReceptionData{false}; bool doReceptionData{false};
bool doRFData{true}; bool doRFData{true};
bool doObserverPosition{false}; bool doObserverPosition{false};
bool doObserverDetails{false};
bool doTimeOffsets{false};
bool doVERSION{false}; bool doVERSION{false};
string rinexfname; string rinexfname;
string osnmafname; string osnmafname;
@ -265,6 +267,8 @@ try
app.add_option("--stations", stations, "Listen to specified stations."); app.add_option("--stations", stations, "Listen to specified stations.");
app.add_option("--positions,-p", doObserverPosition, "Print out observer positions (or not)"); app.add_option("--positions,-p", doObserverPosition, "Print out observer positions (or not)");
app.add_option("--rfdata,-r", doRFData, "Print out RF data (or not)"); app.add_option("--rfdata,-r", doRFData, "Print out RF data (or not)");
app.add_option("--observerdetails,-o", doObserverDetails, "Print out observer detail data (or not)");
app.add_option("--timeoffsets,-t", doTimeOffsets, "Print out timeoffset data (or not)");
app.add_option("--recdata", doReceptionData, "Print out reception data (or not)"); app.add_option("--recdata", doReceptionData, "Print out reception data (or not)");
app.add_option("--rinex", rinexfname, "If set, emit ephemerides to this filename"); app.add_option("--rinex", rinexfname, "If set, emit ephemerides to this filename");
app.add_option("--osnma", osnmafname, "If set, emit OSNMA CSV to this filename"); app.add_option("--osnma", osnmafname, "If set, emit OSNMA CSV to this filename");
@ -1117,17 +1121,19 @@ try
} }
else if(nmm.type() == NavMonMessage::ObserverDetailsType) { else if(nmm.type() == NavMonMessage::ObserverDetailsType) {
etstamp(); if(doObserverDetails) {
cout<<"vendor "<<nmm.od().vendor()<<" hwversion " <<nmm.od().hwversion()<<" modules "<<nmm.od().modules()<<" swversion "<<nmm.od().swversion(); etstamp();
cout<<" serial "<<nmm.od().serialno(); cout<<"vendor "<<nmm.od().vendor()<<" hwversion " <<nmm.od().hwversion()<<" modules "<<nmm.od().modules()<<" swversion "<<nmm.od().swversion();
if(nmm.od().has_owner()) cout<<" serial "<<nmm.od().serialno();
cout<<" owner "<<nmm.od().owner(); if(nmm.od().has_owner())
if(nmm.od().has_clockoffsetdriftns()) cout<<" owner "<<nmm.od().owner();
cout<<" drift "<<nmm.od().clockoffsetdriftns(); if(nmm.od().has_clockoffsetdriftns())
if(nmm.od().has_clockaccuracyns()) cout<<" drift "<<nmm.od().clockoffsetdriftns();
cout<<" clock-accuracy "<<nmm.od().clockaccuracyns(); if(nmm.od().has_clockaccuracyns())
cout<<" clock-accuracy "<<nmm.od().clockaccuracyns();
cout<<endl;
cout<<endl;
}
} }
else if(nmm.type() == NavMonMessage::UbloxJammingStatsType) { else if(nmm.type() == NavMonMessage::UbloxJammingStatsType) {
etstamp(); etstamp();
@ -1298,12 +1304,14 @@ try
cout<< nmm.sr().gnsssv() << " beacon "<<hexstring <<" code "<<(int)nmm.sr().code()<<" params "<< makeHexDump(nmm.sr().params()) <<endl; cout<< nmm.sr().gnsssv() << " beacon "<<hexstring <<" code "<<(int)nmm.sr().code()<<" params "<< makeHexDump(nmm.sr().params()) <<endl;
} }
else if(nmm.type() == NavMonMessage::TimeOffsetType) { else if(nmm.type() == NavMonMessage::TimeOffsetType) {
etstamp(); if(doTimeOffsets) {
cout<<" got a time-offset message with "<< nmm.to().offsets().size()<<" offsets: "; etstamp();
for(const auto& o : nmm.to().offsets()) { cout<<" got a time-offset message with "<< nmm.to().offsets().size()<<" offsets: ";
cout << "gnssid "<<o.gnssid()<<" offset " << o.offsetns() << " +- "<<o.tacc()<<" ("<<o.valid()<<") , "; for(const auto& o : nmm.to().offsets()) {
cout << "gnssid "<<o.gnssid()<<" offset " << o.offsetns() << " +- "<<o.tacc()<<" ("<<o.valid()<<") , ";
}
cout<<endl;
} }
cout<<endl;
} }
else { else {