add pull modes

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / generic_agnostic_board / pin.py

diff --git a/src/adafruit_blinka/microcontroller/generic_agnostic_board/pin.py b/src/adafruit_blinka/microcontroller/generic_agnostic_board/pin.py
index c9c15a3a6d8eba805a87fb67ea34bf9e1bcf2e09..1f6818e64c750c1a9e85984cbe718cad42a2daae 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_agnostic_board/pin.py
+++ b/src/adafruit_blinka/microcontroller/generic_agnostic_board/pin.py
@@ -4,8 +4,10 @@
 """generic_agnostic_board pin interface"""
 import random
 
 """generic_agnostic_board pin interface"""
 import random
 

+

 class Pin:
     """A basic Pin class for use with generic_agnostic_board"""
 class Pin:
     """A basic Pin class for use with generic_agnostic_board"""

+

     # pin modes
     OUT = 0
     IN = 1
     # pin modes
     OUT = 0
     IN = 1


@@ -14,63 +16,85 @@ class Pin:
     # pin values
     LOW = 0
     HIGH = 1
     # pin values
     LOW = 0
     HIGH = 1

+    # pin pulls
+    PULL_NONE = 0
+    PULL_UP = 1
+    PULL_DOWN = 2

 
     def return_toggle(self):
 
     def return_toggle(self):

-      """Returns the pin's expected value, toggling between True and False"""
-      toggle_state = not self.previous_value
-      return toggle_state
+        """Returns the pin's expected value, toggling between True and False"""
+        toggle_state = not self.previous_value
+        return toggle_state

 
     def return_false(self):
 
     def return_false(self):

-      """Returns the pin's expected value, False"""
-      return False
+        """Returns the pin's expected value, False"""
+        return False

 
     def return_true(self):
 
     def return_true(self):

-      """Returns the pin's expected value, True"""
-      return True
+        """Returns the pin's expected value, True"""
+        return True

 
     def return_random_int(self):
 
     def return_random_int(self):

-      """Returns a random integer"""
-      return random.randint(0, 65535)
+        """Returns a random integer"""
+        return random.randint(0, 65535)

 
     def return_fixed_int_pi(self):
 
     def return_fixed_int_pi(self):

-      """Returns the first five digits of Pi, 31415"""
-      return 31415
-
-    expected_pin_behavior = {
-      'Dx_INPUT_TRUE': return_true,
-      'Dx_INPUT_FALSE': return_false,
-      'Dx_INPUT_TRUE_THEN_FALSE': return_toggle,
-      'Dx_INPUT_TRUE_PULL_UP': return_true,
-      'Dx_INPUT_TRUE_PULL_DOWN': return_true,
-      'Dx_OUTPUT_TRUE': return_true,
-      'Dx_OUTPUT_FALSE': return_true,
-      'Ax_INPUT_RAND_INT': return_random_int
-    }
+        """Returns the first five digits of Pi, 31415"""
+        return 31415

 
     def __init__(self, pin_id=None):
 
     def __init__(self, pin_id=None):

-      self.id = pin_id
-      self._mode = None
-      self.previous_value = None
-      self.current_value = None
+        self.id = pin_id
+        self._mode = None
+        self._pull = None
+        self.previous_value = False
+        self.current_value = None
+
+        # mapping of pin definition names to expected behavior
+        self.pin_behavior = {
+            0: self.return_true,  # Dx_INPUT_TRUE
+            1: self.return_false,  # Dx_INPUT_FALSE
+            2: self.return_true,  # Dx_INPUT_TRUE_PULL_UP
+            3: self.return_true,  # Dx_INPUT_TRUE_PULL_DOWN
+            4: self.return_true,  # Dx_OUTPUT_TRUE
+            5: self.return_false,  # Dx_OUTPUT_FALSE
+            6: self.return_true,  # NEOPIXEL
+            7: self.return_random_int,  # Ax_INPUT_RAND_INT
+            8: self.return_fixed_int_pi,  # Ax_INPUT_FIXED_INT_PI
+            9: self.return_true,  # Ax_OUTPUT_WAVE_SINE
+            10: self.return_true,  # Ax_OUTPUT_WAVE_SAWTOOTH
+            11: self.return_toggle,  # Dx_INPUT_TOGGLE
+            # Add other mappings as needed
+        }

 
     def init(self, mode=IN, pull=None):
         """Initialize the Pin"""
         if self.id is None:
             raise RuntimeError("Can not init a None type pin.")
 
     def init(self, mode=IN, pull=None):
         """Initialize the Pin"""
         if self.id is None:
             raise RuntimeError("Can not init a None type pin.")

-        if pull is not None:
-            raise NotImplementedError("Internal pullups and pulldowns not supported")
+        pull = Pin.PULL_NONE if pull is None else pull
+        self._pull = pull

         self._mode = mode
 
     def write(self, new_value):
         self._mode = mode
 
     def write(self, new_value):

-      """Saves the new_value to the pin for subsequent calls to .value"""
-      self.previous_value = self.current_value
-      self.current_value = new_value
+        """Saves the new_value to the pin for subsequent calls to .value"""
+        self.previous_value = self.current_value
+        self.current_value = new_value

 
     def read(self):
 
     def read(self):

-      """Returns the pin's expected value."""
-      self.previous_value = self.current_value
-      self.current_value = self.expected_pin_behavior.get(self.pin_id)
-      return self.current_value
+        print("\nread mode: ", self._mode)
+        """Returns the pin's expected value."""
+        self.previous_value = self.current_value
+        # perform a lookup on the pin_behavior dict to get the value
+        self.current_value = self.pin_behavior.get(self.id)()
+
+        # is pin a pull up and pin is LOW?
+        if self._pull == Pin.PULL_UP and self.current_value == False:
+            self.current_value = True
+        # is pin a pull down and pin is HIGH?
+        if self._pull == Pin.PULL_DOWN and self.current_value == True:
+            print("switching PDR to False")
+            self.current_value = False
+
+        return self.current_value

 
     def value(self, val=None):
         """Set or return the Pin Value"""
 
     def value(self, val=None):
         """Set or return the Pin Value"""


@@ -101,6 +125,7 @@ class Pin:
             "No action for mode {} with value {}".format(self._mode, val)
         )
 
             "No action for mode {} with value {}".format(self._mode, val)
         )
 

+

 # create pin instances for each pin
 D0 = Pin(0)
 D1 = Pin(1)
 # create pin instances for each pin
 D0 = Pin(0)
 D1 = Pin(1)


@@ -116,6 +141,8 @@ A1 = Pin(8)
 A2 = Pin(9)
 A3 = Pin(10)
 
 A2 = Pin(9)
 A3 = Pin(10)
 

+D7 = Pin(11)
+

 # I2C pins
 SDA = Pin()
 SCL = Pin()
 # I2C pins
 SDA = Pin()
 SCL = Pin()