Skip to content

Commit 0765f7d

Browse files
sfuhrerRomanBapst
authored andcommitted
fix message translation
Signed-off-by: Silvan <[email protected]>
1 parent 2462e43 commit 0765f7d

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

msg/px4_msgs_old/msg/ArmingCheckReplyV0.msg

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ bool mode_req_local_alt
2525
bool mode_req_local_position
2626
bool mode_req_local_position_relaxed
2727
bool mode_req_global_position
28-
bool mode_req_global_position_relaxed
2928
bool mode_req_mission
3029
bool mode_req_home_position
3130
bool mode_req_prevent_arming

msg/translation_node/translations/translation_arming_check_reply_v1.h

+11-12
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
class ArmingCheckReplyV1Translation {
1212
public:
1313
using MessageOlder = px4_msgs_old::msg::ArmingCheckReplyV0;
14-
static_assert(MessageOlder::Request::MESSAGE_VERSION == 0);
14+
static_assert(MessageOlder::MESSAGE_VERSION == 0);
1515

1616
using MessageNewer = px4_msgs::msg::ArmingCheckReplyV1;
17-
static_assert(MessageNewer::Request::MESSAGE_VERSION == 1);
17+
static_assert(MessageNewer::MESSAGE_VERSION == 1);
1818

1919
static constexpr const char* kTopic = "/fmu/in/arming_check_reply";
2020

21-
static void fromOlder(const MessageOlder::Request &msg_older, MessageNewer::Request &msg_newer) {
22-
// Request: set msg_newer from msg_older
21+
static void fromOlder(const MessageOlder &msg_older, MessageNewer &msg_newer) {
22+
// Set msg_newer from msg_older
2323
msg_newer.timestamp = msg_older.timestamp;
2424

2525
msg_newer.request_id = msg_older.request_id;
@@ -37,9 +37,9 @@ class ArmingCheckReplyV1Translation {
3737
msg_newer.mode_req_angular_velocity = msg_older.mode_req_angular_velocity;
3838
msg_newer.mode_req_attitude = msg_older.mode_req_attitude;
3939
msg_newer.mode_req_local_alt = msg_older.mode_req_local_alt;
40-
msg_newer.mode_req_local_position = msg_older.ode_req_local_position;
41-
msg_newer.mode_req_local_position_relaxed = msg_older.ode_req_local_position_relaxed;
42-
msg_newer.ode_req_global_position = msg_older.ode_req_global_position;
40+
msg_newer.mode_req_local_position = msg_older.mode_req_local_position;
41+
msg_newer.mode_req_local_position_relaxed = msg_older.mode_req_local_position_relaxed;
42+
msg_newer.mode_req_global_position = msg_older.mode_req_global_position;
4343
msg_newer.mode_req_global_position_relaxed = false;
4444
msg_newer.mode_req_mission = msg_older.mode_req_mission;
4545
msg_newer.mode_req_home_position = msg_older.mode_req_home_position;
@@ -48,8 +48,8 @@ class ArmingCheckReplyV1Translation {
4848

4949
}
5050

51-
static void toOlder(const MessageNewer::Request &msg_newer, MessageOlder::Request &msg_older) {
52-
// Request: set msg_older from msg_newer
51+
static void toOlder(const MessageNewer &msg_newer, MessageOlder &msg_older) {
52+
// Set msg_older from msg_newer
5353
msg_older.timestamp = msg_newer.timestamp;
5454

5555
msg_older.request_id = msg_newer.request_id;
@@ -67,9 +67,8 @@ class ArmingCheckReplyV1Translation {
6767
msg_older.mode_req_angular_velocity = msg_newer.mode_req_angular_velocity;
6868
msg_older.mode_req_attitude = msg_newer.mode_req_attitude;
6969
msg_older.mode_req_local_alt = msg_newer.mode_req_local_alt;
70-
msg_older.mode_req_local_position = msg_newer.ode_req_local_position;
71-
msg_older.ode_req_global_position = msg_newer.ode_req_global_position;
72-
msg_older.mode_req_global_position_relaxed = false;
70+
msg_older.mode_req_local_position = msg_newer.mode_req_local_position;
71+
msg_older.mode_req_global_position = msg_newer.mode_req_global_position;
7372
msg_older.mode_req_mission = msg_newer.mode_req_mission;
7473
msg_older.mode_req_home_position = msg_newer.mode_req_home_position;
7574
msg_older.mode_req_prevent_arming = msg_newer.mode_req_prevent_arming;

0 commit comments

Comments
 (0)