diff options
| author | J08nY | 2020-07-02 21:20:34 +0200 |
|---|---|---|
| committer | J08nY | 2020-07-02 21:20:34 +0200 |
| commit | ad813a9dcfb9e0f9226d2fec8368a0a9506e2226 (patch) | |
| tree | 573f0fc0e9fb3a1d155ac87548946eb2739300e4 | |
| parent | c79a886f24cd10297354af57893a7f359c8374e7 (diff) | |
| download | pyecsca-ad813a9dcfb9e0f9226d2fec8368a0a9506e2226.tar.gz pyecsca-ad813a9dcfb9e0f9226d2fec8368a0a9506e2226.tar.zst pyecsca-ad813a9dcfb9e0f9226d2fec8368a0a9506e2226.zip | |
Fix PicoScope 3000.
| -rw-r--r-- | pyecsca/sca/scope/picoscope_alt.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/scope/picoscope_sdk.py | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pyecsca/sca/scope/picoscope_alt.py b/pyecsca/sca/scope/picoscope_alt.py index 7c96f8b..5a1b74b 100644 --- a/pyecsca/sca/scope/picoscope_alt.py +++ b/pyecsca/sca/scope/picoscope_alt.py @@ -64,7 +64,7 @@ class PicoScopeAlt(Scope): # pragma: no cover data = self.ps.getDataV(channel) if data is None: return None - return Trace(data, {"sampling_frequency": self.frequency, "channel": channel}) + return Trace(data, {"sampling_frequency": self.frequency, "channel": channel, "sample_type": type}) def stop(self) -> None: self.ps.stop() diff --git a/pyecsca/sca/scope/picoscope_sdk.py b/pyecsca/sca/scope/picoscope_sdk.py index 0962af1..301d280 100644 --- a/pyecsca/sca/scope/picoscope_sdk.py +++ b/pyecsca/sca/scope/picoscope_sdk.py @@ -203,7 +203,7 @@ class PicoScopeSdk(Scope): # pragma: no cover data = arr else: data = adc2volt(arr, self.ranges[channel], self.MAX_ADC_VALUE) - return Trace(data, {"sampling_frequency": self.frequency, "channel": channel}) + return Trace(data, {"sampling_frequency": self.frequency, "channel": channel, "sample_type": type}) def stop(self): assert_pico_ok(self.__dispatch_call("Stop")) @@ -237,20 +237,20 @@ else: } RANGES = { - 0.02: ps3000.PS3000_RANGE["PS3000_20MV"], - 0.05: ps3000.PS3000_RANGE["PS3000_50MV"], - 0.10: ps3000.PS3000_RANGE["PS3000_100MV"], - 0.20: ps3000.PS3000_RANGE["PS3000_200MV"], - 0.50: ps3000.PS3000_RANGE["PS3000_500MV"], - 1.00: ps3000.PS3000_RANGE["PS3000_1V"], - 2.00: ps3000.PS3000_RANGE["PS3000_2V"], - 5.00: ps3000.PS3000_RANGE["PS3000_5V"], - 10.0: ps3000.PS3000_RANGE["PS3000_10V"], - 20.0: ps3000.PS3000_RANGE["PS3000_20V"], - 50.0: ps3000.PS3000_RANGE["PS3000_50V"], - 100.0: ps3000.PS3000_RANGE["PS3000_100V"], - 200.0: ps3000.PS3000_RANGE["PS3000_200V"], - 400.0: ps3000.PS3000_RANGE["PS3000_400V"] + 0.02: ps3000.PS3000_VOLTAGE_RANGE["PS3000_20MV"], + 0.05: ps3000.PS3000_VOLTAGE_RANGE["PS3000_50MV"], + 0.10: ps3000.PS3000_VOLTAGE_RANGE["PS3000_100MV"], + 0.20: ps3000.PS3000_VOLTAGE_RANGE["PS3000_200MV"], + 0.50: ps3000.PS3000_VOLTAGE_RANGE["PS3000_500MV"], + 1.00: ps3000.PS3000_VOLTAGE_RANGE["PS3000_1V"], + 2.00: ps3000.PS3000_VOLTAGE_RANGE["PS3000_2V"], + 5.00: ps3000.PS3000_VOLTAGE_RANGE["PS3000_5V"], + 10.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_10V"], + 20.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_20V"], + 50.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_50V"], + 100.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_100V"], + 200.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_200V"], + 400.0: ps3000.PS3000_VOLTAGE_RANGE["PS3000_400V"] } MAX_ADC_VALUE = 32764 # TODO: fix |