.github/workflows/ccpp.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
       with:
         submodules: "recursive"
     - name: deps

.github/workflows/docker.yml

@@ -9,15 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v2
       - name: Checkout submodules
         run: git submodule update --init --recursive
-      - name: Set up docker qemu
-        id: qemu
-        uses: docker/setup-qemu-action@v4
       - name: Set up docker buildx
         id: buildx
-        uses: docker/setup-buildx-action@v4
+        uses: crazy-max/ghaction-docker-buildx@v3
+        with:
+          buildx-version: latest
+          qemu-version: latest
       - name: Login to docker registry
         run: |
           docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_TOKEN }}

Dockerfile

@@ -3,18 +3,18 @@
 #
 FROM debian:10-slim AS builder
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV LC_ALL=C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+ENV LC_ALL C.UTF-8
 
 # This allows you to use a local Debian mirror
-ARG APT_URL=http://archive.debian.org/debian
+ARG APT_URL=http://deb.debian.org/debian/
 ARG MAKE_FLAGS=-j2
 
-RUN sed -i "s%http://deb.debian.org/debian%${APT_URL}%" /etc/apt/sources.list
-RUN apt-get update && apt-get -y upgrade \
+RUN sed -i "s%http://deb.debian.org/debian/%${APT_URL}%" /etc/apt/sources.list \
+    && apt-get update && apt-get -y upgrade \
     && apt-get install -y protobuf-compiler libh2o-dev libcurl4-openssl-dev \
            libssl-dev libprotobuf-dev libh2o-evloop-dev libwslay-dev \
-           libeigen3-dev libzstd-dev libfmt-dev libncurses-dev libfmt-dev \
+           libeigen3-dev libzstd-dev libfmt-dev libncurses-dev \
            make gcc g++ git build-essential curl autoconf automake help2man
 
 # Build
@@ -27,9 +27,6 @@ RUN cd /galmon-src/ \
 # Second stage - contains just the binaries
 #
 FROM debian:10-slim
-
-COPY --from=builder /etc/apt/sources.list /etc/apt/sources.list
-
 RUN apt-get update && apt-get -y upgrade \
     && apt-get install -y libcurl4 libssl1.1 libprotobuf17 libh2o-evloop0.13 \
            libncurses6 \
@@ -37,5 +34,5 @@ RUN apt-get update && apt-get -y upgrade \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /galmon/ /galmon/
 ENV PATH=/galmon/bin:${PATH}
-ENV LC_ALL=C.UTF-8
+ENV LC_ALL C.UTF-8
 WORKDIR /galmon/bin

Makefile

@@ -39,11 +39,12 @@ navmon.pb.cc: navmon.proto
 	protoc --cpp_out=./ navmon.proto
 
 
+H2OPP=ext/powerblog/h2o-pp.o
 SIMPLESOCKETS=ext/powerblog/ext/simplesocket/swrappers.o ext/powerblog/ext/simplesocket/sclasses.o  ext/powerblog/ext/simplesocket/comboaddress.o 
 
 
 clean:
-	rm -f *~ *.o *.d ext/*/*.o ext/*/*.d $(PROGRAMS) navmon.pb.h navmon.pb.cc $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc))  $(SIMPLESOCKETS)
+	rm -f *~ *.o *.d ext/*/*.o ext/*/*.d $(PROGRAMS) navmon.pb.h navmon.pb.cc $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) $(H2OPP) $(SIMPLESOCKETS)
 	rm -f ext/sgp4/libsgp4/*.d ext/powerblog/ext/simplesocket/*.d
 
 help2man:
@@ -62,11 +63,21 @@ install: $(PROGRAMS) help2man
 	mkdir -p $(DESTDIR)$(prefix)$(htdocs)/galmon
 	cp -a html $(DESTDIR)$(prefix)$(htdocs)/galmon/
 
+download-debian-package:
+	apt-key adv --fetch-keys https://ota.bike/public-package-signing-keys/86E7F51C04FBAAB0.asc
+	echo "deb https://ota.bike/debian/ buster main" > /etc/apt/sources.list.d/galmon.list
+	apt-get update && apt-get install -y galmon
+
+download-raspbian-package:
+	apt-key adv --fetch-keys https://ota.bike/public-package-signing-keys/86E7F51C04FBAAB0.asc
+	echo "deb https://ota.bike/raspbian/ buster main" > /etc/apt/sources.list.d/galmon.list
+	apt-get update && apt-get install -y galmon
+
 decrypt: decrypt.o bits.o 
 	$(CXX) -std=gnu++17 $^ -o $@  -lfmt
 
-navparse: navparse.o $(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 trkmeas.o influxpush.o ${EXTRADEP} githash.o sbas.o rtcm.o galileo.o
-	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib/  -lz  -lcurl -lprotobuf  -lfmt
+navparse: navparse.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 trkmeas.o influxpush.o ${EXTRADEP} githash.o sbas.o rtcm.o galileo.o
+	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib/  -lh2o-evloop -lssl -lcrypto -lz  -lcurl -lprotobuf  $(WSLAY) -lfmt
 
 reporter: reporter.o  $(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 githash.o influxpush.o 
 	$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -lprotobuf -lcurl -lfmt

README.md

@@ -82,20 +82,27 @@ receiver-only tools.
 To build everything, including the webserver, try:
 
 ```
-apt-get install protobuf-compiler libcurl4-openssl-dev libssl-dev libprotobuf-dev \
-libncurses5-dev libeigen3-dev libzstd-dev g++ libfmt-dev
+apt-get install protobuf-compiler libh2o-dev libcurl4-openssl-dev libssl-dev libprotobuf-dev \
+libh2o-evloop-dev libwslay-dev libncurses5-dev libeigen3-dev libzstd-dev g++ libfmt-dev
 git clone https://github.com/berthubert/galmon.git --recursive
 cd galmon
 make
 ```
 
+If this doesn't succeed with an error about h2o, make sure you have this
+library installed. If you get an error about 'wslay', do the following, and run make again:
+
+```
+echo WSLAY=-lwslay > Makefile.local
+```
+
 Building on OSX
 ---------------
 With thanks to a contributor from Prague.  First make sure you've installed
 brew, which you can get [here](https://brew.sh/). Then do:
 
 ```
-brew install protobuf lzlib zstd eigen
+brew install protobuf lzlib zstd h2o eigen
 ```
 
 And then:
@@ -321,7 +328,7 @@ Documents
  * [GLONASS CDMA](http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD-GLONASS-CDMA-General.-Edition-1.0-2016.pdf)
    not actually relevant for the CDMA aspects, but has appendices on more
    precise orbit determinations.
- * [GPS](https://www.navcen.uscg.gov/sites/default/files/pdf/gps/IS-GPS-200N.pdf)
+ * [GPS](https://www.gps.gov/technical/icwg/IS-GPS-200K.pdf)
  * [U-blox 8 interface specification](https://www.u-blox.com/sites/default/files/products/documents/u-blox8-M8_ReceiverDescrProtSpec_%28UBX-13003221%29_Public.pdf)
  * [U-blox 9 interface specification](https://www.u-blox.com/sites/default/files/u-blox_ZED-F9P_InterfaceDescription_%28UBX-18010854%29.pdf)
  * [U-blox 10 interface  specification](https://content.u-blox.com/sites/default/files/documents/u-blox-F10-SPG-6.00_InterfaceDescription_UBX-23002975.pdf)

galmonmon.cc

@@ -4,12 +4,11 @@
 #include "navmon.hh"
 #include "fmt/format.h"
 #include "fmt/printf.h"
-
+#include "ext/powerblog/h2o-pp.hh"
 #include <variant>
 
 #include "CLI/CLI.hpp"
 #include "version.hh"
-#include <nlohmann/json.hpp>
 
 static char program[]="galmonmon";
 

gps.cc

@@ -38,8 +38,6 @@ int GPSState::parseGPSMessage(const std::vector<uint8_t>& cond, uint8_t* pageptr
     wn = 2048 + getbitu(&cond[0], 2*24, 10);
     ura = getbitu(&cond[0], 2*24+12, 4);
     gpshealth = getbitu(&cond[0], 2*24+16, 6);
-    iodc = getbitu(&cond[0], 2*24 +22, 2) * 256;
-    iodc += getbitu(&cond[0], 7*24, 8);
     
     //    cerr<<"GPS Week Number: "<< wn <<", URA: "<< (int)ura<<", health: "<<
     //      (int)gpshealth <<endl;

gps.hh

@@ -134,10 +134,8 @@ struct GPSState :  GPSLikeEphemeris
   uint16_t wnLSF{0};
   uint8_t dn; // leap second day number
   //   1  2^-31 2^-43 2^-55   16 second
-  int iodc;
   int ura;
 
-  
   int gpsiod{-1};
 
   int getIOD() const

html/doalles.js

@@ -1,5 +1,7 @@
 var repeat;
 
+moment.relativeTimeThreshold('m', 120);
+
 function maketable(str, arr)
 {
     var table=d3.select(str);
@@ -102,7 +104,8 @@ function maketable(str, arr)
 
                     
                     if(row[column] != null) {
-                        ret.value = row[column].toFixed(0) + " minutes ago";
+                        var b = moment.duration(-row[column], 'm');
+                        ret.value = b.humanize(true);
                     }
                     else
                         ret.value="";
@@ -150,11 +153,8 @@ function maketable(str, arr)
                 }
 
                 else if(column == "last-seen-s") {
-		    var seconds = row[column].toFixed(0);
-		    if(seconds < 30) 
-			ret.value = "a few seconds ago";
-		    else
-			ret.value = (seconds/60) + " minutes ago";
+                    var b = moment.duration(row[column], 's');
+                    ret.value = b.humanize();
                 }
                 else if(column == "best-tle") {
                     ret.value = "<small>"+row[column]+"</small>";
@@ -351,14 +351,9 @@ function update()
         str += ", "+d["leap-seconds"]+"</b> leap seconds (GPS/Galileo)";
         
         d3.select('#facts').html(str);
-        var ageSeconds = (Date.now() - 1000*d["last-seen"])/1000;
-	var ageString;
-	if(ageSeconds < 60)
-	    ageString = "a few seconds ago";
-	else
-	    ageString = (ageSeconds/60).toFixed(0) +" minutes ago";
-	
-        d3.select("#freshness").html(ageString);
+        lastseen = moment(1000*d["last-seen"]);
+        d3.select("#freshness").html(lastseen.fromNow());
+
 
         str = d["total-live-receivers"]+" receivers active, tracking ";
         str += d["total-live-svs"] + " satellites via " ;

html/geo/geo.js

@@ -143,9 +143,6 @@ var Tooltip;
 
 function create_tooltop()
 {
-	if (Tooltip) {
-		return;
-	}
 	// create a tooltip
 	Tooltip = d3.select("#combined")
 		.append("span")

html/index.html

@@ -7,7 +7,7 @@
   
 </head>
 <body>
-  Last update: <span id="freshness"></span>. More information about this Galileo/GPS/BeiDou/Glonass open source monitor can be found <a href="https://berthub.eu/articles/posts/galmon-project/">here</a>. Live observer map <a href="geo">here</a>, status (coverage, DOP) map <a href="geo/coverage.html">here</a>. <b><strike>Experimental Grafana dashboard on <a href="https://public.galmon.eu/">public.galmon.eu</a> (user: guest, password: guest)</strike></b>. SBAS <a href="sbas.html">status</a>, <a href="sbstatus.html">per-satellite</a>.   <a rel="me" href="https://bot.country/@GNSS_Changes">Mastodon</a>.  <span id="allstats"></span><br/>
+  Last update: <span id="freshness"></span>. More information about this Galileo/GPS/BeiDou/Glonass open source monitor can be found <a href="https://berthub.eu/articles/posts/galmon-project/">here</a>. Live observer map <a href="geo">here</a>, status (coverage, DOP) map <a href="geo/coverage.html">here</a>. <b>Experimental Grafana dashboard on <a href="https://public.galmon.eu/">public.galmon.eu</a> (user: guest, password: guest)</b>. SBAS <a href="sbas.html">status</a>, <a href="sbstatus.html">per-satellite</a>. <span id="allstats"></span><br/>
   <div class="centered">
     <hr/>
     <input type="checkbox"  id="GalE1" onclick="updateSats();">  <label for="GalE1">Galileo E1</label> &nbsp;&nbsp;
@@ -21,7 +21,7 @@
     <input type="checkbox"  id="GPSL2C" onclick="updateSats();">  <label for="GPSL2C">GPS L2C</label>
   </div>
   <hr/>
-
+  <a rel="me" href="https://bot.country/@GNSS_Changes">Mastodon</a>
   <table id="svs"></table>
   <hr>
   <p>
@@ -75,9 +75,10 @@
     Information on the status of BeiDou can be found on <a href="http://www.csno-tarc.cn/system/constellation&amp;ce=english">this page</a> from the Chinese Test and Assessment Research Center of China Satellite Navigation Office.
   </p>
   <p>
-    Feedback is very welcome on bert@hubertnet.nl or via Mastodon <a href="https://eupolicy.social/@bert_hubert">@bert_hubert@eupolicy.social</a>.
+    Feedback is very welcome on bert@hubertnet.nl or <a href="https://twitter.com/bert_hu_bert">@bert_hu_bert</a>.
   </p>
   <script src="d3.v4.min.js"></script>
+  <script src="ext/moment-with-locales.js"></script>
   <script src="doalles.js"></script>
 </body>
 </html>