zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Copter: remove global static send_statustext_chan

mission-4.1.18
Peter Barker 8 years ago committed by Francisco Ferreira
parent
5c0aa27b2f
commit
8a1fc6a406
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ArduCopter/GCS_Mavlink.cpp

6
ArduCopter/GCS_Mavlink.cpp
Unescape View File

@ -861,7 +861,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg)
#if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION) #if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION)
send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION); send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION);
#endif #endif
GCS_MAVLINK::send_statustext_chan(MAV_SEVERITY_INFO, chan, "Frame: %s", copter.get_frame_string()); send_text(MAV_SEVERITY_INFO, "Frame: %s", copter.get_frame_string());
handle_param_request_list(msg); handle_param_request_list(msg);
break; break;
} }
@ -1402,7 +1402,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg)
send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION); send_text(MAV_SEVERITY_INFO, "PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION);
#endif #endif
GCS_MAVLINK::send_statustext_chan(MAV_SEVERITY_INFO, chan, "Frame: %s", copter.get_frame_string()); send_text(MAV_SEVERITY_INFO, "Frame: %s", copter.get_frame_string());
// send system ID if we can // send system ID if we can
char sysid[40]; char sysid[40];
@ -1799,7 +1799,7 @@ void GCS_MAVLINK_Copter::handleMessage(mavlink_message_t* msg)
// send or receive fence points with GCS // send or receive fence points with GCS
case MAVLINK_MSG_ID_FENCE_POINT: // MAV ID: 160 case MAVLINK_MSG_ID_FENCE_POINT: // MAV ID: 160
case MAVLINK_MSG_ID_FENCE_FETCH_POINT: case MAVLINK_MSG_ID_FENCE_FETCH_POINT:
copter.fence.handle_msg(chan, msg); copter.fence.handle_msg(*this, msg);
break; break;
#endif // AC_FENCE == ENABLED #endif // AC_FENCE == ENABLED

Write Preview
Loading…
Cancel
Save