debug

portiloop/capture.py

@@ -91,7 +91,7 @@ def to_ads_frequency(frequency):
     possible_datarates = [250, 500, 1000, 2000, 4000, 8000, 16000]
     dr = 16000
     for i in possible_datarates:
-        if i >= datarate:
+        if i >= frequency:
             dr = i
             break
     return dr
@@ -912,12 +912,12 @@ class Capture:
             fp = FilterPipeline(nb_channels=8,
                                 sampling_rate=self.frequency,
                                 power_line_fq=self.power_line,
-                                use_custom_fir=False,
-                                custom_fir_order=10,
-                                custom_fir_cutoff=30,
-                                alpha_avg=0.1,
-                                alpha_std=0.001,
-                                epsilon=0.000001)
+                                use_custom_fir=self.custom_fir,
+                                custom_fir_order=self.custom_fir_order,
+                                custom_fir_cutoff=self.custom_fir_cutoff,
+                                alpha_avg=self.polyak_mean,
+                                alpha_std=self.polyak_std,
+                                epsilon=self.epsilon)
 
         self._p_capture = mp.Process(target=_capture_process,
                                      args=(p_data_o,

portiloop/notebooks/test_LSL.ipynb

@@ -2,60 +2,10 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "37a4d718",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'lo' (status: 0, multicast: 1, broadcast: 0)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'eth0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'wlan0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'p2p0' (status: 4096, multicast: 0, broadcast: 2)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'lo' (status: 0, multicast: 1, broadcast: 0)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'eth0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.506 (   0.018s) [python3         ]      netinterfaces.cpp:102   INFO| \tIPv4 addr: c0a80172\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'wlan0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:102   INFO| \tIPv4 addr: c0a80001\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'lo' (status: 0, multicast: 1, broadcast: 0)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'eth0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:105   INFO| \tIPv6 addr: fd24:dec0:e89c::b8b\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'eth0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:105   INFO| \tIPv6 addr: fd24:dec0:e89c:0:57e3:6122:3c71:7ca4\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'eth0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:105   INFO| \tIPv6 addr: fe80::1d2b:5fd6:c05d:9642%eth0\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:91    INFO| netif 'wlan0' (status: 4096, multicast: 1, broadcast: 2)\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]      netinterfaces.cpp:105   INFO| \tIPv6 addr: fe80::7ed9:5cff:feb2:5133%wlan0\n",
-      "2022-03-25 20:14:39.507 (   0.018s) [python3         ]         api_config.cpp:270   INFO| Loaded default config\n",
-      "2022-03-25 20:14:39.509 (   0.020s) [python3         ]             common.cpp:65    INFO| v1.15.2-108-g6cdcf74d\n",
-      "2022-03-25 20:14:39.509 (   0.021s) [python3         ]         udp_server.cpp:82    WARN| Could not bind multicast responder for ff02:113d:6fdd:2c17:a643:ffe2:1bd1:3cd2 to interface fd24:dec0:e89c:0:57e3:6122:3c71:7ca4 (Address already in use)\n",
-      "2022-03-25 20:14:39.509 (   0.021s) [python3         ]         udp_server.cpp:82    WARN| Could not bind multicast responder for ff02:113d:6fdd:2c17:a643:ffe2:1bd1:3cd2 to interface fe80::7ed9:5cff:feb2:5133%wlan0 (Address already in use)\n",
-      "2022-03-25 20:14:39.509 (   0.021s) [python3         ]         udp_server.cpp:82    WARN| Could not bind multicast responder for ff05:113d:6fdd:2c17:a643:ffe2:1bd1:3cd2 to interface fd24:dec0:e89c:0:57e3:6122:3c71:7ca4 (Address already in use)\n",
-      "2022-03-25 20:14:39.510 (   0.021s) [python3         ]         udp_server.cpp:82    WARN| Could not bind multicast responder for ff05:113d:6fdd:2c17:a643:ffe2:1bd1:3cd2 to interface fe80::7ed9:5cff:feb2:5133%wlan0 (Address already in use)\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "now sending data...\n"
-     ]
-    },
-    {
-     "ename": "KeyboardInterrupt",
-     "evalue": "",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mKeyboardInterrupt\u001b[0m                         Traceback (most recent call last)",
-      "\u001b[0;32m/tmp/ipykernel_3906/1992969341.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m     42\u001b[0m         \u001b[0mtime\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msleep\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;36m0.01\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     43\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 44\u001b[0;31m \u001b[0mmain\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;32m/tmp/ipykernel_3906/1992969341.py\u001b[0m in \u001b[0;36mmain\u001b[0;34m()\u001b[0m\n\u001b[1;32m     40\u001b[0m         \u001b[0msent_samples\u001b[0m \u001b[0;34m+=\u001b[0m \u001b[0mrequired_samples\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     41\u001b[0m         \u001b[0;31m# now send it and wait for a bit before trying again.\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 42\u001b[0;31m         \u001b[0mtime\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msleep\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;36m0.01\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     43\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     44\u001b[0m \u001b[0mmain\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;31mKeyboardInterrupt\u001b[0m: "
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "\"\"\"Example program to demonstrate how to send a multi-channel time series to\n",
     "LSL.\"\"\"\n",
@@ -102,14 +52,6 @@
     "\n",
     "main()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e67e094c",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

portiloop/notebooks/tests.ipynb

@@ -2,40 +2,17 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "7b2fc5da",
    "metadata": {
     "scrolled": false
    },
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "695e7a12068640caa478d92b47a6e76c",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "VBox(children=(Accordion(children=(GridBox(children=(Label(value='CH1'), Label(value='CH2'), Label(value='CH3'…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
     "from portiloop.capture import Capture\n",
     "\n",
     "cap = Capture()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a34e9672",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {