diff --git a/.gitignore b/.gitignore index bbae22d..10a930a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ navcat navdisplay navdump navnexus +navparse navrecv testrunner tlecatch @@ -18,6 +19,7 @@ glo-ops.txt gps-ops.txt # - git version internals githash.h +githash # *.csv diff --git a/Makefile b/Makefile index edc4131..24d10cd 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ SIMPLESOCKETS=ext/powerblog/ext/simplesocket/swrappers.o ext/powerblog/ext/simpl clean: rm -f *~ *.o *.d ext/*/*.o $(PROGRAMS) navmon.pb.h navmon.pb.cc $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) $(H2OPP) $(SIMPLESOCKETS) rm -f ext/fmt-5.2.1/src/format.o + rm -f githash.h githash navparse: navparse.o ext/fmt-5.2.1/src/format.o $(H2OPP) $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o diff --git a/ubxtool.cc b/ubxtool.cc index 5324227..ec40cc8 100644 --- a/ubxtool.cc +++ b/ubxtool.cc @@ -232,7 +232,7 @@ UBXMessage sendAndWaitForUBX(int fd, int seconds, basic_string_view msg catch(...) { if(n==1) throw; - cerr<<"Retransmit"< ms catch(...) { if(n==1) throw; - cerr<<"Retransmit"<dst.toStringWithPort()<<" had error"; } { std::lock_guard mut(d->mut); - if (doDEBUG) { cerr<<"There are now "<queue.size()<<" messages queued for "<dst.toStringWithPort()<queue.size()<<" messages queued for "<dst.toStringWithPort()<>2)<<","<<(int)(pvt.valid&0x02>>1)<<","<<(int)(pvt.valid&0x01>>0)<