Browse Source

remove unused vehicle_status

sbg
Daniel Agar 9 years ago committed by Julian Oes
parent
commit
dfeab4f5e3
  1. 4
      src/modules/land_detector/FixedwingLandDetector.cpp
  2. 2
      src/modules/land_detector/FixedwingLandDetector.h

4
src/modules/land_detector/FixedwingLandDetector.cpp

@ -50,11 +50,9 @@ FixedwingLandDetector::FixedwingLandDetector() : LandDetector(),
_paramHandle(), _paramHandle(),
_params(), _params(),
_controlStateSub(-1), _controlStateSub(-1),
_vehicleStatusSub(-1),
_armingSub(-1), _armingSub(-1),
_airspeedSub(-1), _airspeedSub(-1),
_controlState{}, _controlState{},
_vehicleStatus{},
_arming{}, _arming{},
_airspeed{}, _airspeed{},
_parameterSub(-1), _parameterSub(-1),
@ -73,7 +71,6 @@ FixedwingLandDetector::FixedwingLandDetector() : LandDetector(),
void FixedwingLandDetector::initialize() void FixedwingLandDetector::initialize()
{ {
_controlStateSub = orb_subscribe(ORB_ID(control_state)); _controlStateSub = orb_subscribe(ORB_ID(control_state));
_vehicleStatusSub = orb_subscribe(ORB_ID(vehicle_status));
_armingSub = orb_subscribe(ORB_ID(actuator_armed)); _armingSub = orb_subscribe(ORB_ID(actuator_armed));
_airspeedSub = orb_subscribe(ORB_ID(airspeed)); _airspeedSub = orb_subscribe(ORB_ID(airspeed));
@ -83,7 +80,6 @@ void FixedwingLandDetector::initialize()
void FixedwingLandDetector::updateSubscriptions() void FixedwingLandDetector::updateSubscriptions()
{ {
orb_update(ORB_ID(control_state), _controlStateSub, &_controlState); orb_update(ORB_ID(control_state), _controlStateSub, &_controlState);
orb_update(ORB_ID(vehicle_status), _vehicleStatusSub, &_vehicleStatus);
orb_update(ORB_ID(actuator_armed), _armingSub, &_arming); orb_update(ORB_ID(actuator_armed), _armingSub, &_arming);
orb_update(ORB_ID(airspeed), _airspeedSub, &_airspeed); orb_update(ORB_ID(airspeed), _airspeedSub, &_airspeed);
} }

2
src/modules/land_detector/FixedwingLandDetector.h

@ -95,11 +95,9 @@ private:
private: private:
int _controlStateSub; /**< notification of local position */ int _controlStateSub; /**< notification of local position */
int _vehicleStatusSub;
int _armingSub; int _armingSub;
int _airspeedSub; int _airspeedSub;
struct control_state_s _controlState; /**< the result from local position subscription */ struct control_state_s _controlState; /**< the result from local position subscription */
struct vehicle_status_s _vehicleStatus;
struct actuator_armed_s _arming; struct actuator_armed_s _arming;
struct airspeed_s _airspeed; struct airspeed_s _airspeed;
int _parameterSub; int _parameterSub;

Loading…
Cancel
Save