Merge pull request #309 from JohnGriffiths/fix_kf_markers

modified kf packet info following discussion w devs

Author: JohnGriffiths

eegnb/devices/eeg.py

@@ -451,8 +451,10 @@ def _start_kf(self): #:, duration):
 
         kf_start_timestamp = int(time()*1e6)
 
-        # Send first data packet 
         self.kf_evnum = 0
+        self.kf_trialnum = 0
+
+        # Send first data packet 
         data_to_send = {"id": self.kf_evnum,
                         "timestamp": kf_start_timestamp,
                         "event": "start_experiment",
@@ -467,41 +469,71 @@ def _start_kf(self): #:, duration):
 
 
     def _kf_push_sample(self, timestamp, marker, marker_name):
-   
-        # Send trigger
+
+
+        self.kf_trialnum += 1
+
+        # 1/3: Send start trial trigger
         self.kf_evnum+=1
         kf_trigger_timestamp = int(time()*1e6)
         data_to_send = {
                          "id": self.kf_evnum, #event_id,
                          "timestamp": kf_trigger_timestamp, # timestamp
                          "event": 'start_trial', #marker_name, #event_name,
+                         "value": str(self.kf_trialnum), #str(marker_name), 
+                        }
+        self._kf_sendeventinfo(data_to_send)
+        self.kf_triggers_history.append({'kf_evnum': '%s' %self.kf_evnum,
+                                         'kf_trigger_timestamp': kf_trigger_timestamp,
+                                         'experiment_timestamp': timestamp,
+                                         'packet_sent': data_to_send})
+        # 2/3: Send trial_type trigger
+        self.kf_evnum+=1
+        kf_trigger_timestamp = int(time()*1e6)
+        data_to_send = {
+                         "id": self.kf_evnum, #event_id,
+                         "timestamp": kf_trigger_timestamp, # timestamp
+                         "event": 'trial_type', #marker_name, #event_name,
                          "value": str(marker), #str(marker_name), 
                         }
         self._kf_sendeventinfo(data_to_send)
-        
-        # Update logfile text
         self.kf_triggers_history.append({'kf_evnum': '%s' %self.kf_evnum,
                                          'kf_trigger_timestamp': kf_trigger_timestamp,
                                          'experiment_timestamp': timestamp,
                                          'packet_sent': data_to_send})
-    
-    
+        # 3/3: Send end trial trigger
+        self.kf_evnum+=1
+        kf_trigger_timestamp = int(time()*1e6)
+        data_to_send = {
+                         "id": self.kf_evnum, #event_id,
+                         "timestamp": kf_trigger_timestamp, # timestamp
+                         "event": 'end_trial', #marker_name, #event_name,
+                         "value":  str(self.kf_trialnum), #str(marker_name), 
+                        }
+        self._kf_sendeventinfo(data_to_send)
+        self.kf_triggers_history.append({'kf_evnum': '%s' %self.kf_evnum,
+                                         'kf_trigger_timestamp': kf_trigger_timestamp,
+                                         'experiment_timestamp': timestamp,
+                                         'packet_sent': data_to_send})
+   
     def _stop_kf(self):
 
         self.kf_evnum+=1
         kf_stop_timestamp = int(time()*1e6)
+
+        # Send end experiment trigger
         data_to_send = {
-                        "id": 3, #self.kf_evnum,
+                        "id": self.kf_evnum,
                         "timestamp": kf_stop_timestamp,
                         "event": "end_experiment",
-                        "value": "5"
+                        "value": "1"
                         }
         self._kf_sendeventinfo(data_to_send)
 
         self.kf_triggers_history.append({'kf_evnum': '%s' % self.kf_evnum,
                                          'kf_stop_timestamp': kf_stop_timestamp,
                                          'packet_sent': data_to_send})
-        
+       
         if self.make_logfile:
             self.kf_logfile_handle.write(self.kf_triggers_history)
             self.kf_logfile_handle.close()