diff --git a/artiq/coredevice/ad9910.py b/artiq/coredevice/ad9910.py index 1a24a632a..708509d5e 100644 --- a/artiq/coredevice/ad9910.py +++ b/artiq/coredevice/ad9910.py @@ -15,21 +15,6 @@ from artiq.coredevice.kasli_i2c import KasliEEPROM # NAC3TODO class ValueError(Exception): pass -# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/206 -@portable -def min(a: int32, b: int32) -> int32: - if a > b: - return b - else: - return a - -@portable -def max(a: int32, b: int32) -> int32: - if a > b: - return a - else: - return b - __all__ = [ "AD9910", diff --git a/artiq/coredevice/phaser.py b/artiq/coredevice/phaser.py index a68b5eda8..b37b0382e 100644 --- a/artiq/coredevice/phaser.py +++ b/artiq/coredevice/phaser.py @@ -14,14 +14,6 @@ from artiq.coredevice.trf372017 import TRF372017 class ValueError(Exception): pass -# NAC3TODO https://git.m-labs.hk/M-Labs/nac3/issues/201 -@portable -def abs(x: int32) -> int32: - if x > 0: - return x - else: - return -x - PHASER_BOARD_ID = 19 PHASER_ADDR_BOARD_ID = 0x00 diff --git a/flake.lock b/flake.lock index efcd30abe..8835a0900 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1646423985, - "narHash": "sha256-WXzmupl6WNef65imDgQAvYdU0gRUu3nrbONVgYzQ+/Q=", + "lastModified": 1646753161, + "narHash": "sha256-jEq+4j90gk+oUDbCLByUhS5uGBSufcQuHMZuVZY2YGk=", "ref": "master", - "rev": "42fbe8e383bbe454e87dc2c59d8cd3cca67c42f9", - "revCount": 625, + "rev": "60b3807ab325bee3252bc0c451f0dcd5c4633ab7", + "revCount": 637, "type": "git", "url": "https://git.m-labs.hk/m-labs/nac3.git" },