location-service

Merge lp:~thomas-voss/location-service/iterate-on-galileo-handling into lp:location-service

  1. iterate-on-galileo-handling
  2. Merge into next
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 292
Merged at revision: 293
Proposed branch: lp:~thomas-voss/location-service/iterate-on-galileo-handling
Merge into: lp:location-service
Diff against target: 53 lines (+5/-2)
3 files modified
src/location/providers/ubx/_8/nmea/generator.h (+2/-1)
src/location/providers/ubx/_8/nmea/grammar.h (+2/-1)
src/location/providers/ubx/_8/nmea/talker.h (+1/-0)
To merge this branch: bzr merge lp:~thomas-voss/location-service/iterate-on-galileo-handling
Reviewer Review Type Date Requested Status
Simon Fels (community) Approve
Thomas Voß Pending
Review via email: mp+319409@code.launchpad.net

Commit message

Enable support for GALILEO talker id.

Description of the change

Enable support for GALILEO talker id.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/location/providers/ubx/_8/nmea/generator.h'
2--- src/location/providers/ubx/_8/nmea/generator.h 2016-10-10 09:15:40 +0000
3+++ src/location/providers/ubx/_8/nmea/generator.h 2017-03-09 09:45:55 +0000
4@@ -58,6 +58,7 @@
5 field_separator %= ',';
6 checksum %= boost::spirit::karma::hex;
7 talker.add
8+ (Talker::ga, "GA")
9 (Talker::gl, "GL")
10 (Talker::gn, "GN")
11 (Talker::gp, "GP");
12@@ -165,7 +166,7 @@
13 << boost::spirit::karma::maxwidth(1)[-boost::spirit::karma::uint_generator<std::uint8_t, 10>()] << field_separator
14 << boost::spirit::karma::maxwidth(1)[-boost::spirit::karma::uint_generator<std::uint8_t, 10>()] << field_separator
15 << boost::spirit::karma::right_align(2, '0')[-boost::spirit::karma::uint_generator<std::uint16_t, 10>()]
16- << +(gsv_info);
17+ << *(gsv_info);
18
19 rmc %= talker << "RMC" << field_separator
20 << -utc << field_separator
21
22=== modified file 'src/location/providers/ubx/_8/nmea/grammar.h'
23--- src/location/providers/ubx/_8/nmea/grammar.h 2016-10-10 09:15:40 +0000
24+++ src/location/providers/ubx/_8/nmea/grammar.h 2017-03-09 09:45:55 +0000
25@@ -60,6 +60,7 @@
26 field_separator %= ',';
27 checksum %= boost::spirit::qi::hex;
28 talker.add
29+ ("GA", Talker::ga)
30 ("GL", Talker::gl)
31 ("GN", Talker::gn)
32 ("GP", Talker::gp);
33@@ -164,7 +165,7 @@
34 >> -boost::spirit::qi::uint_parser<std::uint8_t, 10, 1, 1>() >> field_separator
35 >> -boost::spirit::qi::uint_parser<std::uint8_t, 10, 1, 1>() >> field_separator
36 >> -boost::spirit::qi::uint_parser<std::uint16_t, 10, 2, 2>()
37- >> +(gsv_info);
38+ >> *(gsv_info);
39
40 rmc %= talker >> "RMC" >> field_separator
41 >> -utc >> field_separator
42
43=== modified file 'src/location/providers/ubx/_8/nmea/talker.h'
44--- src/location/providers/ubx/_8/nmea/talker.h 2016-10-10 09:15:40 +0000
45+++ src/location/providers/ubx/_8/nmea/talker.h 2017-03-09 09:45:55 +0000
46@@ -28,6 +28,7 @@
47 /// @brief Talker enumerates well-known participants on an NMEA bus.
48 enum class Talker
49 {
50+ ga, ///< GALILEO receiver
51 gl, ///< GLONASS receiver
52 gn, ///< Global Navigation Satellite System (GNSS)
53 gp ///< Global Positioning System (GPS)

Subscribers

People subscribed via source and target branches

to all changes: