Merge pull request #7 from freaf87/master

Merge latest changes

Author: freaf87

02_Code/FSEDevBoard/FseDevBoard/buzzer.py

@@ -28,11 +28,10 @@
 class BUZZER(GPIO_Manager):
     """Driver for a BUZZER connected by GPIO."""
 
-    _pin = 17
-    _pins = [_pin]
-
-    def __init__(self):
+    def __init__(self, pin = 4):
         super(BUZZER, self).__init__()
+        self._pin = pin
+        self._pins = [self._pin]
         wiringpi.pinMode(self._pin, wiringpi.OUTPUT)
 
     def buzzerHigh(self):
@@ -48,7 +47,7 @@ def buzzForTime(self, time):
         sleep(time)
 
 if __name__ == "__main__":
-    with BUZZER() as buzzer:
+    with BUZZER(4) as buzzer:
         while True:
             for i in list(range(40,0,-1)):
                 print ("distance = {0} cm".format(i))

02_Code/FSEDevBoard/FseDevBoard/hcsr04.py

@@ -32,14 +32,14 @@ class UltrasonicTimeoutError(Exception):
 class HCSR04(GPIO_Manager):
     """Interface with an HCSR04 ultrasonic range sensor."""
 
-    _trigger_pin = 15
-    _echo_pin = 14
-    _pins = [_trigger_pin, _echo_pin]
     _timeout = 0.1  # seconds
     _average_count = 1
 
-    def __init__(self):
+    def __init__(self, triggerPin = 15, echoPin = 14):
         super(HCSR04, self).__init__()
+        self._trigger_pin = triggerPin #15
+        self._echo_pin = echoPin       #14
+        self._pins = [self._trigger_pin, self._echo_pin]
         wiringpi.pinMode(self._trigger_pin, wiringpi.OUTPUT)
         wiringpi.pinMode(self._echo_pin, wiringpi.INPUT)
 

02_Code/FSEDevBoard/FseDevBoard/pushbutton.py

@@ -33,18 +33,16 @@ class PUSHBUTTON(GPIO_Manager):
 
     def __init__(self):
         super(PUSHBUTTON, self).__init__()
-        wiringpi.pinMode(self._pin, wiringpi.OUTPUT)
+        wiringpi.pinMode(self._pin, wiringpi.INPUT)
         self.state = False
 
-    def PBStatus(self):
+    def getPBStatus(self):
         return wiringpi.digitalRead(self._pin)
 
 
 if __name__ == "__main__":
-    while True:
-        if PBStatus == False:
-            # do something button pressed
-            pass
-        else:
-            pass
-        time.sleep(0.5)
+    with PUSHBUTTON() as PB:
+        while True:
+            if PB.getPBStatus() == False:
+                print("Pushbutton pressed...")
+            time.sleep(0.25)

02_Code/FSEDevBoard/FseDevBoard/rgbLed.py

@@ -17,7 +17,6 @@
 from os.path import dirname
 sys.path.append(dirname(__file__))
 
-
 from pca9685 import PWM_Driver
 import time
 import sys

02_Code/FSEDevBoard/FseDevBoard/tb6612fng.py

@@ -17,6 +17,7 @@
 
 """Driver for 2 TB6612FNG DC motors mounted to a single chassis."""
 import sys
+import os
 from os.path import dirname
 sys.path.append(dirname(__file__))
 
@@ -28,27 +29,23 @@
 class MotorDriver(GPIO_Manager):
     """Interface with 2 TB6612FNG DC Motor drivers."""
     # Configure motor 1
-    _m1_dir1_pin = 6
-    _m1_dir2_pin = 12
-    _m1_pwm_pin_annex = 5  # solve error mapping (Vers.01)
-    _m1_pwm_pin = 18
+    _m1_dir1_pin = 19
+    _m1_dir2_pin = 16
+    _m1_pwm_pin  = 12
 
     # Configure motor 2
-    _m2_dir1_pin = 19
-    _m2_dir2_pin = 16
-    _m2_pwm_pin_annex = 26  # solve error mapping (Vers.01)
+    _m2_dir1_pin = 26
+    _m2_dir2_pin = 20
     _m2_pwm_pin = 13
 
