mirror of https://github.com/m-labs/artiq.git
coredevice: remove exception workarounds
This commit is contained in:
parent
1a71a45225
commit
743b49e07e
|
@ -17,12 +17,6 @@ from artiq.coredevice.ttl import TTLOut
|
||||||
from artiq.coredevice.spi2 import *
|
from artiq.coredevice.spi2 import *
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
SPI_AD53XX_CONFIG = (0*SPI_OFFLINE | 1*SPI_END |
|
SPI_AD53XX_CONFIG = (0*SPI_OFFLINE | 1*SPI_END |
|
||||||
0*SPI_INPUT | 0*SPI_CS_POLARITY |
|
0*SPI_INPUT | 0*SPI_CS_POLARITY |
|
||||||
0*SPI_CLK_POLARITY | 1*SPI_CLK_PHASE |
|
0*SPI_CLK_POLARITY | 1*SPI_CLK_PHASE |
|
||||||
|
|
|
@ -10,12 +10,6 @@ from artiq.coredevice.ttl import TTLOut
|
||||||
from artiq.coredevice.kasli_i2c import KasliEEPROM # NAC3TODO
|
from artiq.coredevice.kasli_i2c import KasliEEPROM # NAC3TODO
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"AD9910",
|
"AD9910",
|
||||||
"PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE", "PHASE_MODE_TRACKING",
|
"PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE", "PHASE_MODE_TRACKING",
|
||||||
|
|
|
@ -10,12 +10,6 @@ from artiq.coredevice.urukul import *
|
||||||
from artiq.coredevice.ttl import TTLOut
|
from artiq.coredevice.ttl import TTLOut
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@nac3
|
@nac3
|
||||||
class AD9912:
|
class AD9912:
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -10,12 +10,6 @@ from artiq.coredevice.rtio import rtio_output
|
||||||
from artiq.coredevice.core import Core
|
from artiq.coredevice.core import Core
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"AD9914",
|
"AD9914",
|
||||||
"PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE", "PHASE_MODE_TRACKING"
|
"PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE", "PHASE_MODE_TRACKING"
|
||||||
|
|
|
@ -20,13 +20,6 @@ from artiq.coredevice.spi2 import *
|
||||||
from artiq.coredevice.adf5356_reg import *
|
from artiq.coredevice.adf5356_reg import *
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SPI_CONFIG = (
|
SPI_CONFIG = (
|
||||||
0 * SPI_OFFLINE
|
0 * SPI_OFFLINE
|
||||||
| 0 * SPI_END
|
| 0 * SPI_END
|
||||||
|
|
|
@ -10,15 +10,6 @@ from artiq.language.units import ns
|
||||||
from artiq.coredevice.core import Core
|
from artiq.coredevice.core import Core
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
@nac3
|
|
||||||
class NotImplementedError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@nac3
|
@nac3
|
||||||
class Fastino:
|
class Fastino:
|
||||||
"""Fastino 32-channel, 16-bit, 2.5 MS/s per channel streaming DAC
|
"""Fastino 32-channel, 16-bit, 2.5 MS/s per channel streaming DAC
|
||||||
|
|
|
@ -10,12 +10,6 @@ from artiq.coredevice.core import Core
|
||||||
from artiq.coredevice.spi2 import *
|
from artiq.coredevice.spi2 import *
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
SPI_CONFIG = (
|
SPI_CONFIG = (
|
||||||
0 * SPI_OFFLINE
|
0 * SPI_OFFLINE
|
||||||
| 0 * SPI_END
|
| 0 * SPI_END
|
||||||
|
|
|
@ -9,12 +9,6 @@ from artiq.coredevice.dac34h84 import DAC34H84
|
||||||
from artiq.coredevice.trf372017 import TRF372017
|
from artiq.coredevice.trf372017 import TRF372017
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
PHASER_BOARD_ID = 19
|
PHASER_BOARD_ID = 19
|
||||||
PHASER_ADDR_BOARD_ID = 0x00
|
PHASER_ADDR_BOARD_ID = 0x00
|
||||||
PHASER_ADDR_HW_REV = 0x01
|
PHASER_ADDR_HW_REV = 0x01
|
||||||
|
|
|
@ -8,13 +8,6 @@ from artiq.coredevice.spi2 import *
|
||||||
from artiq.coredevice.ttl import TTLOut
|
from artiq.coredevice.ttl import TTLOut
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SPI_CONFIG = (0*SPI_OFFLINE | 0*SPI_END |
|
SPI_CONFIG = (0*SPI_OFFLINE | 0*SPI_END |
|
||||||
0*SPI_INPUT | 0*SPI_CS_POLARITY |
|
0*SPI_INPUT | 0*SPI_CS_POLARITY |
|
||||||
0*SPI_CLK_POLARITY | 0*SPI_CLK_PHASE |
|
0*SPI_CLK_POLARITY | 0*SPI_CLK_PHASE |
|
||||||
|
|
|
@ -14,13 +14,6 @@ from artiq.coredevice.core import Core
|
||||||
from artiq.coredevice.rtio import rtio_output, rtio_input_data
|
from artiq.coredevice.rtio import rtio_output, rtio_input_data
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"SPI_DATA_ADDR", "SPI_CONFIG_ADDR",
|
"SPI_DATA_ADDR", "SPI_CONFIG_ADDR",
|
||||||
"SPI_OFFLINE", "SPI_END", "SPI_INPUT",
|
"SPI_OFFLINE", "SPI_END", "SPI_INPUT",
|
||||||
|
|
|
@ -10,12 +10,6 @@ from artiq.coredevice.ad9910 import AD9910
|
||||||
from artiq.coredevice.sampler import adc_mu_to_volt as sampler_adc_mu_to_volt, SPI_CONFIG as SAMPLER_SPI_CONFIG, SPI_CS_PGIA as SAMPLER_SPI_CS_PGIA
|
from artiq.coredevice.sampler import adc_mu_to_volt as sampler_adc_mu_to_volt, SPI_CONFIG as SAMPLER_SPI_CONFIG, SPI_CS_PGIA as SAMPLER_SPI_CS_PGIA
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
COEFF_WIDTH = 18
|
COEFF_WIDTH = 18
|
||||||
Y_FULL_SCALE_MU = (1 << (COEFF_WIDTH - 1)) - 1
|
Y_FULL_SCALE_MU = (1 << (COEFF_WIDTH - 1)) - 1
|
||||||
COEFF_DEPTH = 10 + 1
|
COEFF_DEPTH = 10 + 1
|
||||||
|
|
|
@ -8,13 +8,6 @@ from artiq.coredevice.spi2 import *
|
||||||
from artiq.coredevice.ttl import TTLOut
|
from artiq.coredevice.ttl import TTLOut
|
||||||
|
|
||||||
|
|
||||||
# NAC3TODO work around https://git.m-labs.hk/M-Labs/nac3/issues/189
|
|
||||||
@nac3
|
|
||||||
class ValueError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SPI_CONFIG = (0 * SPI_OFFLINE | 0 * SPI_END |
|
SPI_CONFIG = (0 * SPI_OFFLINE | 0 * SPI_END |
|
||||||
0 * SPI_INPUT | 1 * SPI_CS_POLARITY |
|
0 * SPI_INPUT | 1 * SPI_CS_POLARITY |
|
||||||
0 * SPI_CLK_POLARITY | 0 * SPI_CLK_PHASE |
|
0 * SPI_CLK_POLARITY | 0 * SPI_CLK_PHASE |
|
||||||
|
|
Loading…
Reference in New Issue