occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
8,325 Commits 14 Branches 35 Tags 23 MiB
Commit Graph

8325 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq a5b7e958f8 flake: update dependencies 2022-05-31 18:25:08 +08:00
Sebastien Bourdeauducq 667f36a2e7 gui: fix Python 3.10 PyQt float/int issues. Closes #1887 2022-05-29 08:43:25 +08:00
Sebastien Bourdeauducq 7c3d9bb376 doc: remove unnecessary builtins.__in_sphinx__ hack 2022-05-27 15:35:01 +08:00
Sebastien Bourdeauducq 2c7c2d0e3d windows: add pybase64 dependency 2022-05-27 15:33:51 +08:00
Sebastien Bourdeauducq 6ac7aced34 windows: use upstream pyqtgraph and qasync 2022-05-27 15:32:47 +08:00
Sebastien Bourdeauducq c3ad77ec30 Merge branch 'master' into nac3 2022-05-27 15:29:55 +08:00
Sebastien Bourdeauducq c7b8dcac49 flake: update dependencies 2022-05-27 15:28:47 +08:00
Sebastien Bourdeauducq 7cff63e539 frontend: use sipyco SignalHandler (#1063) 2022-05-27 15:17:33 +08:00
Sebastien Bourdeauducq df1b19082c flake: update dependencies 2022-05-27 15:14:11 +08:00
Sebastien Bourdeauducq d478086119 flake: support impure derivation for HITL test 2022-05-26 12:00:40 +08:00
Sebastien Bourdeauducq 18a08954c1 flake: update comtools 2022-05-25 15:48:17 +08:00
Sebastien Bourdeauducq 57086e2349 flake: update nixpkgs 2022-05-25 14:20:04 +08:00
Sebastien Bourdeauducq abe6b01191 flake: fix openocd build 2022-05-24 11:30:37 +08:00
Sebastien Bourdeauducq 09e786ed3f msys2: add python-tqdm dependency 2022-05-24 11:15:23 +08:00
Sebastien Bourdeauducq 32d4c520f7 flake: update dependencies 2022-05-24 11:12:30 +08:00
Sebastien Bourdeauducq 45edb9e0f7 Merge branch 'master' into nac3 2022-05-24 11:12:20 +08:00
mwojcik cf8e583847 comm_mgmt: expect error on config_read 2022-05-19 16:48:59 +08:00
mwojcik d24a36a02a comm_mgmt: fix read_expect 2022-05-19 16:48:59 +08:00
mwojcik 4bdb4c8e11 config: error instead of empty value if key not found 2022-05-19 16:48:59 +08:00
Sebastien Bourdeauducq 8599be5550 flake: update nixpkgs 2022-05-18 19:04:52 +08:00
Sebastien Bourdeauducq 9896d78e07 afws_client: update 2022-05-18 19:04:13 +08:00
kk1050 70503bee6f
dashboard: add dataset rename feature (#1893) 
Co-authored-by: kk105 <kkl@m-kabs.hk>
 2022-05-18 17:07:43 +08:00
Sebastien Bourdeauducq 1b348dc002 flake: update NAC3 2022-05-17 12:07:23 +08:00
Sebastien Bourdeauducq fb8c13b541 flake: update dependencies 2022-05-14 16:34:27 +08:00
Laurent Stephenson 16393efa7c fix issue #1890: make dashboard use moninj port from device_db 
Signed-off-by: Laurent Stephenson <laurent.stephenson@nist.gov>
 2022-05-13 06:23:59 +08:00
David Nadlinger 8a7af3f75c compiler: Fix "nowrite" miscompilation for sret functions 
This affected e.g. rtio_input_timestamped_data().
 2022-05-07 21:43:55 +01:00
Spaqin 35f30ddf05
Expose TTLClockGen for Kasli JSONs (#1886) 2022-05-06 13:33:42 +08:00
Sebastien Bourdeauducq c440f9fe1b flake: update dependencies 2022-05-04 08:28:55 +08:00
Sebastien Bourdeauducq fc95dffd0b examples/no_hardware: port to NAC3 2022-04-28 15:38:19 +08:00
Sebastien Bourdeauducq 5504177d48 sim: fix imports 2022-04-28 15:37:44 +08:00
Sebastien Bourdeauducq 8e594d6666 language/core: forward kernel return value 2022-04-28 15:37:30 +08:00
Sebastien Bourdeauducq 49cb570290 examples/kasli_suservo: port to NAC3 2022-04-28 15:28:07 +08:00
Sebastien Bourdeauducq a1651d15f5 urukul: _RegIOUpdate fixes 2022-04-28 15:27:42 +08:00
Sebastien Bourdeauducq 13eb6e89f0 Merge branch 'master' into nac3 2022-04-28 15:01:17 +08:00
Sebastien Bourdeauducq 50767c0365 examples/kc705_nist_clock: port to NAC3 2022-04-27 18:41:59 +08:00
mwojcik 3160378614 almazny: fix missing (but unused) core 2022-04-27 17:31:44 +08:00
mwojcik d6f1c5984a artiq_sinara_tester: fix urukul eeprom_word type 2022-04-27 17:31:19 +08:00
Sebastien Bourdeauducq 614dfde33d flake: update dependencies 2022-04-27 15:43:16 +08:00
Sebastien Bourdeauducq 72aec819f7 revert incorrectly committed part of dd57fdc530 2022-04-27 13:46:44 +08:00
mwojcik 4c21d4a19c artiq_sinara_tester: fix almazny attenuation type 2022-04-27 11:57:20 +08:00
mwojcik 8c825505fd artiq_sinara_tester: fix mirny/almazny freq type 2022-04-26 12:52:58 +08:00
Sebastien Bourdeauducq 69b6426800 flake: use importCargoLock 2022-04-24 14:02:59 +08:00
Michael Birtwell 50dbda4f43 Use new ip_addr_storage module instead of net_settings 
Necessary to avoid needing the alloc only trait impls in net_settings
when compiling the bootloader.
 2022-04-24 10:10:43 +08:00
Michael Birtwell 95378cf9c9 Centralise all uses of the IPv4 index in net_settings.rs 2022-04-24 10:10:43 +08:00
Michael Birtwell 671453938b Require explicitly closing TcpStreams 
Instead of automatically closing and draining the TcpStream in the Drop
implementation instead expect the user to call TcpStream::close.
Add close called to all users of TcpStream.
Document the requirement to call close on TcpListener::accept, this seems
to be the only way to get a new TcpStream at the moment.
 2022-04-24 10:10:43 +08:00
Michael Birtwell 1fe59d27dc Use an Ipv4AddrConfig enum instead of the USE_DHCP constant 2022-04-24 10:10:43 +08:00
Michael Birtwell 73082d116f Ensure that pending data is sent when closing sockets 
This is only necessary if close hasn't been called on the socket
but that's not always done. e.g. by the core analyzer server.
 2022-04-24 10:10:43 +08:00
Michael Birtwell 596b9a265c Prefer DHCP to the built-in static IPs 
Signed-off-by: Michael Birtwell <michael.birtwell@oxionics.com>
 2022-04-24 10:10:42 +08:00
Michael Birtwell 6ffb1f83ee DHCP support for core device firmware 
DHCP is enabled by setting the `ip` config entry to "use_dhcp". Reusing this
config field rather than creating a new one means that there is no ambiguity
over which config field takes precedence.

Adds a thread to configure the interface based on DHCP events
Adds a `Dhcpv4Socket` as a wrapper around smoltcp's version
Formalises the storage of the IP addresses so that we can update one in
another module.

There's also a workaround for the first DHCP discover packet frequently
going missing.

Signed-off-by: Michael Birtwell <michael.birtwell@oxionics.com>
 2022-04-24 10:10:14 +08:00
Michael Birtwell c60de48a30 Upgrade smoltcp 0.6.0 -> 0.8.0 
Main changes:
Deal with interfaces now being generic over mediums, update interface name
and initialisation.
Interfaces now own their sockets. So we store a reference to the Interface
instead of the SocketSet in Scheduler and IO.
Sockets are no longer reference counted. We never called the function to
increase the socket's reference count, so now we just remove it where it
was previously released. This will result in the socket being dropped at
a different time, but I think that should be fine.

Tested firmware upload to the bootloader and spamming artiq_coremgmt log
calls to download the log from the firmware.

Signed-off-by: Michael Birtwell <michael.birtwell@oxionics.com>
 2022-04-24 10:09:27 +08:00