From ce4290c8d42c1f6a0a93eb7ae0c62d4f8ca5a0a6 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Tue, 3 Sep 2019 16:36:34 +0200 Subject: [PATCH] mavlink: typo fix att -> act --- src/modules/mavlink/mavlink_messages.cpp | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 811645f316..0ca2238140 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -2966,12 +2966,12 @@ public: unsigned get_size() { - return _att_ctrl_sub->is_published() ? (MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES) : 0; + return _act_ctrl_sub->is_published() ? (MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET_LEN + MAVLINK_NUM_NON_PAYLOAD_BYTES) : 0; } private: - MavlinkOrbSubscription *_att_ctrl_sub; - uint64_t _att_ctrl_time; + MavlinkOrbSubscription *_act_ctrl_sub; + uint64_t _act_ctrl_time; /* do not allow top copying this class */ MavlinkStreamActuatorControlTarget(MavlinkStreamActuatorControlTarget &) = delete; @@ -2979,41 +2979,41 @@ private: protected: explicit MavlinkStreamActuatorControlTarget(Mavlink *mavlink) : MavlinkStream(mavlink), - _att_ctrl_sub(nullptr), - _att_ctrl_time(0) + _act_ctrl_sub(nullptr), + _act_ctrl_time(0) { // XXX this can be removed once the multiplatform system remaps topics switch (N) { case 0: - _att_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_0)); + _act_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_0)); break; case 1: - _att_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_1)); + _act_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_1)); break; case 2: - _att_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_2)); + _act_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_2)); break; case 3: - _att_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_3)); + _act_ctrl_sub = _mavlink->add_orb_subscription(ORB_ID(actuator_controls_3)); break; } } bool send(const hrt_abstime t) { - actuator_controls_s att_ctrl; + actuator_controls_s act_ctrl; - if (_att_ctrl_sub->update(&_att_ctrl_time, &att_ctrl)) { + if (_act_ctrl_sub->update(&_act_ctrl_time, &act_ctrl)) { mavlink_actuator_control_target_t msg = {}; - msg.time_usec = att_ctrl.timestamp; + msg.time_usec = act_ctrl.timestamp; msg.group_mlx = N; for (unsigned i = 0; i < sizeof(msg.controls) / sizeof(msg.controls[0]); i++) { - msg.controls[i] = att_ctrl.control[i]; + msg.controls[i] = act_ctrl.control[i]; } mavlink_msg_actuator_control_target_send_struct(_mavlink->get_channel(), &msg);