11 files changed, 67 insertions, 43 deletions

diff --git a/pyecsca/ec/efd/shortw/jacobian-0/variables b/pyecsca/ec/efd/shortw/jacobian-0/variables
index 6ea9908..932bce1 100644
--- a/pyecsca/ec/efd/shortw/jacobian-0/variables
+++ b/pyecsca/ec/efd/shortw/jacobian-0/variables
@@ -6,5 +6,7 @@ variable Z
 neutral X = 1
 neutral Y = 1
 neutral Z = 0
-satisfying x = X/Z^2
-satisfying y = Y/Z^3
+satisfying ZZ = Z^2
+satisfying ZZZ = ZZ*Z
+satisfying x = X/ZZ
+satisfying y = Y/ZZZ
diff --git a/pyecsca/ec/efd/shortw/jacobian-3/variables b/pyecsca/ec/efd/shortw/jacobian-3/variables
index a4d2b49..397e688 100644
--- a/pyecsca/ec/efd/shortw/jacobian-3/variables
+++ b/pyecsca/ec/efd/shortw/jacobian-3/variables
@@ -6,5 +6,7 @@ variable Z
 neutral X = 1
 neutral Y = 1
 neutral Z = 0
-satisfying x = X/Z^2
-satisfying y = Y/Z^3
+satisfying ZZ = Z^2
+satisfying ZZZ = ZZ*Z
+satisfying x = X/ZZ
+satisfying y = Y/ZZZ
diff --git a/pyecsca/ec/efd/shortw/jacobian/variables b/pyecsca/ec/efd/shortw/jacobian/variables
index ddfbff6..86123a8 100644
--- a/pyecsca/ec/efd/shortw/jacobian/variables
+++ b/pyecsca/ec/efd/shortw/jacobian/variables
@@ -5,5 +5,7 @@ variable Z
 neutral X = 1
 neutral Y = 1
 neutral Z = 0
-satisfying x = X/Z^2
-satisfying y = Y/Z^3
+satisfying ZZ = Z^2
+satisfying ZZZ = ZZ*Z
+satisfying x = X/ZZ
+satisfying y = Y/ZZZ
diff --git a/pyecsca/ec/efd/shortw/modified/variables b/pyecsca/ec/efd/shortw/modified/variables
index 438494c..d97d2ff 100644
--- a/pyecsca/ec/efd/shortw/modified/variables
+++ b/pyecsca/ec/efd/shortw/modified/variables
@@ -3,6 +3,8 @@ variable X
 variable Y
 variable Z
 variable T
-satisfying x = X/Z^2
-satisfying y = Y/Z^3
+satisfying ZZ = Z^2
+satisfying ZZZ = ZZ*Z
+satisfying x = X/ZZ
+satisfying y = Y/ZZZ
 satisfying T = a*Z^4
diff --git a/pyecsca/ec/efd/shortw/w12-0/variables b/pyecsca/ec/efd/shortw/w12-0/variables
index 5d8326e..5a0ec46 100644
--- a/pyecsca/ec/efd/shortw/w12-0/variables
+++ b/pyecsca/ec/efd/shortw/w12-0/variables
@@ -3,5 +3,6 @@ assume b = 0
 variable X
 variable Y
 variable Z
+satisfying ZZ = Z^2
 satisfying x = X/Z
-satisfying y = Y/Z^2
+satisfying y = Y/ZZ
diff --git a/pyecsca/ec/point.py b/pyecsca/ec/point.py
index 2e41606..f20d5e0 100644
--- a/pyecsca/ec/point.py
+++ b/pyecsca/ec/point.py
@@ -51,20 +51,21 @@ class Point(object):
         with CoordinateMappingAction(self.coordinate_model, affine_model, self):
             if isinstance(self.coordinate_model, AffineCoordinateModel):
                 return copy(self)
-            ops = set()
+            ops = list()
             for s in self.coordinate_model.satisfying:
                 try:
-                    ops.add(CodeOp(s))
+                    ops.append(CodeOp(s))
                 except Exception:
                     pass
             result_variables = set(map(lambda x: x.result, ops))
             if not result_variables.issuperset(affine_model.variables):
                 raise NotImplementedError
             result = {}
+            locals = {**self.coords}
             for op in ops:
-                if op.result not in affine_model.variables:
-                    continue
-                result[op.result] = op(**self.coords)
+                locals[op.result] = op(**locals)
+                if op.result in affine_model.variables:
+                    result[op.result] = locals[op.result]
             return Point(affine_model, **result)
 
     @staticmethod
diff --git a/pyecsca/sca/scope/base.py b/pyecsca/sca/scope/base.py
index 2979a7d..f88bc35 100644
--- a/pyecsca/sca/scope/base.py
+++ b/pyecsca/sca/scope/base.py
@@ -70,13 +70,21 @@ class Scope(object):
         """Arm the scope, it will listen for the trigger after this point."""
         raise NotImplementedError
 
-    def capture(self, channel: str, timeout: Optional[int] = None) -> Optional[np.ndarray]:
+    def capture(self, timeout: Optional[int] = None) -> bool:
         """
         Wait for the trace to capture, this will block until the scope has a trace.
 
-        :param channel: The channel to retrieve the trace from.
         :param timeout: A time in milliseconds to wait for the trace, returns `None` if it runs out.
-        :return: The trace, or if timed out, None.
+        :return: Whether capture was successful (or it timed out).
+        """
+        raise NotImplementedError
+
+    def retrieve(self, channel: str) -> Optional[np.ndarray]:
+        """
+        Retrieve a captured trace of a channel.
+
+        :param channel: The channel to retrieve the trace from.
+        :return: The captured trace (if any).
         """
         raise NotImplementedError
 
diff --git a/pyecsca/sca/scope/chipwhisperer.py b/pyecsca/sca/scope/chipwhisperer.py
index 344ed56..c1a5f48 100644
--- a/pyecsca/sca/scope/chipwhisperer.py
+++ b/pyecsca/sca/scope/chipwhisperer.py
@@ -46,8 +46,10 @@ class ChipWhispererScope(Scope):  # pragma: no cover
     def arm(self) -> None:
         self.scope.arm()
 
-    def capture(self, channel: str, timeout: Optional[int] = None) -> Optional[np.ndarray]:
-        self.scope.capture()
+    def capture(self, timeout: Optional[int] = None) -> bool:
+        return not self.scope.capture()
+
+    def retrieve(self, channel: str) -> Optional[np.ndarray]:
         return self.scope.get_last_trace()
 
     def stop(self) -> None:
diff --git a/pyecsca/sca/scope/picoscope_alt.py b/pyecsca/sca/scope/picoscope_alt.py
index c5f97af..52cbf2e 100644
--- a/pyecsca/sca/scope/picoscope_alt.py
+++ b/pyecsca/sca/scope/picoscope_alt.py
@@ -43,13 +43,15 @@ class PicoScopeAlt(Scope):  # pragma: no cover
     def arm(self) -> None:
         self.ps.runBlock()
 
-    def capture(self, channel: str, timeout: Optional[int] = None) -> Optional[np.ndarray]:
+    def capture(self, timeout: Optional[int] = None) -> bool:
         start = time_ns()
         while not self.ps.isReady():
             sleep(0.001)
             if timeout is not None and (time_ns() - start) / 1e6 >= timeout:
-                return None
+                return False
+        return True
 
+    def retrieve(self, channel: str) -> Optional[np.ndarray]:
         return self.ps.getDataV(channel)
 
     def stop(self) -> None:
diff --git a/pyecsca/sca/scope/picoscope_sdk.py b/pyecsca/sca/scope/picoscope_sdk.py
index 02acddd..b21df09 100644
--- a/pyecsca/sca/scope/picoscope_sdk.py
+++ b/pyecsca/sca/scope/picoscope_sdk.py
@@ -73,7 +73,6 @@ class PicoScopeSdk(Scope):  # pragma: no cover
     def setup_frequency(self, frequency: int, samples: int) -> Tuple[int, int]:
         return self.set_frequency(frequency, samples)
 
