Skip to content

Make text processing of output easier #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeffpc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make text processing of output easier #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd710b0
use a more machine readable timestamp format
jeffpc Dec 29, 2019
3612332
navdump: omit commas to make it easier to extract values with awk
jeffpc Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions navdump.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ try
etstamp();

auto latlonh = ecefToWGS84(nmm.op().x(), nmm.op().y(), nmm.op().z());
cout<<std::fixed<<"ECEF "<<nmm.op().x()<<", "<<nmm.op().y()<<", "<<nmm.op().z();
cout<<", WGS84 lon "<< 180*std::get<1>(latlonh)/M_PI
cout<<std::fixed<<"ECEF "<<nmm.op().x()<<" "<<nmm.op().y()<<" "<<nmm.op().z();
cout<<" WGS84 lon "<< 180*std::get<1>(latlonh)/M_PI
<<" lat "<< 180*std::get<0>(latlonh)/M_PI
<<" elev "<< std::get<2>(latlonh) << " acc "<<nmm.op().acc()<<" m "<<endl;
g_ourpos = Point(nmm.op().x(), nmm.op().y(), nmm.op().z());
Expand Down
4 changes: 2 additions & 2 deletions navmon.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ std::string humanTime(time_t t)
}

char buffer[80];
strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S %z", &tm);
strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S %z", &tm);
// strftime(buffer, sizeof(buffer), "%F %T ", &tm);
return buffer;
}
Expand All @@ -147,7 +147,7 @@ std::string humanTime(time_t t, uint32_t nanoseconds)
gmtime_r(&t, &tm);

char buffer[80];
std::string fmt = "%a, %d %b %Y %H:%M:"+fmt::sprintf("%07.04f", tm.tm_sec + nanoseconds/1000000000.0) +" %z";
std::string fmt = "%Y-%m-%d %H:%M:"+fmt::sprintf("%07.04f", tm.tm_sec + nanoseconds/1000000000.0) +" %z";

strftime(buffer, sizeof(buffer), fmt.c_str(), &tm);
return buffer;
Expand Down
2 changes: 1 addition & 1 deletion navparse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ std::string humanTime(int gnssid, int wn, int tow)
gmtime_r(&t, &tm);

char buffer[80];
strftime(buffer, sizeof(buffer), "%a, %d %b %Y %T %z", &tm);
strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S %z", &tm);
return buffer;
}
char getGNSSChar(int id)
Expand Down