dev mode option to simulate data while sending to speaker

src/config.json

@@ -1,6 +1,7 @@
 {
     "serial_name": "/dev/cu.usbmodem53254001",
     "data_directory": "../data/",
+    "development_mode": 0,
 
     "max_analog_volts": 3.3,
     "analog_read_resolution": 13,

src/runall.py

@@ -50,7 +50,8 @@
                       PARAMS['lrlr_window_secs'],
                       PARAMS['n_peaks_for_flick_detection'],
                       data_fname=data_fname,
-                      saving=True)
+                      saving=True,
+                      development_mode=bool(PARAMS['development_mode']))
 
     # initialize detector as a <worker> attribute
     worker.detector = myDetector(PARAMS['internal_sampling_rate_hz'],

src/workerClass.py

@@ -47,7 +47,8 @@ def __init__(self,serial_name,                # of Arduino
                       lrlr_window_secs,           # secs that n peaks must occur within for detection
                       n_peaks_for_lrlr_detection, # n peaks required to trigger detection
                       data_fname,
-                      saving):
+                      saving,
+                      development_mode):
 
         super(self.__class__,self).__init__()
 
@@ -60,6 +61,7 @@ def __init__(self,serial_name,                # of Arduino
         self.N_PEAKS_FOR_LRLR_DETECTION = n_peaks_for_lrlr_detection
         self.DATA_FNAME = data_fname
         self.SAVING = saving
+        self.DEV_MODE = development_mode
 
         self.COLUMNS = ['timestamp','volts'] # of data output file
 
@@ -98,7 +100,7 @@ def keep_grabbingData_and_checking4flick(self):
         while True: # run until GUI closes
 
             # pull from Arduino or simulate data
-            if self.duino:
+            if self.duino and not self.DEV_MODE:
                 volt = self._grabData()
             else:
                 volt = self._generateSimulatedData()
@@ -155,7 +157,7 @@ def _check4lrlr(self):
         self.detector.update_status(list(self.data),list(self.stamps),self.gain)
         # if a peak, add to the running list of peaks
         if self.detector.status == 'rising':
-            print 'rising'
+            # print 'rising'
             # add the most recent timestamp indicating the time of detection
             self.lrlr.append(self.stamps[-1])
             # check if the timepassed between all 4 is within range
@@ -165,9 +167,9 @@ def _check4lrlr(self):
                 self.signal4log.emit('Flick detected',False,self.stamps[-1])
                 # clear the flick record, preventing rapid consecutive detections
                 self.lrlr.clear()
-                # # send to duino if wanna trigger something
-                # if self.duino is not None:
-                #     self.duino.write(bytes(1))
+                # send to duino if wanna trigger something
+                if self.duino is not None:
+                    self.duino.write(bytes(1))
 
 
     def _connect2arduino(self):
@@ -178,6 +180,9 @@ def _connect2arduino(self):
         try:
             ## TODO: add timeout and baudrate args
             self.duino = serial.Serial(self.SERIAL_NAME)
+            if self.DEV_MODE:
+                self.signal4log.emit('Connected to duino but simulating data for development mode',True,0)
+                self.initializeSimulation()
         except serial.serialutil.SerialException:
             self.duino = None
             self.signal4log.emit('No serial connection, simulating data',True,0)
@@ -226,7 +231,7 @@ def _grabData(self):
         rawvals = [ float(x) for x in list_str_vals if x.isalnum() ]
         # sometimes Arduino sends nothing so make sure there is at least 1 value
         if len(rawvals) > 0:
-            volts = self.__raw2volts(rawvals[-1])
+            volts = self._raw2volts(rawvals[-1])
             return volts
 
     def _generateSimulatedData(self):