Browse Source

refactored schematics + started with some parts of the layout

prozessorkern 4 years ago
parent
commit
9ebc276a6b

+ 29 - 25
pcb/eventTechBerry/audio.sch

@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 8
+Sheet 5 8
 Title "Audio DAC"
 Date "2020-12-13"
 Rev "1.0"
@@ -360,7 +360,7 @@ $Comp
 L Device:C C315
 U 1 1 61103035
 P 7050 4050
-F 0 "C315" V 7000 4150 50  0000 C CNN
+F 0 "C315" V 7000 4200 50  0000 C CNN
 F 1 "2u2" V 7100 4200 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 7088 3900 50  0001 C CNN
 F 3 "~" H 7050 4050 50  0001 C CNN
@@ -451,7 +451,7 @@ $Comp
 L Device:R R301
 U 1 1 611197BC
 P 9800 900
-F 0 "R301" V 9750 1050 50  0000 C CNN
+F 0 "R301" V 9750 1100 50  0000 C CNN
 F 1 "499" V 9800 900 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 900 50  0001 C CNN
 F 3 "~" H 9800 900 50  0001 C CNN
@@ -462,7 +462,7 @@ $Comp
 L Device:R R303
 U 1 1 6111AA2A
 P 9800 1300
-F 0 "R303" V 9750 1450 50  0000 C CNN
+F 0 "R303" V 9750 1500 50  0000 C CNN
 F 1 "499" V 9800 1300 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 1300 50  0001 C CNN
 F 3 "~" H 9800 1300 50  0001 C CNN
@@ -491,13 +491,13 @@ Wire Wire Line
 Wire Wire Line
 	10100 900  10100 950 
 Text HLabel 10550 900  2    50   Output ~ 0
-OUT_L_p
+OUT_L_P
 Text HLabel 10550 1300 2    50   Output ~ 0
-OUT_L_n
+OUT_L_N
 Text HLabel 10550 1800 2    50   Output ~ 0
-OUT_R_p
+OUT_R_P
 Text HLabel 10550 2200 2    50   Output ~ 0
-OUT_R_n
+OUT_R_N
 Wire Wire Line
 	10550 1300 10100 1300
 Connection ~ 10100 1300
@@ -508,7 +508,7 @@ $Comp
 L Device:R R304
 U 1 1 6112C8F2
 P 9800 1800
-F 0 "R304" V 9750 1950 50  0000 C CNN
+F 0 "R304" V 9750 2000 50  0000 C CNN
 F 1 "499" V 9800 1800 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 1800 50  0001 C CNN
 F 3 "~" H 9800 1800 50  0001 C CNN
@@ -519,7 +519,7 @@ $Comp
 L Device:R R305
 U 1 1 6112C8F8
 P 9800 2200
-F 0 "R305" V 9750 2350 50  0000 C CNN
+F 0 "R305" V 9750 2400 50  0000 C CNN
 F 1 "499" V 9800 2200 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 2200 50  0001 C CNN
 F 3 "~" H 9800 2200 50  0001 C CNN
@@ -557,7 +557,7 @@ $Comp
 L Device:R R306
 U 1 1 6113B540
 P 9800 2800
-F 0 "R306" V 9750 2950 50  0000 C CNN
+F 0 "R306" V 9750 3000 50  0000 C CNN
 F 1 "499" V 9800 2800 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 2800 50  0001 C CNN
 F 3 "~" H 9800 2800 50  0001 C CNN
@@ -568,7 +568,7 @@ $Comp
 L Device:R R310
 U 1 1 6113B546
 P 9800 3200
-F 0 "R310" V 9750 3350 50  0000 C CNN
+F 0 "R310" V 9750 3400 50  0000 C CNN
 F 1 "499" V 9800 3200 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 3200 50  0001 C CNN
 F 3 "~" H 9800 3200 50  0001 C CNN
@@ -597,13 +597,13 @@ Wire Wire Line
 Wire Wire Line
 	10100 2800 10100 2850
 Text HLabel 10550 2800 2    50   Output ~ 0
-AMP_L_p
+AMP_L_P
 Text HLabel 10550 3200 2    50   Output ~ 0
-AMP_L_n
+AMP_L_N
 Text HLabel 10550 3700 2    50   Output ~ 0
-AMP_R_p
+AMP_R_P
 Text HLabel 10550 4100 2    50   Output ~ 0
-AMP_R_n
+AMP_R_N
 Wire Wire Line
 	10550 3200 10100 3200
 Connection ~ 10100 3200
@@ -614,7 +614,7 @@ $Comp
 L Device:R R311
 U 1 1 6113B55E
 P 9800 3700
-F 0 "R311" V 9750 3850 50  0000 C CNN
+F 0 "R311" V 9750 3900 50  0000 C CNN
 F 1 "499" V 9800 3700 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 3700 50  0001 C CNN
 F 3 "~" H 9800 3700 50  0001 C CNN
@@ -625,7 +625,7 @@ $Comp
 L Device:R R315
 U 1 1 6113B564
 P 9800 4100
-F 0 "R315" V 9750 4250 50  0000 C CNN
+F 0 "R315" V 9750 4300 50  0000 C CNN
 F 1 "499" V 9800 4100 50  0000 C CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9730 4100 50  0001 C CNN
 F 3 "~" H 9800 4100 50  0001 C CNN
@@ -761,8 +761,6 @@ Entry Wire Line
 	9150 3100 9250 3200
 Entry Wire Line
 	9150 2700 9250 2800
-Wire Bus Line
-	9150 750  7250 750 
 Text Label 9300 900  0    50   ~ 0
 DAC_L_p
 Text Label 9300 1300 0    50   ~ 0
@@ -1210,7 +1208,7 @@ P 1500 3050
 AR Path="/5FD4163D/5FE3B3EA" Ref="R?"  Part="1" 
 AR Path="/5FD4163D/6044FA06/5FE3B3EA" Ref="R?"  Part="1" 
 AR Path="/60C40BC8/5FE3B3EA" Ref="R308"  Part="1" 
-F 0 "R308" V 1450 3200 50  0000 C CNN
+F 0 "R308" V 1450 3250 50  0000 C CNN
 F 1 "100" V 1500 3050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1430 3050 50  0001 C CNN
 F 3 "~" H 1500 3050 50  0001 C CNN
@@ -1240,7 +1238,7 @@ P 1500 4050
 AR Path="/5FD4163D/5FE9A733" Ref="R?"  Part="1" 
 AR Path="/5FD4163D/6044FA06/5FE9A733" Ref="R?"  Part="1" 
 AR Path="/60C40BC8/5FE9A733" Ref="R314"  Part="1" 
-F 0 "R314" V 1450 4200 50  0000 C CNN
+F 0 "R314" V 1450 4250 50  0000 C CNN
 F 1 "100" V 1500 4050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1430 4050 50  0001 C CNN
 F 3 "~" H 1500 4050 50  0001 C CNN
@@ -1258,7 +1256,7 @@ P 1500 4150
 AR Path="/5FD4163D/5FE9AEC2" Ref="R?"  Part="1" 
 AR Path="/5FD4163D/6044FA06/5FE9AEC2" Ref="R?"  Part="1" 
 AR Path="/60C40BC8/5FE9AEC2" Ref="R316"  Part="1" 
-F 0 "R316" V 1450 4300 50  0000 C CNN
+F 0 "R316" V 1450 4350 50  0000 C CNN
 F 1 "100" V 1500 4150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1430 4150 50  0001 C CNN
 F 3 "~" H 1500 4150 50  0001 C CNN
@@ -1272,7 +1270,7 @@ P 1500 3150
 AR Path="/5FD4163D/5FE3B6D7" Ref="R?"  Part="1" 
 AR Path="/5FD4163D/6044FA06/5FE3B6D7" Ref="R?"  Part="1" 
 AR Path="/60C40BC8/5FE3B6D7" Ref="R309"  Part="1" 
-F 0 "R309" V 1450 3300 50  0000 C CNN
+F 0 "R309" V 1450 3350 50  0000 C CNN
 F 1 "100" V 1500 3150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1430 3150 50  0001 C CNN
 F 3 "~" H 1500 3150 50  0001 C CNN
@@ -1286,7 +1284,7 @@ P 1500 2950
 AR Path="/5FD4163D/5FE31C4D" Ref="R?"  Part="1" 
 AR Path="/5FD4163D/6044FA06/5FE31C4D" Ref="R?"  Part="1" 
 AR Path="/60C40BC8/5FE31C4D" Ref="R307"  Part="1" 
-F 0 "R307" V 1450 3100 50  0000 C CNN
+F 0 "R307" V 1450 3150 50  0000 C CNN
 F 1 "100" V 1500 2950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1430 2950 50  0001 C CNN
 F 3 "~" H 1500 2950 50  0001 C CNN
@@ -1299,6 +1297,12 @@ Wire Wire Line
 	8650 4700 10550 4700
 Text Notes 8900 4450 0    50   ~ 0
 correct function of MUTE and STANDBY output\nhighly depends on the used linux driver
+Entry Bus Bus
+	9050 650  9150 750 
+Entry Bus Bus
+	7250 750  7350 650 
+Wire Bus Line
+	7350 650  9050 650 
 Wire Bus Line
 	7250 750  7250 3150
 Wire Bus Line

File diff suppressed because it is too large
+ 238 - 238
pcb/eventTechBerry/buttonInputs1.sch


File diff suppressed because it is too large
+ 239 - 239
pcb/eventTechBerry/buttonInputs2.sch


File diff suppressed because it is too large
+ 461 - 276
pcb/eventTechBerry/dmxOutput.sch


+ 15 - 0
pcb/eventTechBerry/eventTechBerry-cache.lib

@@ -673,6 +673,21 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Mechanical_MountingHole
+#
+DEF Mechanical_MountingHole H 0 40 Y Y 1 F N
+F0 "H" 0 200 50 H V C CNN
+F1 "Mechanical_MountingHole" 0 125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*
+$ENDFPLIST
+DRAW
+C 0 0 50 0 1 50 N
+ENDDRAW
+ENDDEF
+#
 # Memory_EEPROM_CAT24C256
 #
 DEF Memory_EEPROM_CAT24C256 U 0 20 Y Y 1 F N

File diff suppressed because it is too large
+ 7393 - 6568
pcb/eventTechBerry/eventTechBerry.kicad_pcb


+ 15 - 3
pcb/eventTechBerry/eventTechBerry.pro

@@ -1,4 +1,4 @@
-update=Mo 14 Dez 2020 23:00:35 CET
+update=Di 15 Dez 2020 22:58:45 CET
 version=1
 last_client=kicad
 [general]
@@ -39,8 +39,20 @@ MinMicroViaDiameter=0.2
 MinMicroViaDrill=0.09999999999999999
 MinHoleToHole=0.25
 TrackWidth1=0.25
+TrackWidth2=0.25
+TrackWidth3=0.3
+TrackWidth4=0.5
+TrackWidth5=0.7
+TrackWidth6=1
+TrackWidth7=1.2
 ViaDiameter1=0.8
 ViaDrill1=0.4
+ViaDiameter2=0.8
+ViaDrill2=0.4
+ViaDiameter3=1
+ViaDrill3=0.6
+ViaDiameter4=1.2
+ViaDrill4=0.8
 dPairWidth1=0.2
 dPairGap1=0.25
 dPairViaGap1=0.25
@@ -67,7 +79,7 @@ OthersTextUpright=1
 SolderMaskClearance=0
 SolderMaskMinWidth=0
 SolderPasteClearance=0
-SolderPasteRatio=0
+SolderPasteRatio=-0
 [pcbnew/Layer.F.Cu]
 Name=F.Cu
 Type=0
@@ -233,7 +245,7 @@ Enabled=1
 [pcbnew/Layer.F.Fab]
 Enabled=1
 [pcbnew/Layer.Rescue]
-Enabled=1
+Enabled=0
 [pcbnew/Netclasses]
 [pcbnew/Netclasses/Default]
 Name=Default

+ 348 - 251
pcb/eventTechBerry/eventTechBerry.sch

@@ -13,24 +13,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Sheet
-S 8650 4900 950  1400
-U 5FD12D22
-F0 "powerAmplifier" 50
-F1 "powerAmplifier.sch" 50
-F2 "OUT_L_p" O R 9600 5050 50 
-F3 "OUT_L_n" O R 9600 5150 50 
-F4 "OUT_R_p" O R 9600 6050 50 
-F5 "OUT_R_n" O R 9600 6150 50 
-F6 "LED_ERR_p" O R 9600 5550 50 
-F7 "LED_ERR_n" O R 9600 5650 50 
-F8 "IN_R_p" I L 8650 6050 50 
-F9 "IN_R_n" I L 8650 6150 50 
-F10 "IN_L_p" I L 8650 5050 50 
-F11 "IN_L_n" I L 8650 5150 50 
-F12 "MUTE" I L 8650 5550 50 
-F13 "STANDBY" I L 8650 5650 50 
-$EndSheet
 Wire Wire Line
 	9600 5050 9900 5050
 Wire Wire Line
@@ -105,23 +87,23 @@ Wire Wire Line
 $Comp
 L proz_connectors:XLR3_M_GROUND CON102
 U 1 1 5FE7D361
