Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fixposition_driver_msgs/msg/NovbHeading2.msg
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ float32 pitch # Pitch (degrees)
float32 reserved # Reserved
float32 heading_stdev # Heading standard deviation (degrees)
float32 pitch_stdev # Pitch standard deviation (degrees)
uint8[4] rover_stn_id # Rover station ID
uint8[4] master_stn_id # Master station ID
string rover_stn_id # Rover station ID
string master_stn_id # Master station ID
uint8 num_sv_tracked # Number of satellites tracked
uint8 num_sv_in_sol # Number of satellites in solution
uint8 num_sv_obs # Number of satellites with observations
Expand Down
9 changes: 6 additions & 3 deletions fixposition_driver_ros1/src/data_to_ros1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,12 @@ static void NovbHeading2ToMsg(const novb::NovbHeader* header, const novb::NovbHe
msg.reserved = payload->reserved;
msg.heading_stdev = payload->heading_stdev;
msg.pitch_stdev = payload->pitch_stdev;
std::copy(std::begin(payload->rover_stn_id), std::end(payload->rover_stn_id), std::begin(msg.rover_stn_id));
std::copy(std::begin(payload->master_stn_id), std::end(payload->master_stn_id), std::begin(msg.master_stn_id));
msg.num_sv_tracked = payload->num_sv_tracked;
msg.rover_stn_id = fpsdk::common::string::BufToStr(
{payload->rover_stn_id, payload->rover_stn_id + sizeof(payload->rover_stn_id)})
msg.master_stn_id =
fpsdk::common::string::BufToStr(
{payload->master_stn_id, payload->master_stn_id + sizeof(payload->master_stn_id)}) msg.num_sv_tracked =
payload->num_sv_tracked;
msg.num_sv_in_sol = payload->num_sv_in_sol;
msg.num_sv_obs = payload->num_sv_obs;
msg.num_sv_multi = payload->num_sv_multi;
Expand Down
6 changes: 4 additions & 2 deletions fixposition_driver_ros2/src/data_to_ros2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,10 @@ static void NovbHeading2ToMsg(const novb::NovbHeader* header, const novb::NovbHe
msg.reserved = payload->reserved;
msg.heading_stdev = payload->heading_stdev;
msg.pitch_stdev = payload->pitch_stdev;
std::copy(std::begin(payload->rover_stn_id), std::end(payload->rover_stn_id), std::begin(msg.rover_stn_id));
std::copy(std::begin(payload->master_stn_id), std::end(payload->master_stn_id), std::begin(msg.master_stn_id));
msg.rover_stn_id = fpsdk::common::string::BufToStr(
{payload->rover_stn_id, payload->rover_stn_id + sizeof(payload->rover_stn_id)});
msg.master_stn_id = fpsdk::common::string::BufToStr(
{payload->master_stn_id, payload->master_stn_id + sizeof(payload->master_stn_id)});
msg.num_sv_tracked = payload->num_sv_tracked;
msg.num_sv_in_sol = payload->num_sv_in_sol;
msg.num_sv_obs = payload->num_sv_obs;
Expand Down