From 74db87012c9c4d8d0cc97fa9b0017d856b5c17dc Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 1 Aug 2020 21:19:01 +0200
Subject: [PATCH] add Galileo C/NAV type, and support for it to navdump

---
 navdump.cc   |  9 +++++++++
 navmon.proto | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/navdump.cc b/navdump.cc
index e39ef0f..c6b437f 100644
--- a/navdump.cc
+++ b/navdump.cc
@@ -546,6 +546,15 @@ try
       
       cout<<endl;      
     }
+    else if(nmm.type() == NavMonMessage::GalileoCnavType) {
+      basic_string<uint8_t> cnav((uint8_t*)nmm.gf().contents().c_str(), nmm.gf().contents().size());
+      int sv = nmm.gc().gnsssv();
+      if(!svfilter.check(2, sv, nmm.gc().sigid()))
+        continue;
+      etstamp();
+      cout << "C/NAV for " << nmm.gf().gnssid()<<","<<nmm.gf().gnsssv()<<","<<nmm.gf().sigid() <<": "<< makeHexDump(cnav)<<endl;
+
+    }
     else if(nmm.type() == NavMonMessage::GalileoFnavType) {
       basic_string<uint8_t> fnav((uint8_t*)nmm.gf().contents().c_str(), nmm.gf().contents().size());
       int sv = nmm.gf().gnsssv();
diff --git a/navmon.proto b/navmon.proto
index 643b3b8..c8da44e 100644
--- a/navmon.proto
+++ b/navmon.proto
@@ -18,7 +18,8 @@ message NavMonMessage {
     GPSCnavType = 14;
     RTCMMessageType = 15;
     TimeOffsetType = 16;
-    GalileoFnavType = 17;    
+    GalileoFnavType = 17;
+    GalileoCnavType = 18;
   }
 
   required uint64 sourceID = 1;
@@ -46,6 +47,15 @@ message GalileoFnav {
 	required bytes contents =5;
         required uint32 sigid = 6;        
   }
+  message GalileoCnav {
+	required uint32 gnssWN =1;
+  	required uint32 gnssTOW =2; // INTEGERS!
+
+	required uint32 gnssID =3;
+	required uint32 gnssSV =4;
+	required bytes contents =5;
+        required uint32 sigid = 6;        
+  }
 
   message GPSInav {
 	required uint32 gnssWN =1;
@@ -229,4 +239,5 @@ message GalileoFnav {
   optional RTCMMessage rm = 19;
   optional TimeOffsetMessage to = 20;
   optional GalileoFnav gf=21;
+  optional GalileoCnav gc=22;
 }