-P 10100 2950
-F 0 "CON102" H 10448 3268 50  0000 L CNN
-F 1 "NC3 MAH0" H 10448 3177 50  0000 L CNN
-F 2 "proz_connectors:NC3MAH_XLR_M" H 10100 2950 50  0001 C CNN
-F 3 "" H 10100 2950 50  0001 C CNN
-	1    10100 2950
+P 10100 2250
+F 0 "CON102" H 10448 2568 50  0000 L CNN
+F 1 "NC3 MAH0" H 10448 2477 50  0000 L CNN
+F 2 "proz_connectors:NC3MAH_XLR_M" H 10100 2250 50  0001 C CNN
+F 3 "" H 10100 2250 50  0001 C CNN
+	1    10100 2250
 	1    0    0    -1  
 $EndComp
 $Comp
 L proz_connectors:XLR3_F_GROUND CON101
 U 1 1 5FE7A83A
-P 10100 2050
-F 0 "CON101" H 10448 2368 50  0000 L CNN
-F 1 "NC3 FAH0" H 10448 2277 50  0000 L CNN
-F 2 "proz_connectors:NC3FAH2_XLR_F" H 10100 2050 50  0001 C CNN
-F 3 "" H 10100 2050 50  0001 C CNN
-	1    10100 2050
+P 10100 1250
+F 0 "CON101" H 10448 1568 50  0000 L CNN
+F 1 "NC3 FAH0" H 10448 1477 50  0000 L CNN
+F 2 "proz_connectors:NC3FAH2_XLR_F" H 10100 1250 50  0001 C CNN
+F 3 "" H 10100 1250 50  0001 C CNN
+	1    10100 1250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -130,7 +112,7 @@ U 1 1 601A43C2
 P 5400 3950
 F 0 "J103" H 5800 5200 50  0000 C CNN
 F 1 "Raspberry_Pi_4" H 4750 5200 50  0000 C CNN
-F 2 "Connector_IDC:IDC-Header_2x20_P2.54mm_Vertical" H 5400 3950 50  0001 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_2x20_P2.54mm_Vertical" H 5400 3950 50  0001 C CNN
 F 3 "https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/rpi_SCH_3bplus_1p0_reduced.pdf" H 5400 3950 50  0001 C CNN
 	1    5400 3950
 	1    0    0    -1  
@@ -280,27 +262,6 @@ Wire Wire Line
 	1800 4600 1300 4600
 Wire Wire Line
 	1800 4700 1300 4700
-$Sheet
-S 8650 3200 950  1500
-U 60C40BC8
-F0 "audio" 50
-F1 "audio.sch" 50
-F2 "OUT_L_p" O R 9600 3500 50 
-F3 "OUT_L_n" O R 9600 3600 50 
-F4 "OUT_R_p" O R 9600 4100 50 
-F5 "OUT_R_n" O R 9600 4200 50 
-F6 "AMP_L_p" O L 8650 4000 50 
-F7 "AMP_L_n" O L 8650 4100 50 
-F8 "AMP_R_p" O L 8650 4200 50 
-F9 "AMP_R_n" O L 8650 4300 50 
-F10 "I2S_DATA" I L 8650 3300 50 
-F11 "I2S_LRCK" I L 8650 3400 50 
-F12 "I2S_BCK" I L 8650 3500 50 
-F13 "I2C_SCL" I L 8650 3700 50 
-F14 "I2C_SDA" B L 8650 3800 50 
-F15 "AMP_MUTE" O L 8650 4500 50 
-F16 "AMP_STANDBY" O L 8650 4600 50 
-$EndSheet
 $Comp
 L proz_connectors:XLR3_M_GROUND CON103
 U 1 1 60C5AF9B
@@ -333,109 +294,57 @@ $EndSheet
 Wire Wire Line
 	1450 950  1800 950 
 $Comp
-L Device:LED D101
-U 1 1 6101796B
-P 10150 1100
-F 0 "D101" H 10300 1150 50  0000 C CNN
-F 1 "LED_DMX_PWR" H 9900 1250 50  0000 C CNN
-F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10150 1100 50  0001 C CNN
-F 3 "~" H 10150 1100 50  0001 C CNN
-	1    10150 1100
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:LED D102
 U 1 1 610217DD
-P 10150 1400
-F 0 "D102" H 10300 1450 50  0000 C CNN
-F 1 "LED_DMX_TX" H 9850 1450 50  0000 C CNN
-F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10150 1400 50  0001 C CNN
-F 3 "~" H 10150 1400 50  0001 C CNN
-	1    10150 1400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:LED D103
-U 1 1 61021C09
-P 10250 2300
-F 0 "D103" H 10400 2350 50  0000 C CNN
-F 1 "LED_DMX_RX" H 9950 2350 50  0000 C CNN
-F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10250 2300 50  0001 C CNN
-F 3 "~" H 10250 2300 50  0001 C CNN
-	1    10250 2300
+P 10200 1500
+F 0 "D102" H 10350 1550 50  0000 C CNN
+F 1 "LED_DMX_TX" H 9900 1550 50  0000 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10200 1500 50  0001 C CNN
+F 3 "~" H 10200 1500 50  0001 C CNN
+	1    10200 1500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9600 2900 10000 2900
-Wire Wire Line
-	9600 2700 10000 2700
-Wire Wire Line
-	10000 2500 9600 2500
+	9600 2200 10000 2200
 Wire Wire Line
-	10000 2600 9600 2600
+	9600 2000 10000 2000
 Wire Wire Line
-	9600 2300 10100 2300
-Wire Wire Line
-	10400 2300 10550 2300
-Wire Wire Line
-	10550 2300 10550 2200
+	10000 1800 9600 1800
 Wire Wire Line
-	10550 2200 9600 2200
-$Sheet
-S 8650 700  950  2300
-U 5FE81B92
-F0 "dmxOutput" 50
-F1 "dmxOutput.sch" 50
-F2 "DMX_TX" I L 8650 800 50 
-F3 "DMX_RX" O L 8650 900 50 
-F4 "DMX_TX_GND" O R 9600 1600 50 
-F5 "DMX_TX_SHIELD" O R 9600 2000 50 
-F6 "DMX_TX_LED_p" O R 9600 1300 50 
-F7 "DMX_TX_LED_n" O R 9600 1400 50 
-F8 "DMX_RX_GND" O R 9600 2500 50 
-F9 "DMX_RX_SHIELD" O R 9600 2900 50 
-F10 "DMX_RX_LED_n" O R 9600 2300 50 
-F11 "DMX_PWR_LED_p" O R 9600 2200 50 
-F12 "DMX_PWR_LED_n" O R 9600 1100 50 
-F13 "DMX_RX_LED_p" O R 9600 1000 50 
-F14 "DMX_TX_p" O R 9600 1800 50 
-F15 "DMX_TX_n" O R 9600 1700 50 
-F16 "DMX_RX_p" O R 9600 2700 50 
-F17 "DMX_RX_n" O R 9600 2600 50 
-$EndSheet
+	10000 1900 9600 1900
 Wire Wire Line
-	10000 1600 9600 1600
+	9600 2800 10100 2800
 Wire Wire Line
-	10000 1700 9600 1700
+	10400 2800 10550 2800
 Wire Wire Line
-	10000 1800 9600 1800
+	10550 2800 10550 2700
 Wire Wire Line
-	10000 2000 9600 2000
+	10550 2700 9600 2700
 Wire Wire Line
-	10000 1400 9600 1400
+	10000 800  9600 800 
 Wire Wire Line
-	10300 1400 10500 1400
+	10000 900  9600 900 
 Wire Wire Line
-	10500 1400 10500 1300
+	10000 1000 9600 1000
 Wire Wire Line
-	10500 1300 9600 1300
+	10000 1200 9600 1200
 Wire Wire Line
-	10000 1100 9600 1100
+	10050 1500 9600 1500
 Wire Wire Line
-	9600 1000 10500 1000
+	10350 1500 10500 1500
 Wire Wire Line
-	10500 1000 10500 1100
+	10500 1500 10500 1400
 Wire Wire Line
-	10500 1100 10300 1100
+	10500 1400 9600 1400
 $Comp
 L proz_util:LightLine L102
 U 1 1 610772AE
-P 10750 2300
-F 0 "L102" H 10613 2333 50  0000 R CNN
-F 1 "1271.1001" H 10700 2250 50  0000 R CNN
-F 2 "proz_unknown:1271.1001" H 10750 2300 50  0001 C CNN
-F 3 "" H 10750 2300 50  0001 C CNN
-	1    10750 2300
+P 10650 1450
+F 0 "L102" H 10513 1483 50  0000 R CNN
+F 1 "1271.1001" H 10600 1400 50  0000 R CNN
+F 2 "proz_unknown:1271.1001" H 10650 1450 50  0001 C CNN
+F 3 "" H 10650 1450 50  0001 C CNN
+	1    10650 1450
 	-1   0    0    -1  
 $EndComp
 $Comp
@@ -484,18 +393,12 @@ Entry Bus Bus
 	4000 700  4100 600 
 Entry Bus Bus
 	3500 700  3600 600 
-Entry Wire Line
-	8100 800  8200 900 
 Entry Wire Line
 	8100 700  8200 800 
 Wire Wire Line
 	8650 800  8200 800 
-Wire Wire Line
-	8650 900  8200 900 
 Text Label 8250 800  0    50   ~ 0
 DMX_TX
-Text Label 8250 900  0    50   ~ 0
-DMX_RX
 Entry Wire Line
 	4000 2950 4100 3050
 Entry Wire Line
@@ -532,8 +435,6 @@ Entry Wire Line
 	4000 4450 4100 4550
 Entry Wire Line
 	4000 4550 4100 4650
-Entry Wire Line
-	6800 3350 6900 3250
 Entry Wire Line
 	6800 3450 6900 3350
 Entry Wire Line
@@ -787,25 +688,25 @@ Wire Wire Line
 Wire Wire Line
 	8650 6150 8050 6150
 Text Label 8100 4000 0    50   ~ 0
-AMP_L_p
+AMP_L_P
 Text Label 8100 4100 0    50   ~ 0
-AMP_L_n
+AMP_L_N
 Text Label 8100 4200 0    50   ~ 0
-AMP_R_p
+AMP_R_P
 Text Label 8100 4300 0    50   ~ 0
-AMP_R_n
+AMP_R_N
 Text Label 8100 4500 0    50   ~ 0
 AMP_MUTE
 Text Label 8100 4600 0    50   ~ 0
 AMP_STANDBY
 Text Label 8100 5050 0    50   ~ 0
-AMP_L_p
+AMP_L_P
 Text Label 8100 5150 0    50   ~ 0
-AMP_L_n
+AMP_L_N
 Text Label 8100 6050 0    50   ~ 0
-AMP_R_p
+AMP_R_P
 Text Label 8100 6150 0    50   ~ 0
-AMP_R_n
+AMP_R_N
 Text Label 8100 5550 0    50   ~ 0
 AMP_MUTE
 Text Label 8100 5650 0    50   ~ 0
@@ -882,68 +783,6 @@ Text Label 3000 4900 0    50   ~ 0
 OUT_5
 Text Label 3000 5000 0    50   ~ 0
 OUT_6
-$Sheet
-S 1800 2550 1100 5100
-U 5FD4163D
-F0 "inputs_outputs" 50
-F1 "inputs_outputs.sch" 50
-F2 "SW_1_p" B L 1800 2700 50 
-F3 "SW_1_n" B L 1800 2800 50 
-F4 "SW_2_p" B L 1800 2900 50 
-F5 "SW_2_n" O L 1800 3000 50 
-F6 "SW_3_p" B L 1800 3100 50 
-F7 "SW_3_n" B L 1800 3200 50 
-F8 "SW_4_p" B L 1800 3300 50 
-F9 "SW_4_n" B L 1800 3400 50 
-F10 "SW_5_p" B L 1800 3500 50 
-F11 "SW_5_n" B L 1800 3600 50 
-F12 "SW_6_p" B L 1800 3700 50 
-F13 "SW_6_n" B L 1800 3800 50 
-F14 "LED_1" I R 2900 2700 50 
-F15 "LED_2" I R 2900 2900 50 
-F16 "LED_3" I R 2900 3100 50 
-F17 "LED_4" I R 2900 3300 50 
-F18 "LED_5" I R 2900 3500 50 
-F19 "LED_6" I R 2900 3700 50 
-F20 "SW_1" O R 2900 2800 50 
-F21 "SW_2" O R 2900 3000 50 
-F22 "SW_3" O R 2900 3200 50 
-F23 "SW_4" O R 2900 3400 50 
-F24 "SW_5" O R 2900 3600 50 
-F25 "SW_6" O R 2900 3800 50 
-F26 "OUT_1" O L 1800 4500 50 
-F27 "OUT_2" O L 1800 4600 50 
-F28 "OUT_3" O L 1800 4700 50 
-F29 "OUT_4" O L 1800 4800 50 
-F30 "OUT_1_in" I R 2900 4500 50 
-F31 "OUT_2_in" I R 2900 4600 50 
-F32 "OUT_3_in" I R 2900 4700 50 
-F33 "OUT_4_in" I R 2900 4800 50 
-F34 "OUT_5_in" I R 2900 4900 50 
-F35 "OUT_6_in" I R 2900 5000 50 
-F36 "OUT_6" O L 1800 5000 50 
-F37 "OUT_5" O L 1800 4900 50 
-F38 "OUT_7_in" I R 2900 5100 50 
-F39 "OUT_8_in" I R 2900 5200 50 
-F40 "OUT_8" O L 1800 5200 50 
-F41 "OUT_7" O L 1800 5100 50 
-F42 "OUT_LED_8_p" O L 1800 7500 50 
-F43 "OUT_LED_8_n" O L 1800 7600 50 
-F44 "OUT_LED_7_p" O L 1800 7200 50 
-F45 "OUT_LED_7_n" O L 1800 7300 50 
-F46 "OUT_LED_6_p" O L 1800 6900 50 
-F47 "OUT_LED_6_n" O L 1800 7000 50 
-F48 "OUT_LED_5_n" O L 1800 6700 50 
-F49 "OUT_LED_5_p" O L 1800 6600 50 
-F50 "OUT_LED_4_p" O L 1800 6300 50 
-F51 "OUT_LED_3_p" O L 1800 6000 50 
-F52 "OUT_LED_3_n" O L 1800 6100 50 
-F53 "OUT_LED_2_p" O L 1800 5700 50 
-F54 "OUT_LED_2_n" O L 1800 5800 50 
-F55 "OUT_LED_1_n" O L 1800 5500 50 
-F56 "OUT_LED_1_p" O L 1800 5400 50 
-F57 "OUT_LED_4_n" O L 1800 6400 50 
-$EndSheet
 Wire Wire Line
 	1800 4800 1300 4800
 Wire Wire Line
