change timeout for slow sampling

wjasper · wjasper · commit aa5b78e1e854 · 2018-02-12T17:38:57.000-05:00
diff --git a/USB/mcc-libusb/usb-1608FS.c b/USB/mcc-libusb/usb-1608FS.c
@@ -732,10 +732,7 @@ int usbAInScan_USB1608FS(libusb_device_handle *udev, uint8_t lowchannel, uint8_t
   }
 
   if (*frequency < 150.) {
-    arg.options |= AIN_TRANSFER_MODE;
-    if (timeout < floor(1000./(*frequency))) {
-	timeout = floor(1000./(*frequency)) + FS_DELAY;
-    }
+    timeout = floor(32*1000./(*frequency)) + FS_DELAY;
   }
 
   *frequency = 1.0e7/(preload*(1<<arg.prescale));

Original file line number	Diff line number	Diff line change
`@@ -732,10 +732,7 @@ int usbAInScan_USB1608FS(libusb_device_handle *udev, uint8_t lowchannel, uint8_t`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`if (*frequency < 150.) {`
`735`		`- arg.options \|= AIN_TRANSFER_MODE;`
`736`		`- if (timeout < floor(1000./(*frequency))) {`
`737`		`- timeout = floor(1000./(*frequency)) + FS_DELAY;`
`738`		`- }`
	`735`	`+ timeout = floor(321000./(frequency)) + FS_DELAY;`
`739`	`736`	`}`
`740`	`737`
`741`	`738`	`frequency = 1.0e7/(preload(1<<arg.prescale));`