Implement some more I/O

2020-10-03 21:33:10 +02:00 · 2020-10-03 21:33:10 +02:00 · 229b69d5c9
commit 229b69d5c9
parent 6e9bb6b74b
5 changed files with 1158 additions and 188 deletions
--- a/kicad/cpu.sch
+++ b/kicad/cpu.sch
@ -114,17 +114,6 @@ F 3 "" H 5900 5700 50  0001 C CNN
 	1    5900 5700
 	1    0    0    -1  
 $EndComp
-$Comp
-L Connector:AVR-JTAG-10 J?
-U 1 1 5F82F32C
-P 1650 3500
-F 0 "J?" H 1270 3546 50  0000 R CNN
-F 1 "AVR-JTAG-10" H 1270 3455 50  0000 R CNN
-F 2 "" V 1500 3650 50  0001 C CNN
-F 3 " ~" H 375 2950 50  0001 C CNN
-	1    1650 3500
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	5250 4300 4800 4300
 Text Label 4800 4300 0    50   ~ 0
@ -137,12 +126,8 @@ Text Label 7150 5300 2    50   ~ 0
 JTDI
 Text Label 7150 5200 2    50   ~ 0
 JTCK
-Text Label 2500 3400 2    50   ~ 0
-JTDO
-Text Label 2500 3300 2    50   ~ 0
-JTRST_N
 Text Label 2500 3600 2    50   ~ 0
-JTCK
+JTDO
 Text Label 7150 5100 2    50   ~ 0
 JTMS
 Text Label 2500 3500 2    50   ~ 0
@ -166,53 +151,25 @@ Wire Wire Line
 	2800 3200 3050 3200
 Text Label 3050 3200 2    50   ~ 0
 RST_N
-Wire Wire Line
-	1650 2900 1650 2800
-Wire Wire Line
-	1550 2900 1550 2800
-Wire Wire Line
-	1550 2800 1600 2800
-Wire Wire Line
-	1600 2800 1600 2700
-Wire Wire Line
-	1650 2800 1600 2800
-Connection ~ 1600 2800
 $Comp
 L power:+3V3 #PWR?
 U 1 1 5F8392A7
-P 1600 2700
-F 0 "#PWR?" H 1600 2550 50  0001 C CNN
-F 1 "+3V3" H 1615 2873 50  0000 C CNN
-F 2 "" H 1600 2700 50  0001 C CNN
-F 3 "" H 1600 2700 50  0001 C CNN
-	1    1600 2700
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1650 4100 1650 4200
-$Comp
-L power:GND #PWR?
-U 1 1 5F839F74
-P 1650 4200
-F 0 "#PWR?" H 1650 3950 50  0001 C CNN
-F 1 "GND" H 1655 4027 50  0000 C CNN
-F 2 "" H 1650 4200 50  0001 C CNN
-F 3 "" H 1650 4200 50  0001 C CNN
-	1    1650 4200
+P 1650 2800
+F 0 "#PWR?" H 1650 2650 50  0001 C CNN
+F 1 "+3V3" H 1665 2973 50  0000 C CNN
+F 2 "" H 1650 2800 50  0001 C CNN
+F 3 "" H 1650 2800 50  0001 C CNN
+	1    1650 2800
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	5250 2600 5100 2600
 Text Label 4800 2600 0    50   ~ 0
 RST_N
-Wire Wire Line
-	2150 3300 2500 3300
 Wire Wire Line
 	2150 3400 2500 3400
 Wire Wire Line
 	2150 3500 2500 3500
-Wire Wire Line
-	2150 3600 2500 3600
 Wire Wire Line
 	2150 3700 2500 3700
 $Comp
@ -275,9 +232,7 @@ F 3 "" H 850 1350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Text Notes 6100 5650 0    50   ~ 0
-Pin functions in\nTable 9, STM32F410
-Text Notes 8550 2900 0    50   ~ 0
-SPI MOSI: PA7, PB15, PA10, PB5, PB8\nUART(RX,TX): (PA3, PA2), ()
+Pin functions in\nSTM32F410, Table 9
 Text HLabel 7150 4100 2    50   Input ~ 0
 DMX_RO
 Text HLabel 7150 3800 2    50   Output ~ 0
@ -287,48 +242,48 @@ DMX_DI
 Text HLabel 7150 3900 2    50   Output ~ 0
 DMX_DE
 Text HLabel 7150 4500 2    50   Output ~ 0
-WS0
+WS0_TX
 $Comp
 L Device:R R?
 U 1 1 5F854BA0
-P 4650 5300
-F 0 "R?" V 4550 5300 50  0000 C CNN
-F 1 "TBD" V 4650 5300 50  0000 C CNN
-F 2 "" V 4580 5300 50  0001 C CNN
-F 3 "~" H 4650 5300 50  0001 C CNN
-	1    4650 5300
+P 4400 5300
+F 0 "R?" V 4300 5300 50  0000 C CNN
+F 1 "TBD" V 4400 5300 50  0000 C CNN
+F 2 "" V 4330 5300 50  0001 C CNN
+F 3 "~" H 4400 5300 50  0001 C CNN
+	1    4400 5300
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5F855D14
-P 4650 5100
-F 0 "R?" V 4550 5100 50  0000 C CNN
-F 1 "TBD" V 4650 5100 50  0000 C CNN
-F 2 "" V 4580 5100 50  0001 C CNN
-F 3 "~" H 4650 5100 50  0001 C CNN
-	1    4650 5100
+P 4400 5100
+F 0 "R?" V 4300 5100 50  0000 C CNN
+F 1 "TBD" V 4400 5100 50  0000 C CNN
+F 2 "" V 4330 5100 50  0001 C CNN
+F 3 "~" H 4400 5100 50  0001 C CNN
+	1    4400 5100
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 5F855F65
-P 4650 5500
-F 0 "R?" V 4550 5500 50  0000 C CNN
-F 1 "TBD" V 4650 5500 50  0000 C CNN
-F 2 "" V 4580 5500 50  0001 C CNN
-F 3 "~" H 4650 5500 50  0001 C CNN
-	1    4650 5500
+P 4400 5500
+F 0 "R?" V 4300 5500 50  0000 C CNN
+F 1 "TBD" V 4400 5500 50  0000 C CNN
+F 2 "" V 4330 5500 50  0001 C CNN
+F 3 "~" H 4400 5500 50  0001 C CNN
+	1    4400 5500
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4500 5500 4400 5500
+	4250 5500 4150 5500
 Wire Wire Line
-	4400 5300 4500 5300
+	4150 5300 4250 5300
 Wire Wire Line
-	4400 5100 4500 5100
+	4150 5100 4250 5100
 Text HLabel 7150 4800 2    50   Output ~ 0
