rotary encoder logic updated to use abstraction layer

guyc · Jan 29, 2014 · 475ac19 · 475ac19
1 parent 57c57d3
commit 475ac19
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/gaugette/rotary_encoder.py b/gaugette/rotary_encoder.py
@@ -23,7 +23,7 @@
 #       if delta!=0:
 #         print delta
 
-import wiringpi2
+import gaugette.gpio
 import math
 import threading
 import time
@@ -38,13 +38,10 @@ def __init__(self, a_pin, b_pin):
         self.a_pin = a_pin
         self.b_pin = b_pin
 
-        self.gpio = wiringpi2.GPIO(wiringpi2.GPIO.WPI_MODE_PINS)
+        self.gpio = gaugette.gpio.GPIO()
 
-        self.gpio.pinMode(self.a_pin, self.gpio.INPUT)
-        self.gpio.pullUpDnControl(self.a_pin, self.gpio.PUD_UP)
-
-        self.gpio.pinMode(self.b_pin, self.gpio.INPUT)
-        self.gpio.pullUpDnControl(self.b_pin, self.gpio.PUD_UP)
+        self.gpio.setup(self.a_pin, self.gpio.IN, self.gpio.PUD_UP)
+        self.gpio.setup(self.b_pin, self.gpio.IN, self.gpio.PUD_UP)
 
         self.last_delta = 0
         self.r_seq = self.rotation_sequence()
@@ -60,8 +57,8 @@ def __init__(self, a_pin, b_pin):
     # Gets the 2-bit rotation state of the current position
     # This is deprecated - we now use rotation_sequence instead.
     def rotation_state(self):
-        a_state = self.gpio.digitalRead(self.a_pin)
-        b_state = self.gpio.digitalRead(self.b_pin)
+        a_state = self.gpio.input(self.a_pin)
+        b_state = self.gpio.input(self.b_pin)
         r_state = a_state | b_state << 1
         return r_state
 
@@ -79,8 +76,8 @@ def rotation_state(self):
     #   seq = (A ^ B) | B << 2
     # 
     def rotation_sequence(self):
-        a_state = self.gpio.digitalRead(self.a_pin)
-        b_state = self.gpio.digitalRead(self.b_pin)
+        a_state = self.gpio.input(self.a_pin)
+        b_state = self.gpio.input(self.b_pin)
         r_seq = (a_state ^ b_state) | b_state << 1
         return r_seq