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

[modif] changed enum type

parent d72325a2
No related branches found
No related tags found
3 merge requests!20new tag,!19new tag,!11Resolve "Add Novatel raw data stream"
...@@ -8,16 +8,16 @@ namespace GnssUtils ...@@ -8,16 +8,16 @@ namespace GnssUtils
{ {
enum RawDataType : int enum RawDataType : int
{ {
NO = 0, NO = 0,
OBS = 1, OBS = 1,
NAV_EPH = 2, NAV_EPH = 2,
NAV_SBAS = 3, NAV_SBAS = 3,
NAV_ALM = 9, NAV_ALM_IONUTC = 9,
NAV_ANT = 5, NAV_ANT = 5,
NAV_DGPS = 7, NAV_DGPS = 7,
NAV_SSR = 10, NAV_SSR = 10,
NAV_LEX = 31, NAV_LEX = 31,
ERROR = -1 ERROR = -1
}; };
class ReceiverRawAbstract class ReceiverRawAbstract
......
------------ GALILEO -----------
GALALMANAC: 1120 (OK RTK)
GALGLOCK: 1121 (OK RTK)
GALINAVEPHEMERIS: 1309 (same info with an offset in sent via E1 and E5)
GALIONO: 1127 (OK RTK)
------------ GLONASS -----------
GLOALMANAC: 718
GLOCLOCK: 719
GLOEPHEMERIS: 723 (OK RTK)
------------ GPS -----------
GPALM: 217
GPSEPHEM: 7 (L1 EPHEM) --> RAWEPHEM: 41 (OK RTK)
------------ SBAS -----------
SBASALMANAC: 1425
------------ COMMON -----------
RANGE: 43 (OK RTK)
novatel.c L1061, there might be an error. Should move right 5 bits instead of 4 to know the message type.
...@@ -26,23 +26,21 @@ RawDataType NovatelRaw::addDataStream(const std::vector<uint8_t>& data_stream) ...@@ -26,23 +26,21 @@ 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(); updateObservations();
// obs_.print();
break; break;
case NAV_EPH: // Ephemeris case NAV_EPH: // Ephemeris
std::cout << "Ephemeris received!\n"; std::cout << "Ephemeris received!\n";
nav_.copyEphemeris(raw_data_.nav); nav_.copyEphemeris(raw_data_.nav);
nav_.print(); nav_.uniqueNavigation();
break; break;
case NAV_SBAS: // SBAS case NAV_SBAS: // SBAS
std::cout << "SBAS received!\n"; std::cout << "SBAS received!\n";
// std::cout << "SBAS added!\n";
break; break;
case NAV_ALM: // Almanac and ion/utc parameters case NAV_ALM_IONUTC: // Almanac and ion/utc parameters
std::cout << "Almanac and ion/utc parameters received!\n"; std::cout << "Almanac and ion/utc parameters received!\n";
// std::cout << "Almanac freed!\n"; nav_.copyIonUtc(raw_data_.nav);
break; break;
// Not handled messages // Not handled messages
......
...@@ -32,7 +32,6 @@ RawDataType UBloxRaw::addDataStream(const std::vector<uint8_t>& data_stream) ...@@ -32,7 +32,6 @@ RawDataType UBloxRaw::addDataStream(const std::vector<uint8_t>& data_stream)
case NAV_EPH: // Ephemeris case NAV_EPH: // Ephemeris
std::cout << "Ephemeris received!\n"; std::cout << "Ephemeris received!\n";
nav_.copyEphemeris(raw_data_.nav); nav_.copyEphemeris(raw_data_.nav);
// std::cout << "Ephemeris copied!\n";
break; break;
case NAV_SBAS: // SBAS case NAV_SBAS: // SBAS
...@@ -41,14 +40,11 @@ RawDataType UBloxRaw::addDataStream(const std::vector<uint8_t>& data_stream) ...@@ -41,14 +40,11 @@ RawDataType UBloxRaw::addDataStream(const std::vector<uint8_t>& data_stream)
// std::cout << "SBAS added!\n"; // std::cout << "SBAS added!\n";
break; break;
case NAV_ALM: // Almanac and ion/utc parameters case NAV_ALM_IONUTC: // Almanac and ion/utc parameters
std::cout << "Almanac and ion/utc parameters received!\n"; std::cout << "Almanac and ion/utc parameters received!\n";
nav_.freeAlmanac(); nav_.freeAlmanac();
// std::cout << "Almanac freed!\n";
nav_.copyAlmanac(raw_data_.nav); nav_.copyAlmanac(raw_data_.nav);
// std::cout << "Almanac copied!\n";
nav_.copyIonUtc(raw_data_.nav); nav_.copyIonUtc(raw_data_.nav);
// std::cout << "ION UTC copied!\n";
break; break;
// Not handled messages // Not handled messages
......
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