make code more robust by handling case where gpio is not exported alr…

…eady
andygrove · Sep 16, 2016 · 53682c1 · 53682c1
1 parent ebd27aa
commit 53682c1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "qik"
 description = "Rust library for the Pololu qik dual serial motor controllers"
-version = "1.2.2"
+version = "1.2.3"
 authors = ["Andy Grove <andygrove73@gmail.com>"]
 homepage = "https://github.com/andygrove/rust-qik"
 documentation = "https://github.com/andygrove/rust-qik"

diff --git a/src/lib.rs b/src/lib.rs
@@ -165,14 +165,22 @@ impl Qik {
     }
 
     pub fn init(&mut self) -> Result<(), QikError> {
-        //NOTE: the reset pin must be exported first from the command line
+        if self.reset_pin.is_exported() {
+            try!(self.reset());
+        } else {
+            try!(self.reset_pin.with_exported(|| self.reset()));
+        };
+
+        try!(self.write_byte(0xAA));
+        Ok(())
+    }
+
+    fn reset(&self) -> Result<(), sysfs_gpio::Error> {
         try!(self.reset_pin.set_value(0));
         try!(self.reset_pin.set_direction(Direction::Out));
         thread::sleep(Duration::from_millis(1));
         try!(self.reset_pin.set_direction(Direction::In));
         thread::sleep(Duration::from_millis(10));
-
-        try!(self.write_byte(0xAA));
         Ok(())
     }