Skip to content
Snippets Groups Projects
Commit 4a166e25 authored by Pep Martí Saumell's avatar Pep Martí Saumell
Browse files

[modif] novatel_raw inherits from ReceiverRawAbstract

parent 0dc9fee9
No related branches found
No related tags found
3 merge requests!20new tag,!19new tag,!11Resolve "Add Novatel raw data stream"
...@@ -5,23 +5,13 @@ ...@@ -5,23 +5,13 @@
namespace GnssUtils namespace GnssUtils
{ {
class NovatelRaw class NovatelRaw : public ReceiverRawAbstract
{ {
public: public:
NovatelRaw(); NovatelRaw();
~NovatelRaw(); ~NovatelRaw();
RawDataType addDataStream(const std::vector<uint8_t>& data_stream); RawDataType addDataStream(const std::vector<uint8_t>& data_stream);
private:
raw_t raw_data_;
Observations obs_;
Navigation nav_;
void updateObservations();
RawDataType raw_data_type_;
}; };
} // namespace GnssUtils } // namespace GnssUtils
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
using namespace GnssUtils; using namespace GnssUtils;
NovatelRaw::NovatelRaw() : raw_data_type_(NO) NovatelRaw::NovatelRaw()
{ {
} }
...@@ -25,11 +25,14 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream) ...@@ -25,11 +25,14 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream)
case OBS: // Observations case OBS: // Observations
std::cout << "Observations Novatel received!\n"; std::cout << "Observations Novatel received!\n";
updateObservations();
// obs_.print();
break; break;
case NAV_EPH: // Ephemeris case NAV_EPH: // Ephemeris
std::cout << "Ephemeris received!\n"; std::cout << "Ephemeris received!\n";
// std::cout << "Ephemeris copied!\n"; nav_.copyEphemeris(raw_data_.nav);
nav_.print();
break; break;
case NAV_SBAS: // SBAS case NAV_SBAS: // SBAS
...@@ -44,22 +47,22 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream) ...@@ -44,22 +47,22 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream)
// Not handled messages // Not handled messages
case NAV_ANT: case NAV_ANT:
std::cout << "UBloxRaw: Received antenna postion parameters. Not handled.\n"; std::cout << "NovatelRaw: Received antenna postion parameters. Not handled.\n";
break; break;
case NAV_DGPS: case NAV_DGPS:
std::cout << "UBloxRaw: Received dgps correction. Not handled.\n"; std::cout << "NovatelRaw: Received dgps correction. Not handled.\n";
break; break;
case NAV_SSR: case NAV_SSR:
std::cout << "UBloxRaw: Received ssr message. Not handled.\n"; std::cout << "NovatelRaw: Received ssr message. Not handled.\n";
break; break;
case NAV_LEX: case NAV_LEX:
std::cout << "UBloxRaw: Received lex message. Not handled.\n"; std::cout << "NovatelRaw: Received lex message. Not handled.\n";
break; break;
case ERROR: case ERROR:
std::cout << "UBloxRaw: Received error message. Not handled.\n"; std::cout << "NovatelRaw: Received error message. Not handled.\n";
break; break;
default: default:
std::cout << "UBloxRaw: Received unknown message. Not handled.\n"; std::cout << "NovatelRaw: Received unknown message. Not handled.\n";
break; break;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment