Merge pull request #181 from berthubert/string2vec

remove std::basic_string<uint8_t> and basic_string_view

Author: berthubert

beidou.cc

@@ -1,6 +1,8 @@
 #include "beidou.hh"
 #include "bits.hh"
 #include <iostream>
+#include <vector>
+#include "navmon.hh"
 
 using namespace std;
 
@@ -29,7 +31,7 @@ static int checkbds(int bits)
   return 1;
 }
 
-std::basic_string<uint8_t> getCondensedBeidouMessage(std::basic_string_view<uint8_t> payload)
+std::vector<uint8_t> getCondensedBeidouMessage(const std::vector<uint8_t>& payload)
 {
 
   // payload consists of 32 bit words where we have to ignore the first 2 bits of every word
@@ -56,7 +58,7 @@ std::basic_string<uint8_t> getCondensedBeidouMessage(std::basic_string_view<uint
     setbitu(buffer, 26+22*(w-1), 22, getbitu(&payload[0], 2 + w*32, 22));
   }
 
-  return std::basic_string<uint8_t>(buffer, 28);
+  return makeVec(buffer, 28);
 }
 
 

beidou.hh

@@ -4,9 +4,10 @@
 #include "bits.hh"
 #include <math.h>
 #include <stdexcept>
+#include <vector>
 #include "ephemeris.hh"
 
-std::basic_string<uint8_t> getCondensedBeidouMessage(std::basic_string_view<uint8_t> payload);
+std::vector<uint8_t> getCondensedBeidouMessage(const std::vector<uint8_t>& payload);
 int beidouBitconv(int their);
 
 /* Geostationary, so D2, so not to be parsed by this parser:
@@ -21,7 +22,7 @@ struct BeidouMessage : GPSLikeEphemeris
 {
   uint8_t strtype;
 
-  std::basic_string_view<uint8_t> g_cond;
+  std::vector<uint8_t> g_cond;
   int bbitu(int bit, int len)
   {
     return getbitu(&g_cond[0], beidouBitconv(bit), len);
@@ -34,7 +35,7 @@ struct BeidouMessage : GPSLikeEphemeris
 
   int fraid{-1}, sow{-1}; // part of every message (thanks!)
 
-  int parse(std::basic_string_view<uint8_t> cond, uint8_t* pageno)
+  int parse(const std::vector<uint8_t>& cond, uint8_t* pageno)
   {
     g_cond = cond;
     if(pageno)
@@ -89,7 +90,7 @@ struct BeidouMessage : GPSLikeEphemeris
     return {factor * cur, factor * trend};
   }
 
-  void parse1(std::basic_string_view<uint8_t> cond)
+  void parse1(const std::vector<uint8_t>& cond)
   {
     sath1 = bbitu(43,1);
     aodc = bbitu(31+13, 5);
@@ -124,7 +125,7 @@ struct BeidouMessage : GPSLikeEphemeris
     return -1;
   }
 
-  void parse2(std::basic_string_view<uint8_t> cond)
+  void parse2(const std::vector<uint8_t>& cond)
   {
     deltan = bbits(43, 16);
     cuc = bbits(67, 18);
@@ -151,7 +152,7 @@ struct BeidouMessage : GPSLikeEphemeris
   double getOmega0()    const { return ldexp(Omega0 * M_PI,   -31);   } // radians
   double getIdot()      const { return ldexp(idot * M_PI,     -43);   } // radians/s
   double getOmega()     const { return ldexp(omega * M_PI,    -31);   } // radians
-  void parse3(std::basic_string_view<uint8_t> cond)
+  void parse3(const std::vector<uint8_t>& cond)
   {
     t0eLSB = bbitu(43, 15);
     i0 = bbits(66, 32);
@@ -207,7 +208,7 @@ struct BeidouMessage : GPSLikeEphemeris
   } alma;
 
   // 4 is all almanac
-  int parse4(std::basic_string_view<uint8_t> cond)
+  int parse4(const std::vector<uint8_t>& cond)
   {
     alma.sqrtA = bbitu(51, 24);
     alma.a1 = bbits(91, 11);
@@ -254,7 +255,7 @@ struct BeidouMessage : GPSLikeEphemeris
   }
 
 
-  int parse5(std::basic_string_view<uint8_t> cond)
+  int parse5(const std::vector<uint8_t>& cond)
   {
     alma.pageno = bbitu(44, 7);
     if(alma.pageno == 9) {

fixhunter.cc

@@ -6,7 +6,7 @@
 #include "galileo.hh"
 using namespace std;
 
-void FixHunter::reportInav(const basic_string<uint8_t>& inav, int32_t gst)
+void FixHunter::reportInav(const vector<uint8_t>& inav, int32_t gst)
 {
   int wtype = getbitu(&inav[0], 0, 6);
 
@@ -181,7 +181,7 @@ void FixHunter::tryFix(int32_t gst)
 struct GalileoMessage FixHunter::fillGMFromRS(const std::string& out)
 {
   // we need to reconstruct words 1, 2, 3 and 4 and feed them to the parser
-  basic_string<uint8_t> inav[5];
+  vector<uint8_t> inav[5];
   string inavraw[5];
   inavraw[4] = out.substr(0, 14); 
   inavraw[3] = out.substr(14, 14);
@@ -198,7 +198,7 @@ struct GalileoMessage FixHunter::fillGMFromRS(const std::string& out)
   for(int n=0; n < 14; ++n)
     setbitu(tmp, 16 + n*8, 8, getbitu((unsigned char*) inavraw[1].c_str(), 16 + n*8, 8));
 
-  inav[1].assign(tmp, 16);
+  inav[1]= makeVec(tmp, 16);
 
   struct GalileoMessage gm={};
   gm.parse(inav[1]);
@@ -210,7 +210,7 @@ struct GalileoMessage FixHunter::fillGMFromRS(const std::string& out)
     setbitu(tmp, 6, 10, getbitu((unsigned char*) inav[1].c_str(), 6, 10)); // fake in IOD from inav1
     for(int n=0; n < 14; ++n)
       setbitu(tmp, 16 + n*8, 8, getbitu((unsigned char*) inavraw[i].c_str(), n*8, 8));
-    inav[i].assign(tmp, 16);
+    inav[i]= makeVec(tmp, 16);
     gm.parse(inav[i]);
     cout<<"wtype: "<<(int)gm.wtype<<", iod "<<gm.iodnav<<endl;
   }

fixhunter.hh

@@ -5,11 +5,11 @@
 class FixHunter
 {
 public:
-  void reportInav(const std::basic_string<uint8_t>& inav, int32_t gst);
+  void reportInav(const std::vector<uint8_t>& inav, int32_t gst);
 private:
   void tryFix(int32_t gst);
   struct GalileoMessage fillGMFromRS(const std::string& out);
-  std::basic_string<uint8_t> inav1, inav2, inav3, inav4, inav16, inav17, inav18, inav19, inav20;
+  std::vector<uint8_t> inav1, inav2, inav3, inav4, inav16, inav17, inav18, inav19, inav20;
   int d_latestiod;
   uint32_t d_inav16t0r;
 };

galileo.cc

@@ -1,7 +1,7 @@
 #include "bits.hh"
 #include "galileo.hh"
 
-bool getTOWFromInav(std::basic_string_view<uint8_t> inav, uint32_t *satTOW, uint16_t *wn)
+bool getTOWFromInav(const std::vector<uint8_t>& inav, uint32_t *satTOW, uint16_t *wn)
 {
   unsigned int wtype = getbitu(&inav[0], 0, 6);
   if(wtype==0) {
@@ -25,7 +25,7 @@ bool getTOWFromInav(std::basic_string_view<uint8_t> inav, uint32_t *satTOW, uint
   return false;
 }
 
-int GalileoMessage::parseFnav(std::basic_string_view<uint8_t> page)
+int GalileoMessage::parseFnav(const std::vector<uint8_t>& page)
 {
   const uint8_t* ptr = &page[0];
   int offset=0;

galileo.hh

@@ -7,13 +7,13 @@
 #include "ephemeris.hh"
 #include "bits.hh"
 
-bool getTOWFromInav(std::basic_string_view<uint8_t> inav, uint32_t *satTOW, uint16_t *wn);
+bool getTOWFromInav(const std::vector<uint8_t>& inav, uint32_t *satTOW, uint16_t *wn);
 
 struct GalileoMessage : GPSLikeEphemeris
 {
   uint8_t wtype;
 
-  typedef void (GalileoMessage::*func_t)(std::basic_string_view<uint8_t> page);
+  typedef void (GalileoMessage::*func_t)(const std::vector<uint8_t>& page);
   std::map<int, func_t> parsers{
     {0, &GalileoMessage::parse0},
     {1, &GalileoMessage::parse1},
@@ -34,7 +34,7 @@ struct GalileoMessage : GPSLikeEphemeris
   };
 
 
-  int parse(std::basic_string_view<uint8_t> page)
+  int parse(const std::vector<uint8_t>& page)
   {
     wtype = getbitu(&page[0], 0, 6);
     if(!parsers.count(wtype)) {
@@ -46,7 +46,7 @@ struct GalileoMessage : GPSLikeEphemeris
     return wtype;
   }
 
-  int parseFnav(std::basic_string_view<uint8_t> page);
+  int parseFnav(const std::vector<uint8_t>& page);
 
   uint8_t sparetime{0};
   uint16_t wn{0};  
@@ -58,7 +58,7 @@ struct GalileoMessage : GPSLikeEphemeris
 
 
   // spare word, only contains a WN and a TOW, but only if the 'time' field is set to 2
-  void parse0(std::basic_string_view<uint8_t> page)
+  void parse0(const std::vector<uint8_t>& page)
   {
     sparetime = getbitu(&page[0], 6, 2);
     if(sparetime == 2) {
@@ -164,7 +164,7 @@ struct GalileoMessage : GPSLikeEphemeris
 
 
   // an ephemeris word
-  void parse1(std::basic_string_view<uint8_t> page)
+  void parse1(const std::vector<uint8_t>& page)
   {
     iodnav = getbitu(&page[0], 6, 10);
     t0e = getbitu(&page[0],   16, 14); 
@@ -174,7 +174,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // another ephemeris word
-  void parse2(std::basic_string_view<uint8_t> page)
+  void parse2(const std::vector<uint8_t>& page)
   {
     iodnav = getbitu(&page[0], 6, 10);
     omega0 = getbits(&page[0], 16, 32);
@@ -184,7 +184,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // yet another ephemeris word
-  void parse3(std::basic_string_view<uint8_t> page)
+  void parse3(const std::vector<uint8_t>& page)
   {
     iodnav = getbitu(&page[0], 6, 10);
     omegadot = getbits(&page[0], 16, 24);
@@ -264,7 +264,7 @@ struct GalileoMessage : GPSLikeEphemeris
 
 
   // can't get enough of that ephemeris
-  void parse4(std::basic_string_view<uint8_t> page)
+  void parse4(const std::vector<uint8_t>& page)
   {
     iodnav = getbitu(&page[0], 6, 10);
     cic = getbits(&page[0], 22, 16);
@@ -277,7 +277,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // ionospheric disturbance, health, group delay, time
-  void parse5(std::basic_string_view<uint8_t> page)
+  void parse5(const std::vector<uint8_t>& page)
   {
     ai0 = getbitu(&page[0], 6, 11);
     ai1 = getbits(&page[0], 17, 11); // ai1 & 2 are signed, 0 not
@@ -300,7 +300,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // time stuff
-  void parse6(std::basic_string_view<uint8_t> page)
+  void parse6(const std::vector<uint8_t>& page)
   {
     a0 = getbits(&page[0], 6, 32);
     a1 = getbits(&page[0], 38, 24);
@@ -315,7 +315,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // almanac
-  void parse7(std::basic_string_view<uint8_t> page)
+  void parse7(const std::vector<uint8_t>& page)
   {
     iodalmanac = getbitu(&page[0], 6, 4);
     alma1.wnalmanac = wnalmanac = getbitu(&page[0], 10, 2);
@@ -331,7 +331,7 @@ struct GalileoMessage : GPSLikeEphemeris
 
   }
   // almanac
-  void parse8(std::basic_string_view<uint8_t> page)
+  void parse8(const std::vector<uint8_t>& page)
   {
     iodalmanac = getbitu(&page[0], 6, 4);
     alma1.af0 = getbits(&page[0], 10, 16);
@@ -350,7 +350,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // almanac
-  void parse9(std::basic_string_view<uint8_t> page)
+  void parse9(const std::vector<uint8_t>& page)
   {
     iodalmanac = getbitu(&page[0], 6, 4);
     alma2.wnalmanac = wnalmanac = getbitu(&page[0], 10, 2);
@@ -371,7 +371,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // almanac + more time stuff (GPS)
-  void parse10(std::basic_string_view<uint8_t> page)
+  void parse10(const std::vector<uint8_t>& page)
   {
     iodalmanac = getbitu(&page[0], 6, 4);
     alma3.Omega0 = getbits(&page[0], 10, 16);
@@ -391,7 +391,7 @@ struct GalileoMessage : GPSLikeEphemeris
 
 
   // reduced clock and ephemeris data (redced)
-  void parse16(std::basic_string_view<uint8_t> page)
+  void parse16(const std::vector<uint8_t>& page)
   {
     deltaAred = getbits(&page[0], 6,    5);
     exred = getbits(&page[0], 11,      13);
@@ -404,7 +404,7 @@ struct GalileoMessage : GPSLikeEphemeris
   }
 
   // reed-solomon data
-  void parseRS(std::basic_string_view<uint8_t> page)
+  void parseRS(const std::vector<uint8_t>& page)
   {
     // see 5.1.13.2 of the Galileo SIS ICD 2.0
     rs2bitiod = getbitu(&page[0], 6+8, 2);

glonass.cc

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <chrono>
 #include <iostream>
+#include "navmon.hh"
 using std::cout;
 using std::endl;
 
@@ -12,15 +13,15 @@ static const double J2 = 1082625.75E-9;                 // IERS: 1.0826359
 static const double oe = 7.2921151467E-5; // rad/s	// IERS: 7.292115
 
 // this strips out spare bits + parity, and leaves 10 clean 24 bit words
-std::basic_string<uint8_t> getGlonassMessage(std::basic_string_view<uint8_t> payload)
+std::vector<uint8_t> getGlonassMessage(const std::vector<uint8_t>& payload)
 {
   uint8_t buffer[4*4];
 
   for(int w = 0 ; w < 4; ++w) {
     setbitu(buffer, 32*w, 32, getbitu(&payload[0],  w*32, 32));
   }
 
-  return std::basic_string<uint8_t>(buffer, 16);
+  return makeVec(buffer, 16);
 
 }