Fix discrepancy issue

pybpod · May 7, 2018 · 67017d8 · 67017d8
1 parent 057d128
commit 67017d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pybpodapi/bpod/bpod_com_protocol.py b/pybpodapi/bpod/bpod_com_protocol.py
@@ -359,13 +359,14 @@ def _bpodcom_read_timestamps(self):
 
         data = self._arcom.read_bytes_array(12)
 
-        n_hw_timer_cyles        = ArduinoTypes.cvt_float32(b''.join(data[:4]))
+        n_hw_timer_cyles        = ArduinoTypes.cvt_uint32(b''.join(data[:4]))
         trial_end_micros        = ArduinoTypes.cvt_uint64(b''.join(data[4:12]))# / float(self.hardware.DEFAULT_FREQUENCY_DIVIDER)
-        trial_time_from_micros  = trial_end_micros - self.trial_start_micros
+        trial_end_timestamp     = trial_end_micros / float(self.hardware.DEFAULT_FREQUENCY_DIVIDER)
+        trial_time_from_micros  = trial_end_timestamp - self.trial_start_timestamp
         trial_time_from_cycles  = n_hw_timer_cyles/self.hardware.cycle_frequency
         discrepancy             = abs(trial_time_from_micros - trial_time_from_cycles)*1000
 
-        return trial_end_micros / float(self.hardware.DEFAULT_FREQUENCY_DIVIDER), discrepancy
+        return trial_end_timestamp, discrepancy
 
 
 

diff --git a/pybpodapi/com/arcom.py b/pybpodapi/com/arcom.py
@@ -68,6 +68,11 @@ def cvt_float64(message_bytes):
 	def cvt_int64(message_bytes):
 		return int.from_bytes(message_bytes, byteorder='little')
 
+	@staticmethod
+	def cvt_uint32(message_bytes):
+		return struct.unpack('<L',message_bytes)[0]
+
+
 	@staticmethod
 	def cvt_uint64(message_bytes):
 		return struct.unpack('<Q',message_bytes)[0]