srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

update nac3

This commit is contained in:
Sebastien Bourdeauducq 2022-03-09 09:15:12 +08:00
parent 25b1bbd10e
commit 87154ea016
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq/coredevice/ad9910.py
View File

@ -15,21 +15,6 @@ from artiq.coredevice.kasli_i2c import KasliEEPROM # NAC3TODO
class ValueError(Exception): class ValueError(Exception):
pass 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__ = [ __all__ = [
"AD9910", "AD9910",

8
artiq/coredevice/phaser.py
View File

@ -14,14 +14,6 @@ from artiq.coredevice.trf372017 import TRF372017
class ValueError(Exception): class ValueError(Exception):
pass 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_BOARD_ID = 19
PHASER_ADDR_BOARD_ID = 0x00 PHASER_ADDR_BOARD_ID = 0x00

8
flake.lock
View File

@ -45,11 +45,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1646423985, "lastModified": 1646753161,
"narHash": "sha256-WXzmupl6WNef65imDgQAvYdU0gRUu3nrbONVgYzQ+/Q=", "narHash": "sha256-jEq+4j90gk+oUDbCLByUhS5uGBSufcQuHMZuVZY2YGk=",
"ref": "master", "ref": "master",
"rev": "42fbe8e383bbe454e87dc2c59d8cd3cca67c42f9", "rev": "60b3807ab325bee3252bc0c451f0dcd5c4633ab7",
"revCount": 625, "revCount": 637,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/m-labs/nac3.git" "url": "https://git.m-labs.hk/m-labs/nac3.git"
}, },