-WS1
+WS1_TX
 Wire Wire Line
 	6550 3800 7150 3800
 Wire Wire Line
@ -510,45 +465,118 @@ NoConn ~ 5250 3800
 Text Notes 5550 3800 0    50   ~ 0
 |/!\ These pins have\n|limited capabilities.\n|
 Wire Wire Line
-	4800 5100 5250 5100
+	4550 5100 5250 5100
 Wire Wire Line
-	5250 5200 4900 5200
+	5250 5200 4650 5200
 Wire Wire Line
-	4900 5200 4900 5300
+	4650 5200 4650 5300
 Wire Wire Line
-	4900 5300 4800 5300
+	4650 5300 4550 5300
 Wire Wire Line
-	4800 5500 5050 5500
+	4550 5500 4800 5500
 Wire Wire Line
-	5050 5500 5050 5300
+	4800 5500 4800 5300
 Wire Wire Line
-	5050 5300 5250 5300
-$Comp
-L Device:LED_CRGB D?
-U 1 1 5F8DD01B
-P 4200 5300
-F 0 "D?" H 4200 5797 50  0000 C CNN
-F 1 "LED_CRGB" H 4200 5706 50  0000 C CNN
-F 2 "" H 4200 5250 50  0001 C CNN
-F 3 "~" H 4200 5250 50  0001 C CNN
-	1    4200 5300
-	1    0    0    -1  
-$EndComp
+	4800 5300 5250 5300
 $Comp
 L power:GND #PWR?
 U 1 1 5F8DE84D
-P 3900 5400
-F 0 "#PWR?" H 3900 5150 50  0001 C CNN
-F 1 "GND" H 3905 5227 50  0000 C CNN
-F 2 "" H 3900 5400 50  0001 C CNN
-F 3 "" H 3900 5400 50  0001 C CNN
-	1    3900 5400
+P 3650 5400
+F 0 "#PWR?" H 3650 5150 50  0001 C CNN
+F 1 "GND" H 3655 5227 50  0000 C CNN
+F 2 "" H 3650 5400 50  0001 C CNN
+F 3 "" H 3650 5400 50  0001 C CNN
+	1    3650 5400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3900 5400 3900 5300
+	3650 5400 3650 5300
 Wire Wire Line
-	3900 5300 4000 5300
-Text Notes 3600 5800 0    50   ~ 0
-TODO: Check whether I can connect\nthe LED timer compare outputs.
+	3650 5300 3750 5300
+Text HLabel 7150 4400 2    50   Input ~ 0
+WS0_RX
+Wire Wire Line
+	6550 4400 7150 4400
+Text Notes 6550 4400 0    50   ~ 0
+:SPI1_MISO
+Text HLabel 7150 5000 2    50   Input ~ 0
+WS1_RX
+Wire Wire Line
+	6550 5000 7150 5000
+Text Notes 6550 5000 0    50   ~ 0
+:SPI5_MISO
+Wire Wire Line
+	5250 4600 4800 4600
+Wire Wire Line
+	5250 4700 4800 4700
+Text Notes 5250 4600 2    50   ~ 0
+USART1_TX:
+Text Notes 5250 4700 2    50   ~ 0
+USART1_RX:
+Text HLabel 4800 4700 0    50   Input ~ 0
+CONTROL_UART_IN
+Text HLabel 4800 4600 0    50   Output ~ 0
+CONTROL_UART_OUT
+Text Notes 5250 5300 2    50   ~ 0
+TIM1_CH1N:
+Text Notes 5250 5200 2    50   ~ 0
+TIM1_CH2N:
+Text Notes 5250 5100 2    50   ~ 0
+TIM1_CH3N:
+$Comp
+L Device:LED_ARGB D?
+U 1 1 5F8154E7
+P 3950 5300
+F 0 "D?" H 3950 4833 50  0000 C CNN
+F 1 "LED_ARGB" H 3950 4924 50  0000 C CNN
+F 2 "" H 3950 5250 50  0001 C CNN
+F 3 "~" H 3950 5250 50  0001 C CNN
+	1    3950 5300
+	-1   0    0    1   
+$EndComp
+Text HLabel 4800 4800 0    50   Input ~ 0
+CONTROL_UART_RST
+Wire Wire Line
+	4800 4800 5250 4800
+$Comp
+L Connector:Conn_ARM_JTAG_SWD_10 J?
+U 1 1 5F908B18
+P 1650 3500
+F 0 "J?" H 1207 3546 50  0000 R CNN
+F 1 "JTAG" H 1207 3455 50  0000 R CNN
+F 2 "" H 1650 3500 50  0001 C CNN
+F 3 "http://infocenter.arm.com/help/topic/com.arm.doc.ddi0314h/DDI0314H_coresight_components_trm.pdf" V 1300 2250 50  0001 C CNN
+	1    1650 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2150 3600 2500 3600
+Text Label 2500 3400 2    50   ~ 0
+JTCK
+Wire Wire Line
+	1650 2800 1650 2900
+Wire Wire Line
+	1550 4100 1550 4200
+Wire Wire Line
+	1550 4200 1600 4200
+Wire Wire Line
+	1650 4200 1650 4100
+Connection ~ 1600 4200
+Wire Wire Line
+	1600 4200 1650 4200
+Wire Wire Line
+	1600 4200 1600 4300
+$Comp
+L power:GND #PWR?
+U 1 1 5F839F74
+P 1600 4300
+F 0 "#PWR?" H 1600 4050 50  0001 C CNN
+F 1 "GND" H 1605 4127 50  0000 C CNN
+F 2 "" H 1600 4300 50  0001 C CNN
+F 3 "" H 1600 4300 50  0001 C CNN
+	1    1600 4300
+	1    0    0    -1  
+$EndComp
+Text Notes 4800 4400 2    50   ~ 0
+Not used:
 $EndSCHEMATC
--- a/kicad/io.sch
+++ b/kicad/io.sch
@ -16,12 +16,657 @@ $EndDescr
 $Comp
 L Interface_UART:MAX485E U?
 U 1 1 5F846A22
-P 5400 2650
-F 0 "U?" H 5400 3331 50  0000 C CNN
-F 1 "MAX485E" H 5400 3240 50  0000 C CNN
-F 2 "" H 5400 1950 50  0001 C CNN
-F 3 "https://datasheets.maximintegrated.com/en/ds/MAX1487E-MAX491E.pdf" H 5400 2700 50  0001 C CNN
-	1    5400 2650
+P 8400 1950
+F 0 "U?" H 8150 2400 50  0000 C CNN
+F 1 "MAX485E" H 8600 1400 50  0000 C CNN
+F 2 "" H 8400 1250 50  0001 C CNN
+F 3 "https://datasheets.maximintegrated.com/en/ds/MAX1487E-MAX491E.pdf" H 8400 2000 50  0001 C CNN
+	1    8400 1950
 	1    0    0    -1  
 $EndComp
+$Comp
+L Device:R R?
+U 1 1 5F78D28A
+P 9100 2000
+F 0 "R?" H 9170 2046 50  0000 L CNN
+F 1 "DNP" H 9170 1955 50  0000 L CNN
+F 2 "" V 9030 2000 50  0001 C CNN
+F 3 "~" H 9100 2000 50  0001 C CNN
+	1    9100 2000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8800 1850 8900 1850
+Wire Wire Line
+	8900 1850 8900 1750
+Wire Wire Line
+	8900 1750 9100 1750
+Wire Wire Line
+	9100 2150 9100 2250
+Wire Wire Line
+	9100 2250 8900 2250
+Wire Wire Line
+	8900 2250 8900 2150
+Wire Wire Line
+	8900 2150 8800 2150
+Connection ~ 9100 2250
+Wire Wire Line
+	9100 1850 9100 1750
+Connection ~ 9100 1750
+Text HLabel 7800 1850 0    50   Output ~ 0
+DMX_RO
+Text HLabel 7800 1950 0    50   Input ~ 0
+DMX_RE
+Text HLabel 7800 2150 0    50   Input ~ 0
+DMX_DI
+Text HLabel 7800 2050 0    50   Input ~ 0
+DMX_DE
+Wire Wire Line
+	7800 1850 8000 1850
+Wire Wire Line
+	7800 1950 8000 1950
+Wire Wire Line
+	7800 2050 8000 2050
+Wire Wire Line
+	7800 2150 8000 2150
+$Comp
+L Connector:Screw_Terminal_01x03 J?
+U 1 1 5F7904F0
+P 10500 1850
+F 0 "J?" H 10580 1892 50  0000 L CNN
+F 1 "DMX-IN" H 10580 1801 50  0000 L CNN
+F 2 "" H 10500 1850 50  0001 C CNN
+F 3 "~" H 10500 1850 50  0001 C CNN
+	1    10500 1850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9100 1750 9800 1750
+Wire Wire Line
+	9400 2250 9400 1850
+Wire Wire Line
+	9400 1850 9700 1850
+Wire Wire Line
+	9100 2250 9400 2250
+Wire Wire Line
+	10300 1950 10200 1950
+Wire Wire Line
+	10200 1950 10200 2050
+$Comp
+L power:GND #PWR?
+U 1 1 5F7934F5
+P 10200 2050
+F 0 "#PWR?" H 10200 1800 50  0001 C CNN
+F 1 "GND" H 10205 1877 50  0000 C CNN
+F 2 "" H 10200 2050 50  0001 C CNN
+F 3 "" H 10200 2050 50  0001 C CNN
+	1    10200 2050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Screw_Terminal_01x03 J?
+U 1 1 5F793A79
+P 10500 2500
+F 0 "J?" H 10580 2542 50  0000 L CNN
+F 1 "DMX-OUT" H 10580 2451 50  0000 L CNN
+F 2 "" H 10500 2500 50  0001 C CNN
+F 3 "~" H 10500 2500 50  0001 C CNN
+	1    10500 2500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10300 2600 10200 2600
+Wire Wire Line
+	10200 2600 10200 2700
+$Comp
+L power:GND #PWR?
+U 1 1 5F7944DB
+P 10200 2700
+F 0 "#PWR?" H 10200 2450 50  0001 C CNN
+F 1 "GND" H 10205 2527 50  0000 C CNN
+F 2 "" H 10200 2700 50  0001 C CNN
+F 3 "" H 10200 2700 50  0001 C CNN
+	1    10200 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5F794BC2
+P 10050 2400
+F 0 "R?" V 10100 2550 50  0000 C CNN
+F 1 "0" V 10050 2400 50  0000 C CNN
+F 2 "" V 9980 2400 50  0001 C CNN
+F 3 "~" H 10050 2400 50  0001 C CNN
+	1    10050 2400
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5F79524D
+P 10050 2500
+F 0 "R?" V 10100 2650 50  0000 C CNN
+F 1 "0" V 10050 2500 50  0000 C CNN
+F 2 "" V 9980 2500 50  0001 C CNN
+F 3 "~" H 10050 2500 50  0001 C CNN
+	1    10050 2500
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	10200 2400 10300 2400
+Wire Wire Line
+	10300 2500 10200 2500
+Wire Wire Line
+	9900 2400 9800 2400
+Wire Wire Line
+	9800 2400 9800 1750
+Connection ~ 9800 1750
+Wire Wire Line
+	9800 1750 10300 1750
+Wire Wire Line
+	9900 2500 9700 2500
+Wire Wire Line
+	9700 2500 9700 1850
+Connection ~ 9700 1850
+Wire Wire Line
+	9700 1850 10300 1850
+Text Label 9400 1750 0    50   ~ 0
+DMXL
+Text Label 9400 1850 0    50   ~ 0
+DMXH
+$Comp
+L Connector:Screw_Terminal_01x04 J?
+U 1 1 5F79C1C7
+P 9800 4850
+F 0 "J?" H 9880 4842 50  0000 L CNN
+F 1 "WS-0" H 9880 4751 50  0000 L CNN
+F 2 "" H 9800 4850 50  0001 C CNN
+F 3 "~" H 9800 4850 50  0001 C CNN
+	1    9800 4850
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Screw_Terminal_01x04 J?
+U 1 1 5F79C92B
+P 9800 5350
+F 0 "J?" H 9880 5342 50  0000 L CNN
+F 1 "WS-1" H 9880 5251 50  0000 L CNN
+F 2 "" H 9800 5350 50  0001 C CNN
+F 3 "~" H 9800 5350 50  0001 C CNN
+	1    9800 5350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9600 5550 9500 5550
+Wire Wire Line
+	9500 5550 9500 5050
+Wire Wire Line
+	9500 5050 9600 5050
+Wire Wire Line
+	9600 5450 9400 5450
+Wire Wire Line
+	9400 5450 9400 4950
+Wire Wire Line
+	9400 4950 9600 4950
+Wire Wire Line
+	9500 5550 9500 5650
+Connection ~ 9500 5550
+Wire Wire Line
+	9400 4950 9400 4650
+Connection ~ 9400 4950
+$Comp
+L power:GND #PWR?
+U 1 1 5F79F898
+P 9500 5650
+F 0 "#PWR?" H 9500 5400 50  0001 C CNN
+F 1 "GND" H 9505 5477 50  0000 C CNN
+F 2 "" H 9500 5650 50  0001 C CNN
+F 3 "" H 9500 5650 50  0001 C CNN
+	1    9500 5650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9600 4750 8800 4750
+Wire Wire Line
+	9600 4850 9100 4850
+Wire Wire Line
+	9600 5250 9100 5250
+Wire Wire Line
+	9600 5350 8800 5350
+Text HLabel 8800 4750 0    50   Input ~ 0
+WS0_TX
+Text HLabel 8800 5350 0    50   Output ~ 0
+WS1_RX
+$Comp
+L Device:R R?
+U 1 1 5F7A18C0
+P 9100 5050
+F 0 "R?" H 9170 5096 50  0000 L CNN
+F 1 "0" H 9170 5005 50  0000 L CNN
+F 2 "" V 9030 5050 50  0001 C CNN
+F 3 "~" H 9100 5050 50  0001 C CNN
+	1    9100 5050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9100 4900 9100 4850
+Connection ~ 9100 4850
+Wire Wire Line
+	9100 4850 8800 4850
+Wire Wire Line
+	9100 5200 9100 5250
+Connection ~ 9100 5250
+Wire Wire Line
+	9100 5250 8800 5250
+Text HLabel 8800 5250 0    50   Input ~ 0
+WS1_TX
+Text HLabel 8800 4850 0    50   Output ~ 0
+WS0_RX
+$Comp
+L Interface_USB:CH340G U?
+U 1 1 5F7AA7E3
+P 5550 2000
+F 0 "U?" H 5300 2550 50  0000 C CNN
+F 1 "CH340G/C" H 5750 1450 50  0000 C CNN
+F 2 "Package_SO:SOIC-16_3.9x9.9mm_P1.27mm" H 5600 1450 50  0001 L CNN
+F 3 "http://www.datasheet5.com/pdf-local-2195953" H 5200 2800 50  0001 C CNN
+	1    5550 2000
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:USB_B_Micro J?
+U 1 1 5F7ABAAB
+P 1000 2100
+F 0 "J?" H 1057 2567 50  0000 C CNN
+F 1 "USB_B_Micro" H 1057 2476 50  0000 C CNN
+F 2 "" H 1150 2050 50  0001 C CNN
+F 3 "~" H 1150 2050 50  0001 C CNN
+	1    1000 2100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1400 1900 1300 1900
+Wire Wire Line
+	1700 1900 1800 1900
+$Comp
+L Device:R R?
+U 1 1 5F7AF577
+P 1550 2100
+F 0 "R?" V 1500 2250 50  0000 C CNN
+F 1 "0" V 1550 2100 50  0000 C CNN
+F 2 "" V 1480 2100 50  0001 C CNN
+F 3 "~" H 1550 2100 50  0001 C CNN
+	1    1550 2100
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R?
+U 1 1 5F7AFBC7
+P 1550 2200
+F 0 "R?" V 1500 2350 50  0000 C CNN
+F 1 "0" V 1550 2200 50  0000 C CNN
+F 2 "" V 1480 2200 50  0001 C CNN
+F 3 "~" H 1550 2200 50  0001 C CNN
+	1    1550 2200
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	1300 2100 1400 2100
+Wire Wire Line
+	1300 2200 1400 2200
+Wire Wire Line
+	900  2500 900  2600
+Wire Wire Line
+	900  2600 950  2600
+Wire Wire Line
+	1000 2600 1000 2500
+Wire Wire Line
+	950  2600 950  2700
+Connection ~ 950  2600
+Wire Wire Line
+	950  2600 1000 2600
+$Comp
+L power:GND #PWR?
+U 1 1 5F7B6FBF
+P 950 2700
+F 0 "#PWR?" H 950 2450 50  0001 C CNN
+F 1 "GND" H 955 2527 50  0000 C CNN
+F 2 "" H 950 2700 50  0001 C CNN
+F 3 "" H 950 2700 50  0001 C CNN
+	1    950  2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Crystal Y?
+U 1 1 5F7B8331
+P 4200 2300
+F 0 "Y?" V 4154 2431 50  0000 L CNN
+F 1 "12M" V 4245 2431 50  0000 L CNN
+F 2 "" H 4200 2300 50  0001 C CNN
+F 3 "~" H 4200 2300 50  0001 C CNN
+	1    4200 2300
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5F7B9DAD
+P 3950 2550
+F 0 "C?" V 4100 2550 50  0000 C CNN
+F 1 "20p" V 3789 2550 50  0000 C CNN
+F 2 "" H 3988 2400 50  0001 C CNN
+F 3 "~" H 3950 2550 50  0001 C CNN
+	1    3950 2550
+	0    1    -1   0   
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 5F7BD5C2
+P 3950 2050
+F 0 "C?" V 4100 2050 50  0000 C CNN
+F 1 "20p" V 3789 2050 50  0000 C CNN
+F 2 "" H 3988 1900 50  0001 C CNN
+F 3 "~" H 3950 2050 50  0001 C CNN
+	1    3950 2050
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4100 2050 4200 2050
+Wire Wire Line
+	4200 2050 4200 2150
+Wire Wire Line
+	4200 2450 4200 2550
+Wire Wire Line
+	4200 2550 4100 2550
+Wire Wire Line
+	5150 2400 4650 2400
+Wire Wire Line
+	4650 2400 4650 2550
+Wire Wire Line
+	4650 2550 4200 2550
+Connection ~ 4200 2550
+Wire Wire Line
+	5150 2200 4650 2200
+Wire Wire Line
+	4650 2200 4650 2050
+Wire Wire Line
+	4650 2050 4200 2050
+Connection ~ 4200 2050
+Wire Wire Line
+	3800 2050 3700 2050
+Wire Wire Line
+	3700 2050 3700 2300
+Wire Wire Line
+	3700 2550 3800 2550
+Wire Wire Line
+	3700 2300 3600 2300
+Connection ~ 3700 2300
+Wire Wire Line
+	3700 2300 3700 2550
+$Comp
+L power:GND #PWR?
+U 1 1 5F7CC94D
+P 3600 2300
+F 0 "#PWR?" H 3600 2050 50  0001 C CNN
+F 1 "GND" V 3605 2172 50  0000 R CNN
+F 2 "" H 3600 2300 50  0001 C CNN
+F 3 "" H 3600 2300 50  0001 C CNN
+	1    3600 2300
+	0    1    1    0   
+$EndComp
+Wire Notes Line
+	4550 1800 3300 1800
+Wire Notes Line
+	3300 1800 3300 2800
+Wire Notes Line
+	3300 2800 4550 2800
+Wire Notes Line
+	4550 2800 4550 1800
+Text Notes 3350 2000 0    50   ~ 0
+Only for\nCH340G
+Text Notes 4200 2000 0    50   ~ 0
+DNP for\nCH340C
+Wire Wire Line
+	5150 2000 4750 2000
+Text Label 4750 1900 0    50   ~ 0
+USB_DP
+Wire Wire Line
+	4750 1900 5150 1900
+Text Label 4750 2000 0    50   ~ 0
+USB_DM
+Wire Wire Line
+	1700 2100 2100 2100
+Text Label 2100 2100 2    50   ~ 0
+USB_DP
+Wire Wire Line
+	2100 2200 1700 2200
+Text Label 2100 2200 2    50   ~ 0
+USB_DM
+Wire Wire Line
+	5550 2600 5550 2700
+$Comp
+L power:GND #PWR?
+U 1 1 5F7EE5AE
+P 5550 2700
+F 0 "#PWR?" H 5550 2450 50  0001 C CNN
+F 1 "GND" H 5555 2527 50  0000 C CNN
+F 2 "" H 5550 2700 50  0001 C CNN
+F 3 "" H 5550 2700 50  0001 C CNN
+	1    5550 2700
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 5F7F16A8
+P 5500 1200
+F 0 "#PWR?" H 5500 1050 50  0001 C CNN
+F 1 "+3V3" H 5515 1373 50  0000 C CNN
+F 2 "" H 5500 1200 50  0001 C CNN
+F 3 "" H 5500 1200 50  0001 C CNN
+	1    5500 1200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5500 1200 5500 1300
+Wire Wire Line
+	5500 1300 5450 1300
+Wire Wire Line
+	5450 1300 5450 1400
+Wire Wire Line
+	5500 1300 5550 1300
+Wire Wire Line
+	5550 1300 5550 1400
+Connection ~ 5500 1300
+Wire Wire Line
+	5950 1600 6300 1600
+Wire Wire Line
+	5950 1700 6300 1700
+Text HLabel 6300 1600 2    50   Output ~ 0
+USB_UART_IN
+Text HLabel 6300 1700 2    50   Input ~ 0
+USB_UART_OUT
+Wire Wire Line
+	5950 2300 6300 2300
+Text HLabel 6300 2300 2    50   Output ~ 0
+USB_UART_DTR
+NoConn ~ 5950 1900
+NoConn ~ 5950 2000
+NoConn ~ 5950 2100
+NoConn ~ 5950 2200
+NoConn ~ 5950 2400
+NoConn ~ 5150 1700
+$Comp
+L Device:D_Schottky D?
+U 1 1 5F853296
+P 1550 1900
+F 0 "D?" H 1550 1684 50  0000 C CNN
+F 1 "Schottky" H 1550 1775 50  0000 C CNN
+F 2 "" H 1550 1900 50  0001 C CNN
+F 3 "~" H 1550 1900 50  0001 C CNN
+	1    1550 1900
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	1800 1900 2000 1900
+$Comp
+L Device:Fuse F?
+U 1 1 5F857219
+P 2150 1900
+F 0 "F?" V 1953 1900 50  0000 C CNN
+F 1 "2A" V 2044 1900 50  0000 C CNN
+F 2 "" V 2080 1900 50  0001 C CNN
+F 3 "~" H 2150 1900 50  0001 C CNN
+	1    2150 1900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2300 1900 2400 1900
+Wire Wire Line
+	2400 1900 2400 1800
+$Comp
+L Connector:Screw_Terminal_01x02 J?
+U 1 1 5F876E47
+P 850 1400
+F 0 "J?" H 768 1075 50  0000 C CNN
+F 1 "Power" H 768 1166 50  0000 C CNN
+F 2 "" H 850 1400 50  0001 C CNN
+F 3 "~" H 850 1400 50  0001 C CNN
+	1    850  1400
+	-1   0    0    1   
+$EndComp
+Text Label 1800 1900 0    50   ~ 0
+VIN
+Connection ~ 1800 1900
+Wire Wire Line
+	1050 1400 1800 1400
+Wire Wire Line
+	1800 1400 1800 1900
+Wire Wire Line
+	1050 1300 1800 1300
+$Comp
+L power:GND #PWR?
+U 1 1 5F8B42B2
+P 1800 1300
+F 0 "#PWR?" H 1800 1050 50  0001 C CNN
+F 1 "GND" V 1805 1172 50  0000 R CNN
+F 2 "" H 1800 1300 50  0001 C CNN
+F 3 "" H 1800 1300 50  0001 C CNN
+	1    1800 1300
+	0    -1   -1   0   
+$EndComp
+$Comp
+L power:+5V #PWR?
+U 1 1 5F8B4A28
+P 2400 1800
+F 0 "#PWR?" H 2400 1650 50  0001 C CNN
+F 1 "+5V" H 2415 1973 50  0000 C CNN
+F 2 "" H 2400 1800 50  0001 C CNN
+F 3 "" H 2400 1800 50  0001 C CNN
+	1    2400 1800
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR?
+U 1 1 5F8B5D26
+P 9400 4650
+F 0 "#PWR?" H 9400 4500 50  0001 C CNN
+F 1 "+5V" H 9415 4823 50  0000 C CNN
+F 2 "" H 9400 4650 50  0001 C CNN
+F 3 "" H 9400 4650 50  0001 C CNN
+	1    9400 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR?
+U 1 1 5F8B64D4
+P 8400 1350
+F 0 "#PWR?" H 8400 1200 50  0001 C CNN
+F 1 "+5V" H 8415 1523 50  0000 C CNN
+F 2 "" H 8400 1350 50  0001 C CNN
+F 3 "" H 8400 1350 50  0001 C CNN
+	1    8400 1350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8400 1350 8400 1450
+Wire Wire Line
+	8400 2550 8400 2650
+$Comp
+L power:GND #PWR?
+U 1 1 5F8BC4E7
+P 8400 2650
+F 0 "#PWR?" H 8400 2400 50  0001 C CNN
+F 1 "GND" H 8405 2477 50  0000 C CNN
+F 2 "" H 8400 2650 50  0001 C CNN
+F 3 "" H 8400 2650 50  0001 C CNN
+	1    8400 2650
+	1    0    0    -1  
+$EndComp
+NoConn ~ 1300 2300
+$Comp
+L Connector:Screw_Terminal_01x03 J?
+U 1 1 5F8DE004
+P 1100 4300
+F 0 "J?" H 1018 3975 50  0000 C CNN
+F 1 "AUDIO-IN" H 1018 4066 50  0000 C CNN
+F 2 "" H 1100 4300 50  0001 C CNN
+F 3 "~" H 1100 4300 50  0001 C CNN
+	1    1100 4300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector:AudioJack3 J?
+U 1 1 5F8DF7AD
+P 1300 5000
+F 0 "J?" H 1020 4933 50  0000 R CNN
+F 1 "AUDIO-IN" H 1020 5024 50  0000 R CNN
+F 2 "" H 1300 5000 50  0001 C CNN
+F 3 "~" H 1300 5000 50  0001 C CNN
+	1    1300 5000
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	1500 5100 1600 5100
+Wire Wire Line
+	1600 5100 1600 5200
+$Comp
+L power:GND #PWR?
+U 1 1 5F8E3C62
+P 1600 5200
+F 0 "#PWR?" H 1600 4950 50  0001 C CNN
+F 1 "GND" H 1605 5027 50  0000 C CNN
+F 2 "" H 1600 5200 50  0001 C CNN
+F 3 "" H 1600 5200 50  0001 C CNN
+	1    1600 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1500 4900 1850 4900
+Text Label 1850 4900 2    50   ~ 0
+AUDIO_L
+Text Label 1850 5000 2    50   ~ 0
+AUDIO_R
+Wire Wire Line
+	1850 5000 1500 5000
+Wire Wire Line
+	1300 4400 1400 4400
+Wire Wire Line
+	1400 4400 1400 4500
+$Comp
+L power:GND #PWR?
+U 1 1 5F8ED51F
+P 1400 4500
+F 0 "#PWR?" H 1400 4250 50  0001 C CNN
+F 1 "GND" H 1405 4327 50  0000 C CNN
+F 2 "" H 1400 4500 50  0001 C CNN
+F 3 "" H 1400 4500 50  0001 C CNN
+	1    1400 4500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1300 4200 1650 4200
+Text Label 1650 4200 2    50   ~ 0
+AUDIO_L
+Text Label 1650 4300 2    50   ~ 0
+AUDIO_R
+Wire Wire Line
+	1650 4300 1300 4300
 $EndSCHEMATC
--- a/kicad/power.sch
+++ b/kicad/power.sch
@ -75,19 +75,6 @@ Wire Wire Line
 	750  1050 750  950 
 Connection ~ 1200 1050
 $Comp
-L power:VBUS #PWR?
-U 1 1 5F7D3473
-P 750 950
-AR Path="/5F7D3473" Ref="#PWR?"  Part="1" 
-AR Path="/5F7CBB94/5F7D3473" Ref="#PWR?"  Part="1" 
-F 0 "#PWR?" H 750 800 50  0001 C CNN
-F 1 "VBUS" H 765 1123 50  0000 C CNN
-F 2 "" H 750 950 50  0001 C CNN
-F 3 "" H 750 950 50  0001 C CNN
-	1    750  950 
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:Battery_Cell BT?
 U 1 1 5F7D3481
 P 1700 2600
@ -405,8 +392,6 @@ Wire Wire Line
 	3950 1750 3950 1650
 Wire Notes Line
 	3400 650  3400 2000
-Wire Notes Line
-	3400 2000 5600 2000
 Text Notes 4050 800  0    50   ~ 0
 Place close to STM32F4
 $Comp
@ -426,8 +411,6 @@ Wire Wire Line
 	1700 3450 1700 3550
 Wire Wire Line
 	1700 3550 1600 3550
