Skip to content

Commit e60ccef

Browse files
billbonneyHefnySco
authored andcommitted
Fixes dronekit#447 Add filter on Drone sys_id on incoming messages
1 parent 359371b commit e60ccef

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

ClientLib/src/main/java/org/droidplanner/services/android/impl/core/drone/autopilot/apm/ArduPilot.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,12 @@ protected boolean performTakeoff(Bundle data, ICommandListener listener) {
385385

386386
@Override
387387
public void onMavLinkMessageReceived(MAVLinkMessage message) {
388+
389+
if (message.sysid != this.getSysid()) {
390+
// Reject Messages that are not for the system id
391+
return;
392+
}
393+
388394
int compId = message.compid;
389395
if (compId != AUTOPILOT_COMPONENT_ID
390396
&& compId != ARTOO_COMPONENT_ID

ClientLib/src/main/java/org/droidplanner/services/android/impl/core/drone/autopilot/generic/GenericMavLinkDrone.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,11 @@ private void onHeartbeat(MAVLinkMessage msg) {
574574
@Override
575575
public void onMavLinkMessageReceived(MAVLinkMessage message) {
576576

577+
if (message.sysid != this.getSysid()) {
578+
// Reject Messages that are not for the system id
579+
return;
580+
}
581+
577582
onHeartbeat(message);
578583

579584
switch (message.msgid) {

0 commit comments

Comments
 (0)