From 5ebe3e8598c469ae0b1beb90b028bf491cc295ed Mon Sep 17 00:00:00 2001 From: inesmaria08 Date: Thu, 26 Sep 2024 12:03:18 +0300 Subject: [PATCH] update --- apis/interface/servo/src/lib.rs | 6 +++--- apis/interface/servo/src/tests.rs | 4 ++-- examples/servo.rs | 4 ++-- unittest/src/fake/servo/mod.rs | 2 +- unittest/src/fake/servo/tests.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apis/interface/servo/src/lib.rs b/apis/interface/servo/src/lib.rs index d55b9c53..21920930 100644 --- a/apis/interface/servo/src/lib.rs +++ b/apis/interface/servo/src/lib.rs @@ -15,8 +15,8 @@ impl Servo { } } /// Returns the number of the servomotors available. - pub fn servo_number() -> Result { - S::command(DRIVER_NUM, SERVO_NUMBER, 0, 0).to_result() + pub fn servo_count() -> Result { + S::command(DRIVER_NUM, SERVO_COUNT, 0, 0).to_result() } /// Changes the angle of the servo. @@ -59,6 +59,6 @@ const DRIVER_NUM: u32 = 0x90009; // Command IDs const EXISTS: u32 = 0; -const SERVO_NUMBER: u32 = 1; +const SERVO_COUNT: u32 = 1; const SET_ANGLE: u32 = 2; const GET_ANGLE: u32 = 3; diff --git a/apis/interface/servo/src/tests.rs b/apis/interface/servo/src/tests.rs index 65bc202b..33a778bc 100644 --- a/apis/interface/servo/src/tests.rs +++ b/apis/interface/servo/src/tests.rs @@ -16,11 +16,11 @@ fn exists() { assert_eq!(Servo::exists(), Ok(())); } #[test] -fn servo_number() { +fn servo_count() { let kernel = fake::Kernel::new(); let driver = fake::Servo::<2>::new(); kernel.add_driver(&driver); - assert_eq!(Servo::servo_number(), Ok(2)); + assert_eq!(Servo::servo_count(), Ok(2)); } #[test] fn set_angle() { diff --git a/examples/servo.rs b/examples/servo.rs index 1398c2d3..039fdb2c 100644 --- a/examples/servo.rs +++ b/examples/servo.rs @@ -16,12 +16,12 @@ fn main() { writeln!(Console::writer(), "The driver could not be found").unwrap(); return; } - let servo_number = Servo::servo_number().unwrap(); + let servo_count = Servo::servo_count().unwrap(); writeln!( Console::writer(), "The number of available servomotors is {:?}", - servo_number + servo_count ) .unwrap(); diff --git a/unittest/src/fake/servo/mod.rs b/unittest/src/fake/servo/mod.rs index 7f4e0dee..b7b493a1 100644 --- a/unittest/src/fake/servo/mod.rs +++ b/unittest/src/fake/servo/mod.rs @@ -61,6 +61,6 @@ const DRIVER_NUM: u32 = 0x90009; // Command numbers const EXISTS: u32 = 0; -const SERVO_NUMBER: u32 = 1; +const SERVO_COUNT: u32 = 1; const SET_ANGLE: u32 = 2; const GET_ANGLE: u32 = 3; diff --git a/unittest/src/fake/servo/tests.rs b/unittest/src/fake/servo/tests.rs index 8ac130ee..95cec333 100644 --- a/unittest/src/fake/servo/tests.rs +++ b/unittest/src/fake/servo/tests.rs @@ -10,7 +10,7 @@ fn command() { let value = servo.command(EXISTS, 0, 0); assert_eq!(CommandReturn::is_success(&value), true); assert_eq!( - CommandReturn::get_success_u32(&servo.command(SERVO_NUMBER, 0, 0)), + CommandReturn::get_success_u32(&servo.command(SERVO_COUNT, 0, 0)), Some(1) ); assert_eq!( @@ -32,7 +32,7 @@ fn kernel_integration() { let value = fake::Syscalls::command(DRIVER_NUM, EXISTS, 0, 0); assert_eq!(CommandReturn::is_success(&value), true); assert_eq!( - CommandReturn::get_success_u32(&fake::Syscalls::command(DRIVER_NUM, SERVO_NUMBER, 0, 0)), + CommandReturn::get_success_u32(&fake::Syscalls::command(DRIVER_NUM, SERVO_COUNT, 0, 0)), Some(1) ); assert_eq!(