Skip to content

Commit 942039d

Browse files
committed
AP_DroneCAN: correct enable/disable of AP_DRONECAN_VOLZ_FEEDBACK_ENABLED
recent servo-feedback library didn't record appropriate dependencies in build_options.py
1 parent 9d7024f commit 942039d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libraries/AP_DroneCAN/AP_DroneCAN.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class AP_DroneCAN : public AP_CANDriver, public AP_ESC_Telem_Backend {
350350
Canard::ObjCallback<AP_DroneCAN, com_himark_servo_ServoInfo> himark_servo_ServoInfo_cb{this, &AP_DroneCAN::handle_himark_servoinfo};
351351
Canard::Subscriber<com_himark_servo_ServoInfo> himark_servo_ServoInfo_cb_listener{himark_servo_ServoInfo_cb, _driver_index};
352352
#endif
353-
#if AP_DRONECAN_VOLZ_FEEDBACK_ENABLED && AP_SERVO_TELEM_ENABLED
353+
#if AP_DRONECAN_VOLZ_FEEDBACK_ENABLED
354354
Canard::ObjCallback<AP_DroneCAN, com_volz_servo_ActuatorStatus> volz_servo_ActuatorStatus_cb{this, &AP_DroneCAN::handle_actuator_status_Volz};
355355
Canard::Subscriber<com_volz_servo_ActuatorStatus> volz_servo_ActuatorStatus_listener{volz_servo_ActuatorStatus_cb, _driver_index};
356356
#endif
@@ -418,7 +418,7 @@ class AP_DroneCAN : public AP_CANDriver, public AP_ESC_Telem_Backend {
418418
#if AP_SERVO_TELEM_ENABLED
419419
void handle_actuator_status(const CanardRxTransfer& transfer, const uavcan_equipment_actuator_Status& msg);
420420
#endif
421-
#if AP_DRONECAN_VOLZ_FEEDBACK_ENABLED && AP_SERVO_TELEM_ENABLED
421+
#if AP_DRONECAN_VOLZ_FEEDBACK_ENABLED
422422
void handle_actuator_status_Volz(const CanardRxTransfer& transfer, const com_volz_servo_ActuatorStatus& msg);
423423
#endif
424424
void handle_ESC_status(const CanardRxTransfer& transfer, const uavcan_equipment_esc_Status& msg);

0 commit comments

Comments
 (0)