-Wire Notes Line
-	5600 650  3400 650 
 Wire Notes Line
 	5600 2000 5600 650 
 Wire Wire Line
@ -468,4 +451,66 @@ $EndComp
 Wire Wire Line
 	2600 950  2600 1050
 Connection ~ 2600 1050
+$Comp
+L Device:C C?
+U 1 1 5F90151D
+P 5850 1400
+AR Path="/5F90151D" Ref="C?"  Part="1" 
+AR Path="/5F7CBB94/5F90151D" Ref="C?"  Part="1" 
+F 0 "C?" H 5965 1446 50  0000 L CNN
+F 1 "100n" H 5965 1355 50  0000 L CNN
+F 2 "" H 5888 1250 50  0001 C CNN
+F 3 "~" H 5850 1400 50  0001 C CNN
+	1    5850 1400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3V3 #PWR?
+U 1 1 5F90152F
+P 5850 1050
+AR Path="/5F90152F" Ref="#PWR?"  Part="1" 
+AR Path="/5F7CBB94/5F90152F" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 5850 900 50  0001 C CNN
+F 1 "+3V3" H 5865 1223 50  0000 C CNN
+F 2 "" H 5850 1050 50  0001 C CNN
+F 3 "" H 5850 1050 50  0001 C CNN
+	1    5850 1050
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR?
+U 1 1 5F90153A
+P 5850 1750
+AR Path="/5F90153A" Ref="#PWR?"  Part="1" 
+AR Path="/5F7CBB94/5F90153A" Ref="#PWR?"  Part="1" 
+F 0 "#PWR?" H 5850 1500 50  0001 C CNN
+F 1 "GND" H 5855 1577 50  0000 C CNN
+F 2 "" H 5850 1750 50  0001 C CNN
+F 3 "" H 5850 1750 50  0001 C CNN
+	1    5850 1750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5850 1050 5850 1250
+Wire Wire Line
+	5850 1550 5850 1750
+Wire Notes Line
+	6200 2000 6200 650 
+Wire Notes Line
+	3400 2000 6200 2000
+Wire Notes Line
+	3400 650  6200 650 
+Text Notes 5700 850  0    50   ~ 0
+Place close\nto CH340
+$Comp
+L power:+5V #PWR?
+U 1 1 5F924E38
+P 750 950
+F 0 "#PWR?" H 750 800 50  0001 C CNN
+F 1 "+5V" H 765 1123 50  0000 C CNN
+F 2 "" H 750 950 50  0001 C CNN
+F 3 "" H 750 950 50  0001 C CNN
+	1    750  950 
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
--- a/kicad/sabik-cpu-cache.lib
+++ b/kicad/sabik-cpu-cache.lib
@ -1,38 +1,175 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector_AVR-JTAG-10
+# Connector_AudioJack3
 #
-DEF Connector_AVR-JTAG-10 J 0 40 Y Y 1 F N
-F0 "J" 175 500 50 H V L CNN
-F1 "Connector_AVR-JTAG-10" 100 -500 50 H V L CNN
-F2 "" -150 150 50 V I C CNN
-F3 "" -1275 -550 50 H I C CNN
+DEF Connector_AudioJack3 J 0 20 Y Y 1 F N
+F0 "J" 0 350 50 H V C CNN
+F1 "Connector_AudioJack3" 0 250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- IDC?Header*2x05*
- Pin?Header*2x05*
+ Jack*
 $ENDFPLIST
 DRAW
-S -105 450 -95 420 0 1 0 N
-S -5 -420 5 -450 0 1 0 N
-S -5 450 5 420 0 1 0 N
-S 350 -195 320 -205 0 1 0 N
-S 350 -95 320 -105 0 1 0 N
-S 350 5 320 -5 0 1 0 N
-S 350 105 320 95 0 1 0 N
-S 350 205 320 195 0 1 0 N
-S 350 305 320 295 0 1 0 N
-S 350 450 -350 -450 0 1 10 f
-X TCK 1 500 100 150 L 50 50 1 1 P
-X GND 10 0 -600 150 U 50 50 1 1 W
-X GND 2 0 -600 150 U 50 50 1 1 P N
-X TDO 3 500 -100 150 L 50 50 1 1 P
-X VREF 4 -100 600 150 D 50 50 1 1 P
-X TMS 5 500 0 150 L 50 50 1 1 P
-X ~SRST 6 500 300 150 L 50 50 1 1 P
-X VCC 7 0 600 150 D 50 50 1 1 W
-X ~TRST 8 500 200 150 L 50 50 1 1 P
-X TDI 9 500 -200 150 L 50 50 1 1 P
+S -200 -200 -250 -100 0 1 10 F
+S 100 150 -200 -200 0 1 10 f
+P 4 0 1 10 0 -100 25 -125 50 -100 100 -100 N
+P 5 0 1 10 -75 -100 -50 -125 -25 -100 -25 0 100 0 N
+P 5 0 1 10 100 100 -100 100 -100 -100 -125 -125 -150 -100 N
+X ~ R 200 0 100 L 50 50 1 1 P
+X ~ S 200 100 100 L 50 50 1 1 P
+X ~ T 200 -100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Conn_ARM_JTAG_SWD_10
+#
+DEF Connector_Conn_ARM_JTAG_SWD_10 J 0 40 Y Y 1 F N
+F0 "J" -100 650 50 H V R CNN
+F1 "Connector_Conn_ARM_JTAG_SWD_10" -100 550 50 H V R BNN
+F2 "" 0 0 50 H I C CNN
+F3 "" -350 -1250 50 V I C CNN
+$FPLIST
+ PinHeader?2x05?P1.27mm*
+$ENDFPLIST
+DRAW
+S -400 500 400 -500 0 1 10 f
+S -110 -500 -90 -460 0 1 0 N
+S -10 -500 10 -460 0 1 0 N
+S -10 500 10 460 0 1 0 N
+S 360 90 400 110 0 1 0 N
+S 400 -110 360 -90 0 1 0 N
+S 400 -10 360 10 0 1 0 N
+S 400 310 360 290 0 1 0 N
+S 360 -210 400 -190 1 1 0 N
+X VTref 1 0 600 100 D 50 50 1 1 W
+X ~RESET~ 10 500 300 100 L 50 50 1 1 C
+X SWDIO/TMS 2 500 0 100 L 50 50 1 1 B
+X GND 3 0 -600 100 U 50 50 1 1 W
+X SWDCLK/TCK 4 500 100 100 L 50 50 1 1 O
+X GND 5 0 -600 100 U 50 50 1 1 P N
+X SWO/TDO 6 500 -100 100 L 50 50 1 1 I
+X KEY 7 -400 0 100 R 50 50 1 1 N N
+X NC/TDI 8 500 -200 100 L 50 50 1 1 O
+X GNDDetect 9 -100 -600 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Screw_Terminal_01x02
+#
+DEF Connector_Screw_Terminal_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Screw_Terminal_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Screw_Terminal_01x03
+#
+DEF Connector_Screw_Terminal_01x03 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Screw_Terminal_01x03" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+C 0 100 25 1 1 6 N
+S -50 150 50 -150 1 1 10 f
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -21 113 13 80 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+P 2 1 1 6 -14 120 20 87 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Screw_Terminal_01x04
+#
+DEF Connector_Screw_Terminal_01x04 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Screw_Terminal_01x04" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TerminalBlock*:*
+$ENDFPLIST
+DRAW
+C 0 -200 25 1 1 6 N
+C 0 -100 25 1 1 6 N
+C 0 0 25 1 1 6 N
+C 0 100 25 1 1 6 N
+S -50 150 50 -250 1 1 10 f
+P 2 1 1 6 -21 -187 13 -220 N
+P 2 1 1 6 -21 -87 13 -120 N
+P 2 1 1 6 -21 13 13 -20 N
+P 2 1 1 6 -21 113 13 80 N
+P 2 1 1 6 -14 -180 20 -213 N
+P 2 1 1 6 -14 -80 20 -113 N
+P 2 1 1 6 -14 20 20 -13 N
+P 2 1 1 6 -14 120 20 87 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_USB_B_Micro
+#
+DEF Connector_USB_B_Micro J 0 40 Y Y 1 F N
+F0 "J" -200 450 50 H V L CNN
+F1 "Connector_USB_B_Micro" -200 350 50 H V L CNN
+F2 "" 150 -50 50 H I C CNN
+F3 "" 150 -50 50 H I C CNN
+ALIAS USB_B_Mini
+$FPLIST
+ USB*
+$ENDFPLIST
+DRAW
+C -150 85 25 0 1 10 F
+C -25 135 15 0 1 10 F
+S -200 -300 200 300 0 1 10 f
+S -5 -300 5 -270 0 1 0 N
+S 10 50 -20 20 0 1 10 F
+S 200 -205 170 -195 0 1 0 N
+S 200 -105 170 -95 0 1 0 N
+S 200 -5 170 5 0 1 0 N
+S 200 195 170 205 0 1 0 N
+P 2 0 1 10 -75 85 25 85 N
+P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+P 4 0 1 10 25 110 25 60 75 85 25 110 F
+P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
+P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
+X VBUS 1 300 200 100 L 50 50 1 1 w
+X D- 2 300 -100 100 L 50 50 1 1 P
+X D+ 3 300 0 100 L 50 50 1 1 P
+X ID 4 300 -200 100 L 50 50 1 1 P
+X GND 5 0 -400 100 U 50 50 1 1 w
+X Shield 6 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@ -114,11 +251,51 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_LED_CRGB
+# Device_D_Schottky
 #
