Working on making things work outside of the hardware of the Portiloop

portiloop/notebooks/tests.ipynb

@@ -11,7 +11,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "573c77a0af1944859cce1eeb2c6eadea",
+       "model_id": "f46843d136af4c79a73841b997fa3284",
        "version_major": 2,
        "version_minor": 0
       },
@@ -22,28 +22,21 @@
      "metadata": {},
      "output_type": "display_data"
     },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "DEBUG:/home/mendel/portiloop-software/portiloop/sounds/stimulus.wav\n"
-     ]
-    },
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Exception in thread Thread-5:\n",
+      "Exception in thread Thread-3:\n",
       "Traceback (most recent call last):\n",
-      "  File \"/usr/lib/python3.7/threading.py\", line 917, in _bootstrap_inner\n",
+      "  File \"C:\\Users\\milos\\AppData\\Local\\Programs\\Python\\Python37\\lib\\threading.py\", line 917, in _bootstrap_inner\n",
       "    self.run()\n",
-      "  File \"/usr/lib/python3.7/threading.py\", line 865, in run\n",
+      "  File \"C:\\Users\\milos\\AppData\\Local\\Programs\\Python\\Python37\\lib\\threading.py\", line 865, in run\n",
       "    self._target(*self._args, **self._kwargs)\n",
-      "  File \"/home/mendel/portiloop-software/portiloop/src/capture.py\", line 920, in start_capture\n",
-      "    stimulator = stimulator_cls() if stimulator_cls is not None else None\n",
-      "  File \"/home/mendel/portiloop-software/portiloop/src/stimulation.py\", line 81, in __init__\n",
-      "    self.pcm = alsaaudio.PCM(channels=f.getnchannels(), rate=f.getframerate(), format=format, periodsize=self.periodsize, device=device)\n",
-      "alsaaudio.ALSAAudioError: Device or resource busy [default]\n",
+      "  File \"c:\\users\\milos\\documents\\github\\portiloop-software\\portiloop\\src\\capture.py\", line 927, in start_capture\n",
+      "    detector = detector_cls(threshold, channel=channel) if detector_cls is not None else None\n",
+      "  File \"c:\\users\\milos\\documents\\github\\portiloop-software\\portiloop\\src\\detection.py\", line 56, in __init__\n",
+      "    self.interpreters.append(edgetpu.make_interpreter(model_path))\n",
+      "NameError: name 'edgetpu' is not defined\n",
       "\n"
      ]
     }
@@ -58,19 +51,11 @@
     "\n",
     "cap = Capture(detector_cls=my_detector_class, stimulator_cls=my_stimulator_class)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "cded6bbc",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3.7.0b2 ('venv': venv)",
    "language": "python",
    "name": "python3"
   },
@@ -84,7 +69,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.0b2"
+  },
+  "vscode": {
+   "interpreter": {
+    "hash": "770b75f59a9c369b74cb4cefed633f309c892e213e0ed32eed0937c0a5627480"
+   }
   }
  },
  "nbformat": 4,

portiloop/src/__init__.py

@@ -0,0 +1 @@
+ADS = False

portiloop/src/capture.py

@@ -8,12 +8,16 @@ from datetime import datetime
 import multiprocessing as mp
 import warnings
 from threading import Thread, Lock
-import alsaaudio
+from portiloop.src import ADS
+
+if ADS:
+    import alsaaudio
+    from portiloop.src.hardware.frontend import Frontend
+    from portiloop.src.hardware.leds import LEDs, Color
 
 from portiloop.src.stimulation import UpStateDelayer
 
-from portiloop.src.hardware.frontend import Frontend
-from portiloop.src.hardware.leds import LEDs, Color
+
 from portiloop.src.processing import FilterPipeline, int_to_float
 from portiloop.src.config import mod_config, LEADOFF_CONFIG, FRONTEND_CONFIG, to_ads_frequency
 from portiloop.src.utils import FileReader, LiveDisplay, DummyAlsaMixer, EDFRecorder, EDF_PATH
@@ -164,22 +168,25 @@ class Capture:
         self._pause_detect_lock = Lock()
         self._pause_detect = True
         
-        try:
-            mixers = alsaaudio.mixers()
-            if len(mixers) <= 0:
+        if ADS:
+            try:
+                mixers = alsaaudio.mixers()
+                if len(mixers) <= 0:
+                    warnings.warn(f"No ALSA mixer found.")
+                    self.mixer = DummyAlsaMixer()
+                elif 'PCM' in mixers:
+                    self.mixer = alsaaudio.Mixer(control='PCM')
+                else:
+                    warnings.warn(f"Could not find mixer PCM, using {mixers[0]} instead.")
+                    self.mixer = alsaaudio.Mixer(control=mixers[0])
+            except ALSAAudioError as e:
                 warnings.warn(f"No ALSA mixer found.")
                 self.mixer = DummyAlsaMixer()
-            elif 'PCM' in mixers:
-                self.mixer = alsaaudio.Mixer(control='PCM')
-            else:
-                warnings.warn(f"Could not find mixer PCM, using {mixers[0]} instead.")
-                self.mixer = alsaaudio.Mixer(control=mixers[0])
-        except ALSAAudioError as e:
-            warnings.warn(f"No ALSA mixer found.")
+            
+            self.volume = self.mixer.getvolume()[0]  # we will set the same volume on all channels
+        else:
             self.mixer = DummyAlsaMixer()
-        
-        self.volume = self.mixer.getvolume()[0]  # we will set the same volume on all channels
-        
+            self.volume = self.mixer.getvolume()[0]
         
         # widgets ===============================
         
@@ -528,9 +535,10 @@ class Capture:
         self.b_test_stimulus.on_click(self.on_b_test_stimulus)
         self.b_test_impedance.on_click(self.on_b_test_impedance)
         self.b_pause.observe(self.on_b_pause, 'value')
-        
+
         self.display_buttons()
 
+
     def __del__(self):
         self.b_capture.close()
     

portiloop/src/detection.py

@@ -1,8 +1,10 @@
 from abc import ABC, abstractmethod
 import time
 from pathlib import Path
+from portiloop.src import ADS
 
-from pycoral.utils import edgetpu
+if ADS:
+    from pycoral.utils import edgetpu
 import numpy as np
 
 

portiloop/src/stimulation.py

@@ -3,7 +3,12 @@ from enum import Enum
 import time
 from threading import Thread, Lock
 from pathlib import Path
-import alsaaudio
+
+from portiloop.src import ADS
+
+if ADS:
+    import alsaaudio
+    
 import wave
 import pylsl
 from scipy.signal import find_peaks

setup.py

@@ -11,10 +11,11 @@ setup(
                       'portilooplot',
                       'ipywidgets',
                       'python-periphery',
-                      'spidev',
+                    #   'spidev',
                       'pylsl-coral',
                       'scipy',
                       'pycoral',
-                      'pyalsaaudio'
+                      'matplotlib',
+                    #   'pyalsaaudio'
                      ]
 )