diff --git a/control-core/src/controllers/deadtime_p_controller.rs b/control-core/src/controllers/deadtime_pi_controller.rs similarity index 96% rename from control-core/src/controllers/deadtime_p_controller.rs rename to control-core/src/controllers/deadtime_pi_controller.rs index 240f73dd..3cfbc7ee 100644 --- a/control-core/src/controllers/deadtime_p_controller.rs +++ b/control-core/src/controllers/deadtime_pi_controller.rs @@ -1,7 +1,7 @@ use std::time::{Duration, Instant}; #[derive(Debug)] -pub struct TimeAgnosticDeadTimePController { +pub struct TimeAgnosticDeadTimePiController { // Params /// Proportional gain kp: f64, @@ -18,7 +18,7 @@ pub struct TimeAgnosticDeadTimePController { last: Option, } -impl TimeAgnosticDeadTimePController { +impl TimeAgnosticDeadTimePiController { pub fn new(kp: f64, ki: f64, dead: Duration) -> Self { Self { kp, diff --git a/control-core/src/controllers/mod.rs b/control-core/src/controllers/mod.rs index feb0c3b5..a787cf9e 100644 --- a/control-core/src/controllers/mod.rs +++ b/control-core/src/controllers/mod.rs @@ -1,5 +1,5 @@ pub mod clamping_timeagnostic_pid; -pub mod deadtime_p_controller; +pub mod deadtime_pi_controller; pub mod first_degree_motion; pub mod pid; pub mod second_degree_motion; diff --git a/server/src/machines/winder2/puller_speed_controller.rs b/server/src/machines/winder2/puller_speed_controller.rs index 5a3135ba..5fbbe26c 100644 --- a/server/src/machines/winder2/puller_speed_controller.rs +++ b/server/src/machines/winder2/puller_speed_controller.rs @@ -5,7 +5,7 @@ use std::{ use control_core::{ controllers::{ - deadtime_p_controller::TimeAgnosticDeadTimePController, + deadtime_pi_controller::TimeAgnosticDeadTimePiController, second_degree_motion::linear_jerk_speed_controller::LinearJerkSpeedController, }, converters::linear_step_converter::LinearStepConverter, @@ -66,7 +66,7 @@ pub struct PullerSpeedController { /// Converter for linear to angular transformations pub converter: LinearStepConverter, pub last_speed: Velocity, - pub p_dead_controller: TimeAgnosticDeadTimePController, + pub p_dead_controller: TimeAgnosticDeadTimePiController, } impl PullerSpeedController { @@ -94,7 +94,7 @@ impl PullerSpeedController { ), converter, last_speed: Velocity::ZERO, - p_dead_controller: TimeAgnosticDeadTimePController::new( + p_dead_controller: TimeAgnosticDeadTimePiController::new( 0.1 / 10000.0, 0.0, Duration::ZERO,