fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 06:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed mavlink wifi interface name and enabled land_detector

Browse Source
This commit is contained in:
Bob-F
2018-08-06 13:32:36 +02:00
committed by Beat Küng
parent 0368c26177
commit a9bb274001
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_main.cpp
+3 -3
View File
@@ -1150,7 +1150,7 @@ Mavlink::find_broadcast_address()
const struct in_addr netmask_addr = query_netmask_addr(_socket_fd, *cur_ifreq);
const struct in_addr broadcast_addr = compute_broadcast_addr(sin_addr, netmask_addr);
if (strstr(cur_ifreq->ifr_name, _mavlink_wifi_name) == NULL) { continue; }
if (_interface_name && strstr(cur_ifreq->ifr_name, _interface_name) == NULL) { continue; }
PX4_INFO("using network interface %s, IP: %s", cur_ifreq->ifr_name, inet_ntoa(sin_addr));
PX4_INFO("with netmask: %s", inet_ntoa(netmask_addr));
@@ -1947,7 +1947,7 @@ Mavlink::task_main(int argc, char *argv[])
_mode = MAVLINK_MODE_NORMAL;
bool _force_flow_control = false;
_mavlink_wifi_name = __DEFAULT_MAVLINK_WIFI;
_interface_name = nullptr;
#ifdef __PX4_NUTTX
/* the NuttX optarg handler does not
@@ -1998,7 +1998,7 @@ Mavlink::task_main(int argc, char *argv[])
break;
case 'n':
_mavlink_wifi_name = myoptarg;
_interface_name = myoptarg;
break;
#ifdef __PX4_POSIX
src/modules/mavlink/mavlink_main.h
+1 -5
View File
@@ -63,10 +63,6 @@
#include <net/if.h>
#endif
#ifndef __DEFAULT_MAVLINK_WIFI
#define __DEFAULT_MAVLINK_WIFI "wlan"
#endif
#include <uORB/uORB.h>
#include <uORB/topics/mission.h>
#include <uORB/topics/mission_result.h>
@@ -606,7 +602,7 @@ private:
unsigned _network_buf_len;
#endif
const char *_mavlink_wifi_name;
const char *_interface_name;
int _socket_fd;
Protocol _protocol;