-DEF Device_LED_CRGB D 0 0 Y N 1 F N
+DEF Device_D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_Fuse
+#
+DEF Device_Fuse F 0 0 N Y 1 F N
+F0 "F" 80 0 50 V V C CNN
+F1 "Device_Fuse" -75 0 50 V V C CNN
+F2 "" -70 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ *Fuse*
+$ENDFPLIST
+DRAW
+S -30 -100 30 100 0 1 10 N
+P 2 0 1 0 0 100 0 -100 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_LED_ARGB
+#
+DEF Device_LED_ARGB D 0 0 Y N 1 F N
 F0 "D" 0 370 50 H V C CNN
-F1 "Device_LED_CRGB" 0 -350 50 H V C CNN
+F1 "Device_LED_ARGB" 0 -350 50 H V C CNN
 F2 "" 0 -50 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
@ -127,21 +304,21 @@ $FPLIST
 LED_THT:*
 $ENDFPLIST
 DRAW
-C -85 0 10 0 1 0 F
-T 0 75 -250 50 0 0 0 B Normal 0 C C
-T 0 75 -50 50 0 0 0 G Normal 0 C C
-T 0 75 150 50 0 0 0 R Normal 0 C C
+C 80 0 10 0 1 0 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 250 50 250 0 1 0 N
 S 110 330 -110 -300 0 1 10 f
