From 2d3c993762e26e6ac1156a8d01f4bc2e1dc0fe84 Mon Sep 17 00:00:00 2001 From: Wesley Maa Date: Tue, 17 Dec 2024 20:32:14 -0800 Subject: [PATCH] revert to robstride --- platforms/kbot/Cargo.toml | 2 +- platforms/kbot/src/actuator.rs | 4 ++-- platforms/kbot/src/lib.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platforms/kbot/Cargo.toml b/platforms/kbot/Cargo.toml index 12b6e3f..4b1255f 100644 --- a/platforms/kbot/Cargo.toml +++ b/platforms/kbot/Cargo.toml @@ -13,7 +13,7 @@ eyre = "0.6" krec = "0.2" tracing = "0.1" async-trait = "0.1" -robstridev2 = "0.3" +robstride = "0.3" gstreamer = "0.20" gstreamer-app = "0.20" gstreamer-video = "0.20" diff --git a/platforms/kbot/src/actuator.rs b/platforms/kbot/src/actuator.rs index c5857a3..ef9c578 100644 --- a/platforms/kbot/src/actuator.rs +++ b/platforms/kbot/src/actuator.rs @@ -10,7 +10,7 @@ use kos_core::{ }, }; -use robstridev2::{CH341Transport, ControlConfig, SocketCanTransport, Supervisor, TransportType}; +use robstride::{CH341Transport, ControlConfig, SocketCanTransport, Supervisor, TransportType}; use std::time::Duration; use tokio::sync::Mutex; @@ -24,7 +24,7 @@ impl KBotActuator { ports: Vec<&str>, actuator_timeout: Duration, polling_interval: Duration, - actuators_config: &[(u8, robstridev2::ActuatorConfiguration)], + actuators_config: &[(u8, robstride::ActuatorConfiguration)], ) -> Result { let mut supervisor = Supervisor::new(actuator_timeout)?; let mut found_motors = vec![false; actuators_config.len()]; diff --git a/platforms/kbot/src/lib.rs b/platforms/kbot/src/lib.rs index cb988ea..79d4174 100644 --- a/platforms/kbot/src/lib.rs +++ b/platforms/kbot/src/lib.rs @@ -5,7 +5,7 @@ mod process_manager; mod hexmove; pub use actuator::*; -pub use robstridev2::{ActuatorConfiguration, ActuatorType}; +pub use robstride::{ActuatorConfiguration, ActuatorType}; #[cfg(target_os = "linux")] pub use hexmove::*; @@ -282,7 +282,7 @@ impl Platform for KbotPlatform { Duration::from_nanos(3_333_333), &[( 1, - robstridev2::ActuatorConfiguration { + robstride::ActuatorConfiguration { actuator_type: ActuatorType::RobStride04, max_angle_change: Some(2.0f32.to_radians()), max_velocity: Some(10.0f32.to_radians()),