Skip to content

Commit

Permalink
Move test_data into tests folder, remove duplicate nunchuk tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@9names
9names committed Apr 15, 2024
1 parent 723e19a commit 006db04
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 491 deletions.
4 changes: 0 additions & 4 deletions wii-ext/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,5 @@ pub mod interface_async;

pub mod nunchuk;

/// Test data used by the integration tests to confirm that the driver is working.
/// Not intended for use outside of this crate.
pub mod test_data;

// Expose all common types at the crate level
pub use common::*;
257 changes: 0 additions & 257 deletions wii-ext/src/nunchuk.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,260 +92,3 @@ where
))
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::test_data;
use crate::EXT_I2C_ADDR;
use embedded_hal_mock::eh1::{
delay::NoopDelay,
i2c::{self, Transaction},
};
/// There's a certain amount of slop around the center position.
/// Allow up to this range without it being an error
const ZERO_SLOP: i8 = 5;
/// The max value at full deflection is ~100, but allow a bit less than that
const AXIS_MAX: i8 = 90;

// TODO: work out how to test analogue values from joystick and gyro

#[test]
fn nunchuck_idle() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
];

let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
mock.done();
}

#[test]
fn nunchuck_idle_calibrated() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
assert_eq!(report.joystick_x, 0);
assert_eq!(report.joystick_y, 0);
mock.done();
}

#[test]
fn nunchuck_left_calibrated() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_JOY_L.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
assert!(report.joystick_x < -AXIS_MAX, "x = {}", report.joystick_x);
assert!(report.joystick_y > -ZERO_SLOP, "y = {}", report.joystick_y);
assert!(report.joystick_y < ZERO_SLOP, "y = {}", report.joystick_y);
mock.done();
}

#[test]
fn nunchuck_right_calibrated() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_JOY_R.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
assert!(report.joystick_x > AXIS_MAX, "x = {}", report.joystick_x);
assert!(report.joystick_y > -ZERO_SLOP, "y = {}", report.joystick_y);
assert!(report.joystick_y < ZERO_SLOP, "y = {}", report.joystick_y);
mock.done();
}

#[test]
fn nunchuck_up_calibrated() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_JOY_U.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
assert!(report.joystick_y > AXIS_MAX, "y = {}", report.joystick_y);
assert!(report.joystick_x > -ZERO_SLOP, "x = {}", report.joystick_x);
assert!(report.joystick_x < ZERO_SLOP, "x = {}", report.joystick_x);
mock.done();
}

#[test]
fn nunchuck_down_calibrated() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_JOY_D.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();
let report = nc.read_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
assert!(report.joystick_y < -AXIS_MAX, "y = {}", report.joystick_y);
assert!(report.joystick_x > -ZERO_SLOP, "x = {}", report.joystick_x);
assert!(report.joystick_x < ZERO_SLOP, "x = {}", report.joystick_x);
mock.done();
}

#[test]
fn nunchuck_idle_repeat() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();

let report = nc.read_report_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
let report = nc.read_report_blocking().unwrap();
assert!(!report.button_c);
assert!(!report.button_z);
mock.done();
}

#[test]
fn nunchuck_btn_c() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_BTN_C.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();

let report = nc.read_report_blocking().unwrap();
assert!(report.button_c);
assert!(!report.button_z);
mock.done();
}

#[test]
fn nunchuck_btn_z() {
let expectations = vec![
// Reset controller
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
// Init
Transaction::write(EXT_I2C_ADDR as u8, vec![240, 85]),
Transaction::write(EXT_I2C_ADDR as u8, vec![251, 0]),
// Calibration read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_IDLE.to_vec()),
// Read
Transaction::write(EXT_I2C_ADDR as u8, vec![0]),
Transaction::read(EXT_I2C_ADDR as u8, test_data::NUNCHUCK_BTN_Z.to_vec()),
];
let mut mock = i2c::Mock::new(&expectations);
let delay = NoopDelay::new();
let mut nc = Nunchuk::new(mock.clone(), delay).unwrap();

let report = nc.read_report_blocking().unwrap();
assert!(!report.button_c);
assert!(report.button_z);
mock.done();
}
}
Loading

0 comments on commit 006db04

Please sign in to comment.