updating model options

Author: JensBlack

experiments/base/stimulation.py

@@ -33,18 +33,18 @@ def _setup_device(type, port, ip):
             device = DigitalModDevice(port)
 
         if type == 'RASPBERRY':
-            from experiments.utils.generic_output import DigitalPiBoardDevice
-            device = DigitalPiBoardDevice(port)
+            from experiments.utils.gpio_control import DigitalPiDevice
+            device = DigitalPiDevice(port)
 
         if type == 'RASP_NETWORK':
-            from experiments.utils.generic_output import DigitalPiBoardDevice
+            from experiments.utils.gpio_control import DigitalPiDevice
             if ip is not None:
-                device = DigitalPiBoardDevice(port, ip)
+                device = DigitalPiDevice(port, ip)
             else:
                 raise ValueError('IP required for remote GPIO control.')
 
         if type == 'ARDUINO':
-            from experiments.utils.generic_output import DigitalArduinoDevice
+            from experiments.utils.gpio_control import DigitalArduinoDevice
             device = DigitalArduinoDevice(port)
 
 
@@ -110,11 +110,11 @@ def _setup_device(type, port, ip):
             device = DigitalModDevice(port)
 
         if type == 'RASPBERRY':
-            from experiments.utils.generic_output import DigitialPiBoardDevice
+            from experiments.utils.gpio_control import DigitialPiBoardDevice
             device = DigitialPiBoardDevice(port)
 
         if type == 'RASP_NETWORK':
-            from experiments.utils.generic_output import DigitialPiBoardDevice
+            from experiments.utils.gpio_control import DigitialPiBoardDevice
             if ip is not None:
                 device = DigitialPiBoardDevice(port, ip)
             else:

experiments/configs/default_config.ini

@@ -102,7 +102,7 @@ STIMULATION = BaseStimulation
 TYPE = NI
 ;only used in RASP_NETWORK
 IP = None
-;Port from DAQ, PIN from Raspberry
+;PORT parameter is used for all (Port from DAQ, PIN from Raspberry, or serial port from Arduino)
 PORT = Dev1/PFI6
 STIM_TIME = 3.5
 
@@ -111,7 +111,7 @@ STIM_TIME = 3.5
 TYPE = NI
 ;only used in RASP_NETWORK
 IP = None
-;Port from DAQ, PIN from Raspberry or USB PORT for ARDUINO
+;PORT parameter is used for all (Port from DAQ, PIN from Raspberry, or serial port from Arduino)
 STIM_PORT = Dev1/PFI6
 REMOVAL_PORT = Dev1/PFI5
 STIM_TIME = 3.5

experiments/utils/generic_output.py experiments/utils/gpio_control.pyexperiments/utils/generic_output.py renamed to experiments/utils/gpio_control.py

@@ -2,13 +2,13 @@
 from gpiozero.pins.pigpio import PiGPIOFactory
 
 import serial
-BOARD_IP = '192.168.1.2'
 
 
 
-class DigitalPiBoardDevice:
+class DigitalPiDevice:
     """
     Digital modulated devices in combination with Raspberry Pi GPIO
+    Setup: https://gpiozero.readthedocs.io/en/stable/remote_gpio.html
     """
 
     def __init__(self, PIN, BOARD_IP: str = None):
@@ -18,10 +18,10 @@ def __init__(self, PIN, BOARD_IP: str = None):
         """
         if BOARD_IP is not None:
             self._factory = PiGPIOFactory(host = BOARD_IP)
-            self._device = DigitalOutputDevice(PIN= PIN, pin_factory = self._factory)
+            self._device = DigitalOutputDevice(PIN, pin_factory = self._factory)
         else:
             self._factory = None
-            self._device = DigitalOutputDevice(PIN = PIN)
+            self._device = DigitalOutputDevice(PIN)
         self._running = False
 
     def turn_on(self):
@@ -40,21 +40,23 @@ def toggle(self):
 class DigitalArduinoDevice:
     """
     Digital modulated devices in combination with Arduino boards connected via USB
+        setup: https://pythonforundergradengineers.com/python-arduino-LED.html
+
     """
 
     def __init__(self, PORT):
         """
         :param PORT:  USB PORT of the arduino board
         """
-        self._device = serial.Serial(PORT, baudrate=19200)
+        self._device = serial.Serial(PORT, baudrate=9600)
         self._running = False
 
     def turn_on(self):
-        self._device.write(b'1')
+        self._device.write(b'H')
         self._running = True
 
     def turn_off(self):
-        self._device.write(b'0')
+        self._device.write(b'L')
         self._running = False
 
     def toggle(self):

requirements.txt

@@ -1,8 +1,11 @@
+gpiozero
+pigpio
+pyserial
 nidaqmx>=0.5.7
 click>=7.0
 opencv-python>=3.4.5.20
 numpy>=1.14.5
 pandas>=0.21.0
 matplotlib>=3.0.3
 scikit-image>=0.14.2
-scipy>=1.1.0
+scipy>=1.1.0