511f125c08
Merge branch 'master' into nac3
2023-07-17 15:45:54 +08:00
41caec797e
flake: do not install ARTIQ itself in dev shell, only its dependencies
...
Otherwise, test runs take a long time when entering the shell, and failing tests stop entering the shell which is not what we want.
Also make jsonschema a regular dependency of ARTIQ, since users can now retrieve JSONs via AFWS.
2023-05-30 16:20:57 +08:00
Hartmann Michael (IFAG PSS SIS SCE QSE)
df15f53ee9
doc: conda installation notes
2023-05-12 17:44:38 +08:00
60aa64b79e
Merge branch 'master' into nac3
2023-05-09 14:26:29 +08:00
45cd438fb8
Almazny v1.2 support
...
Based on PR #2060 by Robert Jördens.
2023-05-09 12:54:48 +08:00
2b73ca862e
Merge branch 'master' into nac3
2023-04-30 16:40:50 +08:00
d0b8818688
Add 125 MHz from 80 MHz reference option to rtio clocking
...
Signed-off-by: Egor Savkin <es@m-labs.hk>
2023-04-13 14:57:24 +08:00
b225717ddb
DDMA: documentation
2023-03-29 13:46:33 +08:00
a43baa4cc4
Merge branch 'master' into nac3
2023-03-13 18:25:02 +08:00
1ca09b9484
Add support for default route (IPv4 and IPv6) ( #2059 )
...
Based on code by Michael Birtwell <michael.birtwell@oxionics.com>
2023-03-13 17:29:10 +08:00
Ikko Eltociear Ashimine
15c18bdc81
fix typo in developing_a_ndsp.rst
...
occurence -> occurrence
2023-03-11 18:32:14 +08:00
Michael Hartmann
07d684a35d
doc: Add jsonschema to nix package list
...
Add jsonschema to the nix package list as it is required by
artiq_ddb_template.
2023-01-31 18:24:15 +08:00
Michael Hartmann
2371c825f5
doc: Add remark about FTDI drivers
...
Add a remark that on Windows you might need to install the FTDI drivers
first before you can connect to the serial port.
2023-01-26 21:05:47 +08:00
e9c65abebe
manual: fix Nix flakes installation. Closes #2036
2023-01-15 13:03:15 +08:00
7635b9ed92
Merge branch 'master' into nac3
2023-01-15 12:23:25 +08:00
0a37a1a4c1
Merge branch 'syncrtio'
2023-01-12 12:58:19 +08:00
628b671433
update copyright year
2023-01-12 10:41:10 +08:00
cf2a4972f7
remove WRPLL
2023-01-06 17:53:11 +08:00
5da9794895
remove Sayma and Metlino support
2023-01-06 17:41:12 +08:00
1be7e2a2e1
doc: duplicate nixConfig
2023-01-04 15:13:55 +08:00
1852491102
add channel names to RTIO errors
2022-12-02 16:27:03 +08:00
wlph17
3f93f16955
manual: add msys2 openocd instructions ( #2014 )
2022-12-01 17:23:51 +08:00
826281a529
Merge branch 'master' into nac3
2022-11-18 17:10:12 +08:00
2fe02cee6f
doc: MSYS2 packages
2022-11-15 19:32:06 +08:00
b705862ecd
afws_client: fix argument order
2022-08-25 13:17:41 +08:00
fanmingyu212
20cb99061e
doc: updates artiq_flash syntax in developing.rst
2022-08-25 07:03:26 +08:00
ce027d9c51
Merge branch 'master' into nac3
2022-06-06 18:18:05 +08:00
68ef0073ea
doc: mock sipyco.keepalive. Closes #1900
2022-06-01 20:46:16 +08:00
71a37bb408
doc: switch to wavedrompy
2022-06-01 20:45:49 +08:00
7c3d9bb376
doc: remove unnecessary builtins.__in_sphinx__ hack
2022-05-27 15:35:01 +08:00
13eb6e89f0
Merge branch 'master' into nac3
2022-04-28 15:01:17 +08:00
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
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
9b910679f8
doc: MSYS2
2022-04-05 18:22:59 +08:00
69cda517f6
Merge branch 'master' into nac3
2022-03-28 13:41:17 +08:00
bbb2c75194
add aqctl_moninj_proxy
2022-03-18 17:02:50 +08:00
46fe507bd4
Merge branch 'master' into nac3
2022-03-10 17:30:26 +08:00
8415151866
update copyright year
2022-03-10 11:56:16 +08:00
ciciwu
67ca48fa84
manual: fix formatting ( #1865 )
2022-03-08 19:03:47 +08:00
41c597a707
remove parts that won't initially be supported by nac3
2022-02-25 20:02:36 +08:00
404811cd5c
Merge branch 'master' into nac3
2022-02-25 19:02:07 +08:00
2b918ac6f7
coredevice: merge pcf8574a into i2c
2022-02-25 19:01:14 +08:00
f7b315d661
Merge branch 'master' into nac3
2022-02-23 11:07:26 +08:00
69ce09c7c0
manual: minor fixes
2022-02-21 18:44:18 +08:00
6a586c2e4d
manual: kasli-soc flashing
2022-02-21 16:27:59 +08:00
e84056f7e0
manual: Flakes installation instructions. Closes #1835
2022-02-21 16:20:14 +08:00
7b56a72da0
Merge branch 'master' into nac3
2022-02-14 16:38:09 +08:00
9e37fb95d6
manual: use recommended contents caption
2022-02-11 14:25:10 +08:00
b452789f03
Merge branch 'master' into nac3
2022-01-19 21:07:10 +08:00
f542f045da
manual: use git+https URL for ARTIQ flake
...
github: flake URL lacks revCount
2022-01-19 20:04:20 +08:00
