This repository was archived by the owner on Feb 2, 2026. It is now read-only.
Commit 56beddb
committed
Rework reference level code to support readback and prevent clobbering
1 parent e31af7b commit 56beddb
1 file changed
Lines changed: 27 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1388,44 +1388,68 @@ def _measurement_initiate(self): | |||
| 1388 | 1388 | self._write(":digitize") | |
| 1389 | 1389 | self._set_cache_valid(False, 'trigger_continuous') | |
| 1390 | 1390 | ||
| 1391 | + def _get_reference_levels(self): | ||
| 1392 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1393 | + thresh, mode, high, middle, low = self._ask(":measure:define? thresholds").split(',') | ||
| 1394 | + if mode == 'PERC': | ||
| 1395 | + self._reference_level_high = float(high) | ||
| 1396 | + self._reference_level_low = float(low) | ||
| 1397 | + self._reference_level_middle = float(middle) | ||
| 1398 | + self._set_cache_valid() | ||
| 1399 | + self._set_cache_valid('reference_level_high') | ||
| 1400 | + self._set_cache_valid('reference_level_low') | ||
| 1401 | + self._set_cache_valid('reference_level_middle') | ||
| 1402 | + | ||
| 1391 | 1403 | def _get_reference_level_high(self): | |
| 1404 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1405 | + self._get_reference_levels() | ||
| 1392 | 1406 | return self._reference_level_high | |
| 1393 | 1407 | ||
| 1394 | 1408 | def _set_reference_level_high(self, value): | |
| 1395 | 1409 | value = float(value) | |
| 1396 | 1410 | if value < 5: value = 5 | |
| 1397 | 1411 | if value > 95: value = 95 | |
| 1412 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1413 | + self._get_reference_levels() | ||
| 1398 | 1414 | self._reference_level_high = value | |
| 1399 | 1415 | if not self._driver_operation_simulate: | |
| 1400 | - self._write(":measure:define thresholds, %e, %e, %e" % | ||
| 1416 | + self._write(":measure:define thresholds, percent, %e, %e, %e" % | ||
| 1401 | 1417 | (self._reference_level_high, | |
| 1402 | 1418 | self._reference_level_middle, | |
| 1403 | 1419 | self._reference_level_low)) | |
| 1404 | 1420 | ||
| 1405 | 1421 | def _get_reference_level_low(self): | |
| 1422 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1423 | + self._get_reference_levels() | ||
| 1406 | 1424 | return self._reference_level_low | |
| 1407 | 1425 | ||
| 1408 | 1426 | def _set_reference_level_low(self, value): | |
| 1409 | 1427 | value = float(value) | |
| 1410 | 1428 | if value < 5: value = 5 | |
| 1411 | 1429 | if value > 95: value = 95 | |
| 1430 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1431 | + self._get_reference_levels() | ||
| 1412 | 1432 | self._reference_level_low = value | |
| 1413 | 1433 | if not self._driver_operation_simulate: | |
| 1414 | - self._write(":measure:define thresholds, %e, %e, %e" % | ||
| 1434 | + self._write(":measure:define thresholds, percent, %e, %e, %e" % | ||
| 1415 | 1435 | (self._reference_level_high, | |
| 1416 | 1436 | self._reference_level_middle, | |
| 1417 | 1437 | self._reference_level_low)) | |
| 1418 | 1438 | ||
| 1419 | 1439 | def _get_reference_level_middle(self): | |
| 1440 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1441 | + self._get_reference_levels() | ||
| 1420 | 1442 | return self._reference_level_middle | |
| 1421 | 1443 | ||
| 1422 | 1444 | def _set_reference_level_middle(self, value): | |
| 1423 | 1445 | value = float(value) | |
| 1424 | 1446 | if value < 5: value = 5 | |
| 1425 | 1447 | if value > 95: value = 95 | |
| 1448 | + if not self._driver_operation_simulate and not self._get_cache_valid(): | ||
| 1449 | + self._get_reference_levels() | ||
| 1426 | 1450 | self._reference_level_middle = value | |
| 1427 | 1451 | if not self._driver_operation_simulate: | |
| 1428 | - self._write(":measure:define thresholds, %e, %e, %e" % | ||
| 1452 | + self._write(":measure:define thresholds, percent, %e, %e, %e" % | ||
| 1429 | 1453 | (self._reference_level_high, | |
| 1430 | 1454 | self._reference_level_middle, | |
| 1431 | 1455 | self._reference_level_low)) | |
0 commit comments