@@ -21,10 +21,10 @@ class MavlinkMessage:
21
21
component_id : uint32_t
22
22
Component ID of the sender (for received messages)
23
23
24
- target_system : uint32_t
24
+ target_system_id : uint32_t
25
25
Target system ID (for sending, 0 for broadcast)
26
26
27
- target_component : uint32_t
27
+ target_component_id : uint32_t
28
28
Target component ID (for sending, 0 for broadcast)
29
29
30
30
fields_json : std::string
@@ -39,15 +39,15 @@ def __init__(
39
39
message_name ,
40
40
system_id ,
41
41
component_id ,
42
- target_system ,
43
- target_component ,
42
+ target_system_id ,
43
+ target_component_id ,
44
44
fields_json ):
45
45
""" Initializes the MavlinkMessage object """
46
46
self .message_name = message_name
47
47
self .system_id = system_id
48
48
self .component_id = component_id
49
- self .target_system = target_system
50
- self .target_component = target_component
49
+ self .target_system_id = target_system_id
50
+ self .target_component_id = target_component_id
51
51
self .fields_json = fields_json
52
52
53
53
def __eq__ (self , to_compare ):
@@ -59,8 +59,8 @@ def __eq__(self, to_compare):
59
59
(self .message_name == to_compare .message_name ) and \
60
60
(self .system_id == to_compare .system_id ) and \
61
61
(self .component_id == to_compare .component_id ) and \
62
- (self .target_system == to_compare .target_system ) and \
63
- (self .target_component == to_compare .target_component ) and \
62
+ (self .target_system_id == to_compare .target_system_id ) and \
63
+ (self .target_component_id == to_compare .target_component_id ) and \
64
64
(self .fields_json == to_compare .fields_json )
65
65
66
66
except AttributeError :
@@ -72,8 +72,8 @@ def __str__(self):
72
72
"message_name: " + str (self .message_name ),
73
73
"system_id: " + str (self .system_id ),
74
74
"component_id: " + str (self .component_id ),
75
- "target_system : " + str (self .target_system ),
76
- "target_component : " + str (self .target_component ),
75
+ "target_system_id : " + str (self .target_system_id ),
76
+ "target_component_id : " + str (self .target_component_id ),
77
77
"fields_json: " + str (self .fields_json )
78
78
])
79
79
@@ -93,10 +93,10 @@ def translate_from_rpc(rpcMavlinkMessage):
93
93
rpcMavlinkMessage .component_id ,
94
94
95
95
96
- rpcMavlinkMessage .target_system ,
96
+ rpcMavlinkMessage .target_system_id ,
97
97
98
98
99
- rpcMavlinkMessage .target_component ,
99
+ rpcMavlinkMessage .target_component_id ,
100
100
101
101
102
102
rpcMavlinkMessage .fields_json
@@ -126,13 +126,13 @@ def translate_to_rpc(self, rpcMavlinkMessage):
126
126
127
127
128
128
129
- rpcMavlinkMessage .target_system = self .target_system
129
+ rpcMavlinkMessage .target_system_id = self .target_system_id
130
130
131
131
132
132
133
133
134
134
135
- rpcMavlinkMessage .target_component = self .target_component
135
+ rpcMavlinkMessage .target_component_id = self .target_component_id
136
136
137
137
138
138
0 commit comments