-    _standby_pin = 20
+    _standby_pin = 21
 
     PWM_OUTPUTS = [_m1_pwm_pin, _m2_pwm_pin]
 
-    INPUT_PINS = [_m1_pwm_pin_annex, _m2_pwm_pin_annex]
-
     OUTPUT_PINS = [_m1_dir1_pin, _m1_dir2_pin,
                    _m2_dir1_pin, _m2_dir2_pin,
                    _standby_pin]
-    _pins = PWM_OUTPUTS + INPUT_PINS + OUTPUT_PINS
+    _pins = PWM_OUTPUTS + OUTPUT_PINS
 
     @staticmethod
     def to_dc(dc):
@@ -64,11 +61,6 @@ def __init__(self):
         for pin in self.PWM_OUTPUTS:
             wiringpi.pinMode(pin, wiringpi.PWM_OUTPUT)
 
-        for pin in self.INPUT_PINS:
-            wiringpi.pinMode(pin, wiringpi.INPUT)
-            # Make sure all annex_pin are set LOW
-            wiringpi.pullUpDnControl(pin, wiringpi.PUD_DOWN)
-
     def right_forward(self):
         """Drive right motor forward."""
         wiringpi.digitalWrite(self._m1_dir1_pin, wiringpi.LOW)
@@ -138,28 +130,28 @@ def __exit__(self, *args):
     with MotorDriver() as tb6612fng:
         while True:
             print("forward")
-            tb6612fng.forward()
+            tb6612fng.forward(50)
             time.sleep(3)
 
             tb6612fng.stop()
             time.sleep(3)
 
             print("reverse")
-            tb6612fng.reverse()
+            tb6612fng.reverse(50)
             time.sleep(3)
 
             tb6612fng.stop()
             time.sleep(3)
 
             print("left")
-            tb6612fng.left()
+            tb6612fng.left(50)
             time.sleep(3)
 
             tb6612fng.stop()
             time.sleep(3)
 
             print("right")
-            tb6612fng.right()
+            tb6612fng.right(50)
             time.sleep(3)
 
             tb6612fng.stop()

02_Code/FSEDevBoard/README.md 02_Code/FSEDevBoard/README.txt02_Code/FSEDevBoard/README.md renamed to 02_Code/FSEDevBoard/README.txt

@@ -9,4 +9,4 @@ Typical usage::
 
 Contributors
 ============
-Daniel Lee, Frederic Afadjigla
+Frederic Afadjigla

02_Code/FSEDevBoard/setup.py

@@ -9,7 +9,7 @@
     url='https://fullstackembedded.com',
     license='LICENSE.txt',
     description='Drivers for FSEDevBoard used in FSE workshops.',
-    long_description=open('README.md').read(),
+    long_description=open('README.txt').read(),
     install_requires=[
         "smbus2",
         "wiringpi",

02_Code/README.md

@@ -1,5 +1,5 @@
 # FSEDevBoard package
- 
+
 ## Installing
       % sudo apt install python3 python3-pip
       % pip3 install virtualenv
@@ -14,5 +14,8 @@
       (venv) % pip3 install FseDevBoard-0.0.1.tar.gz
 
 ### Running the PDC example
-     (venv) % cd ../../applications
-     (venv) % python3 PDC.py
+Note: Because applications using PWM must have root privileges, it is necessary to switch to root so that the venv is respected.
+      % sudo su
+      % source venv/bin/activate
+      (venv) % cd ../../applications
+      (venv) % python3 PDC.py

02_Code/applications/PDC.py

@@ -29,9 +29,9 @@
 class PDC(object):
     """ PDC class """
     def __init__(self):
-        self.ultrasonic = HCSR04()
+        self.ultrasonic = HCSR04(15, 14)
         self.rgbled = RGBLED()
-        self.buzzer = BUZZER()
+        self.buzzer = BUZZER(4)
         self.rgbled.pwmDriver.setPwmFreq(600)
 
     def setPDCColor(self, color):