@@ -1147,12 +986,12 @@ $EndComp
 $Comp
 L power:+3V3 #PWR0102
 U 1 1 611A23C0
-P 5400 950
-F 0 "#PWR0102" H 5400 800 50  0001 C CNN
-F 1 "+3V3" H 5415 1123 50  0000 C CNN
-F 2 "" H 5400 950 50  0001 C CNN
-F 3 "" H 5400 950 50  0001 C CNN
-	1    5400 950 
+P 5400 900
+F 0 "#PWR0102" H 5400 750 50  0001 C CNN
+F 1 "+3V3" H 5415 1073 50  0000 C CNN
+F 2 "" H 5400 900 50  0001 C CNN
+F 3 "" H 5400 900 50  0001 C CNN
+	1    5400 900 
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1208,14 +1047,14 @@ F 3 "~" H 6150 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6050 1100 6050 1000
+	6050 1100 6050 950 
 Wire Wire Line
-	6050 1000 5950 1000
+	6050 950  5950 950 
 Wire Wire Line
-	6150 1100 6150 1000
+	6150 1100 6150 950 
 Wire Wire Line
-	6150 1000 6050 1000
-Connection ~ 6050 1000
+	6150 950  6050 950 
+Connection ~ 6050 950 
 Wire Wire Line
 	5950 1400 5950 1450
 Wire Wire Line
@@ -1325,38 +1164,38 @@ Wire Wire Line
 $Comp
 L power:+3V3 #PWR0101
 U 1 1 6137AF4C
-P 4550 950
-F 0 "#PWR0101" H 4550 800 50  0001 C CNN
-F 1 "+3V3" H 4565 1123 50  0000 C CNN
-F 2 "" H 4550 950 50  0001 C CNN
-F 3 "" H 4550 950 50  0001 C CNN
-	1    4550 950 
+P 4550 900
+F 0 "#PWR0101" H 4550 750 50  0001 C CNN
+F 1 "+3V3" H 4565 1073 50  0000 C CNN
+F 2 "" H 4550 900 50  0001 C CNN
+F 3 "" H 4550 900 50  0001 C CNN
+	1    4550 900 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4550 950  4550 1400
+	4550 900  4550 1400
 Wire Wire Line
-	5400 950  5400 1250
+	5400 900  5400 1250
 Wire Wire Line
-	5950 1000 5950 1100
+	5950 950  5950 1100
 $Comp
 L power:+3V3 #PWR0103
 U 1 1 6138F3FC
-P 6050 950
-F 0 "#PWR0103" H 6050 800 50  0001 C CNN
-F 1 "+3V3" H 6065 1123 50  0000 C CNN
-F 2 "" H 6050 950 50  0001 C CNN
-F 3 "" H 6050 950 50  0001 C CNN
-	1    6050 950 
+P 6050 900
+F 0 "#PWR0103" H 6050 750 50  0001 C CNN
+F 1 "+3V3" H 6065 1073 50  0000 C CNN
+F 2 "" H 6050 900 50  0001 C CNN
+F 3 "" H 6050 900 50  0001 C CNN
+	1    6050 900 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6050 950  6050 1000
+	6050 900  6050 950 
 $Comp
 L Device:LED D104
 U 1 1 602186B8
 P 1400 5500
-F 0 "D104" H 1600 5550 50  0000 C CNN
+F 0 "D104" H 1550 5550 50  0000 C CNN
 F 1 "LED_BL" H 1200 5550 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 5500 50  0001 C CNN
 F 3 "~" H 1400 5500 50  0001 C CNN
@@ -1375,7 +1214,7 @@ $Comp
 L Device:LED D106
 U 1 1 602D1610
 P 1400 5800
-F 0 "D106" H 1600 5850 50  0000 C CNN
+F 0 "D106" H 1550 5850 50  0000 C CNN
 F 1 "LED_BL" H 1200 5850 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 5800 50  0001 C CNN
 F 3 "~" H 1400 5800 50  0001 C CNN
@@ -1394,7 +1233,7 @@ $Comp
 L Device:LED D107
 U 1 1 602E443A
 P 1400 6100
-F 0 "D107" H 1600 6150 50  0000 C CNN
+F 0 "D107" H 1550 6150 50  0000 C CNN
 F 1 "LED_BL" H 1200 6150 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 6100 50  0001 C CNN
 F 3 "~" H 1400 6100 50  0001 C CNN
@@ -1413,7 +1252,7 @@ $Comp
 L Device:LED D108
 U 1 1 602F8AFF
 P 1400 6400
-F 0 "D108" H 1600 6450 50  0000 C CNN
+F 0 "D108" H 1550 6450 50  0000 C CNN
 F 1 "LED_BL" H 1200 6450 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 6400 50  0001 C CNN
 F 3 "~" H 1400 6400 50  0001 C CNN
@@ -1432,7 +1271,7 @@ $Comp
 L Device:LED D109
 U 1 1 603235E6
 P 1400 6700
-F 0 "D109" H 1600 6750 50  0000 C CNN
+F 0 "D109" H 1550 6750 50  0000 C CNN
 F 1 "LED_BL" H 1200 6750 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 6700 50  0001 C CNN
 F 3 "~" H 1400 6700 50  0001 C CNN
@@ -1451,7 +1290,7 @@ $Comp
 L Device:LED D110
 U 1 1 60339141
 P 1400 7000
-F 0 "D110" H 1600 7050 50  0000 C CNN
+F 0 "D110" H 1550 7050 50  0000 C CNN
 F 1 "LED_BL" H 1200 7050 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 7000 50  0001 C CNN
 F 3 "~" H 1400 7000 50  0001 C CNN
@@ -1470,7 +1309,7 @@ $Comp
 L Device:LED D111
 U 1 1 60350557
 P 1400 7300
-F 0 "D111" H 1600 7350 50  0000 C CNN
+F 0 "D111" H 1550 7350 50  0000 C CNN
 F 1 "LED_BL" H 1200 7350 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 7300 50  0001 C CNN
 F 3 "~" H 1400 7300 50  0001 C CNN
@@ -1489,7 +1328,7 @@ $Comp
 L Device:LED D112
 U 1 1 603679EA
 P 1400 7600
-F 0 "D112" H 1600 7650 50  0000 C CNN
+F 0 "D112" H 1550 7650 50  0000 C CNN
 F 1 "LED_BL" H 1200 7650 50  0000 C CNN
 F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 1400 7600 50  0001 C CNN
 F 3 "~" H 1400 7600 50  0001 C CNN
@@ -1518,12 +1357,12 @@ $EndComp
 $Comp
 L proz_util:LightLine_x2 L101
 U 1 1 603EC6C4
-P 10850 1350
-F 0 "L101" H 10863 1533 50  0000 R CNN
-F 1 "1271.1002" H 10950 1400 50  0000 R CNN
-F 2 "proz_unknown:1271.1002" H 11040 1620 50  0001 C CNN
-F 3 "" H 11040 1620 50  0001 C CNN
-	1    10850 1350
+P 10850 2750
+F 0 "L101" H 10863 2933 50  0000 R CNN
+F 1 "1271.1002" H 10950 2800 50  0000 R CNN
+F 2 "proz_unknown:1271.1002" H 11040 3020 50  0001 C CNN
+F 3 "" H 11040 3020 50  0001 C CNN
+	1    10850 2750
 	-1   0    0    -1  
 $EndComp
 Text Label 6300 3350 0    50   ~ 0
@@ -1532,6 +1371,264 @@ Text Label 6300 3450 0    50   ~ 0
 I2C_SCL
 Wire Wire Line
 	6200 3350 6800 3350
