Merge pull request #19 from Ragnaroek/master

added smbus_read_i2c_block_data

Author: posborne

.travis.yml

@@ -1,14 +1,5 @@
 language: rust
 sudo: false
-rust:
-- 1.3.0
-- 1.4.0
-- 1.5.0
-- 1.6.0
-- 1.7.0
-- stable
-- beta
-- nightly
 env:
   global:
   - secure: gZdvTl4i1QfHQaCUPcVpnLtlrsE4WldSm99AD9C9jiMgjlzhhI4kQmIhssNFhA1BWDW6qDazrKnw4ZT1GA/rlmGSpLxs2lfBNTjPF0CJMVSTEQ1OaFcDGajziTTCSMh7jDml1/CFHuGSc+rS4bNv5wu0bj+pz3ZSRSuB7Vgoa0aRD8JQKc+phnIoXMCCfIh9vxlXWvO9mDMoR84/B35/gN/vWIi3+uuHgvvdKMK8qBbJ0ne25kOIA5CpXzJmOBFHCGblVQM4+AiTWvWtoXJjMcJXn9HZ2g3HWhrnixG07Ee1RrjUPo25tsxrBowHSGq9Bbo+jzmOmx03CRnCBHyXk6e12MXrfVFWRdmFaf7Sl/RBlz8Y2BRgktp8ihB6JQmjNuRptE4RdnWn6CU9liSQ5nzzGEl2ZtBrzN9GR3qyhq5W9e09v93MZfBr0svp/rtBoqDANfkpxvmWqtgO3fjN1fdf092sEcQfq3d7e6NaLSWKkI6V9wJnJ9UulPDAaqGVm8RrA9b0vJR6ouCf5ChZgYirz6LW5uPpMkf+cjESU9JxnX9xVB8tfPSoNrPKolRC/WRZ8gPbRmx0vF4wrDk8z9Fks5nHGwDsPdYe60Qe8m6ZclncCkpUzy2yAZWe/kiDaseOwNbSqEUZW80hLyHpuGi1IFpGBQfc8mYMPvqOHa8=

Cargo.toml

@@ -2,7 +2,7 @@
 
 name = "i2cdev"
 build = "build.rs"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Paul Osborne <[email protected]>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-embedded/rust-i2cdev"

examples/nunchuck.rs

@@ -11,7 +11,6 @@
 extern crate i2cdev;
 extern crate docopt;
 
-use i2cdev::core::*;
 use i2cdev::linux::*;
 use i2cdev::sensors::nunchuck::*;
 use std::env::args;

examples/sensors.rs

@@ -15,6 +15,7 @@ extern crate i2cdev;
 extern crate docopt;
 
 use std::thread;
+use std::time::Duration;
 use std::env::args;
 use docopt::Docopt;
 use i2cdev::sensors::{Thermometer, Barometer, Accelerometer};
@@ -56,6 +57,6 @@ fn main() {
         println!("Accel:       {:?}", accel);
         println!("Accel Tot:   {:?}",
                  (accel.x.powi(2) + accel.y.powi(2) + accel.z.powi(2)).sqrt());
-        thread::sleep_ms(1000);
+        thread::sleep(Duration::from_millis(1000));
     }
 }

src/core.rs

@@ -90,6 +90,11 @@ pub trait I2CDevice {
     /// count bytes read from the device.
     fn smbus_read_block_data(&mut self, register: u8) -> Result<Vec<u8>, Self::Error>;
 
+    /// Read a block of up to 32 bytes from a device
+    ///
+    /// Uses read_i2c_block_data instead read_block_data.
+    fn smbus_read_i2c_block_data(&mut self, register: u8, len: u8) -> Result<Vec<u8>, Self::Error>;
+
     /// Write a block of up to 32 bytes to a device
     ///
     /// The opposite of the Block Read command, this writes up to 32 bytes to

src/ffi.rs

@@ -338,6 +338,23 @@ pub fn i2c_smbus_read_block_data(fd: RawFd, register: u8) -> Result<Vec<u8>, I2C
     Ok((&data.block[1..(count + 1) as usize]).to_vec())
 }
 
+pub fn i2c_smbus_read_i2c_block_data(fd: RawFd, register: u8, len: u8) -> Result<Vec<u8>, I2CError> {
+    let mut data = i2c_smbus_data::empty();
+    data.block[0] = len;
+    try!(unsafe {
+        i2c_smbus_access(fd,
+                         I2CSMBusReadWrite::I2C_SMBUS_READ,
+                         register,
+                         I2CSMBusSize::I2C_SMBUS_I2C_BLOCK_DATA,
+                         &mut data)
+    });
+
+    // create a vector from the data in the block starting at byte
+    // 1 and ending after count bytes after that
+    let count = data.block[0];
+    Ok((&data.block[1..(count + 1) as usize]).to_vec())
+}
+
 #[inline]
 pub fn i2c_smbus_write_block_data(fd: RawFd, register: u8, values: &[u8]) -> Result<(), I2CError> {
     let mut data = i2c_smbus_data::empty();

src/linux.rs

@@ -196,6 +196,11 @@ impl I2CDevice for LinuxI2CDevice {
         ffi::i2c_smbus_read_block_data(self.as_raw_fd(), register).map_err(From::from)
     }
 
+    /// Read a block of up to 32 bytes from a device via i2c_smbus_i2c_read_block_data
+    fn smbus_read_i2c_block_data(&mut self, register: u8, len: u8) -> Result<Vec<u8>, LinuxI2CError> {
+        ffi::i2c_smbus_read_i2c_block_data(self.as_raw_fd(), register, len).map_err(From::from)
+    }
+
     /// Write a block of up to 32 bytes to a device
     ///
     /// The opposite of the Block Read command, this writes up to 32 bytes to

src/mock.rs

@@ -91,4 +91,8 @@ impl I2CDevice for MockI2CDevice {
     fn smbus_process_block(&mut self, _register: u8, _values: &[u8]) -> I2CResult<()> {
         unimplemented!()
     }
+
+    fn smbus_read_i2c_block_data(&mut self, _register: u8, _len: u8) -> I2CResult<Vec<u8>> {
+        unimplemented!()
+    }
 }

src/sensors/adxl345_accelerometer.rs

@@ -10,7 +10,7 @@
 
 use sensors::{Accelerometer, AccelerometerSample};
 use core::I2CDevice;
-use byteorder::{ByteOrder, LittleEndian, ReadBytesExt};
+use byteorder::{ByteOrder, LittleEndian};
 
 // TODO: read/write data format (for now, assumed 0x00)
 

src/sensors/mpl115a2_barometer.rs

@@ -10,6 +10,7 @@
 
 use sensors::{Thermometer, Barometer};
 use std::thread;
+use std::time::Duration;
 use std::error::Error;
 use core::I2CDevice;
 use byteorder::{ByteOrder, BigEndian};
@@ -102,7 +103,7 @@ impl MPL115A2RawReading {
         try!(i2cdev.smbus_write_byte_data(REGISTER_ADDR_START_CONVERSION, 0x00));
 
         // maximum conversion time is 3ms
-        thread::sleep_ms(3);
+        thread::sleep(Duration::from_millis(3));
 
         // The SMBus functions read word values as little endian but that is not
         // what we want