-    # channel setup (ranges, coupling, which channel is scope vs trigger)
     def set_channel(self, channel: str, enabled: bool, coupling: str, range: float):
         assert_pico_ok(
                 self.__dispatch_call("SetChannel", self.handle, self.CHANNELS[channel], enabled,
@@ -104,7 +103,6 @@ class PicoScopeSdk(Scope):  # pragma: no cover
         self.timebase = tb
         return actual_frequency, samples
 
-    # frequency setup
     def set_frequency(self, frequency: int, samples: int) -> Tuple[int, int]:
         raise NotImplementedError
 
@@ -112,7 +110,6 @@ class PicoScopeSdk(Scope):  # pragma: no cover
                       timeout: int, enable: bool):
         self.set_trigger(direction, enable, threshold, channel, delay, timeout)
 
-    # triggering setup
     def set_trigger(self, type: str, enabled: bool, value: float, channel: str,
                     delay: int, timeout: int):
         assert_pico_ok(
@@ -124,7 +121,6 @@ class PicoScopeSdk(Scope):  # pragma: no cover
     def setup_capture(self, channel: str, enable: bool):
         self.set_buffer(channel, enable)
 
-    # buffer setup
     def set_buffer(self, channel: str, enable: bool):
         if self.samples is None:
             raise ValueError
@@ -147,10 +143,9 @@ class PicoScopeSdk(Scope):  # pragma: no cover
             raise ValueError
         assert_pico_ok(
                 self.__dispatch_call("RunBlock", self.handle, 0, self.samples, self.timebase, 0,
-                                     None,
-                                     0, None, None))
+                                     None, 0, None, None))
 
-    def capture(self, channel: str, timeout: Optional[int] = None) -> Optional[np.ndarray]:
+    def capture(self, timeout: Optional[int] = None) -> bool:
         start = time_ns()
         if self.samples is None:
             raise ValueError
@@ -160,18 +155,18 @@ class PicoScopeSdk(Scope):  # pragma: no cover
             sleep(0.001)
             assert_pico_ok(self.__dispatch_call("IsReady", self.handle, ctypes.byref(ready)))
             if timeout is not None and (time_ns() - start) / 1e6 >= timeout:
-                return None
+                return False
+        return True
 
+    def retrieve(self, channel: str) -> Optional[np.ndarray]:
         actual_samples = ctypes.c_int32(self.samples)
         overflow = ctypes.c_int16()
         assert_pico_ok(
                 self.__dispatch_call("GetValues", self.handle, 0, ctypes.byref(actual_samples), 1,
-                                     0, 0,
-                                     ctypes.byref(overflow)))
+                                     0, 0, ctypes.byref(overflow)))
         arr = np.array(self.buffers[channel], dtype=np.int16)
         return adc2volt(arr, self.ranges[channel], self.MAX_ADC_VALUE)
 
-    # stop
     def stop(self):
         assert_pico_ok(self.__dispatch_call("Stop"))
 
@@ -196,17 +191,18 @@ class PS5000Scope(PicoScopeSdk):  # pragma: no cover
     }
 
     RANGES = {
-        0.01: ps5000.PS5000_RANGE["PS5000_10MV"],
-        0.02: ps5000.PS5000_RANGE["PS5000_20MV"],
-        0.05: ps5000.PS5000_RANGE["PS5000_50MV"],
-        0.10: ps5000.PS5000_RANGE["PS5000_100MV"],
-        0.20: ps5000.PS5000_RANGE["PS5000_200MV"],
-        1.00: ps5000.PS5000_RANGE["PS5000_1V"],
-        2.00: ps5000.PS5000_RANGE["PS5000_2V"],
-        5.00: ps5000.PS5000_RANGE["PS5000_5V"],
-        10.0: ps5000.PS5000_RANGE["PS5000_10V"],
-        20.0: ps5000.PS5000_RANGE["PS5000_20V"],
-        50.0: ps5000.PS5000_RANGE["PS5000_50V"]
+        0.01: 0,
+        0.02: 1,
+        0.05: 2,
+        0.10: 3,
+        0.20: 4,
+        0.50: 5,
+        1.00: 6,
+        2.00: 7,
+        5.00: 8,
+        10.0: 9,
+        20.0: 10,
+        50.0: 11
     }
 
     MAX_ADC_VALUE = 32512
diff --git a/pyecsca/sca/target/chipwhisperer.py b/pyecsca/sca/target/chipwhisperer.py
index 1dcdbe3..3710195 100644
--- a/pyecsca/sca/target/chipwhisperer.py
+++ b/pyecsca/sca/target/chipwhisperer.py
@@ -39,5 +39,11 @@ class ChipWhispererTarget(Flashable, SimpleSerialTarget):  # pragma: no cover
     def read(self, num: Optional[int] = 0, timeout: Optional[int] = 0) -> bytes:
         return self.target.read(num, timeout).encode()
 
+    def reset(self):
+        self.scope.io.nrst = "low"
+        sleep(0.05)
+        self.scope.io.nrst = "high"
+        sleep(0.05)
+
     def disconnect(self):
         self.target.dis()