+$Sheet
+S 8650 700  950  2300
+U 5FE81B92
+F0 "dmxOutput" 50
+F1 "dmxOutput.sch" 50
+F2 "DMX_TX" I L 8650 800 50 
+F3 "DMX_RX" O L 8650 900 50 
+F4 "DMX_TX_GND" O R 9600 800 50 
+F5 "DMX_TX_SHIELD" O R 9600 1200 50 
+F6 "DMX_RX_GND" O R 9600 1800 50 
+F7 "DMX_RX_SHIELD" O R 9600 2200 50 
+F8 "DMX_RE" I L 8650 1200 50 
+F9 "DMX_TX_P" O R 9600 1000 50 
+F10 "DMX_TX_N" O R 9600 900 50 
+F11 "DMX_TX_LED_P" O R 9600 1400 50 
+F12 "DMX_TX_LED_N" O R 9600 1500 50 
+F13 "DMX_RX_P" O R 9600 2000 50 
+F14 "DMX_RX_N" O R 9600 1900 50 
+F15 "DMX_RX_LED_N" O R 9600 2500 50 
+F16 "DMX_PWR_LED_P" O R 9600 2400 50 
+F17 "DMX_PWR_LED_N" O R 9600 2800 50 
+F18 "DMX_RX_LED_P" O R 9600 2700 50 
+$EndSheet
+Text Label 8250 900  0    50   ~ 0
+DMX_RX
+Wire Wire Line
+	8650 900  8200 900 
+Entry Wire Line
+	8100 800  8200 900 
+Entry Wire Line
+	8100 1100 8200 1200
+Wire Wire Line
+	8200 1200 8650 1200
+Text Label 8250 1200 0    50   ~ 0
+DMX_RE
+Text Label 4150 3850 0    50   ~ 0
+DMX_RE
+$Comp
+L Mechanical:MountingHole H101
+U 1 1 60139E3E
+P 6200 6150
+F 0 "H101" H 6300 6196 50  0000 L CNN
+F 1 "MountingHole" H 6300 6105 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 6150 50  0001 C CNN
+F 3 "~" H 6200 6150 50  0001 C CNN
+	1    6200 6150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H102
+U 1 1 60143C54
+P 6200 6350
+F 0 "H102" H 6300 6396 50  0000 L CNN
+F 1 "MountingHole" H 6300 6305 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 6350 50  0001 C CNN
+F 3 "~" H 6200 6350 50  0001 C CNN
+	1    6200 6350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H103
+U 1 1 60144143
+P 6200 6550
+F 0 "H103" H 6300 6596 50  0000 L CNN
+F 1 "MountingHole" H 6300 6505 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 6550 50  0001 C CNN
+F 3 "~" H 6200 6550 50  0001 C CNN
+	1    6200 6550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H104
+U 1 1 60144488
+P 6200 6750
+F 0 "H104" H 6300 6796 50  0000 L CNN
+F 1 "MountingHole" H 6300 6705 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 6750 50  0001 C CNN
+F 3 "~" H 6200 6750 50  0001 C CNN
+	1    6200 6750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H105
+U 1 1 6014488B
+P 6200 6950
+F 0 "H105" H 6300 6996 50  0000 L CNN
+F 1 "MountingHole" H 6300 6905 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 6950 50  0001 C CNN
+F 3 "~" H 6200 6950 50  0001 C CNN
+	1    6200 6950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H106
+U 1 1 60144D69
+P 6200 7150
+F 0 "H106" H 6300 7196 50  0000 L CNN
+F 1 "MountingHole" H 6300 7105 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 7150 50  0001 C CNN
+F 3 "~" H 6200 7150 50  0001 C CNN
+	1    6200 7150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10550 2500 10400 2500
+Wire Wire Line
+	10550 2400 10550 2500
+Wire Wire Line
+	9600 2400 10550 2400
+$Comp
+L Device:LED D101
+U 1 1 6101796B
+P 10250 2800
+F 0 "D101" H 10400 2850 50  0000 C CNN
+F 1 "LED_DMX_PWR" H 9900 2850 50  0000 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10250 2800 50  0001 C CNN
+F 3 "~" H 10250 2800 50  0001 C CNN
+	1    10250 2800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10100 2500 9600 2500
+$Comp
+L Device:LED D103
+U 1 1 61021C09
+P 10250 2500
+F 0 "D103" H 10400 2550 50  0000 C CNN
+F 1 "LED_DMX_RX" H 9950 2550 50  0000 C CNN
+F 2 "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 10250 2500 50  0001 C CNN
+F 3 "~" H 10250 2500 50  0001 C CNN
+	1    10250 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H107
+U 1 1 603FC313
+P 6200 7350
+F 0 "H107" H 6300 7396 50  0000 L CNN
+F 1 "MountingHole" H 6300 7305 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 7350 50  0001 C CNN
+F 3 "~" H 6200 7350 50  0001 C CNN
+	1    6200 7350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mechanical:MountingHole H108
+U 1 1 603FC795
+P 6200 7550
+F 0 "H108" H 6300 7596 50  0000 L CNN
+F 1 "MountingHole" H 6300 7505 50  0000 L CNN
+F 2 "proz_unknown:MountingHole_3.2mm_M3_Pad_Via" H 6200 7550 50  0001 C CNN
+F 3 "~" H 6200 7550 50  0001 C CNN
+	1    6200 7550
+	1    0    0    -1  
+$EndComp
+$Sheet
+S 8650 4900 950  1400
+U 5FD12D22
+F0 "powerAmplifier" 50
+F1 "powerAmplifier.sch" 50
+F2 "MUTE" I L 8650 5550 50 
+F3 "STANDBY" I L 8650 5650 50 
+F4 "IN_L_P" I L 8650 5050 50 
+F5 "IN_L_N" I L 8650 5150 50 
+F6 "OUT_L_P" O R 9600 5050 50 
+F7 "OUT_R_P" O R 9600 6050 50 
+F8 "OUT_R_N" O R 9600 6150 50 
+F9 "LED_ERR_P" O R 9600 5550 50 
+F10 "LED_ERR_N" O R 9600 5650 50 
+F11 "IN_R_P" I L 8650 6050 50 
+F12 "IN_R_N" I L 8650 6150 50 
+F13 "OUT_L_N" O R 9600 5150 50 
+$EndSheet
+$Sheet
+S 8650 3200 950  1500
+U 60C40BC8
+F0 "audio" 50
+F1 "audio.sch" 50
+F2 "I2S_DATA" I L 8650 3300 50 
+F3 "I2S_LRCK" I L 8650 3400 50 
+F4 "I2S_BCK" I L 8650 3500 50 
+F5 "I2C_SCL" I L 8650 3700 50 
+F6 "I2C_SDA" B L 8650 3800 50 
+F7 "AMP_MUTE" O L 8650 4500 50 
+F8 "AMP_STANDBY" O L 8650 4600 50 
+F9 "OUT_L_P" O R 9600 3500 50 
+F10 "OUT_L_N" O R 9600 3600 50 
+F11 "OUT_R_P" O R 9600 4100 50 
+F12 "OUT_R_N" O R 9600 4200 50 
+F13 "AMP_L_P" O L 8650 4000 50 
+F14 "AMP_L_N" O L 8650 4100 50 
+F15 "AMP_R_P" O L 8650 4200 50 
+F16 "AMP_R_N" O L 8650 4300 50 
+$EndSheet
+$Sheet
+S 1800 2550 1100 5100
+U 5FD4163D
+F0 "inputs_outputs" 50
+F1 "inputs_outputs.sch" 50
+F2 "LED_1" I R 2900 2700 50 
+F3 "LED_2" I R 2900 2900 50 
+F4 "LED_3" I R 2900 3100 50 
+F5 "LED_4" I R 2900 3300 50 
+F6 "LED_5" I R 2900 3500 50 
+F7 "LED_6" I R 2900 3700 50 
+F8 "SW_1" O R 2900 2800 50 
+F9 "SW_2" O R 2900 3000 50 
+F10 "SW_3" O R 2900 3200 50 
+F11 "SW_4" O R 2900 3400 50 
+F12 "SW_5" O R 2900 3600 50 
+F13 "SW_6" O R 2900 3800 50 
+F14 "OUT_1" O L 1800 4500 50 
+F15 "OUT_2" O L 1800 4600 50 
+F16 "OUT_3" O L 1800 4700 50 
+F17 "OUT_4" O L 1800 4800 50 
+F18 "OUT_6" O L 1800 5000 50 
+F19 "OUT_5" O L 1800 4900 50 
+F20 "OUT_8" O L 1800 5200 50 
+F21 "OUT_7" O L 1800 5100 50 
+F22 "SW_1_P" B L 1800 2700 50 
+F23 "SW_1_N" B L 1800 2800 50 
+F24 "SW_2_P" B L 1800 2900 50 
+F25 "SW_2_N" B L 1800 3000 50 
+F26 "SW_3_P" B L 1800 3100 50 
+F27 "SW_3_N" B L 1800 3200 50 
+F28 "SW_4_P" B L 1800 3300 50 
+F29 "SW_4_N" B L 1800 3400 50 
+F30 "SW_5_P" B L 1800 3500 50 
+F31 "SW_5_N" B L 1800 3600 50 
+F32 "SW_6_P" B L 1800 3700 50 
+F33 "SW_6_N" B L 1800 3800 50 
+F34 "OUT_1_IN" I R 2900 4500 50 
+F35 "OUT_2_IN" I R 2900 4600 50 
+F36 "OUT_3_IN" I R 2900 4700 50 
+F37 "OUT_4_IN" I R 2900 4800 50 
+F38 "OUT_5_IN" I R 2900 4900 50 
+F39 "OUT_6_IN" I R 2900 5000 50 
+F40 "OUT_7_IN" I R 2900 5100 50 
+F41 "OUT_8_IN" I R 2900 5200 50 
+F42 "OUT_LED_8_P" O L 1800 7500 50 
+F43 "OUT_LED_8_N" O L 1800 7600 50 
+F44 "OUT_LED_7_P" O L 1800 7200 50 
+F45 "OUT_LED_7_N" O L 1800 7300 50 
+F46 "OUT_LED_6_P" O L 1800 6900 50 
+F47 "OUT_LED_6_N" O L 1800 7000 50 
+F48 "OUT_LED_5_N" O L 1800 6700 50 
+F49 "OUT_LED_5_P" O L 1800 6600 50 
+F50 "OUT_LED_4_P" O L 1800 6300 50 
+F51 "OUT_LED_3_P" O L 1800 6000 50 
+F52 "OUT_LED_3_N" O L 1800 6100 50 
+F53 "OUT_LED_2_P" O L 1800 5700 50 
+F54 "OUT_LED_2_N" O L 1800 5800 50 
+F55 "OUT_LED_1_N" O L 1800 5500 50 
+F56 "OUT_LED_1_P" O L 1800 5400 50 
+F57 "OUT_LED_4_N" O L 1800 6400 50 
+$EndSheet
+Entry Wire Line
+	6800 3350 6900 3250
 Wire Bus Line
 	3600 600  8000 600 
 Wire Bus Line

File diff suppressed because it is too large
+ 71086 - 1
pcb/eventTechBerry/fp-info-cache


+ 270 - 270
pcb/eventTechBerry/inputs_outputs.sch

@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 6 8
+Sheet 3 8
 Title "GPIOs"
 Date "2020-12-13"
 Rev "1.0"
@@ -20,59 +20,41 @@ F0 "buttonInputs1" 50
 F1 "buttonInputs1.sch" 50
 F2 "SW_1" O R 2050 1200 50 
 F3 "LED_1" I R 2050 1100 50 
-F4 "SW_1_n" O L 1200 1200 50 
-F5 "SW_1_p" O L 1200 1100 50 
-F6 "SW_3" O R 2050 1800 50 
-F7 "LED_3" I R 2050 1700 50 
-F8 "SW_3_n" O L 1200 1800 50 
-F9 "SW_3_p" O L 1200 1700 50 
-F10 "SW_2" O R 2050 1500 50 
-F11 "LED_2" I R 2050 1400 50 
-F12 "SW_2_n" O L 1200 1500 50 
-F13 "SW_2_p" O L 1200 1400 50 
-$EndSheet
-$Sheet
-S 1200 2250 850  1000
-U 60496EC1
-F0 "buttonInputs2" 50
-F1 "buttonInputs2.sch" 50
-F2 "SW_4" O R 2050 2500 50 
-F3 "LED_4" I R 2050 2400 50 
-F4 "SW_4_n" O L 1200 2500 50 
-F5 "SW_4_p" O L 1200 2400 50 
-F6 "SW_6" O R 2050 3100 50 
-F7 "LED_6" I R 2050 3000 50 
-F8 "SW_6_p" O L 1200 3000 50 
-F9 "SW_5" O R 2050 2800 50 
-F10 "LED_5" I R 2050 2700 50 
-F11 "SW_5_n" O L 1200 2800 50 
-F12 "SW_5_p" O L 1200 2700 50 
-F13 "SW_6_n" O L 1200 3100 50 
+F4 "SW_3" O R 2050 1800 50 
+F5 "LED_3" I R 2050 1700 50 
+F6 "SW_2" O R 2050 1500 50 
+F7 "LED_2" I R 2050 1400 50 
+F8 "SW_1_N" B L 1200 1200 50 
+F9 "SW_1_P" B L 1200 1100 50 
+F10 "SW_3_N" B L 1200 1800 50 
+F11 "SW_3_P" B L 1200 1700 50 
+F12 "SW_2_N" B L 1200 1500 50 
+F13 "SW_2_P" B L 1200 1400 50 
 $EndSheet
 Text HLabel 900  1100 0    50   BiDi ~ 0
-SW_1_p
+SW_1_P
 Text HLabel 900  1200 0    50   BiDi ~ 0
-SW_1_n
+SW_1_N
 Text HLabel 900  1400 0    50   BiDi ~ 0
-SW_2_p
-Text HLabel 900  1500 0    50   Output ~ 0
-SW_2_n
+SW_2_P
+Text HLabel 900  1500 0    50   BiDi ~ 0
+SW_2_N
 Text HLabel 900  1700 0    50   BiDi ~ 0
-SW_3_p
+SW_3_P
 Text HLabel 900  1800 0    50   BiDi ~ 0
-SW_3_n
+SW_3_N
 Text HLabel 900  2400 0    50   BiDi ~ 0
-SW_4_p
+SW_4_P
 Text HLabel 900  2500 0    50   BiDi ~ 0
-SW_4_n
+SW_4_N
 Text HLabel 900  2700 0    50   BiDi ~ 0
-SW_5_p
+SW_5_P
 Text HLabel 900  2800 0    50   BiDi ~ 0
-SW_5_n
+SW_5_N
 Text HLabel 900  3000 0    50   BiDi ~ 0
-SW_6_p
+SW_6_P
 Text HLabel 900  3100 0    50   BiDi ~ 0
-SW_6_n
+SW_6_N
 Wire Wire Line
 	900  1100 1200 1100
 Wire Wire Line
@@ -146,10 +128,10 @@ Wire Wire Line
 Wire Wire Line
 	2050 1800 2350 1800
 $Comp
-L Transistor_Array:ULN2803A U601
+L Transistor_Array:ULN2803A U501
 U 1 1 608F1F1C
 P 8550 1500
-F 0 "U601" H 8550 2067 50  0000 C CNN
+F 0 "U501" H 8550 2067 50  0000 C CNN
 F 1 "ULN2803A" H 8550 1976 50  0000 C CNN
 F 2 "Package_SO:SOIC-18W_7.5x11.6mm_P1.27mm" H 8600 850 50  0001 L CNN
 F 3 "http://www.ti.com/lit/ds/symlink/uln2803a.pdf" H 8650 1300 50  0001 C CNN
@@ -191,10 +173,10 @@ Wire Wire Line
 Wire Wire Line
 	9050 1350 9800 1350
 $Comp
-L power:+12V #PWR0601
+L power:+12V #PWR0501
 U 1 1 6090395E
 P 9050 1000
-F 0 "#PWR0601" H 9050 850 50  0001 C CNN
+F 0 "#PWR0501" H 9050 850 50  0001 C CNN
 F 1 "+12V" H 9065 1173 50  0000 C CNN
 F 2 "" H 9050 1000 50  0001 C CNN
 F 3 "" H 9050 1000 50  0001 C CNN
@@ -230,10 +212,10 @@ Wire Wire Line
 Wire Wire Line
 	8050 1900 8150 1900
 $Comp
-L power:GND #PWR0605
+L power:GND #PWR0505
 U 1 1 6090932A
 P 8550 2500
-F 0 "#PWR0605" H 8550 2250 50  0001 C CNN
+F 0 "#PWR0505" H 8550 2250 50  0001 C CNN
 F 1 "GND" H 8555 2327 50  0000 C CNN
 F 2 "" H 8550 2500 50  0001 C CNN
 F 3 "" H 8550 2500 50  0001 C CNN
@@ -243,21 +225,21 @@ $EndComp
 Wire Wire Line
 	8550 2500 8550 2200
 Text HLabel 7250 1950 0    50   Input ~ 0
-OUT_1_in
+OUT_1_IN
 Text HLabel 7250 1750 0    50   Input ~ 0
-OUT_2_in
+OUT_2_IN
 Text HLabel 7250 1550 0    50   Input ~ 0
-OUT_3_in
+OUT_3_IN
 Text HLabel 7250 1350 0    50   Input ~ 0
-OUT_4_in
+OUT_4_IN
 $Comp
 L Device:C C?
 U 1 1 610893D5
 P 6550 2200
 AR Path="/610893D5" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/610893D5" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/610893D5" Ref="C604"  Part="1" 
-F 0 "C604" H 6665 2246 50  0000 L CNN
+AR Path="/5FD4163D/610893D5" Ref="C504"  Part="1" 
+F 0 "C504" H 6665 2246 50  0000 L CNN
 F 1 "22u" H 6665 2155 50  0000 L CNN
 F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 6588 2050 50  0001 C CNN
 F 3 "~" H 6550 2200 50  0001 C CNN
@@ -270,8 +252,8 @@ U 1 1 610893E2
 P 6150 2200
 AR Path="/610893E2" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/610893E2" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/610893E2" Ref="C603"  Part="1" 
-F 0 "C603" H 6265 2246 50  0000 L CNN
+AR Path="/5FD4163D/610893E2" Ref="C503"  Part="1" 
+F 0 "C503" H 6265 2246 50  0000 L CNN
 F 1 "100n" H 6265 2155 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 2050 50  0001 C CNN
 F 3 "~" H 6150 2200 50  0001 C CNN
@@ -279,10 +261,10 @@ F 3 "~" H 6150 2200 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:+12V #PWR0604
+L power:+12V #PWR0504
 U 1 1 6108C980
 P 6350 1850
-F 0 "#PWR0604" H 6350 1700 50  0001 C CNN
+F 0 "#PWR0504" H 6350 1700 50  0001 C CNN
 F 1 "+12V" H 6365 2023 50  0000 C CNN
 F 2 "" H 6350 1850 50  0001 C CNN
 F 3 "" H 6350 1850 50  0001 C CNN
@@ -301,10 +283,10 @@ Wire Wire Line
 	6150 1950 6150 2050
 Connection ~ 6350 1950
 $Comp
-L power:GND #PWR0607
+L power:GND #PWR0507
 U 1 1 61094792
 P 6350 2550
-F 0 "#PWR0607" H 6350 2300 50  0001 C CNN
+F 0 "#PWR0507" H 6350 2300 50  0001 C CNN
 F 1 "GND" H 6355 2377 50  0000 C CNN
 F 2 "" H 6350 2550 50  0001 C CNN
 F 3 "" H 6350 2550 50  0001 C CNN
@@ -328,8 +310,8 @@ U 1 1 610A4E2F
 P 5650 2200
 AR Path="/610A4E2F" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/610A4E2F" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/610A4E2F" Ref="C602"  Part="1" 
-F 0 "C602" H 5765 2246 50  0000 L CNN
+AR Path="/5FD4163D/610A4E2F" Ref="C502"  Part="1" 
+F 0 "C502" H 5765 2246 50  0000 L CNN
 F 1 "22u" H 5765 2155 50  0000 L CNN
 F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 5688 2050 50  0001 C CNN
 F 3 "~" H 5650 2200 50  0001 C CNN
@@ -348,10 +330,10 @@ Wire Wire Line
 	5250 1950 5250 2050
 Connection ~ 5450 1950
 $Comp
-L power:GND #PWR0606
+L power:GND #PWR0506
 U 1 1 610A4E47
 P 5450 2550
-F 0 "#PWR0606" H 5450 2300 50  0001 C CNN
+F 0 "#PWR0506" H 5450 2300 50  0001 C CNN
 F 1 "GND" H 5455 2377 50  0000 C CNN
 F 2 "" H 5450 2550 50  0001 C CNN
 F 3 "" H 5450 2550 50  0001 C CNN
@@ -370,10 +352,10 @@ Wire Wire Line
 	5250 2450 5250 2350
 Connection ~ 5450 2450
 $Comp
-L power:+5V #PWR0603
+L power:+5V #PWR0503
 U 1 1 610A8B2A
 P 5450 1850
-F 0 "#PWR0603" H 5450 1700 50  0001 C CNN
+F 0 "#PWR0503" H 5450 1700 50  0001 C CNN
 F 1 "+5V" H 5465 2023 50  0000 C CNN
 F 2 "" H 5450 1850 50  0001 C CNN
 F 3 "" H 5450 1850 50  0001 C CNN
@@ -381,12 +363,12 @@ F 3 "" H 5450 1850 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C C601
+L Device:C C501
 U 1 1 610BACF6
 P 5250 2200
-AR Path="/5FD4163D/610BACF6" Ref="C601"  Part="1" 
+AR Path="/5FD4163D/610BACF6" Ref="C501"  Part="1" 
 AR Path="/5FD4163D/60496EC1/610BACF6" Ref="C?"  Part="1" 
-F 0 "C601" H 5365 2246 50  0000 L CNN
+F 0 "C501" H 5365 2246 50  0000 L CNN
 F 1 "100n" H 5365 2155 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5288 2050 50  0001 C CNN
 F 3 "~" H 5250 2200 50  0001 C CNN
@@ -394,10 +376,10 @@ F 3 "~" H 5250 2200 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Transistor_Array:ULN2803A U602
+L Transistor_Array:ULN2803A U502
 U 1 1 60AE3D85
 P 8550 4300
-F 0 "U602" H 8550 4867 50  0000 C CNN
+F 0 "U502" H 8550 4867 50  0000 C CNN
 F 1 "ULN2803A" H 8550 4776 50  0000 C CNN
 F 2 "Package_SO:SOIC-18W_7.5x11.6mm_P1.27mm" H 8600 3650 50  0001 L CNN
 F 3 "http://www.ti.com/lit/ds/symlink/uln2803a.pdf" H 8650 4100 50  0001 C CNN
@@ -431,10 +413,10 @@ Wire Wire Line
 Wire Wire Line
 	9050 4100 9050 4150
 $Comp
-L power:+12V #PWR0608
+L power:+12V #PWR0508
 U 1 1 60AE3DA3
 P 9050 3800
-F 0 "#PWR0608" H 9050 3650 50  0001 C CNN
+F 0 "#PWR0508" H 9050 3650 50  0001 C CNN
 F 1 "+12V" H 9065 3973 50  0000 C CNN
 F 2 "" H 9050 3800 50  0001 C CNN
 F 3 "" H 9050 3800 50  0001 C CNN
@@ -470,10 +452,10 @@ Wire Wire Line
 Wire Wire Line
 	8050 4700 8150 4700
 $Comp
-L power:GND #PWR0614
+L power:GND #PWR0514
 U 1 1 60AE3DB7
 P 8550 5300
-F 0 "#PWR0614" H 8550 5050 50  0001 C CNN
+F 0 "#PWR0514" H 8550 5050 50  0001 C CNN
 F 1 "GND" H 8555 5127 50  0000 C CNN
 F 2 "" H 8550 5300 50  0001 C CNN
 F 3 "" H 8550 5300 50  0001 C CNN
@@ -483,152 +465,9 @@ $EndComp
 Wire Wire Line
 	8550 5300 8550 5000
 Text HLabel 7250 4750 0    50   Input ~ 0
-OUT_5_in
+OUT_5_IN
 Text HLabel 7250 4550 0    50   Input ~ 0
-OUT_6_in
-$Comp
-L Device:C C?
-U 1 1 60AE3E00
-P 6550 4950
-AR Path="/60AE3E00" Ref="C?"  Part="1" 
-AR Path="/60FF07AF/60AE3E00" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/60AE3E00" Ref="C608"  Part="1" 
-F 0 "C608" H 6665 4996 50  0000 L CNN
-F 1 "22u" H 6665 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 6588 4800 50  0001 C CNN
-F 3 "~" H 6550 4950 50  0001 C CNN
-	1    6550 4950
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C C?
-U 1 1 60AE3E06
-P 6150 4950
-AR Path="/60AE3E06" Ref="C?"  Part="1" 
-AR Path="/60FF07AF/60AE3E06" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/60AE3E06" Ref="C607"  Part="1" 
-F 0 "C607" H 6265 4996 50  0000 L CNN
-F 1 "100n" H 6265 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 4800 50  0001 C CNN
-F 3 "~" H 6150 4950 50  0001 C CNN
-	1    6150 4950
-	-1   0    0    -1  
-$EndComp
-$Comp
-L power:+12V #PWR0611
-U 1 1 60AE3E0C
-P 6350 4600
-F 0 "#PWR0611" H 6350 4450 50  0001 C CNN
-F 1 "+12V" H 6365 4773 50  0000 C CNN
-F 2 "" H 6350 4600 50  0001 C CNN
-F 3 "" H 6350 4600 50  0001 C CNN
-	1    6350 4600
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	6350 4600 6350 4700
-Wire Wire Line
-	6350 4700 6550 4700
-Wire Wire Line
-	6550 4700 6550 4800
-Wire Wire Line
-	6350 4700 6150 4700
-Wire Wire Line
-	6150 4700 6150 4800
-Connection ~ 6350 4700
-$Comp
-L power:GND #PWR0613
-U 1 1 60AE3E18
-P 6350 5300
-F 0 "#PWR0613" H 6350 5050 50  0001 C CNN
-F 1 "GND" H 6355 5127 50  0000 C CNN
-F 2 "" H 6350 5300 50  0001 C CNN
-F 3 "" H 6350 5300 50  0001 C CNN
-	1    6350 5300
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	6550 5100 6550 5200
-Wire Wire Line
-	6550 5200 6350 5200
-Wire Wire Line
-	6350 5200 6350 5300
-Wire Wire Line
-	6350 5200 6150 5200
-Wire Wire Line
-	6150 5200 6150 5100
-Connection ~ 6350 5200
-$Comp
-L Device:C C?
-U 1 1 60AE3E24
-P 5650 4950
-AR Path="/60AE3E24" Ref="C?"  Part="1" 
-AR Path="/60FF07AF/60AE3E24" Ref="C?"  Part="1" 
-AR Path="/5FD4163D/60AE3E24" Ref="C606"  Part="1" 
-F 0 "C606" H 5765 4996 50  0000 L CNN
-F 1 "22u" H 5765 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 5688 4800 50  0001 C CNN
-F 3 "~" H 5650 4950 50  0001 C CNN
-	1    5650 4950
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	5450 4600 5450 4700
-Wire Wire Line
-	5450 4700 5650 4700
-Wire Wire Line
-	5650 4700 5650 4800
-Wire Wire Line
-	5450 4700 5250 4700
-Wire Wire Line
-	5250 4700 5250 4800
-Connection ~ 5450 4700
-$Comp
-L power:GND #PWR0612
-U 1 1 60AE3E30
-P 5450 5300
-F 0 "#PWR0612" H 5450 5050 50  0001 C CNN
-F 1 "GND" H 5455 5127 50  0000 C CNN
-F 2 "" H 5450 5300 50  0001 C CNN
-F 3 "" H 5450 5300 50  0001 C CNN
-	1    5450 5300
-	-1   0    0    -1  
-$EndComp
-Wire Wire Line
-	5650 5100 5650 5200
-Wire Wire Line
-	5650 5200 5450 5200
-Wire Wire Line
-	5450 5200 5450 5300
-Wire Wire Line
-	5450 5200 5250 5200
-Wire Wire Line
-	5250 5200 5250 5100
-Connection ~ 5450 5200
-$Comp
-L power:+5V #PWR0610
-U 1 1 60AE3E3C
-P 5450 4600
-F 0 "#PWR0610" H 5450 4450 50  0001 C CNN
-F 1 "+5V" H 5465 4773 50  0000 C CNN
-F 2 "" H 5450 4600 50  0001 C CNN
-F 3 "" H 5450 4600 50  0001 C CNN
-	1    5450 4600
-	-1   0    0    -1  
-$EndComp
-$Comp
-L Device:C C605
-U 1 1 60AE3E42
-P 5250 4950
-AR Path="/5FD4163D/60AE3E42" Ref="C605"  Part="1" 
-AR Path="/5FD4163D/60496EC1/60AE3E42" Ref="C?"  Part="1" 
-F 0 "C605" H 5365 4996 50  0000 L CNN
-F 1 "100n" H 5365 4905 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5288 4800 50  0001 C CNN
-F 3 "~" H 5250 4950 50  0001 C CNN
-	1    5250 4950
-	-1   0    0    -1  
-$EndComp
+OUT_6_IN
 Text HLabel 10450 4550 2    50   Output ~ 0
 OUT_6
 Text HLabel 10450 4750 2    50   Output ~ 0
@@ -680,9 +519,9 @@ Connection ~ 8050 4350
 Wire Wire Line
 	8050 4350 8050 4300
 Text HLabel 7250 4350 0    50   Input ~ 0
-OUT_7_in
+OUT_7_IN
 Text HLabel 7250 4150 0    50   Input ~ 0
-OUT_8_in
+OUT_8_IN
 Connection ~ 8050 4550
 Wire Wire Line
 	8050 4550 8050 4500
@@ -727,10 +566,10 @@ Wire Wire Line
 Wire Wire Line
 	8050 4350 7600 4350
 $Comp
-L Device:Jumper_NC_Small JP602
+L Device:Jumper_NC_Small JP502
 U 1 1 60E1B5C8
 P 9450 4050
-F 0 "JP602" H 9600 4100 50  0000 C CNN
+F 0 "JP502" H 9600 4100 50  0000 C CNN
 F 1 "JP NC" H 9450 4000 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 9450 4050 50  0001 C CNN
 F 3 "~" H 9450 4050 50  0001 C CNN
