Merge pull request #179 from aarmea-butterfly/make-callback-optional-again

hmaarrfk · web-flow · commit 144eca29c276 · 2021-12-10T18:24:42.000-05:00
Make callback in runBlock optional
diff --git a/picoscope/ps4000a.py b/picoscope/ps4000a.py
@@ -77,6 +77,9 @@ def blockReady(function):
      void          * pParameter
     )
     """
+    if function is None:
+        return None
+
     callback = CFUNCTYPE(c_void_p, c_int16, c_uint32, c_void_p)
     return callback(function)
 
diff --git a/picoscope/ps5000a.py b/picoscope/ps5000a.py
@@ -71,6 +71,9 @@ def blockReady(function):
      void          * pParameter
     )
     """
+    if function is None:
+        return None
+
     callback = CFUNCTYPE(c_void_p, c_int16, c_uint32, c_void_p)
     return callback(function)
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ def blockReady(function):`
`77`	`77`	`void * pParameter`
`78`	`78`	`)`
`79`	`79`	`"""`
	`80`	`+ if function is None:`
	`81`	`+ return None`
	`82`	`+`
`80`	`83`	`callback = CFUNCTYPE(c_void_p, c_int16, c_uint32, c_void_p)`
`81`	`84`	`return callback(function)`
`82`	`85`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ def blockReady(function):`
`71`	`71`	`void * pParameter`
`72`	`72`	`)`
`73`	`73`	`"""`
	`74`	`+ if function is None:`
	`75`	`+ return None`
	`76`	`+`
`74`	`77`	`callback = CFUNCTYPE(c_void_p, c_int16, c_uint32, c_void_p)`
`75`	`78`	`return callback(function)`
`76`	`79`