From 5485d9655e2ab3a6d04e5f69b246f5db4d2c5936 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Wed, 21 Nov 2018 09:35:37 +0100 Subject: Code formatting --- src/construction.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/construction.rs') diff --git a/src/construction.rs b/src/construction.rs index ab100fd..61abb06 100644 --- a/src/construction.rs +++ b/src/construction.rs @@ -1,42 +1,40 @@ //! Constructor/destructor functions. extern crate embedded_hal as hal; -use hal::blocking; use core::marker::PhantomData; -use { Ads1x1x, DEVICE_BASE_ADDRESS, SlaveAddr, ic, Config, mode, FullScaleRange }; +use hal::blocking; use interface::I2cInterface; - +use {ic, mode, Ads1x1x, Config, FullScaleRange, SlaveAddr, DEVICE_BASE_ADDRESS}; macro_rules! impl_new_destroy { ( $IC:ident, $create:ident, $destroy:ident, $conv:ty ) => { impl Ads1x1x, ic::$IC, $conv, mode::OneShot> where - I2C: blocking::i2c::Write + blocking::i2c::WriteRead + I2C: blocking::i2c::Write + blocking::i2c::WriteRead, { /// Create a new instance of the device in OneShot mode. pub fn $create(i2c: I2C, address: SlaveAddr) -> Self { Ads1x1x { iface: I2cInterface { i2c, - address: address.addr(DEVICE_BASE_ADDRESS) + address: address.addr(DEVICE_BASE_ADDRESS), }, config: Config::default(), fsr: FullScaleRange::default(), a_conversion_was_started: false, _conv: PhantomData, _ic: PhantomData, - _mode: PhantomData + _mode: PhantomData, } } } - impl Ads1x1x, ic::$IC, CONV, MODE> - { + impl Ads1x1x, ic::$IC, CONV, MODE> { /// Destroy driver instance, return I²C bus instance. pub fn $destroy(self) -> I2C { self.iface.i2c } } - } + }; } impl_new_destroy!(Ads1013, new_ads1013, destroy_ads1013, ic::Resolution12Bit); -- cgit v1.2.3-54-g00ecf