Skip to content

Commit

Permalink
General tidy up (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
FutureSharks authored Aug 18, 2019
1 parent 91f8771 commit ca7ba9e
Show file tree
Hide file tree
Showing 72 changed files with 271 additions and 4,235 deletions.
10 changes: 5 additions & 5 deletions PCBs/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PCBs and schematics

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_input_selector.png" width="900"></a>
[![](../images/page-break-1.png)](#)

* [MDAC attenuator](mdac-attenuator): Controls the volume
* [Input selector](input-selector): Selects the input
* [Encoder panel](encoder-panel): Holds rotary encoder and LED indicator
* [MDAC attenuator](mdac-attenuator): A digital attenuator
* [Input selector](input-selector): Relay based input selector
* [Encoder panel](encoder-panel): Holds rotary encoder and LED ring
* [Power Supply 5V](psu-digital): Power supply for digital components.
* [Power Supply +/- 15V](psu-analog): Power supply for MDAC attenuator op-amp
* [Power Supply +/- 15V](psu-analog): Power supply for MDAC attenuator
* [Micro controller board](mcu-board): Holds the micro controller and other connectors
* [RCA panel](rca-panel): For the RCA sockets and connectors
32 changes: 17 additions & 15 deletions PCBs/encoder-panel/README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
# Encoder Panel

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_input_selector.png" width="900"></a>

**work in progress**
[![](../../images/page-break-1.png)](#)

The module is the sole human interface to the preamp. It consists of 2 things:

- A high quality optical encoder for changing of the volume and input
- A ring of [NeoPixels](https://learn.adafruit.com/adafruit-neopixel-uberguide/the-magic-of-neopixels) as a visual indicator and to give feedback

### Photos
## Photos

![](../../prototypes/prototype-16.gif)

![](../../images/animation-2.gif)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_1.jpg" width="900">
![](../../images/encoder_panel_1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_2.jpg" width="900">
![](../../images/encoder_panel_2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_3d.png" width="900">
![](../../images/encoder_panel_3d.png)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
## <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code

CircuitPython module is here: [code/modules/encoder_panel.py](https://github.com/FutureSharks/preamp-two/blob/master/code/modules/encoder_panel.py)
Python module is here: [code/modules/encoder_panel.py](../../code/modules/encoder_panel.py)

### Schematic
## Schematic

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_schematic.png" width="900">
![](../../images/encoder_panel_schematic.png)

### Layout
## Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_pcb_front.png" width="600">
![](../../images/encoder_panel_pcb_front.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/encoder_panel_pcb_back.png" width="600">
![](../../images/encoder_panel_pcb_back.png)

### BoM
## BoM

| Reference | Quantity | Value | Footprint |
|------------|----------|-------------|----------------------------------------------------------------|
Expand Down
30 changes: 15 additions & 15 deletions PCBs/input-selector/README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# Input Selector

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_input_selector.png" width="900"></a>
[![](../../images/page-break-2.png)](#)

* 6x inputs
* Mute for output
* SPI controlled using a MCP23S17
* Latching relays for low current draw
* Compatible with 5V and 3V relays
* Uses high quality Panasonic relays
* Stackable with [RCA panel](https://github.com/FutureSharks/preamp-two/tree/master/PCBs/rca-panel) and [MDAC attenuator](https://github.com/FutureSharks/preamp-two/tree/master/PCBs/mdac-attenuator)
* Stackable with [RCA panel](../rca-panel) and [MDAC attenuator](../mdac-attenuator)

### Photos
## Photos

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_1.jpg" width="900">
![](../../images/input_selector_1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_2.jpg" width="900">
![](../../images/input_selector_2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_3.jpg" width="900">
![](../../images/input_selector_3.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_3d.png" width="900">
![](../../images/input_selector_3d.png)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
## <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code

CircuitPython module is here: [code/modules/input_selector.py](https://github.com/FutureSharks/preamp-two/blob/master/code/modules/input_selector.py)
Python module is here: [code/modules/input_selector.py](../../code/modules/input_selector.py)

### Schematic
## Schematic

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_schematic.png" width="900">
![](../../images/input_selector_schematic.png)

### Layout
## Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_pcb_front.png" width="600">
![](../../images/input_selector_pcb_front.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/input_selector_pcb_back.png" width="600">
![](../../images/input_selector_pcb_back.png)

### BoM
## BoM

| Reference | Quantity | Value | Footprint / Notes |
|-------------------------------------------|-----------|-----------|-----------------|
Expand Down
30 changes: 15 additions & 15 deletions PCBs/mcu-board/README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
# Micro controller board

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_input_selector.png" width="900"></a>
[![](../../images/page-break-1.png)](#)

The PCB holds the [Adafruit ItsyBitsy M4 Express](https://learn.adafruit.com/introducing-adafruit-itsybitsy-m4), connectors and level shifters. The MDAC attenuator, input selector, both encoder panels and power digital power supply all connect to this PCB.

### Photos
## Photos

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_1.jpg" width="600">
![](../../images/mcu_board_1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_2.jpg" width="600">
![](../../images/mcu_board_2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_3.jpg" width="600">
![](../../images/mcu_board_3.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_5.jpg" width="600">
![](../../images/mcu_board_5.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_3d.png" width="600">
![](../../images/mcu_board_3d.png)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
## <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code

N/A
The main python code is here: [main.py](../../code/main.py)

### Schematic
## Schematic

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_schematic.png" width="900">
![](../../images/mcu_board_schematic.png)

### Layout
## Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_pcb_front.png" width="900">
![](../../images/mcu_board_pcb_front.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mcu_board_pcb_back.png" width="900">
![](../../images/mcu_board_pcb_back.png)

### BoM
## BoM

| Reference | Quantity | Value | Footprint |
|------------------|----------|--------------------------|----------------------------------------------------------------|
Expand Down
28 changes: 14 additions & 14 deletions PCBs/mdac-attenuator/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MDAC attenuator

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_mdac_attenuator.png" width="900"></a>
[![](../../images/page-break-4.png)](#)

Based on designs from these sources:

Expand All @@ -24,31 +24,31 @@ Features:

Here is the DIYAudio forum thread with my prototypes and questions: [Solid state R2R attenuator using analog switches or multiplying DAC](https://www.diyaudio.com/forums/analog-line-level/235853-solid-r2r-attenuator-using-analog-switches-multiplying-dac.html)

### Photos
## Photos

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_3.jpg" width="900">
![](../../images/mdac_attenuator_3.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_1.jpg" width="900">
![](../../images/mdac_attenuator_1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_2.jpg" width="900">
![](../../images/mdac_attenuator_2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_3d.png" width="900">
![](../../images/mdac_attenuator_3d.png)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
## <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code

CircuitPython module is here: [code/modules/input_selector.py](https://github.com/FutureSharks/preamp-two/blob/master/code/modules/mdac_attenuator.py)
Python module is here: [code/modules/mdac_attenuator.py](../../code/modules/mdac_attenuator.py)

### Schematic
## Schematic

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_schematic.png" width="900">
![](../../images/mdac_attenuator_schematic.png)

### Layout
## Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_pcb_front.png" width="600">
![](../../images/mdac_attenuator_pcb_front.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/mdac_attenuator_pcb_back.png" width="600">
![](../../images/mdac_attenuator_pcb_back.png)

### BoM
## BoM

| Reference | Quantity | Value | Footprint / Notes |
|--------------------------|-----------|---------|------------------|
Expand Down
28 changes: 11 additions & 17 deletions PCBs/psu-analog/README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
# Analog Power Supply

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_rca_panel.png" width="900"></a>
[![](../../images/page-break-1.png)](#)

This the +/- 15V power supply. It powers the op-amp in the MDAC attenuator.
This the +/- 15V power supply. It powers the op-amp in the MDAC attenuator using TPS7A3301 regulators.

It uses a TPS7A3301 regulators.
The PCB files are in Eagle format.

The PCB files are in Eagle format. I will convert them to KiCAD soon.
## Photos

### Photos
![](../../images/psu-analog-1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-analog-1.jpg" width="600">
![](../../images/psu-analog-2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-analog-2.jpg" width="600">
## Schematic

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
![](../../images/psu-analog-schematic.jpg)

N/A
## Layout

### Schematic
![](../../images/psu-analog-front.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-analog-schematic.jpg" width="900">

### Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-analog-front.jpg" width="900">

### BoM
## BoM

| Part name | RS part | Farnell Part | Mouser Part | Description | EVM Part name | Notes |
| ---------- | ---------------- | ------------ | -------------------- | --------------------------------------------------------------- | ------------- | -------------------- |
Expand Down
22 changes: 9 additions & 13 deletions PCBs/psu-digital/README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
# Digital Power Supply

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_rca_panel.png" width="900"></a>
[![](../../images/page-break-2.png)](#)

This the 5V digital power supply. It powers the input selector, digital part of the MDAC attenuator, the NeoPixels in the encoder panels and the encoders.

It uses a LT1763 regulator.

The PCB files are in Eagle format. I will convert them to KiCAD soon.
The PCB files are in Eagle format.

### Photos
## Photos

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-digital-1.jpg" width="600">
![](../../images/psu-digital-1.jpg)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
## Schematic

N/A
![](../../images/psu-digital-schematic.jpg)

### Schematic
## Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-digital-schematic.jpg" width="900">
![](../../images/psu-digital-front.jpg)

### Layout

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/psu-digital-front.jpg" width="900">

### BoM
## BoM

| Reference | Footprint / Notes |
|-------------|--------------------|
Expand Down
30 changes: 14 additions & 16 deletions PCBs/rca-panel/README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
# RCA Panel

<a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/page_break_rca_panel.png" width="900"></a>
[![](../../images/page-break-4.png)](#)

This PCB provides mounting for the RCA sockets and [input selector](https://github.com/FutureSharks/preamp-two/tree/master/PCBs/input-selector).
This PCB provides mounting for the RCA sockets and connects with the [input selector](../input-selector).

### Photos
The RCA sockets are [CMC](http://www.audio-cmc.com/rca-jacks-c.html) 805 model.

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_1.jpg" width="900">
## Photos

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_2.jpg" width="900">
![](../../images/rca_panel_1.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_3.jpg" width="900">
![](../../images/rca_panel_2.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_4.jpg" width="900">
![](../../images/rca_panel_3.jpg)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_3d.png" width="900">
![](../../images/rca_panel_4.jpg)

### <a href="#"><img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/logo-adafruit_blinka_angles-left.svg?sanitize=true" width="20"></a> Code
![](../../images/rca_panel_3d.png)

N/A
## Schematic

### Schematic
![](../../images/rca_panel_schematic.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_schematic.png" width="900">
## Layout

### Layout
![](../../images/rca_panel_pcb_front.png)

<img src="https://raw.githubusercontent.com/FutureSharks/preamp-two/master/images/rca_panel_pcb_front.png" width="900">

### BoM
## BoM

| Reference | Quantity | Value | Footprint / Notes |
|-------------|-----------|---------|-------------|
Expand Down
Loading

0 comments on commit ca7ba9e

Please sign in to comment.