+P 2 0 1 0 -100 -200 50 -200 N
 P 2 0 1 8 -50 -150 -50 -250 N
 P 2 0 1 8 -50 50 -50 -50 N
 P 2 0 1 8 -50 250 -50 150 N
-P 2 0 1 0 50 -200 100 -200 N
-P 2 0 1 0 50 0 -100 0 N
-P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
+P 2 0 1 0 50 200 -100 200 N
+P 2 0 1 0 100 0 -100 0 N
+P 4 0 1 0 50 -200 80 -200 80 200 50 200 N
 P 4 0 1 8 50 -150 50 -250 -50 -200 50 -150 N
 P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
-P 4 0 1 0 50 200 -85 200 -85 -200 50 -200 N
 P 4 0 1 8 50 250 50 150 -50 200 50 250 N
 P 5 0 1 0 -40 -150 20 -90 -10 -90 20 -90 20 -120 N
 P 5 0 1 0 -40 50 20 110 -10 110 20 110 20 80 N
@ -149,10 +326,10 @@ P 5 0 1 0 -40 250 20 310 -10 310 20 310 20 280 N
 P 5 0 1 0 0 -150 60 -90 30 -90 60 -90 60 -120 N
 P 5 0 1 0 0 50 60 110 30 110 60 110 60 80 N
 P 5 0 1 0 0 250 60 310 30 310 60 310 60 280 N
-X K 1 -200 0 100 R 50 50 1 1 P
-X RA 2 200 200 100 L 50 50 1 1 P
-X GA 3 200 0 100 L 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
+X A 1 200 0 100 L 50 50 1 1 P
+X RK 2 -200 200 100 R 50 50 1 1 P
+X GK 3 -200 0 100 R 50 50 1 1 P
+X BK 4 -200 -200 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@ -213,6 +390,37 @@ X VCC 8 0 500 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# Interface_USB_CH340G
+#
+DEF Interface_USB_CH340G U 0 20 Y Y 1 F N
+F0 "U" -200 550 50 H V R CNN
+F1 "Interface_USB_CH340G" 50 550 50 H V L CNN
+F2 "Package_SO:SOIC-16_3.9x9.9mm_P1.27mm" 50 -550 50 H I L CNN
+F3 "" -350 800 50 H I C CNN
+$FPLIST
+ SOIC*3.9x9.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 500 300 -500 0 1 10 f
+X GND 1 0 -600 100 U 50 50 1 1 W
+X ~DSR 10 400 0 100 L 50 50 1 1 I
+X ~RI 11 400 -100 100 L 50 50 1 1 I
+X ~DCD 12 400 -200 100 L 50 50 1 1 I
+X ~DTR 13 400 -300 100 L 50 50 1 1 O
+X ~RTS 14 400 -400 100 L 50 50 1 1 O
+X R232 15 -400 300 100 R 50 50 1 1 I
+X VCC 16 0 600 100 D 50 50 1 1 W
+X TXD 2 400 400 100 L 50 50 1 1 O
+X RXD 3 400 300 100 L 50 50 1 1 I
+X V3 4 -100 600 100 D 50 50 1 1 P
+X UD+ 5 -400 100 100 R 50 50 1 1 B
+X UD- 6 -400 0 100 R 50 50 1 1 B
+X XI 7 -400 -200 100 R 50 50 1 1 I
+X XO 8 -400 -400 100 R 50 50 1 1 O
+X ~CTS 9 400 100 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # MCU_ST_STM32F4_STM32F410CBTx
 #
 DEF MCU_ST_STM32F4_STM32F410CBTx U 0 20 Y Y 1 F N
@ -329,6 +537,21 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 # power_+BATT
 #
 DEF power_+BATT #PWR 0 0 Y Y 1 F P
@ -357,21 +580,6 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power_VBUS
-#
-DEF power_VBUS #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power_VBUS" 0 150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X VBUS 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
 # power_VDDA
 #
 DEF power_VDDA #PWR 0 0 Y Y 1 F P
--- a/kicad/sabik-cpu.sch
+++ b/kicad/sabik-cpu.sch
@ -20,15 +20,59 @@ F0 "power" 50
 F1 "power.sch" 50
 $EndSheet
 $Sheet
-S 2250 650  1400 1100
+S 2250 650  1400 1400
 U 5F7D680C
 F0 "cpu" 50
 F1 "cpu.sch" 50
+F2 "DMX_RO" I R 3650 800 50 
+F3 "DMX_RE" O R 3650 900 50 
+F4 "DMX_DI" O R 3650 1000 50 
+F5 "DMX_DE" O R 3650 1100 50 
+F6 "WS0_TX" O R 3650 1250 50 
+F7 "WS1_TX" O R 3650 1450 50 
+F8 "WS0_RX" I R 3650 1350 50 
+F9 "CONTROL_UART_IN" I R 3650 1800 50 
+F10 "CONTROL_UART_OUT" O R 3650 1700 50 
+F11 "WS1_RX" I R 3650 1550 50 
+F12 "CONTROL_UART_RST" I R 3650 1900 50 
 $EndSheet
 $Sheet
-S 3850 650  1400 1100
+S 3850 650  1250 1400
 U 5F8467A7
 F0 "io" 50
 F1 "io.sch" 50
+F2 "DMX_RO" O L 3850 800 50 
+F3 "DMX_RE" I L 3850 900 50 
+F4 "DMX_DI" I L 3850 1000 50 
+F5 "DMX_DE" I L 3850 1100 50 
+F6 "WS0_TX" I L 3850 1250 50 
+F7 "WS1_RX" O L 3850 1550 50 
+F8 "WS1_TX" I L 3850 1450 50 
+F9 "WS0_RX" O L 3850 1350 50 
+F10 "USB_UART_IN" O L 3850 1800 50 
+F11 "USB_UART_OUT" I L 3850 1700 50 
+F12 "USB_UART_DTR" O L 3850 1900 50 
 $EndSheet
+Wire Wire Line
+	3650 800  3850 800 
+Wire Wire Line
+	3650 900  3850 900 
+Wire Wire Line
+	3650 1000 3850 1000
+Wire Wire Line
+	3650 1100 3850 1100
+Wire Wire Line
+	3650 1250 3850 1250
+Wire Wire Line
+	3650 1350 3850 1350
+Wire Wire Line
+	3650 1450 3850 1450
+Wire Wire Line
+	3650 1550 3850 1550
+Wire Wire Line
+	3650 1700 3850 1700
+Wire Wire Line
+	3650 1800 3850 1800
+Wire Wire Line
+	3650 1900 3850 1900
 $EndSCHEMATC