@@ -747,10 +586,10 @@ Wire Wire Line
 Wire Wire Line
 	9350 4050 9150 4050
 $Comp
-L Device:Jumper_NC_Small JP604
+L Device:Jumper_NC_Small JP505
 U 1 1 60E31796
 P 9450 4250
-F 0 "JP604" H 9600 4300 50  0000 C CNN
+F 0 "JP505" H 9600 4300 50  0000 C CNN
 F 1 "JP NC" H 9450 4200 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 9450 4250 50  0001 C CNN
 F 3 "~" H 9450 4250 50  0001 C CNN
@@ -762,10 +601,10 @@ Wire Wire Line
 Wire Wire Line
 	8050 4050 8000 4050
 $Comp
-L Device:Jumper_NO_Small JP605
+L Device:Jumper_NO_Small JP503
 U 1 1 60ED9605
 P 7500 4150
-F 0 "JP605" H 7650 4200 50  0000 C CNN
+F 0 "JP503" H 7650 4200 50  0000 C CNN
 F 1 "JP NO" H 7500 4100 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 7500 4150 50  0001 C CNN
 F 3 "~" H 7500 4150 50  0001 C CNN
@@ -773,10 +612,10 @@ F 3 "~" H 7500 4150 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:Jumper_NO_Small JP606
+L Device:Jumper_NO_Small JP506
 U 1 1 60EDA192
 P 7500 4350
-F 0 "JP606" H 7650 4400 50  0000 C CNN
+F 0 "JP506" H 7650 4400 50  0000 C CNN
 F 1 "JP NO" H 7500 4300 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 7500 4350 50  0001 C CNN
 F 3 "~" H 7500 4350 50  0001 C CNN
@@ -786,42 +625,42 @@ $EndComp
 Text Notes 7300 3500 0    50   ~ 0
 By opening the NC and closing the NO jumpers\n8 independant outputs are available, by sacrificing the 6th Button input
 Text HLabel 10450 5150 2    50   Output ~ 0
-OUT_LED_8_p
+OUT_LED_8_P
 Text HLabel 10450 5250 2    50   Output ~ 0
-OUT_LED_8_n
+OUT_LED_8_N
 Text HLabel 10450 5450 2    50   Output ~ 0
-OUT_LED_7_p
+OUT_LED_7_P
 Text HLabel 10450 5550 2    50   Output ~ 0
-OUT_LED_7_n
+OUT_LED_7_N
 Text HLabel 10450 5750 2    50   Output ~ 0
-OUT_LED_6_p
+OUT_LED_6_P
 Text HLabel 10450 5850 2    50   Output ~ 0
-OUT_LED_6_n
+OUT_LED_6_N
 Text HLabel 10450 6150 2    50   Output ~ 0
-OUT_LED_5_n
+OUT_LED_5_N
 Text HLabel 10450 6050 2    50   Output ~ 0
-OUT_LED_5_p
+OUT_LED_5_P
 Text HLabel 10450 2350 2    50   Output ~ 0
-OUT_LED_4_p
+OUT_LED_4_P
 Text HLabel 10450 2650 2    50   Output ~ 0
-OUT_LED_3_p
+OUT_LED_3_P
 Text HLabel 10450 2750 2    50   Output ~ 0
-OUT_LED_3_n
+OUT_LED_3_N
 Text HLabel 10450 2950 2    50   Output ~ 0
-OUT_LED_2_p
+OUT_LED_2_P
 Text HLabel 10450 3050 2    50   Output ~ 0
-OUT_LED_2_n
+OUT_LED_2_N
 Text HLabel 10450 3350 2    50   Output ~ 0
-OUT_LED_1_n
+OUT_LED_1_N
 Text HLabel 10450 3250 2    50   Output ~ 0
-OUT_LED_1_p
+OUT_LED_1_P
 $Comp
 L Device:R R?
 U 1 1 600820DB
 P 10200 5150
 AR Path="/5FE81B92/600820DB" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/600820DB" Ref="R605"  Part="1" 
-F 0 "R605" V 10100 5100 50  0000 C CNN
+AR Path="/5FD4163D/600820DB" Ref="R505"  Part="1" 
+F 0 "R505" V 10100 5100 50  0000 C CNN
 F 1 "220" V 10200 5150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 5150 50  0001 C CNN
 F 3 "~" H 10200 5150 50  0001 C CNN
@@ -833,8 +672,8 @@ L Device:R R?
 U 1 1 6008A08B
 P 10200 5450
 AR Path="/5FE81B92/6008A08B" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/6008A08B" Ref="R606"  Part="1" 
-F 0 "R606" V 10100 5400 50  0000 C CNN
+AR Path="/5FD4163D/6008A08B" Ref="R506"  Part="1" 
+F 0 "R506" V 10100 5400 50  0000 C CNN
 F 1 "220" V 10200 5450 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 5450 50  0001 C CNN
 F 3 "~" H 10200 5450 50  0001 C CNN
@@ -846,8 +685,8 @@ L Device:R R?
 U 1 1 6008A410
 P 10200 5750
 AR Path="/5FE81B92/6008A410" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/6008A410" Ref="R607"  Part="1" 
-F 0 "R607" V 10100 5700 50  0000 C CNN
+AR Path="/5FD4163D/6008A410" Ref="R507"  Part="1" 
+F 0 "R507" V 10100 5700 50  0000 C CNN
 F 1 "220" V 10200 5750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 5750 50  0001 C CNN
 F 3 "~" H 10200 5750 50  0001 C CNN
@@ -859,8 +698,8 @@ L Device:R R?
 U 1 1 6008A846
 P 10200 6050
 AR Path="/5FE81B92/6008A846" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/6008A846" Ref="R608"  Part="1" 
-F 0 "R608" V 10100 6000 50  0000 C CNN
+AR Path="/5FD4163D/6008A846" Ref="R508"  Part="1" 
+F 0 "R508" V 10100 6000 50  0000 C CNN
 F 1 "220" V 10200 6050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 6050 50  0001 C CNN
 F 3 "~" H 10200 6050 50  0001 C CNN
@@ -898,10 +737,10 @@ Connection ~ 9800 4150
 Wire Wire Line
 	9800 4150 9700 4150
 $Comp
-L power:+5V #PWR0609
+L power:+5V #PWR0509
 U 1 1 600ED51E
 P 9950 3800
-F 0 "#PWR0609" H 9950 3650 50  0001 C CNN
+F 0 "#PWR0509" H 9950 3650 50  0001 C CNN
 F 1 "+5V" H 9965 3973 50  0000 C CNN
 F 2 "" H 9950 3800 50  0001 C CNN
 F 3 "" H 9950 3800 50  0001 C CNN
@@ -932,8 +771,8 @@ L Device:R R?
 U 1 1 60121C67
 P 10200 2350
 AR Path="/5FE81B92/60121C67" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/60121C67" Ref="R601"  Part="1" 
-F 0 "R601" V 10100 2300 50  0000 C CNN
+AR Path="/5FD4163D/60121C67" Ref="R501"  Part="1" 
+F 0 "R501" V 10100 2300 50  0000 C CNN
 F 1 "220" V 10200 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 2350 50  0001 C CNN
 F 3 "~" H 10200 2350 50  0001 C CNN
@@ -945,8 +784,8 @@ L Device:R R?
 U 1 1 60121C6D
 P 10200 2650
 AR Path="/5FE81B92/60121C6D" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/60121C6D" Ref="R602"  Part="1" 
-F 0 "R602" V 10100 2600 50  0000 C CNN
+AR Path="/5FD4163D/60121C6D" Ref="R502"  Part="1" 
+F 0 "R502" V 10100 2600 50  0000 C CNN
 F 1 "220" V 10200 2650 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 2650 50  0001 C CNN
 F 3 "~" H 10200 2650 50  0001 C CNN
@@ -958,8 +797,8 @@ L Device:R R?
 U 1 1 60121C73
 P 10200 2950
 AR Path="/5FE81B92/60121C73" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/60121C73" Ref="R603"  Part="1" 
-F 0 "R603" V 10100 2900 50  0000 C CNN
+AR Path="/5FD4163D/60121C73" Ref="R503"  Part="1" 
+F 0 "R503" V 10100 2900 50  0000 C CNN
 F 1 "220" V 10200 2950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 2950 50  0001 C CNN
 F 3 "~" H 10200 2950 50  0001 C CNN
@@ -971,8 +810,8 @@ L Device:R R?
 U 1 1 60121C79
 P 10200 3250
 AR Path="/5FE81B92/60121C79" Ref="R?"  Part="1" 
-AR Path="/5FD4163D/60121C79" Ref="R604"  Part="1" 
-F 0 "R604" V 10100 3200 50  0000 C CNN
+AR Path="/5FD4163D/60121C79" Ref="R504"  Part="1" 
+F 0 "R504" V 10100 3200 50  0000 C CNN
 F 1 "220" V 10200 3250 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10130 3250 50  0001 C CNN
 F 3 "~" H 10200 3250 50  0001 C CNN
@@ -990,10 +829,10 @@ Wire Wire Line
 Wire Wire Line
 	10450 2450 9800 2450
 $Comp
-L power:+5V #PWR0602
+L power:+5V #PWR0502
 U 1 1 60121C87
 P 9950 1000
-F 0 "#PWR0602" H 9950 850 50  0001 C CNN
+F 0 "#PWR0502" H 9950 850 50  0001 C CNN
 F 1 "+5V" H 9965 1173 50  0000 C CNN
 F 2 "" H 9950 1000 50  0001 C CNN
 F 3 "" H 9950 1000 50  0001 C CNN
@@ -1052,16 +891,16 @@ Connection ~ 9800 1350
 Wire Wire Line
 	9800 1350 10450 1350
 Text HLabel 10450 2450 2    50   Output ~ 0
-OUT_LED_4_n
+OUT_LED_4_N
 Wire Wire Line
 	7400 4150 7250 4150
 Wire Wire Line
 	7400 4350 7250 4350
 $Comp
-L Device:Jumper_NC_Small JP601
+L Device:Jumper_NC_Small JP501
 U 1 1 60E895FB
 P 7900 4050
-F 0 "JP601" H 8050 4100 50  0000 C CNN
+F 0 "JP501" H 8050 4100 50  0000 C CNN
 F 1 "JP NC" H 7900 4000 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 7900 4050 50  0001 C CNN
 F 3 "~" H 7900 4050 50  0001 C CNN
@@ -1069,10 +908,10 @@ F 3 "~" H 7900 4050 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:Jumper_NC_Small JP603
+L Device:Jumper_NC_Small JP504
 U 1 1 60E8A0E8
 P 7900 4250
-F 0 "JP603" H 8050 4300 50  0000 C CNN
+F 0 "JP504" H 8050 4300 50  0000 C CNN
 F 1 "JP NC" H 7900 4200 50  0000 C CNN
 F 2 "Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm" H 7900 4250 50  0001 C CNN
 F 3 "~" H 7900 4250 50  0001 C CNN
@@ -1103,4 +942,165 @@ Wire Wire Line
 Connection ~ 8050 4300
 Wire Wire Line
 	8050 4250 8050 4300
