Move data/functions from common into core

wii-ext/src/classic_async.rs

@@ -11,8 +11,8 @@
 // See `decode_classic_report` and `decode_classic_hd_report` for data format
 
 use crate::core::classic::*;
+use crate::core::{ControllerIdReport, ControllerType};
 use crate::interface_async::InterfaceAsync;
-use crate::{ControllerIdReport, ControllerType};
 use embedded_hal_async;
 
 // use core::future::Future;

wii-ext/src/classic_sync.rs

@@ -11,8 +11,8 @@
 // See `decode_classic_report` and `decode_classic_hd_report` for data format
 
 use crate::core::classic::*;
+use crate::core::ControllerType;
 use crate::interface::Interface;
-use crate::ControllerType;
 use embedded_hal::i2c::I2c;
 
 #[cfg(feature = "defmt_print")]

wii-ext/src/core.rs

@@ -1,2 +1,44 @@
 pub mod classic;
 pub mod nunchuk;
+
+/// Standard input report
+pub type ExtReport = [u8; 6];
+/// HD input report
+pub type ExtHdReport = [u8; 8];
+/// Controller ID report
+pub type ControllerIdReport = [u8; 6];
+
+#[cfg_attr(feature = "defmt_print", derive(defmt::Format))]
+#[derive(Debug)]
+pub enum ControllerType {
+    Nunchuk,
+    Classic,
+    ClassicPro,
+}
+
+/// All Wii extension controllers use i2c address 52
+pub const EXT_I2C_ADDR: u16 = 0x52;
+
+/// There needs to be some time between i2c messages or the
+/// wii ext device will abort the i2c transaction
+/// 200 microseconds works in my tests - need to test with more devices
+pub const INTERMESSAGE_DELAY_MICROSEC_U32: u32 = 200;
+
+pub fn identify_controller(id: ControllerIdReport) -> Option<ControllerType> {
+    if id[2] != 0xA4 || id[3] != 0x20 {
+        // Not an extension controller
+        None
+    } else if id[0] == 0 && id[1] == 0 && id[4] == 0 && id[5] == 0 {
+        // It's a nunchuck
+        Some(ControllerType::Nunchuk)
+    } else if id[0] == 0 && id[1] == 0 && id[4] == 3 && id[5] == 1 {
+        // It's a wii classic controller
+        Some(ControllerType::Classic)
+    } else if id[0] == 1 && id[1] == 0 && id[4] == 1 && id[5] == 1 {
+        // It's a wii classic pro (or compatible) controller
+        // This is most wii classic extension controllers (NES/SNES/Clones)
+        Some(ControllerType::ClassicPro)
+    } else {
+        None
+    }
+}

wii-ext/src/interface.rs

@@ -1,9 +1,9 @@
-use crate::common::ControllerIdReport;
-use crate::common::ExtHdReport;
-use crate::common::ExtReport;
-use crate::ControllerType;
-use crate::EXT_I2C_ADDR;
-use crate::INTERMESSAGE_DELAY_MICROSEC_U32 as INTERMESSAGE_DELAY_MICROSEC;
+use crate::core::ControllerIdReport;
+use crate::core::ControllerType;
+use crate::core::ExtHdReport;
+use crate::core::ExtReport;
+use crate::core::EXT_I2C_ADDR;
+use crate::core::INTERMESSAGE_DELAY_MICROSEC_U32 as INTERMESSAGE_DELAY_MICROSEC;
 use embedded_hal::i2c::I2c;
 use embedded_hal::i2c::SevenBitAddress;
 
@@ -60,7 +60,7 @@ where
 
     pub(super) fn identify_controller(&mut self) -> Result<Option<ControllerType>, Error<E>> {
         let i2c_id = self.read_id()?;
-        Ok(crate::common::identify_controller(i2c_id))
+        Ok(crate::core::identify_controller(i2c_id))
     }
 
     /// tell the extension controller to prepare a sample by setting the read cursor to 0

wii-ext/src/interface_async.rs

@@ -10,12 +10,12 @@
 //
 // See `decode_classic_report` and `decode_classic_hd_report` for data format
 
-use crate::ControllerIdReport;
-use crate::ControllerType;
-use crate::ExtHdReport;
-use crate::ExtReport;
-use crate::EXT_I2C_ADDR;
-use crate::INTERMESSAGE_DELAY_MICROSEC_U32;
+use crate::core::ControllerIdReport;
+use crate::core::ControllerType;
+use crate::core::ExtHdReport;
+use crate::core::ExtReport;
+use crate::core::EXT_I2C_ADDR;
+use crate::core::INTERMESSAGE_DELAY_MICROSEC_U32;
 use embedded_hal_async;
 
 #[cfg(feature = "defmt_print")]
@@ -166,7 +166,7 @@ where
         &mut self,
     ) -> Result<Option<ControllerType>, ClassicAsyncError> {
         let i2c_id = self.read_id().await?;
-        Ok(crate::common::identify_controller(i2c_id))
+        Ok(crate::core::identify_controller(i2c_id))
     }
 
     /// tell the extension controller to prepare a sample by setting the read cursor to 0

wii-ext/src/lib.rs

@@ -9,15 +9,9 @@ pub mod classic_async;
 /// Types + data decoding
 pub mod core;
 
-/// Anything common between nunchuk + classic
-pub mod common;
-
 /// i2c interface code
 pub mod interface;
 /// async i2c interface code
 pub mod interface_async;
 
 pub mod nunchuk;
-
-// Expose all common types at the crate level
-pub use common::*;

wii-ext/src/nunchuk.rs

@@ -8,8 +8,8 @@
 // work out if it's worth supporting that
 
 use crate::core::nunchuk::{CalibrationData, NunchukReading, NunchukReadingCalibrated};
+use crate::core::ControllerType;
 use crate::interface::Interface;
-use crate::ControllerType;
 use embedded_hal::i2c::{I2c, SevenBitAddress};
 
 #[derive(Debug)]

wii-ext/tests/classic_hd.rs

@@ -4,6 +4,7 @@ use paste::paste;
 use wii_ext::classic_sync::*;
 use wii_ext::*;
 mod common;
+use crate::core::EXT_I2C_ADDR;
 use common::test_data;
 
 /// There's a certain amount of slop around the center position.

wii-ext/tests/classic_pdp_clone.rs

@@ -2,12 +2,11 @@ use embedded_hal_mock::eh1::delay::NoopDelay;
 use embedded_hal_mock::eh1::i2c::{self, Transaction};
 use paste::paste;
 use wii_ext::classic_sync::*;
-use wii_ext::common::*;
 use wii_ext::core::classic::ClassicReading;
-use wii_ext::*;
 mod common;
 use common::test_data;
 use common::test_data::*;
+use wii_ext::core::EXT_I2C_ADDR;
 
 /// There's a certain amount of slop around the center position.
 /// Allow up to this range without it being an error

wii-ext/tests/classic_pdp_clone_hd.rs

@@ -4,6 +4,7 @@ use paste::paste;
 use wii_ext::classic_sync::*;
 use wii_ext::*;
 mod common;
+use crate::core::EXT_I2C_ADDR;
 use common::test_data;
 
 /// There's a certain amount of slop around the center position.

wii-ext/tests/classic_pro.rs

@@ -2,8 +2,8 @@ use embedded_hal_mock::eh1::delay::NoopDelay;
 use embedded_hal_mock::eh1::i2c::{self, Transaction};
 use paste::paste;
 use wii_ext::classic_sync::*;
-use wii_ext::common::*;
 use wii_ext::core::classic::ClassicReading;
+use wii_ext::core::EXT_I2C_ADDR;
 mod common;
 use common::test_data;
 use common::test_data::*;

wii-ext/tests/classic_pro_hd.rs

@@ -2,7 +2,7 @@ use embedded_hal_mock::eh1::delay::NoopDelay;
 use embedded_hal_mock::eh1::i2c::{self, Transaction};
 use paste::paste;
 use wii_ext::classic_sync::*;
-use wii_ext::*;
+use wii_ext::core::EXT_I2C_ADDR;
 mod common;
 use common::test_data;
 

wii-ext/tests/classic_regular.rs

@@ -2,8 +2,8 @@ use embedded_hal_mock::eh1::delay::NoopDelay;
 use embedded_hal_mock::eh1::i2c::{self, Transaction};
 use paste::paste;
 use wii_ext::classic_sync::*;
-use wii_ext::common::*;
 use wii_ext::core::classic::ClassicReading;
+use wii_ext::core::EXT_I2C_ADDR;
 mod common;
 use common::test_data;
 use common::test_data::*;

wii-ext/tests/nunchuk.rs

@@ -2,7 +2,8 @@ use embedded_hal_mock::eh1::{
     delay::NoopDelay,
     i2c::{self, Transaction},
 };
-use wii_ext::{nunchuk::Nunchuk, EXT_I2C_ADDR};
+use wii_ext::core::EXT_I2C_ADDR;
+use wii_ext::nunchuk::Nunchuk;
 mod common;
 use common::test_data;