Skip to content

Commit

Permalink
RpmControl: remove status message because it by now only contains red…
Browse files Browse the repository at this point in the history
…undant information
  • Loading branch information
MaEtUgR committed Dec 11, 2024
1 parent a93e5fd commit dd82d45
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 19 deletions.
1 change: 0 additions & 1 deletion msg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ set(msg_files
RoverMecanumSetpoint.msg
RoverMecanumStatus.msg
Rpm.msg
RpmControlStatus.msg
RtlStatus.msg
RtlTimeEstimate.msg
SatelliteInfo.msg
Expand Down
7 changes: 0 additions & 7 deletions msg/RpmControlStatus.msg

This file was deleted.

11 changes: 0 additions & 11 deletions src/modules/control_allocator/ActuatorEffectiveness/RpmControl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class RpmControl : public ModuleParams

if (_rpm_sub.copy(&rpm)) {
_rpm_estimate = rpm.rpm_estimate;
_rpm_raw = rpm.rpm_raw;
_timestamp_last_rpm_measurement = rpm.timestamp;
}
}
Expand All @@ -102,24 +101,14 @@ class RpmControl : public ModuleParams

float output = _pid.update(_rpm_estimate, dt, true);

rpm_control_status_s rpm_control_status{};
rpm_control_status.rpm_raw = _rpm_raw;
rpm_control_status.rpm_estimate = _rpm_estimate;;
rpm_control_status.rpm_setpoint = _param_ca_heli_rpm_sp.get();
rpm_control_status.output = output;
rpm_control_status.timestamp = hrt_absolute_time();
_rpm_control_status_pub.publish(rpm_control_status);

return output;
}

private:
static constexpr float RPM_MAX_VALUE = 1800.f;
uORB::Subscription _rpm_sub{ORB_ID(rpm)};
uORB::Publication<rpm_control_status_s> _rpm_control_status_pub{ORB_ID(rpm_control_status)};

float _rpm_estimate{0.f};
float _rpm_raw{0.f};
float _spoolup_progress{0.f};
PID _pid;
hrt_abstime _timestamp_last_rpm_measurement{0};
Expand Down

0 comments on commit dd82d45

Please sign in to comment.