Skip to content

Commit fc6eb0d

Browse files
committed
rearrange ToC
1 parent c481dfe commit fc6eb0d

16 files changed

+164
-164
lines changed
Loading

gateware/docs/_static/soldiercrab.jpg

250 KB
Loading
-722 KB
Binary file not shown.
Loading
Loading

gateware/docs/blog/index.rst

-5
This file was deleted.

gateware/docs/blog/march_2025.rst

-2
This file was deleted.

gateware/docs/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"sphinx.ext.doctest",
1515
"sphinx.ext.todo",
1616
"sphinx.ext.autodoc",
17+
"sphinx_rtd_theme",
1718
"sphinxcontrib.platformpicker",
1819
]
1920

@@ -51,10 +52,9 @@
5152
"Platform overrides"
5253
]
5354

54-
html_theme = "furo"
55+
html_theme = "sphinx_rtd_theme"
5556
html_static_path = ["_static"]
56-
html_css_files = ["custom.css"]
57-
html_logo = "_static/logo.png"
57+
html_logo = "_static/logo.jpg"
5858

5959
rst_prolog = """
6060
.. role:: py(code)

gateware/docs/hardware.rst gateware/docs/connections.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Connecting Hardware
2-
###################
1+
Connections
2+
###########
33

44
Connections: Front
55
------------------

gateware/docs/dsp/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ TODO short overview of the DSP library philosophy.
88

99
TODO link to Amaranth documentation on streams.
1010

11-
.. image:: _static/mydsp.png
11+
.. image:: /_static/mydsp.png
1212
:width: 800
1313

1414
Components
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,46 @@
1-
Hardware details
2-
################
1+
Changelist
2+
##########
33

4-
.. image:: _static/tiliqua_disassembled.png
5-
:width: 800
4+
There were some Tiliqua hardware released before the production R4 version. This page serves as a brief history of the differences between these versions, as well as any changes in post-production batches.
65

7-
Schematics and PCBAs
8-
--------------------
6+
Tiliqua R4
7+
==========
98

10-
**Schematics for all Tiliqua revisions in the wild can be found :** `here <https://github.com/apfaudio/tiliqua/tree/main/hardware/schematics>`_
9+
First production hardware release.
1110

12-
Tiliqua consists of 3 main PCBAs. All of these are open-hardware designs built in KiCAD and stored in separate repositories.
13-
14-
Motherboard (and front panel)
15-
-----------------------------
16-
17-
**Repository:** `tiliqua-motherboard <https://github.com/apfaudio/tiliqua/tree/main/hardware>`_
18-
19-
- Switched rotary encoder with bar graph display.
20-
- Dual USB ports:
21-
- `dbg`: Included RP2040-based JTAG debugger supported by `openFPGAloader`
22-
- `usb2`: USB PHY connected directly to FPGA for high-speed USB Audio support
23-
- Display output for video synthesis (maximum resolution 720/60P)
24-
- 2x expansion ports for up to 24 simultaneous audio channels (PMOD-compatible)
25-
- MIDI-In jack (TRS-A standard)
26-
27-
Embedded FPGA SoM (`soldiercrab`)
28-
---------------------------------
29-
30-
**Repository:** `soldiercrab <https://github.com/apfaudio/soldiercrab>`_
31-
32-
- Lattice ECP5 FPGA, supported by open-source FPGA toolchains
33-
- 256 Mbit (32 MByte) HyperRAM / oSPI RAM (for long audio buffers or video framebuffers)
34-
- 128 Mbit (16 MByte) SPI flash for user bitstreams
35-
- High-speed USB HS PHY (ULPI)
36-
37-
Audio Interface
38-
---------------
11+
- **SoldierCrab R3** FPGA SoM (LFE5U-25F, 1.8V 32MByte oSPIRAM)
12+
- **Tiliqua R4** motherboard and front panel.
13+
- **eurorack-pmod R3.3** audio interface.
3914

40-
**Repository:** `eurorack-pmod <https://github.com/apfaudio/eurorack-pmod/tree/master/hardware>`_
15+
R4 changes (compared to R3)
16+
^^^^^^^^^^^^^^^^^^^
4117

42-
- 8 (4 in + 4 out) DC-coupled audio channels, 192 KHz / 24-bit sampling supported
43-
- Touch and proximity sensing on all 8 audio jacks (if unused)
44-
- PWM-controlled, user-programmable red/green LEDs on each audio channel
45-
- Jack insertion detection on all 8 jacks
18+
- Add external PLL SI5351 and route 2x clocks to ECP5 (useful for EMC as it supports spread-spectrum, also for runtime clock/resolution switching).
19+
- Add series 27R/33R on all FFC lines to reduce radiated emissions.
20+
- Pinswaps to ensure external PLL is routed to true ECP5 clock input pins:
21+
- FFC_SDIN1: 44 -> 42
22+
- ENC_B: 40 -> 12
23+
- ENC_A: 42 -> 8
24+
- PLL_CLK1 -> 40 (removed: spare FPGA to RP2040 line)
25+
- PLL_CLK0 -> 44 (removed: spare FPGA to RP2040 line)
26+
- Route 4 new ex0/ex1 pins to RP2040 spare pins (shared with expansion connectors)
27+
- Swap RP2040 SPI flash for 128MBit part
28+
- Put spare RP2040 I2C pins on main tiliqua-mobo I2C bus.
29+
- Switch from 4L stackup to 6L stackup to improve SI/EMC.
4630

47-
Hardware Revisions
48-
------------------
31+
Tiliqua R3
32+
==========
4933

50-
There are a few Tiliqua hardware variants in existence:
34+
Another hardware revision that some beta testers have. Only 5 were produced.
5135

52-
- **Tiliqua R2**
53-
- **SoldierCrab R2** FPGA SoM (LFE5U-45F, 3.3V 16MByte HyperRAM)
54-
- **Tiliqua R2** motherboard and front panel.
55-
- **eurorack-pmod R3.3** audio interface.
56-
- **Tiliqua R3**
5736
- **SoldierCrab R3** FPGA SoM (LFE5U-25F, 1.8V 32MByte oSPIRAM)
5837
- **Tiliqua R3** motherboard and front panel.
5938
- **eurorack-pmod R3.3** audio interface.
60-
- **Tiliqua R4** (unreleased)
6139

62-
Hardware Changelist
63-
^^^^^^^^^^^^^^^^^^^
6440

65-
- From **Tiliqua R2** to **Tiliqua R3**:
41+
R3 changes (compared to R2)
42+
^^^^^^^^^^^^^^^^^^^^^^^^^^^
43+
6644
- Pinswap all DVI pins to true ECP5 complementary pairs.
6745
- Swap all tantalums for ceramics, clean up PSU routing, swap LDO for TPS7A91, add choke input capacitors
6846
- Delete unused LEDs (MIDI bottom-side)
@@ -79,16 +57,24 @@ Hardware Changelist
7957
- Add 2x spare pins for RP2040/ECP5 I2C (no pullups)
8058
- Layerswap In1 / In2 (move GND closer to SMPS)
8159
- Add flip-flop on CODEC PDN pin (allows for soft-mute when swapping bitstreams)
82-
- From **Tiliqua R3** to **Tiliqua R4**:
83-
- Add external PLL SI5351 and route 2x clocks to ECP5 (useful for EMC as it supports spread-spectrum, also for runtime clock/resolution switching).
84-
- Add series 27R/33R on all FFC lines to reduce radiated emissions.
85-
- Pinswaps to ensure external PLL is routed to true ECP5 clock input pins:
86-
- FFC_SDIN1: 44 -> 42
87-
- ENC_B: 40 -> 12
88-
- ENC_A: 42 -> 8
89-
- PLL_CLK1 -> 40 (removed: spare FPGA to RP2040 line)
90-
- PLL_CLK0 -> 44 (removed: spare FPGA to RP2040 line)
91-
- Route 4 new ex0/ex1 pins to RP2040 spare pins (shared with expansion connectors)
92-
- Swap RP2040 SPI flash for 128MBit part
93-
- Put spare RP2040 I2C pins on main tiliqua-mobo I2C bus.
94-
- Switch from 4L stackup to 6L stackup to improve SI/EMC.
60+
61+
62+
Tiliqua R2
63+
==========
64+
65+
This was the first hardware revision that some beta testers have. Only 5 were produced.
66+
67+
- **SoldierCrab R2** FPGA SoM (LFE5U-45F, 3.3V 16MByte HyperRAM)
68+
- **Tiliqua R2** motherboard and front panel.
69+
- **eurorack-pmod R3.3** audio interface.
70+
71+
72+
Tiliqua R1
73+
==========
74+
75+
This prototype was shown at SuperBooth 2024. It was never shipped to anyone.
76+
77+
- **SoldierCrab R1** FPGA SoM (LFE5U-45F, 3.3V 16MByte HyperRAM, no USB2 PHY)
78+
- **Tiliqua R1** motherboard and front panel.
79+
- **eurorack-pmod R3.3** audio interface.
80+

gateware/docs/hardware_design.rst

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
Electrical Design
2+
#################
3+
4+
Tiliqua consists of 3 PCBAs. All of these are open-hardware designs built in KiCAD and stored in separate repositories. **Schematics for all Tiliqua revisions in the wild are plotted to PDFs** `here <https://github.com/apfaudio/tiliqua/tree/main/hardware/schematics>`_.
5+
6+
Block Diagram (Tiliqua R4)
7+
--------------------------
8+
9+
Below is high-level picture of how all the different electrical components of Tiliqua are connected.
10+
11+
.. image:: _static/tiliqua-block-diagram.svg
12+
:width: 800
13+
14+
Some connections are omitted for simplicity (example: some ex0/ex1 pins are connected to both the ECP5 and RP2040, not shown).
15+
16+
We now follow with a summary of the core functions of each of the Tiliqua PCBAs.
17+
18+
Tiliqua Motherboard
19+
-------------------
20+
21+
**Repository:** `tiliqua-motherboard <https://github.com/apfaudio/tiliqua/tree/main/hardware>`_
22+
23+
.. image:: _static/tiliqua_motherboard_without_som.jpg
24+
:width: 800
25+
26+
- Rotary encoder with button and bar graph display.
27+
- RP2040-based JTAG debugger and UART bridge supported by `openFPGAloader`.
28+
- Two USB ports:
29+
- `dbg`: USB FS for JTAG debugging.
30+
- `usb2`: 480Mbit/sec USB HS PHY connected to FPGA. Device, host and dual-role operation is supported on this port with a dedicated TUSB322I CC control IC and +5V VBUS switch.
31+
- Display output for video synthesis
32+
- Maximum resolution 1280x720p/60Hz or 1920x1080p/30Hz.
33+
- 2x (PMOD-compatible) expansion ports for up to 24 simultaneous audio channels.
34+
- MIDI-In jack (TRS-A standard) with optoisolation.
35+
- External PLL (SI5351A) for dynamic display resolution switching.
36+
- Soft mute for pop-free bitstream switching
37+
38+
FPGA SoM (`soldiercrab`)
39+
---------------------------------
40+
41+
**Repository:** `soldiercrab <https://github.com/apfaudio/soldiercrab>`_ (see README there for more detailed docs on this SoM)
42+
43+
.. image:: _static/soldiercrab.jpg
44+
:width: 800
45+
46+
- Lattice ECP5 (25 K) FPGA, supported by open-source FPGA toolchains
47+
- 256 Mbit (32 MByte) HyperRAM / oSPI RAM (for long audio buffers or video framebuffers)
48+
- 128 Mbit (16 MByte) SPI flash for user bitstreams
49+
- High-speed USB HS PHY (ULPI)
50+
51+
Audio Interface (`eurorack-pmod R3.3`)
52+
--------------------------------------
53+
54+
**Repository:** `eurorack-pmod <https://github.com/apfaudio/eurorack-pmod/tree/master/hardware>`_
55+
56+
.. image:: _static/eurorack_pmod_bare_pcba_top.jpg
57+
:width: 800
58+
59+
- 8 (4 in + 4 out) DC-coupled audio channels, 192 KHz / 24-bit sampling
60+
- Touch and proximity sensing on all 8 audio jacks (if unused)
61+
- PWM-controlled, user-programmable red/green LEDs on each audio channel
62+
- Jack insertion detection on all 8 jacks
63+
- Built-in calibration EEPROM

gateware/docs/index.rst

+24-8
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,37 @@ Tiliqua documentation
55

66
This manual is under construction and very incomplete!
77

8-
.. image:: _static/tiliqua_front_labelled.png
8+
.. image:: _static/tiliqua_disassembled_top.jpg
99
:width: 800
1010

1111
.. toctree::
12+
:caption: Hardware
13+
:maxdepth: 2
14+
15+
connections
16+
hardware_design
17+
hardware_changes
18+
19+
.. toctree::
20+
:caption: Building & Flashing
1221
:maxdepth: 3
1322

14-
blog/index
15-
hardware
16-
technical
1723
install
1824
gettingstarted/index
1925
calibration
2026
bootloader
21-
dsp/index
2227
examples/index
23-
GitHub <https://github.com/apfaudio/tiliqua>
24-
Crowd Supply <https://www.crowdsupply.com/apfaudio/tiliqua>
25-
`apf.audio` homepage <https://apf.audio/>
28+
29+
.. toctree::
30+
:caption: Reference
31+
:maxdepth: 3
32+
33+
dsp/index
34+
35+
.. toctree::
36+
:caption: Links
37+
:maxdepth: 2
38+
39+
Tiliqua on Crowd Supply <https://www.crowdsupply.com/apfaudio/tiliqua>
40+
Tiliqua on GitHub <https://github.com/apfaudio/tiliqua>
41+
Homepage (apf.audio) <https://apf.audio/>

0 commit comments

Comments
 (0)