+$Comp
+L Device:C C505
+U 1 1 60AE3E42
+P 5250 4950
+AR Path="/5FD4163D/60AE3E42" Ref="C505"  Part="1" 
+AR Path="/5FD4163D/60496EC1/60AE3E42" Ref="C?"  Part="1" 
+F 0 "C505" H 5365 4996 50  0000 L CNN
+F 1 "100n" H 5365 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 5288 4800 50  0001 C CNN
+F 3 "~" H 5250 4950 50  0001 C CNN
+	1    5250 4950
+	-1   0    0    -1  
+$EndComp
+$Comp
+L power:+5V #PWR0510
+U 1 1 60AE3E3C
+P 5450 4600
+F 0 "#PWR0510" H 5450 4450 50  0001 C CNN
+F 1 "+5V" H 5465 4773 50  0000 C CNN
+F 2 "" H 5450 4600 50  0001 C CNN
+F 3 "" H 5450 4600 50  0001 C CNN
+	1    5450 4600
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5250 5200 5250 5100
+Wire Wire Line
+	5450 5200 5250 5200
+Wire Wire Line
+	5450 5200 5450 5300
+Connection ~ 5450 5200
+Wire Wire Line
+	5650 5200 5450 5200
+Wire Wire Line
+	5650 5100 5650 5200
+$Comp
+L power:GND #PWR0512
+U 1 1 60AE3E30
+P 5450 5300
+F 0 "#PWR0512" H 5450 5050 50  0001 C CNN
+F 1 "GND" H 5455 5127 50  0000 C CNN
+F 2 "" H 5450 5300 50  0001 C CNN
+F 3 "" H 5450 5300 50  0001 C CNN
+	1    5450 5300
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	5250 4700 5250 4800
+Wire Wire Line
+	5650 4700 5650 4800
+Wire Wire Line
+	5450 4700 5250 4700
+Wire Wire Line
+	5450 4700 5650 4700
+Connection ~ 5450 4700
+Wire Wire Line
+	5450 4600 5450 4700
+$Comp
+L Device:C C?
+U 1 1 60AE3E24
+P 5650 4950
+AR Path="/60AE3E24" Ref="C?"  Part="1" 
+AR Path="/60FF07AF/60AE3E24" Ref="C?"  Part="1" 
+AR Path="/5FD4163D/60AE3E24" Ref="C506"  Part="1" 
+F 0 "C506" H 5765 4996 50  0000 L CNN
+F 1 "22u" H 5765 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 5688 4800 50  0001 C CNN
+F 3 "~" H 5650 4950 50  0001 C CNN
+	1    5650 4950
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	6150 5200 6150 5100
+Wire Wire Line
+	6350 5200 6150 5200
+Wire Wire Line
+	6350 5200 6350 5300
+Connection ~ 6350 5200
+Wire Wire Line
+	6550 5200 6350 5200
+Wire Wire Line
+	6550 5100 6550 5200
+$Comp
+L power:GND #PWR0513
+U 1 1 60AE3E18
+P 6350 5300
+F 0 "#PWR0513" H 6350 5050 50  0001 C CNN
+F 1 "GND" H 6355 5127 50  0000 C CNN
+F 2 "" H 6350 5300 50  0001 C CNN
+F 3 "" H 6350 5300 50  0001 C CNN
+	1    6350 5300
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	6150 4700 6150 4800
+Wire Wire Line
+	6550 4700 6550 4800
+Wire Wire Line
+	6350 4700 6150 4700
+Wire Wire Line
+	6350 4700 6550 4700
+Connection ~ 6350 4700
+Wire Wire Line
+	6350 4600 6350 4700
+$Comp
+L power:+12V #PWR0511
+U 1 1 60AE3E0C
+P 6350 4600
+F 0 "#PWR0511" H 6350 4450 50  0001 C CNN
+F 1 "+12V" H 6365 4773 50  0000 C CNN
+F 2 "" H 6350 4600 50  0001 C CNN
+F 3 "" H 6350 4600 50  0001 C CNN
+	1    6350 4600
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 60AE3E06
+P 6150 4950
+AR Path="/60AE3E06" Ref="C?"  Part="1" 
+AR Path="/60FF07AF/60AE3E06" Ref="C?"  Part="1" 
+AR Path="/5FD4163D/60AE3E06" Ref="C507"  Part="1" 
+F 0 "C507" H 6265 4996 50  0000 L CNN
+F 1 "100n" H 6265 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6188 4800 50  0001 C CNN
+F 3 "~" H 6150 4950 50  0001 C CNN
+	1    6150 4950
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:C C?
+U 1 1 60AE3E00
+P 6550 4950
+AR Path="/60AE3E00" Ref="C?"  Part="1" 
+AR Path="/60FF07AF/60AE3E00" Ref="C?"  Part="1" 
+AR Path="/5FD4163D/60AE3E00" Ref="C508"  Part="1" 
+F 0 "C508" H 6665 4996 50  0000 L CNN
+F 1 "22u" H 6665 4905 50  0000 L CNN
+F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 6588 4800 50  0001 C CNN
+F 3 "~" H 6550 4950 50  0001 C CNN
+	1    6550 4950
+	-1   0    0    -1  
+$EndComp
+$Sheet
+S 1200 2250 850  1000
+U 60496EC1
+F0 "buttonInputs2" 50
+F1 "buttonInputs2.sch" 50
+F2 "SW_4" O R 2050 2500 50 
+F3 "LED_4" I R 2050 2400 50 
+F4 "SW_6" O R 2050 3100 50 
+F5 "LED_6" I R 2050 3000 50 
+F6 "SW_5" O R 2050 2800 50 
+F7 "LED_5" I R 2050 2700 50 
+F8 "SW_4_N" B L 1200 2500 50 
+F9 "SW_4_P" B L 1200 2400 50 
+F10 "SW_6_P" B L 1200 3000 50 
+F11 "SW_5_N" B L 1200 2800 50 
+F12 "SW_5_P" B L 1200 2700 50 
+F13 "SW_6_N" B L 1200 3100 50 
+$EndSheet
 $EndSCHEMATC

+ 77 - 69
pcb/eventTechBerry/powerAmplifier.sch

@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 8
+Sheet 4 8
 Title "Power Amp Class D"
 Date "2020-12-13"
 Rev "1.0"
@@ -14,14 +14,12 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Text HLabel 10650 1650 2    50   Output ~ 0
-OUT_L_p
-Text HLabel 10650 1750 2    50   Output ~ 0
-OUT_L_n
+OUT_L_P
 $Comp
 L Device:C C215
 U 1 1 6016BFBD
 P 6850 2800
-F 0 "C215" V 6900 2900 50  0000 C CNN
+F 0 "C215" V 6900 2950 50  0000 C CNN
 F 1 "220n" V 6800 2950 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6888 2650 50  0001 C CNN
 F 3 "~" H 6850 2800 50  0001 C CNN
@@ -32,7 +30,7 @@ $Comp
 L Device:C C218
 U 1 1 6016C4CC
 P 6850 3300
-F 0 "C218" V 6900 3400 50  0000 C CNN
+F 0 "C218" V 6900 3450 50  0000 C CNN
 F 1 "220n" V 6800 3450 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6888 3150 50  0001 C CNN
 F 3 "~" H 6850 3300 50  0001 C CNN
@@ -81,7 +79,7 @@ $Comp
 L Device:C C216
 U 1 1 60170C96
 P 3700 3050
-F 0 "C216" V 3750 3150 50  0000 C CNN
+F 0 "C216" V 3750 3200 50  0000 C CNN
 F 1 "1u" V 3650 3200 50  0000 C CNN
 F 2 "Capacitor_THT:C_Rect_L7.0mm_W3.5mm_P5.00mm" H 3738 2900 50  0001 C CNN
 F 3 "~" H 3700 3050 50  0001 C CNN
@@ -92,7 +90,7 @@ $Comp
 L Device:C C217
 U 1 1 60171A9F
 P 3700 3250
-F 0 "C217" V 3750 3350 50  0000 C CNN
+F 0 "C217" V 3750 3400 50  0000 C CNN
 F 1 "1u" V 3650 3400 50  0000 C CNN
 F 2 "Capacitor_THT:C_Rect_L7.0mm_W3.5mm_P5.00mm" H 3738 3100 50  0001 C CNN
 F 3 "~" H 3700 3250 50  0001 C CNN
@@ -103,7 +101,7 @@ $Comp
 L Device:C C219
 U 1 1 60171FA4
 P 3700 3550
-F 0 "C219" V 3750 3650 50  0000 C CNN
+F 0 "C219" V 3750 3700 50  0000 C CNN
 F 1 "1u" V 3650 3700 50  0000 C CNN
 F 2 "Capacitor_THT:C_Rect_L7.0mm_W3.5mm_P5.00mm" H 3738 3400 50  0001 C CNN
 F 3 "~" H 3700 3550 50  0001 C CNN
@@ -114,7 +112,7 @@ $Comp
 L Device:C C222
 U 1 1 6017253E
 P 3700 3750
-F 0 "C222" V 3750 3850 50  0000 C CNN
+F 0 "C222" V 3750 3900 50  0000 C CNN
 F 1 "1u" V 3650 3900 50  0000 C CNN
 F 2 "Capacitor_THT:C_Rect_L7.0mm_W3.5mm_P5.00mm" H 3738 3600 50  0001 C CNN
 F 3 "~" H 3700 3750 50  0001 C CNN
@@ -232,7 +230,7 @@ $Comp
 L Device:C C223
 U 1 1 601AD705
 P 6850 3800
-F 0 "C223" V 6900 3900 50  0000 C CNN
+F 0 "C223" V 6900 3950 50  0000 C CNN
 F 1 "220n" V 6800 3950 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6888 3650 50  0001 C CNN
 F 3 "~" H 6850 3800 50  0001 C CNN
@@ -243,7 +241,7 @@ $Comp
 L Device:C C225
 U 1 1 601AD70B
 P 6850 4300
-F 0 "C225" V 6900 4400 50  0000 C CNN
+F 0 "C225" V 6900 4450 50  0000 C CNN
 F 1 "220n" V 6800 4450 50  0000 C CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 6888 4150 50  0001 C CNN
 F 3 "~" H 6850 4300 50  0001 C CNN
@@ -304,7 +302,7 @@ L Device:R R202
 U 1 1 601C50F1
 P 10000 2300
 F 0 "R202" H 10070 2346 50  0000 L CNN
-F 1 "3R3" H 10070 2255 50  0000 L CNN
+F 1 "3R3" V 10000 2250 50  0000 L CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9930 2300 50  0001 C CNN
 F 3 "~" H 10000 2300 50  0001 C CNN
 	1    10000 2300
@@ -315,7 +313,7 @@ L Device:R R201
 U 1 1 601C60F6
 P 10000 1100
 F 0 "R201" H 10070 1146 50  0000 L CNN
-F 1 "3R3" H 10070 1055 50  0000 L CNN
+F 1 "3R3" V 10000 1050 50  0000 L CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9930 1100 50  0001 C CNN
 F 3 "~" H 10000 1100 50  0001 C CNN
 	1    10000 1100
@@ -437,7 +435,7 @@ $Comp
 L proz_powerAmp:TPA3130 U201
 U 1 1 60227BBA
 P 5200 4700
-F 0 "U201" H 6200 7050 50  0000 C CNN
+F 0 "U201" H 5300 6950 50  0000 C CNN
 F 1 "TPA3130" H 6350 6950 50  0000 C CNN
 F 2 "Package_SO:HTSSOP-32-1EP_6.1x11mm_P0.65mm_EP5.2x11mm_Mask4.11x4.36mm_ThermalVias" H 5200 4700 50  0001 C CNN
 F 3 "" H 5200 4700 50  0001 C CNN
@@ -468,9 +466,9 @@ Wire Wire Line
 	7950 850  8700 850 
 Connection ~ 7200 3000
 Text HLabel 10650 4050 2    50   Output ~ 0
-OUT_R_p
+OUT_R_P
 Text HLabel 10650 4150 2    50   Output ~ 0
-OUT_R_n
+OUT_R_N
 $Comp
 L Device:L L203
 U 1 1 6025407A
@@ -553,7 +551,7 @@ L Device:R R206
 U 1 1 602540A4
 P 10000 4700
 F 0 "R206" H 10070 4746 50  0000 L CNN
-F 1 "3R3" H 10070 4655 50  0000 L CNN
+F 1 "3R3" V 10000 4650 50  0000 L CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9930 4700 50  0001 C CNN
 F 3 "~" H 10000 4700 50  0001 C CNN
 	1    10000 4700
@@ -564,7 +562,7 @@ L Device:R R203
 U 1 1 602540AA
 P 10000 3500
 F 0 "R203" H 10070 3546 50  0000 L CNN
-F 1 "3R3" H 10070 3455 50  0000 L CNN
+F 1 "3R3" V 10000 3450 50  0000 L CNN
 F 2 "Resistor_SMD:R_MiniMELF_MMA-0204" V 9930 3500 50  0001 C CNN
 F 3 "~" H 10000 3500 50  0001 C CNN
 	1    10000 3500
@@ -680,7 +678,7 @@ L Device:R R204
 U 1 1 6026F6DE
 P 4150 4150
 F 0 "R204" H 4220 4196 50  0000 L CNN
-F 1 "100k" H 4220 4105 50  0000 L CNN
+F 1 "100k" V 4150 4050 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 4080 4150 50  0001 C CNN
 F 3 "~" H 4150 4150 50  0001 C CNN
 	1    4150 4150
@@ -691,7 +689,7 @@ L Device:R R205
 U 1 1 6026FE3B
 P 4150 4550
 F 0 "R205" H 4220 4596 50  0000 L CNN
-F 1 "20k" H 4220 4505 50  0000 L CNN
+F 1 "20k" V 4150 4500 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 4080 4550 50  0001 C CNN
 F 3 "~" H 4150 4550 50  0001 C CNN
 	1    4150 4550
@@ -786,7 +784,7 @@ L Device:R R216
 U 1 1 6030EB2F
 P 1400 7200
 F 0 "R216" H 1470 7246 50  0000 L CNN
-F 1 "100k" H 1470 7155 50  0000 L CNN
+F 1 "100k" V 1400 7100 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1330 7200 50  0001 C CNN
 F 3 "~" H 1400 7200 50  0001 C CNN
 	1    1400 7200
@@ -796,8 +794,8 @@ $Comp
 L Device:R R213
 U 1 1 6030FD55
 P 1150 6950
-F 0 "R213" V 943 6950 50  0000 C CNN
-F 1 "1k" V 1034 6950 50  0000 C CNN
+F 0 "R213" V 1050 6950 50  0000 C CNN
+F 1 "1k" V 1150 6950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1080 6950 50  0001 C CNN
 F 3 "~" H 1150 6950 50  0001 C CNN
 	1    1150 6950
@@ -828,7 +826,7 @@ L Device:R R217
 U 1 1 60381848
 P 2800 7200
 F 0 "R217" H 2870 7246 50  0000 L CNN
-F 1 "100k" H 2870 7155 50  0000 L CNN
+F 1 "100k" V 2800 7100 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 2730 7200 50  0001 C CNN
 F 3 "~" H 2800 7200 50  0001 C CNN
 	1    2800 7200
@@ -838,8 +836,8 @@ $Comp
 L Device:R R214
 U 1 1 6038184E
 P 2550 6950
-F 0 "R214" V 2343 6950 50  0000 C CNN
-F 1 "1k" V 2434 6950 50  0000 C CNN
+F 0 "R214" V 2450 6950 50  0000 C CNN
+F 1 "1k" V 2550 6950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 2480 6950 50  0001 C CNN
 F 3 "~" H 2550 6950 50  0001 C CNN
 	1    2550 6950
@@ -910,7 +908,7 @@ L Device:R R209
 U 1 1 6041396A
 P 3200 6100
 F 0 "R209" H 3270 6146 50  0000 L CNN
-F 1 "100k" H 3270 6055 50  0000 L CNN
+F 1 "100k" V 3200 6000 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 3130 6100 50  0001 C CNN
 F 3 "~" H 3200 6100 50  0001 C CNN
 	1    3200 6100
@@ -964,7 +962,7 @@ L Device:R R210
 U 1 1 604EF854
 P 3600 6100
 F 0 "R210" H 3670 6146 50  0000 L CNN
-F 1 "100k" H 3670 6055 50  0000 L CNN
+F 1 "100k" V 3600 6000 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 3530 6100 50  0001 C CNN
 F 3 "~" H 3600 6100 50  0001 C CNN
 	1    3600 6100
@@ -991,7 +989,7 @@ L Device:R R208
 U 1 1 60519B4F
 P 1800 6100
 F 0 "R208" H 1870 6146 50  0000 L CNN
-F 1 "100k" H 1870 6055 50  0000 L CNN
+F 1 "100k" V 1800 6000 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 1730 6100 50  0001 C CNN
 F 3 "~" H 1800 6100 50  0001 C CNN
 	1    1800 6100
@@ -1039,7 +1037,7 @@ L Device:R R211
 U 1 1 6056CBAD
 P 4850 6100
 F 0 "R211" H 4920 6146 50  0000 L CNN
-F 1 "100k" H 4920 6055 50  0000 L CNN
+F 1 "100k" V 4850 6000 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 4780 6100 50  0001 C CNN
 F 3 "~" H 4850 6100 50  0001 C CNN
 	1    4850 6100
@@ -1122,8 +1120,8 @@ $Comp
 L Device:R R215
 U 1 1 605E18AE
 P 5200 6950
-F 0 "R215" V 4993 6950 50  0000 C CNN
-F 1 "10k" V 5084 6950 50  0000 C CNN
+F 0 "R215" V 5100 6950 50  0000 C CNN
+F 1 "10k" V 5200 6950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 5130 6950 50  0001 C CNN
 F 3 "~" H 5200 6950 50  0001 C CNN
 	1    5200 6950
@@ -1160,7 +1158,7 @@ L Device:R R212
 U 1 1 605E18C9
 P 5850 6100
 F 0 "R212" H 5920 6146 50  0000 L CNN
-F 1 "100k" H 5920 6055 50  0000 L CNN
+F 1 "100k" V 5850 6000 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 5780 6100 50  0001 C CNN
 F 3 "~" H 5850 6100 50  0001 C CNN
 	1    5850 6100
@@ -1196,9 +1194,9 @@ Connection ~ 4850 6700
 Wire Wire Line
 	5850 6250 5850 6650
 Text HLabel 10650 5550 2    50   Output ~ 0
-LED_ERR_p
+LED_ERR_P
 Text HLabel 10650 5650 2    50   Output ~ 0
-LED_ERR_n
+LED_ERR_N
 $Comp
 L power:+12V #PWR0211
 U 1 1 6070A8F9
@@ -1214,8 +1212,8 @@ $Comp
 L Device:R R207
 U 1 1 6070DD82
 P 10400 5550
-F 0 "R207" V 10193 5550 50  0000 C CNN
-F 1 "1k" V 10284 5550 50  0000 C CNN
+F 0 "R207" V 10300 5550 50  0000 C CNN
+F 1 "1k" V 10400 5550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 10330 5550 50  0001 C CNN
 F 3 "~" H 10400 5550 50  0001 C CNN
 	1    10400 5550
@@ -1237,13 +1235,13 @@ Wire Wire Line
 Wire Wire Line
 	5350 6950 5550 6950
 Text HLabel 1100 3100 0    50   Input ~ 0
-IN_R_p
+IN_R_P
 Text HLabel 1100 3200 0    50   Input ~ 0
-IN_R_n
+IN_R_N
 Text HLabel 1100 3600 0    50   Input ~ 0
-IN_L_p
+IN_L_P
 Text HLabel 1100 3700 0    50   Input ~ 0
-IN_L_n
+IN_L_N
 Wire Wire Line
 	3550 3050 3300 3050
 Wire Wire Line
@@ -1299,8 +1297,8 @@ P 1750 1500
 AR Path="/5FDBC263" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FDBC263" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FDBC263" Ref="C204"  Part="1" 
-F 0 "C204" H 1865 1546 50  0000 L CNN
-F 1 "22u" H 1865 1455 50  0000 L CNN
+F 0 "C204" H 1800 1600 50  0000 L CNN
+F 1 "22u" H 1800 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 1788 1350 50  0001 C CNN
 F 3 "~" H 1750 1500 50  0001 C CNN
 	1    1750 1500
@@ -1313,8 +1311,8 @@ P 2150 1500
 AR Path="/5FDBC269" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FDBC269" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FDBC269" Ref="C205"  Part="1" 
-F 0 "C205" H 2265 1546 50  0000 L CNN
-F 1 "1u" H 2265 1455 50  0000 L CNN
+F 0 "C205" H 2200 1600 50  0000 L CNN
+F 1 "1u" H 2250 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2188 1350 50  0001 C CNN
 F 3 "~" H 2150 1500 50  0001 C CNN
 	1    2150 1500
@@ -1327,25 +1325,14 @@ P 2500 1500
 AR Path="/5FDBC26F" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FDBC26F" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FDBC26F" Ref="C206"  Part="1" 
-F 0 "C206" H 2615 1546 50  0000 L CNN
-F 1 "100n" H 2615 1455 50  0000 L CNN
+F 0 "C206" H 2550 1600 50  0000 L CNN
+F 1 "100n" H 2550 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 2538 1350 50  0001 C CNN
 F 3 "~" H 2500 1500 50  0001 C CNN
 	1    2500 1500
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:CP C203
-U 1 1 5FDCC165
-P 1350 1500
-F 0 "C203" H 1468 1546 50  0000 L CNN
-F 1 "470u" H 1468 1455 50  0000 L CNN
-F 2 "Capacitors_ThroughHole:C_Radial_D10_L13_P5" H 1388 1350 50  0001 C CNN
-F 3 "~" H 1350 1500 50  0001 C CNN
-	1    1350 1500
-	1    0    0    -1  
-$EndComp
-$Comp
 L power:+12V #PWR0201
 U 1 1 5FDE47BE
 P 1950 1150
@@ -1396,8 +1383,6 @@ Wire Wire Line
 	1750 1750 1750 1650
 Wire Wire Line
 	1750 1750 1350 1750
-Wire Wire Line
-	1350 1750 1350 1650
 Connection ~ 1750 1750
 Wire Wire Line
 	1950 1750 2150 1750
@@ -1416,8 +1401,8 @@ P 3500 1500
 AR Path="/5FE8E161" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FE8E161" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FE8E161" Ref="C208"  Part="1" 
-F 0 "C208" H 3615 1546 50  0000 L CNN
-F 1 "22u" H 3615 1455 50  0000 L CNN
+F 0 "C208" H 3550 1600 50  0000 L CNN
+F 1 "22u" H 3550 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_1210_3225Metric_Pad1.42x2.65mm_HandSolder" H 3538 1350 50  0001 C CNN
 F 3 "~" H 3500 1500 50  0001 C CNN
 	1    3500 1500
@@ -1430,8 +1415,8 @@ P 3900 1500
 AR Path="/5FE8E167" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FE8E167" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FE8E167" Ref="C209"  Part="1" 
-F 0 "C209" H 4015 1546 50  0000 L CNN
-F 1 "1u" H 4015 1455 50  0000 L CNN
+F 0 "C209" H 3950 1600 50  0000 L CNN
+F 1 "1u" H 4000 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3938 1350 50  0001 C CNN
 F 3 "~" H 3900 1500 50  0001 C CNN
 	1    3900 1500
@@ -1444,8 +1429,8 @@ P 4250 1500
 AR Path="/5FE8E16D" Ref="C?"  Part="1" 
 AR Path="/60FF07AF/5FE8E16D" Ref="C?"  Part="1" 
 AR Path="/5FD12D22/5FE8E16D" Ref="C210"  Part="1" 
-F 0 "C210" H 4365 1546 50  0000 L CNN
-F 1 "100n" H 4365 1455 50  0000 L CNN
+F 0 "C210" H 4300 1600 50  0000 L CNN
+F 1 "100n" H 4300 1400 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4288 1350 50  0001 C CNN
 F 3 "~" H 4250 1500 50  0001 C CNN
 	1    4250 1500
@@ -1455,8 +1440,8 @@ $Comp
 L Device:CP C207
 U 1 1 5FE8E173
 P 3100 1500
-F 0 "C207" H 3218 1546 50  0000 L CNN
-F 1 "470u" H 3218 1455 50  0000 L CNN
+F 0 "C207" H 3150 1600 50  0000 L CNN
+F 1 "470u" H 3150 1400 50  0000 L CNN
 F 2 "Capacitor_THT:CP_Radial_D10.0mm_P5.00mm" H 3138 1350 50  0001 C CNN
 F 3 "~" H 3100 1500 50  0001 C CNN
 	1    3100 1500
@@ -1526,4 +1511,27 @@ Wire Wire Line
 Wire Wire Line
 	4250 1750 4250 1650
 Connection ~ 3900 1750
+Wire Wire Line
+	1350 1750 1350 1650
+$Comp
+L Device:CP C203
+U 1 1 5FDCC165
+P 1350 1500
+F 0 "C203" H 1400 1600 50  0000 L CNN
+F 1 "470u" H 1400 1400 50  0000 L CNN
+F 2 "Capacitor_THT:CP_Radial_D10.0mm_P5.00mm" H 1388 1350 50  0001 C CNN
+F 3 "~" H 1350 1500 50  0001 C CNN
+	1    1350 1500
+	1    0    0    -1  
+$EndComp
+Text Label 4300 3200 0    50   ~ 0
+RIN_P
+Text Label 4300 3300 0    50   ~ 0
+RIN_N
+Text Label 4300 3500 0    50   ~ 0
+LIN_P
+Text Label 4300 3600 0    50   ~ 0
+LIN_N
+Text HLabel 10650 1750 2    50   Output ~ 0
+OUT_L_N
 $EndSCHEMATC

+ 6 - 6
pcb/eventTechBerry/powerSupply.sch

@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 8
+Sheet 2 8
 Title "Power Supply"
 Date "2020-12-13"
 Rev "1.0"
@@ -437,7 +437,7 @@ U 1 1 60FF7D62
 P 4950 2350
 AR Path="/60FF7D62" Ref="R?"  Part="1" 
 AR Path="/60FF07AF/60FF7D62" Ref="R401"  Part="1" 
-F 0 "R401" V 5050 2350 50  0000 L CNN
+F 0 "R401" V 5050 2250 50  0000 L CNN
 F 1 "10k" V 4950 2300 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 4880 2350 50  0001 C CNN
 F 3 "~" H 4950 2350 50  0001 C CNN
@@ -460,7 +460,7 @@ P 7150 2950
 AR Path="/60FF7D6D" Ref="R?"  Part="1" 
 AR Path="/60FF07AF/60FF7D6D" Ref="R403"  Part="1" 
 F 0 "R403" H 7220 2996 50  0000 L CNN
-F 1 "10k" H 7220 2905 50  0000 L CNN
+F 1 "10k" V 7150 2900 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 7080 2950 50  0001 C CNN
 F 3 "~" H 7150 2950 50  0001 C CNN
 	1    7150 2950
@@ -475,7 +475,7 @@ P 7150 2550
 AR Path="/60FF7D74" Ref="R?"  Part="1" 
 AR Path="/60FF07AF/60FF7D74" Ref="R402"  Part="1" 
 F 0 "R402" H 7220 2596 50  0000 L CNN
-F 1 "56k" H 7220 2505 50  0000 L CNN
+F 1 "56k" V 7150 2500 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 7080 2550 50  0001 C CNN
 F 3 "~" H 7150 2550 50  0001 C CNN
 	1    7150 2550
@@ -546,7 +546,7 @@ P 8950 3000
 AR Path="/6056FAD1" Ref="R?"  Part="1" 
 AR Path="/60FF07AF/6056FAD1" Ref="R404"  Part="1" 
 F 0 "R404" H 9020 3046 50  0000 L CNN
-F 1 "10k" H 9020 2955 50  0000 L CNN
+F 1 "10k" V 8950 2950 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 8880 3000 50  0001 C CNN
 F 3 "~" H 8950 3000 50  0001 C CNN
 	1    8950 3000
@@ -559,7 +559,7 @@ P 9750 3000
 AR Path="/60571BE9" Ref="R?"  Part="1" 
 AR Path="/60FF07AF/60571BE9" Ref="R405"  Part="1" 
 F 0 "R405" H 9820 3046 50  0000 L CNN
-F 1 "10k" H 9820 2955 50  0000 L CNN
+F 1 "10k" V 9750 2950 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" V 9680 3000 50  0001 C CNN
 F 3 "~" H 9750 3000 50  0001 C CNN
 	1    9750 3000