fixed some bugs

portiloop/capture.py

@@ -5,6 +5,7 @@ from time import sleep
 import time
 import numpy as np
 import os
+from copy import deepcopy
 from pathlib import Path
 from datetime import datetime, timedelta
 import multiprocessing as mp
@@ -60,7 +61,7 @@ DEFAULT_FRONTEND_CONFIG = [
 FRONTEND_CONFIG = [
     0x3E, # ID (RO)
     0x95, # CONFIG1 [95] [1, DAISY_EN(bar), CLK_EN, 1, 0, DR[2:0]] : Datarate = 500 SPS
-    0xC0, # CONFIG2 [C0] [1, 1, 0, INT_CAL, 0, CAL_AMP0, CAL_FREQ[1:0]]
+    0xD0, # CONFIG2 [C0] [1, 1, 0, INT_CAL, 0, CAL_AMP0, CAL_FREQ[1:0]]
     0xFC, # CONFIG3 [E0] [PD_REFBUF(bar), 1, 1, BIAS_MEAS, BIASREF_INT, PD_BIAS(bar), BIAS_LOFF_SENS, BIAS_STAT] : Power-down reference buffer, no bias
     0x00, # No lead-off
     0x62, # CH1SET [60] [PD1, GAIN1[2:0], SRB2, MUX1[2:0]] set to measure BIAS signal
@@ -106,6 +107,8 @@ LEADOFF_CONFIG = [
     0x00, # Lead-off negative status (RO)
     0x00, # All GPIOs as output ?
     0x20, # Enable SRB1
+    0x00,
+    0x02,
 ]
 
 EDF_PATH = Path.home() / 'workspace' / 'edf_recording'
@@ -164,7 +167,7 @@ def mod_config(config, datarate, channel_modes):
 
 
 def filter_24(value):
-    return (value * 4.5) / (2**23 - 1)  # 23 because 1 bit is lost for sign
+    return (value * 4.5) / (2**23 - 1) / 24.0 * 1e6  # 23 because 1 bit is lost for sign
 
 
 def filter_2scomplement_np(value):
@@ -1206,23 +1209,21 @@ class Capture:
             return x & 1 << n != 0
         
         try:
-            frontend.write_regs(0x00, FRONTEND_CONFIG)
+            frontend.write_regs(0x00, LEADOFF_CONFIG)
             frontend.start()
             start_time = time.time()
             current_time = time.time()
             while current_time - start_time < 2:
                 current_time = time.time()
-            new_config = frontend.read_regs(0x00, len(LEADOFF_CONFIG))
-            leadoff_p = new_config[18]
-            leadoff_n = new_config[19]
+            reading = frontend.read()
             
             # Check if any of the negative bits are set and initialize the impedance array
-            impedance_check = [any([is_set(leadoff_n, i) for i in range(2, 9)])]
-            
-           # Check all other values for all electrodes
-            for i in range(2, 9):
-                impedance_check.append(is_set(leadoff_p, i))
+#             impedance_check = [any([is_set(leadoff_n, i) for i in range(2, 9)])]
+            impedance_check = [any([reading.loff_n(i) for i in range(7)])]
             
+            for i in range(7):
+                impedance_check.append(reading.loff_p(i))
+                             
             def print_impedance(impedance):
                 names = ["Ref", "Ch2", "Ch3", "Ch4", "Ch5", "Ch6", "Ch7", "Ch8"]
                 vals = [' Y ' if val else ' N ' for val in impedance]
@@ -1378,19 +1379,22 @@ class Capture:
                 continue
                 
             n_array = np.array([point])
-            n_array = filter_np(n_array)
+            n_array_raw = filter_np(n_array)
             
             if filter:
-                n_array = fp.filter(n_array)
+                n_array = fp.filter(deepcopy(n_array_raw))
+            else:
+                n_array = n_array_raw
             
             filtered_point = n_array.tolist()
             
             if lsl:
-                lsl_outlet_raw.push_sample(point)
+                raw_point = n_array_raw.tolist()
+                lsl_outlet_raw.push_sample(raw_point[-1])
                 lsl_outlet.push_sample(filtered_point[-1])
                 
             if stimulation_delayer is not None:
-                stimulation_delayer.add_point(point[channel-1])
+                stimulation_delayer.add_point(filtered_point[channel-1])
 
             with self._pause_detect_lock:
                 pause = self._pause_detect

portiloop/hardware/frontend.py

@@ -33,15 +33,15 @@ class Reading:
     def channels(self):
         return self._channels
 
-    def gpio(idx: int):
+    def gpio(self, idx: int):
         assert 0 <= idx <= 3, "Invalid gpio index"
         return (self.gpios >> idx) & 0x01 == 0x01
 
-    def loff_p(idx: int):
+    def loff_p(self, idx: int):
         assert 0 <= idx <= 7, "Invalid loff index"
         return (self.loff_statp >> idx) & 0x01 == 0x01
 
-    def loff_n(idx: int):
+    def loff_n(self, idx: int):
         assert 0 <= idx <= 7, "Invalid loff index"
         return (self.loff_statn >> idx) & 0x01 == 0x01