Browse Source

PsuSwitchModule update

gobrien 6 years ago
parent
commit
10485190f7

File diff suppressed because it is too large
+ 12810 - 0
3D/17574.step


File diff suppressed because it is too large
+ 2005 - 0
3D/17574.wrl


File diff suppressed because it is too large
+ 23204 - 0
3D/Terminal Block 3 way.wrl


+ 25 - 22
MLI/Modular/PsuSwitchModule/PsuSwitchModule-cache.lib

@@ -64,11 +64,11 @@ X Pin_1 1 -200 0 150 R 50 50 1 1 P
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #
-# Conn_01x02_Male
+# Conn_01x03
 #
 #
-DEF Conn_01x02_Male J 0 40 Y N 1 F N
-F0 "J" 0 100 50 H V C CNN
-F1 "Conn_01x02_Male" 0 -200 50 H V C CNN
+DEF Conn_01x03 J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Conn_01x03" 0 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
 $FPLIST
@@ -76,22 +76,25 @@ $FPLIST
  Connector*:*1x??x*mm*
  Connector*:*1x??x*mm*
  Pin?Header?Straight?1X*
  Pin?Header?Straight?1X*
  Pin?Header?Angled?1X*
  Pin?Header?Angled?1X*
+ Socket?Strip?Straight?1X*
+ Socket?Strip?Angled?1X*
 $ENDFPLIST
 $ENDFPLIST
 DRAW
 DRAW
-S 34 -95 0 -105 1 1 6 F
-S 34 5 0 -5 1 1 6 F
-P 2 1 1 6 50 -100 34 -100 N
-P 2 1 1 6 50 0 34 0 N
-X Pin_1 1 200 0 150 L 50 50 1 1 P
-X Pin_2 2 200 -100 150 L 50 50 1 1 P
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 50 -150 1 1 10 f
+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
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #
-# Conn_01x03
+# Conn_01x03_Male
 #
 #
-DEF Conn_01x03 J 0 40 Y N 1 F N
+DEF Conn_01x03_Male J 0 40 Y N 1 F N
 F0 "J" 0 200 50 H V C CNN
 F0 "J" 0 200 50 H V C CNN
-F1 "Conn_01x03" 0 -200 50 H V C CNN
+F1 "Conn_01x03_Male" 0 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
 $FPLIST
@@ -99,17 +102,17 @@ $FPLIST
  Connector*:*1x??x*mm*
  Connector*:*1x??x*mm*
  Pin?Header?Straight?1X*
  Pin?Header?Straight?1X*
  Pin?Header?Angled?1X*
  Pin?Header?Angled?1X*
- Socket?Strip?Straight?1X*
- Socket?Strip?Angled?1X*
 $ENDFPLIST
 $ENDFPLIST
 DRAW
 DRAW
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 105 0 95 1 1 6 N
-S -50 150 50 -150 1 1 10 f
-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
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+X Pin_1 1 200 100 150 L 50 50 1 1 P
+X Pin_2 2 200 0 150 L 50 50 1 1 P
+X Pin_3 3 200 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #

+ 35 - 20
MLI/Modular/PsuSwitchModule/PsuSwitchModule.Switch.sch

@@ -34,7 +34,7 @@ EELAYER 25 0
 EELAYER END
 EELAYER END
 $Descr User 8268 5846
 $Descr User 8268 5846
 encoding utf-8
 encoding utf-8
-Sheet 4 5
+Sheet 2 5
 Title "Power Module (Control Board)"
 Title "Power Module (Control Board)"
 Date "2018-03-13"
 Date "2018-03-13"
 Rev "Release 0.2"
 Rev "Release 0.2"
@@ -52,7 +52,7 @@ AR Path="/59498AA5/59498139" Ref="IC1"  Part="1"
 AR Path="/59A7109E/59498139" Ref="IC2"  Part="1" 
 AR Path="/59A7109E/59498139" Ref="IC2"  Part="1" 
 AR Path="/59A71299/59498139" Ref="IC3"  Part="1" 
 AR Path="/59A71299/59498139" Ref="IC3"  Part="1" 
 AR Path="/59A712A3/59498139" Ref="IC4"  Part="1" 
 AR Path="/59A712A3/59498139" Ref="IC4"  Part="1" 
-F 0 "IC4" H 4900 2500 50  0000 C CNN
+F 0 "IC1" H 4900 2500 50  0000 C CNN
 F 1 "TC4421CPA" H 4900 1900 50  0000 C CNN
 F 1 "TC4421CPA" H 4900 1900 50  0000 C CNN
 F 2 "PartsLibraries:TC4422AVPA" H 4900 1800 50  0001 C CNN
 F 2 "PartsLibraries:TC4422AVPA" H 4900 1800 50  0001 C CNN
 F 3 "" H 4900 1700 50  0001 C CNN
 F 3 "" H 4900 1700 50  0001 C CNN
@@ -72,7 +72,7 @@ AR Path="/59498AA5/59498146" Ref="C4"  Part="1"
 AR Path="/59A7109E/59498146" Ref="C8"  Part="1" 
 AR Path="/59A7109E/59498146" Ref="C8"  Part="1" 
 AR Path="/59A71299/59498146" Ref="C12"  Part="1" 
 AR Path="/59A71299/59498146" Ref="C12"  Part="1" 
 AR Path="/59A712A3/59498146" Ref="C16"  Part="1" 
 AR Path="/59A712A3/59498146" Ref="C16"  Part="1" 
-F 0 "C16" H 6225 3000 50  0000 L CNN
+F 0 "C4" H 6225 3000 50  0000 L CNN
 F 1 "4.7uF" H 6225 2800 50  0000 L CNN
 F 1 "4.7uF" H 6225 2800 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_D5.0mm_P2.50mm" H 6238 2750 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_D5.0mm_P2.50mm" H 6238 2750 50  0001 C CNN
 F 3 "" H 6200 2900 50  0001 C CNN
 F 3 "" H 6200 2900 50  0001 C CNN
@@ -87,7 +87,7 @@ AR Path="/59498AA5/5949814D" Ref="C3"  Part="1"
 AR Path="/59A7109E/5949814D" Ref="C7"  Part="1" 
 AR Path="/59A7109E/5949814D" Ref="C7"  Part="1" 
 AR Path="/59A71299/5949814D" Ref="C11"  Part="1" 
 AR Path="/59A71299/5949814D" Ref="C11"  Part="1" 
 AR Path="/59A712A3/5949814D" Ref="C15"  Part="1" 
 AR Path="/59A712A3/5949814D" Ref="C15"  Part="1" 
-F 0 "C15" H 5975 3000 50  0000 L CNN
+F 0 "C3" H 5975 3000 50  0000 L CNN
 F 1 "C" H 5975 2800 50  0000 L CNN
 F 1 "C" H 5975 2800 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 5988 2750 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 5988 2750 50  0001 C CNN
 F 3 "" H 5950 2900 50  0001 C CNN
 F 3 "" H 5950 2900 50  0001 C CNN
@@ -102,7 +102,7 @@ AR Path="/59498AA5/59A6D3D9" Ref="C1"  Part="1"
 AR Path="/59A7109E/59A6D3D9" Ref="C5"  Part="1" 
 AR Path="/59A7109E/59A6D3D9" Ref="C5"  Part="1" 
 AR Path="/59A71299/59A6D3D9" Ref="C9"  Part="1" 
 AR Path="/59A71299/59A6D3D9" Ref="C9"  Part="1" 
 AR Path="/59A712A3/59A6D3D9" Ref="C13"  Part="1" 
 AR Path="/59A712A3/59A6D3D9" Ref="C13"  Part="1" 
-F 0 "C13" H 3775 1650 50  0000 L CNN
+F 0 "C1" H 3775 1650 50  0000 L CNN
 F 1 "4.7uF" H 3775 1450 50  0000 L CNN
 F 1 "4.7uF" H 3775 1450 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_D5.0mm_P2.50mm" H 3788 1400 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_D5.0mm_P2.50mm" H 3788 1400 50  0001 C CNN
 F 3 "" H 3750 1550 50  0001 C CNN
 F 3 "" H 3750 1550 50  0001 C CNN
@@ -117,7 +117,7 @@ AR Path="/59498AA5/59A6D3E0" Ref="C2"  Part="1"
 AR Path="/59A7109E/59A6D3E0" Ref="C6"  Part="1" 
 AR Path="/59A7109E/59A6D3E0" Ref="C6"  Part="1" 
 AR Path="/59A71299/59A6D3E0" Ref="C10"  Part="1" 
 AR Path="/59A71299/59A6D3E0" Ref="C10"  Part="1" 
 AR Path="/59A712A3/59A6D3E0" Ref="C14"  Part="1" 
 AR Path="/59A712A3/59A6D3E0" Ref="C14"  Part="1" 
-F 0 "C14" H 4175 1650 50  0000 L CNN
+F 0 "C2" H 4175 1650 50  0000 L CNN
 F 1 "100nF" H 4175 1450 50  0000 L CNN
 F 1 "100nF" H 4175 1450 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 4188 1400 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 4188 1400 50  0001 C CNN
 F 3 "" H 4150 1550 50  0001 C CNN
 F 3 "" H 4150 1550 50  0001 C CNN
@@ -132,7 +132,7 @@ AR Path="/59498AA5/59A6D3EA" Ref="U1"  Part="1"
 AR Path="/59A7109E/59A6D3EA" Ref="U3"  Part="1" 
 AR Path="/59A7109E/59A6D3EA" Ref="U3"  Part="1" 
 AR Path="/59A71299/59A6D3EA" Ref="U5"  Part="1" 
 AR Path="/59A71299/59A6D3EA" Ref="U5"  Part="1" 
 AR Path="/59A712A3/59A6D3EA" Ref="U7"  Part="1" 
 AR Path="/59A712A3/59A6D3EA" Ref="U7"  Part="1" 
-F 0 "U7" H 2550 1850 60  0000 C CNN
+F 0 "U1" H 2550 1850 60  0000 C CNN
 F 1 "NME1212DC" H 2550 1250 60  0000 C CNN
 F 1 "NME1212DC" H 2550 1250 60  0000 C CNN
 F 2 "PartsLibraries:NME1212DC" H 2600 1300 60  0001 C CNN
 F 2 "PartsLibraries:NME1212DC" H 2600 1300 60  0001 C CNN
 F 3 "" H 2600 1300 60  0001 C CNN
 F 3 "" H 2600 1300 60  0001 C CNN
@@ -147,7 +147,7 @@ AR Path="/59498AA5/59A6DA9F" Ref="R2"  Part="1"
 AR Path="/59A7109E/59A6DA9F" Ref="R4"  Part="1" 
 AR Path="/59A7109E/59A6DA9F" Ref="R4"  Part="1" 
 AR Path="/59A71299/59A6DA9F" Ref="R6"  Part="1" 
 AR Path="/59A71299/59A6DA9F" Ref="R6"  Part="1" 
 AR Path="/59A712A3/59A6DA9F" Ref="R8"  Part="1" 
 AR Path="/59A712A3/59A6DA9F" Ref="R8"  Part="1" 
-F 0 "R8" V 2250 2800 50  0000 C CNN
+F 0 "R2" V 2250 2800 50  0000 C CNN
 F 1 "180" V 2350 2800 50  0000 C CNN
 F 1 "180" V 2350 2800 50  0000 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 2280 2800 50  0001 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 2280 2800 50  0001 C CNN
 F 3 "" H 2350 2800 50  0001 C CNN
 F 3 "" H 2350 2800 50  0001 C CNN
@@ -162,7 +162,7 @@ AR Path="/59498AA5/59A6DAA6" Ref="U2"  Part="1"
 AR Path="/59A7109E/59A6DAA6" Ref="U4"  Part="1" 
 AR Path="/59A7109E/59A6DAA6" Ref="U4"  Part="1" 
 AR Path="/59A71299/59A6DAA6" Ref="U6"  Part="1" 
 AR Path="/59A71299/59A6DAA6" Ref="U6"  Part="1" 
 AR Path="/59A712A3/59A6DAA6" Ref="U8"  Part="1" 
 AR Path="/59A712A3/59A6DAA6" Ref="U8"  Part="1" 
-F 0 "U8" H 2600 3100 50  0000 L CNN
+F 0 "U2" H 2600 3100 50  0000 L CNN
 F 1 "H11N1M" H 2800 2700 50  0000 C CNN
 F 1 "H11N1M" H 2800 2700 50  0000 C CNN
 F 2 "Housings_DIP:DIP-6_W7.62mm" H 2600 2700 50  0001 L CIN
 F 2 "Housings_DIP:DIP-6_W7.62mm" H 2600 2700 50  0001 L CIN
 F 3 "" H 2800 2900 50  0001 L CNN
 F 3 "" H 2800 2900 50  0001 L CNN
@@ -177,7 +177,7 @@ AR Path="/59498AA5/59A6DAAD" Ref="R3"  Part="1"
 AR Path="/59A7109E/59A6DAAD" Ref="R5"  Part="1" 
 AR Path="/59A7109E/59A6DAAD" Ref="R5"  Part="1" 
 AR Path="/59A71299/59A6DAAD" Ref="R7"  Part="1" 
 AR Path="/59A71299/59A6DAAD" Ref="R7"  Part="1" 
 AR Path="/59A712A3/59A6DAAD" Ref="R9"  Part="1" 
 AR Path="/59A712A3/59A6DAAD" Ref="R9"  Part="1" 
-F 0 "R9" V 3180 2200 50  0000 C CNN
+F 0 "R3" V 3180 2200 50  0000 C CNN
 F 1 "3K" V 3100 2200 50  0000 C CNN
 F 1 "3K" V 3100 2200 50  0000 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 3030 2200 50  0001 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 3030 2200 50  0001 C CNN
 F 3 "" H 3100 2200 50  0001 C CNN
 F 3 "" H 3100 2200 50  0001 C CNN
@@ -220,7 +220,7 @@ AR Path="/59498AA5/59EF0E59" Ref="D1"  Part="1"
 AR Path="/59A7109E/59EF0E59" Ref="D2"  Part="1" 
 AR Path="/59A7109E/59EF0E59" Ref="D2"  Part="1" 
 AR Path="/59A71299/59EF0E59" Ref="D3"  Part="1" 
 AR Path="/59A71299/59EF0E59" Ref="D3"  Part="1" 
 AR Path="/59A712A3/59EF0E59" Ref="D4"  Part="1" 
 AR Path="/59A712A3/59EF0E59" Ref="D4"  Part="1" 
-F 0 "D4" H 3450 2700 50  0000 C CNN
+F 0 "D1" H 3450 2700 50  0000 C CNN
 F 1 "D_Zener" H 3450 2500 50  0000 C CNN
 F 1 "D_Zener" H 3450 2500 50  0000 C CNN
 F 2 "Diodes_THT:D_T-1_P5.08mm_Horizontal" H 3450 2600 50  0001 C CNN
 F 2 "Diodes_THT:D_T-1_P5.08mm_Horizontal" H 3450 2600 50  0001 C CNN
 F 3 "" H 3450 2600 50  0001 C CNN
 F 3 "" H 3450 2600 50  0001 C CNN
@@ -241,7 +241,7 @@ AR Path="/59498AA5/59EF0ED7" Ref="C17"  Part="1"
 AR Path="/59A7109E/59EF0ED7" Ref="C19"  Part="1" 
 AR Path="/59A7109E/59EF0ED7" Ref="C19"  Part="1" 
 AR Path="/59A71299/59EF0ED7" Ref="C21"  Part="1" 
 AR Path="/59A71299/59EF0ED7" Ref="C21"  Part="1" 
 AR Path="/59A712A3/59EF0ED7" Ref="C23"  Part="1" 
 AR Path="/59A712A3/59EF0ED7" Ref="C23"  Part="1" 
-F 0 "C23" H 3725 2700 50  0000 L CNN
+F 0 "C17" H 3725 2700 50  0000 L CNN
 F 1 "100nF" H 3725 2500 50  0000 L CNN
 F 1 "100nF" H 3725 2500 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 3738 2450 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 3738 2450 50  0001 C CNN
 F 3 "" H 3700 2600 50  0001 C CNN
 F 3 "" H 3700 2600 50  0001 C CNN
@@ -268,7 +268,7 @@ AR Path="/59498AA5/59EF0FC7" Ref="R10"  Part="1"
 AR Path="/59A7109E/59EF0FC7" Ref="R12"  Part="1" 
 AR Path="/59A7109E/59EF0FC7" Ref="R12"  Part="1" 
 AR Path="/59A71299/59EF0FC7" Ref="R14"  Part="1" 
 AR Path="/59A71299/59EF0FC7" Ref="R14"  Part="1" 
 AR Path="/59A712A3/59EF0FC7" Ref="R16"  Part="1" 
 AR Path="/59A712A3/59EF0FC7" Ref="R16"  Part="1" 
-F 0 "R16" V 4130 2650 50  0000 C CNN
+F 0 "R10" V 4130 2650 50  0000 C CNN
 F 1 "R" V 4050 2650 50  0000 C CNN
 F 1 "R" V 4050 2650 50  0000 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 3980 2650 50  0001 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 3980 2650 50  0001 C CNN
 F 3 "" H 4050 2650 50  0001 C CNN
 F 3 "" H 4050 2650 50  0001 C CNN
@@ -289,7 +289,7 @@ AR Path="/59498AA5/59EF1A58" Ref="R11"  Part="1"
 AR Path="/59A7109E/59EF1A58" Ref="R13"  Part="1" 
 AR Path="/59A7109E/59EF1A58" Ref="R13"  Part="1" 
 AR Path="/59A71299/59EF1A58" Ref="R15"  Part="1" 
 AR Path="/59A71299/59EF1A58" Ref="R15"  Part="1" 
 AR Path="/59A712A3/59EF1A58" Ref="R17"  Part="1" 
 AR Path="/59A712A3/59EF1A58" Ref="R17"  Part="1" 
-F 0 "R17" V 5830 2900 50  0000 C CNN
+F 0 "R11" V 5830 2900 50  0000 C CNN
 F 1 "R" V 5750 2900 50  0000 C CNN
 F 1 "R" V 5750 2900 50  0000 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 5680 2900 50  0001 C CNN
 F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 5680 2900 50  0001 C CNN
 F 3 "" H 5750 2900 50  0001 C CNN
 F 3 "" H 5750 2900 50  0001 C CNN
@@ -307,7 +307,7 @@ AR Path="/59498AA5/59EF1DD4" Ref="C18"  Part="1"
 AR Path="/59A7109E/59EF1DD4" Ref="C20"  Part="1" 
 AR Path="/59A7109E/59EF1DD4" Ref="C20"  Part="1" 
 AR Path="/59A71299/59EF1DD4" Ref="C22"  Part="1" 
 AR Path="/59A71299/59EF1DD4" Ref="C22"  Part="1" 
 AR Path="/59A712A3/59EF1DD4" Ref="C24"  Part="1" 
 AR Path="/59A712A3/59EF1DD4" Ref="C24"  Part="1" 
-F 0 "C24" H 4575 1650 50  0000 L CNN
+F 0 "C18" H 4575 1650 50  0000 L CNN
 F 1 "100nF" H 4575 1450 50  0000 L CNN
 F 1 "100nF" H 4575 1450 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 4588 1400 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 4588 1400 50  0001 C CNN
 F 3 "" H 4550 1550 50  0001 C CNN
 F 3 "" H 4550 1550 50  0001 C CNN
@@ -336,7 +336,7 @@ AR Path="/59498AA5/5A16CD08" Ref="C25"  Part="1"
 AR Path="/59A7109E/5A16CD08" Ref="C26"  Part="1" 
 AR Path="/59A7109E/5A16CD08" Ref="C26"  Part="1" 
 AR Path="/59A71299/5A16CD08" Ref="C27"  Part="1" 
 AR Path="/59A71299/5A16CD08" Ref="C27"  Part="1" 
 AR Path="/59A712A3/5A16CD08" Ref="C28"  Part="1" 
 AR Path="/59A712A3/5A16CD08" Ref="C28"  Part="1" 
-F 0 "C28" H 2375 2550 50  0000 L CNN
+F 0 "C25" H 2375 2550 50  0000 L CNN
 F 1 "100nF" H 2375 2350 50  0000 L CNN
 F 1 "100nF" H 2375 2350 50  0000 L CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 2388 2300 50  0001 C CNN
 F 2 "Capacitors_THT:CP_Radial_Tantal_D4.5mm_P2.50mm" H 2388 2300 50  0001 C CNN
 F 3 "" H 2350 2450 50  0001 C CNN
 F 3 "" H 2350 2450 50  0001 C CNN
@@ -372,16 +372,16 @@ Wire Wire Line
 Connection ~ 5000 2050
 Connection ~ 5000 2050
 Connection ~ 4550 1400
 Connection ~ 4550 1400
 $Comp
 $Comp
-L Conn_01x02_Male J201
+L Conn_01x03_Male J201
 U 1 1 5AA809BD
 U 1 1 5AA809BD
 P 6100 1600
 P 6100 1600
 AR Path="/59498AA5/5AA809BD" Ref="J201"  Part="1" 
 AR Path="/59498AA5/5AA809BD" Ref="J201"  Part="1" 
 AR Path="/59A7109E/5AA809BD" Ref="J301"  Part="1" 
 AR Path="/59A7109E/5AA809BD" Ref="J301"  Part="1" 
 AR Path="/59A71299/5AA809BD" Ref="J401"  Part="1" 
 AR Path="/59A71299/5AA809BD" Ref="J401"  Part="1" 
 AR Path="/59A712A3/5AA809BD" Ref="J501"  Part="1" 
 AR Path="/59A712A3/5AA809BD" Ref="J501"  Part="1" 
-F 0 "J501" H 6100 1700 50  0000 C CNN
-F 1 "Conn_01x02_Male" H 6100 1400 50  0000 C CNN
-F 2 "Connectors_JST:JST_XH_B02B-XH-A_02x2.50mm_Straight" H 6100 1600 50  0001 C CNN
+F 0 "J201" H 6200 1850 50  0000 C CNN
+F 1 "Conn_01x03_Male" H 6250 1300 50  0000 C CNN
+F 2 "PartsLibraries:TerminalBlock_Altech_AK300-3_P5.00mm" H 6100 1600 50  0001 C CNN
 F 3 "" H 6100 1600 50  0001 C CNN
 F 3 "" H 6100 1600 50  0001 C CNN
 	1    6100 1600
 	1    6100 1600
 	1    0    0    -1  
 	1    0    0    -1  
@@ -392,4 +392,19 @@ Text HLabel 6300 1600 2    60   Input ~ 0
 DRV_SIG
 DRV_SIG
 Text HLabel 6300 1700 2    60   UnSpc ~ 0
 Text HLabel 6300 1700 2    60   UnSpc ~ 0
 GND_ISO
 GND_ISO
+$Comp
+L Earth #PWR04
+U 1 1 5AC4AFAF
+P 6300 1500
+AR Path="/59498AA5/5AC4AFAF" Ref="#PWR04"  Part="1" 
+AR Path="/59A7109E/5AC4AFAF" Ref="#PWR05"  Part="1" 
+AR Path="/59A71299/5AC4AFAF" Ref="#PWR06"  Part="1" 
+AR Path="/59A712A3/5AC4AFAF" Ref="#PWR07"  Part="1" 
+F 0 "#PWR07" H 6300 1250 50  0001 C CNN
+F 1 "Earth" H 6300 1350 50  0001 C CNN
+F 2 "" H 6300 1500 50  0001 C CNN
+F 3 "" H 6300 1500 50  0001 C CNN
+	1    6300 1500
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
 $EndSCHEMATC

File diff suppressed because it is too large
+ 3105 - 2395
MLI/Modular/PsuSwitchModule/PsuSwitchModule.kicad_pcb


File diff suppressed because it is too large
+ 2962 - 1954
MLI/Modular/PsuSwitchModule/PsuSwitchModule.kicad_pcb-bak


+ 144 - 139
MLI/Modular/PsuSwitchModule/PsuSwitchModule.net

@@ -1,7 +1,7 @@
 (export (version D)
 (export (version D)
   (design
   (design
     (source C:/Development/mlihardware/MLI/Modular/PsuSwitchModule/PsuSwitchModule.sch)
     (source C:/Development/mlihardware/MLI/Modular/PsuSwitchModule/PsuSwitchModule.sch)
-    (date "29/03/2018 14:29:36")
+    (date "04/04/2018 11:50:58")
     (tool "Eeschema 4.0.7")
     (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
     (sheet (number 1) (name /) (tstamps /)
       (title_block
       (title_block
@@ -192,9 +192,9 @@
       (sheetpath (names /PsuSwitchModule.Switch.1/) (tstamps /59498AA5/))
       (sheetpath (names /PsuSwitchModule.Switch.1/) (tstamps /59498AA5/))
       (tstamp 5A16CD08))
       (tstamp 5A16CD08))
     (comp (ref J201)
     (comp (ref J201)
-      (value Conn_01x02_Male)
-      (footprint Connectors_JST:JST_XH_B02B-XH-A_02x2.50mm_Straight)
-      (libsource (lib conn) (part Conn_01x02_Male))
+      (value Conn_01x03_Male)
+      (footprint PartsLibraries:TerminalBlock_Altech_AK300-3_P5.00mm)
+      (libsource (lib conn) (part Conn_01x03_Male))
       (sheetpath (names /PsuSwitchModule.Switch.1/) (tstamps /59498AA5/))
       (sheetpath (names /PsuSwitchModule.Switch.1/) (tstamps /59498AA5/))
       (tstamp 5AA809BD))
       (tstamp 5AA809BD))
     (comp (ref IC2)
     (comp (ref IC2)
@@ -294,9 +294,9 @@
       (sheetpath (names /PsuSwitchModule.Switch.2/) (tstamps /59A7109E/))
       (sheetpath (names /PsuSwitchModule.Switch.2/) (tstamps /59A7109E/))
       (tstamp 5A16CD08))
       (tstamp 5A16CD08))
     (comp (ref J301)
     (comp (ref J301)
-      (value Conn_01x02_Male)
-      (footprint Connectors_JST:JST_XH_B02B-XH-A_02x2.50mm_Straight)
-      (libsource (lib conn) (part Conn_01x02_Male))
+      (value Conn_01x03_Male)
+      (footprint PartsLibraries:TerminalBlock_Altech_AK300-3_P5.00mm)
+      (libsource (lib conn) (part Conn_01x03_Male))
       (sheetpath (names /PsuSwitchModule.Switch.2/) (tstamps /59A7109E/))
       (sheetpath (names /PsuSwitchModule.Switch.2/) (tstamps /59A7109E/))
       (tstamp 5AA809BD))
       (tstamp 5AA809BD))
     (comp (ref IC3)
     (comp (ref IC3)
@@ -396,9 +396,9 @@
       (sheetpath (names /PsuSwitchModule.Switch.3/) (tstamps /59A71299/))
       (sheetpath (names /PsuSwitchModule.Switch.3/) (tstamps /59A71299/))
       (tstamp 5A16CD08))
       (tstamp 5A16CD08))
     (comp (ref J401)
     (comp (ref J401)
-      (value Conn_01x02_Male)
-      (footprint Connectors_JST:JST_XH_B02B-XH-A_02x2.50mm_Straight)
-      (libsource (lib conn) (part Conn_01x02_Male))
+      (value Conn_01x03_Male)
+      (footprint PartsLibraries:TerminalBlock_Altech_AK300-3_P5.00mm)
+      (libsource (lib conn) (part Conn_01x03_Male))
       (sheetpath (names /PsuSwitchModule.Switch.3/) (tstamps /59A71299/))
       (sheetpath (names /PsuSwitchModule.Switch.3/) (tstamps /59A71299/))
       (tstamp 5AA809BD))
       (tstamp 5AA809BD))
     (comp (ref IC4)
     (comp (ref IC4)
@@ -498,9 +498,9 @@
       (sheetpath (names /PsuSwitchModule.Switch.4/) (tstamps /59A712A3/))
       (sheetpath (names /PsuSwitchModule.Switch.4/) (tstamps /59A712A3/))
       (tstamp 5A16CD08))
       (tstamp 5A16CD08))
     (comp (ref J501)
     (comp (ref J501)
-      (value Conn_01x02_Male)
-      (footprint Connectors_JST:JST_XH_B02B-XH-A_02x2.50mm_Straight)
-      (libsource (lib conn) (part Conn_01x02_Male))
+      (value Conn_01x03_Male)
+      (footprint PartsLibraries:TerminalBlock_Altech_AK300-3_P5.00mm)
+      (libsource (lib conn) (part Conn_01x03_Male))
       (sheetpath (names /PsuSwitchModule.Switch.4/) (tstamps /59A712A3/))
       (sheetpath (names /PsuSwitchModule.Switch.4/) (tstamps /59A712A3/))
       (tstamp 5AA809BD)))
       (tstamp 5AA809BD)))
   (libparts
   (libparts
@@ -539,33 +539,34 @@
         (field (name Value) Conn_01x01))
         (field (name Value) Conn_01x01))
       (pins
       (pins
         (pin (num 1) (name Pin_1) (type passive))))
         (pin (num 1) (name Pin_1) (type passive))))
-    (libpart (lib conn) (part Conn_01x02_Male)
-      (description "Generic connector, single row, 01x02")
+    (libpart (lib conn) (part Conn_01x03)
+      (description "Generic connector, single row, 01x03")
       (docs ~)
       (docs ~)
       (footprints
       (footprints
         (fp Connector*:*_??x*mm*)
         (fp Connector*:*_??x*mm*)
         (fp Connector*:*1x??x*mm*)
         (fp Connector*:*1x??x*mm*)
         (fp Pin?Header?Straight?1X*)
         (fp Pin?Header?Straight?1X*)
-        (fp Pin?Header?Angled?1X*))
+        (fp Pin?Header?Angled?1X*)
+        (fp Socket?Strip?Straight?1X*)
+        (fp Socket?Strip?Angled?1X*))
       (fields
       (fields
         (field (name Reference) J)
         (field (name Reference) J)
-        (field (name Value) Conn_01x02_Male))
+        (field (name Value) Conn_01x03))
       (pins
       (pins
         (pin (num 1) (name Pin_1) (type passive))
         (pin (num 1) (name Pin_1) (type passive))
-        (pin (num 2) (name Pin_2) (type passive))))
-    (libpart (lib conn) (part Conn_01x03)
+        (pin (num 2) (name Pin_2) (type passive))
+        (pin (num 3) (name Pin_3) (type passive))))
+    (libpart (lib conn) (part Conn_01x03_Male)
       (description "Generic connector, single row, 01x03")
       (description "Generic connector, single row, 01x03")
       (docs ~)
       (docs ~)
       (footprints
       (footprints
         (fp Connector*:*_??x*mm*)
         (fp Connector*:*_??x*mm*)
         (fp Connector*:*1x??x*mm*)
         (fp Connector*:*1x??x*mm*)
         (fp Pin?Header?Straight?1X*)
         (fp Pin?Header?Straight?1X*)
-        (fp Pin?Header?Angled?1X*)
-        (fp Socket?Strip?Straight?1X*)
-        (fp Socket?Strip?Angled?1X*))
+        (fp Pin?Header?Angled?1X*))
       (fields
       (fields
         (field (name Reference) J)
         (field (name Reference) J)
-        (field (name Value) Conn_01x03))
+        (field (name Value) Conn_01x03_Male))
       (pins
       (pins
         (pin (num 1) (name Pin_1) (type passive))
         (pin (num 1) (name Pin_1) (type passive))
         (pin (num 2) (name Pin_2) (type passive))
         (pin (num 2) (name Pin_2) (type passive))
@@ -654,90 +655,94 @@
         (pin (num 7) (name ~OUTPUT) (type unspc))
         (pin (num 7) (name ~OUTPUT) (type unspc))
         (pin (num 8) (name VDD) (type unspc)))))
         (pin (num 8) (name VDD) (type unspc)))))
   (libraries
   (libraries
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
     (library (logical OAE.Parts)
     (library (logical OAE.Parts)
       (uri C:\Development\multilevelinverter\Hardware\PartsLibraries\OAE.Parts.lib))
       (uri C:\Development\multilevelinverter\Hardware\PartsLibraries\OAE.Parts.lib))
+    (library (logical device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
     (library (logical conn)
     (library (logical conn)
       (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib")))
       (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib")))
   (nets
   (nets
     (net (code 1) (name ARD_PWM_B)
     (net (code 1) (name ARD_PWM_B)
-      (node (ref R4) (pin 1))
       (node (ref J7) (pin 6))
       (node (ref J7) (pin 6))
+      (node (ref R4) (pin 1))
       (node (ref C26) (pin 2)))
       (node (ref C26) (pin 2)))
     (net (code 2) (name ARD_PWM_C)
     (net (code 2) (name ARD_PWM_C)
+      (node (ref C27) (pin 2))
       (node (ref R6) (pin 1))
       (node (ref R6) (pin 1))
-      (node (ref J7) (pin 2))
-      (node (ref C27) (pin 2)))
+      (node (ref J7) (pin 2)))
     (net (code 3) (name ARD_PWM_A)
     (net (code 3) (name ARD_PWM_A)
+      (node (ref J7) (pin 8))
       (node (ref C25) (pin 2))
       (node (ref C25) (pin 2))
-      (node (ref R2) (pin 1))
-      (node (ref J7) (pin 8)))
+      (node (ref R2) (pin 1)))
     (net (code 4) (name Earth)
     (net (code 4) (name Earth)
       (node (ref J7) (pin 9))
       (node (ref J7) (pin 9))
       (node (ref J1) (pin 9))
       (node (ref J1) (pin 9))
+      (node (ref J501) (pin 1))
+      (node (ref J201) (pin 1))
+      (node (ref J401) (pin 1))
+      (node (ref J301) (pin 1))
       (node (ref J102) (pin 1)))
       (node (ref J102) (pin 1)))
     (net (code 5) (name ARD_CUR)
     (net (code 5) (name ARD_CUR)
-      (node (ref J1) (pin 1))
-      (node (ref J101) (pin 1)))
+      (node (ref J101) (pin 1))
+      (node (ref J1) (pin 1)))
     (net (code 6) (name DC_IN)
     (net (code 6) (name DC_IN)
       (node (ref U5) (pin 4))
       (node (ref U5) (pin 4))
       (node (ref U1) (pin 4))
       (node (ref U1) (pin 4))
-      (node (ref J1) (pin 4))
       (node (ref U7) (pin 4))
       (node (ref U7) (pin 4))
-      (node (ref U3) (pin 4)))
+      (node (ref U3) (pin 4))
+      (node (ref J1) (pin 4)))
     (net (code 7) (name "Net-(J2-Pad3)")
     (net (code 7) (name "Net-(J2-Pad3)")
-      (node (ref R1) (pin 1))
-      (node (ref J2) (pin 3)))
+      (node (ref J2) (pin 3))
+      (node (ref R1) (pin 1)))
     (net (code 8) (name ARD_GND)
     (net (code 8) (name ARD_GND)
-      (node (ref U4) (pin 2))
-      (node (ref U6) (pin 2))
-      (node (ref U2) (pin 2))
-      (node (ref U8) (pin 2))
       (node (ref J7) (pin 7))
       (node (ref J7) (pin 7))
       (node (ref J7) (pin 5))
       (node (ref J7) (pin 5))
+      (node (ref U2) (pin 2))
+      (node (ref U4) (pin 2))
       (node (ref J7) (pin 3))
       (node (ref J7) (pin 3))
       (node (ref J7) (pin 1))
       (node (ref J7) (pin 1))
-      (node (ref J101) (pin 2))
+      (node (ref U6) (pin 2))
+      (node (ref U8) (pin 2))
+      (node (ref J1) (pin 8))
       (node (ref R1) (pin 2))
       (node (ref R1) (pin 2))
-      (node (ref J1) (pin 8)))
+      (node (ref J101) (pin 2)))
     (net (code 9) (name ARD_VCC)
     (net (code 9) (name ARD_VCC)
-      (node (ref J101) (pin 3))
       (node (ref J1) (pin 7))
       (node (ref J1) (pin 7))
+      (node (ref J101) (pin 3))
       (node (ref J2) (pin 1)))
       (node (ref J2) (pin 1)))
     (net (code 10) (name ARD_TEMP)
     (net (code 10) (name ARD_TEMP)
-      (node (ref J1) (pin 6))
-      (node (ref J2) (pin 2)))
+      (node (ref J2) (pin 2))
+      (node (ref J1) (pin 6)))
     (net (code 11) (name DC_GND)
     (net (code 11) (name DC_GND)
-      (node (ref U7) (pin 1))
-      (node (ref U3) (pin 1))
       (node (ref U1) (pin 1))
       (node (ref U1) (pin 1))
+      (node (ref U7) (pin 1))
       (node (ref U5) (pin 1))
       (node (ref U5) (pin 1))
+      (node (ref U3) (pin 1))
       (node (ref J1) (pin 5)))
       (node (ref J1) (pin 5)))
     (net (code 12) (name "Net-(J1-Pad3)")
     (net (code 12) (name "Net-(J1-Pad3)")
       (node (ref J1) (pin 3)))
       (node (ref J1) (pin 3)))
     (net (code 13) (name "Net-(J1-Pad2)")
     (net (code 13) (name "Net-(J1-Pad2)")
       (node (ref J1) (pin 2)))
       (node (ref J1) (pin 2)))
     (net (code 14) (name ARD_PWM_D)
     (net (code 14) (name ARD_PWM_D)
-      (node (ref J7) (pin 4))
       (node (ref C28) (pin 2))
       (node (ref C28) (pin 2))
+      (node (ref J7) (pin 4))
       (node (ref R8) (pin 1)))
       (node (ref R8) (pin 1)))
     (net (code 15) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 15) (name /PsuSwitchModule.Switch.1/GND_ISO)
       (node (ref R11) (pin 2)))
       (node (ref R11) (pin 2)))
     (net (code 16) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 16) (name /PsuSwitchModule.Switch.1/GND_ISO)
       (node (ref C18) (pin 2)))
       (node (ref C18) (pin 2)))
     (net (code 17) (name "Net-(IC1-Pad2)")
     (net (code 17) (name "Net-(IC1-Pad2)")
-      (node (ref R10) (pin 2))
       (node (ref U2) (pin 4))
       (node (ref U2) (pin 4))
-      (node (ref IC1) (pin 2)))
+      (node (ref IC1) (pin 2))
+      (node (ref R10) (pin 2)))
     (net (code 18) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 18) (name /PsuSwitchModule.Switch.1/GND_ISO)
-      (node (ref J201) (pin 2)))
+      (node (ref J201) (pin 3)))
     (net (code 19) (name /PsuSwitchModule.Switch.1/DRV_SIG)
     (net (code 19) (name /PsuSwitchModule.Switch.1/DRV_SIG)
-      (node (ref J201) (pin 1)))
+      (node (ref J201) (pin 2)))
     (net (code 20) (name "Net-(C25-Pad1)")
     (net (code 20) (name "Net-(C25-Pad1)")
-      (node (ref C25) (pin 1))
+      (node (ref U2) (pin 1))
       (node (ref R2) (pin 2))
       (node (ref R2) (pin 2))
-      (node (ref U2) (pin 1)))
+      (node (ref C25) (pin 1)))
     (net (code 21) (name "Net-(U2-Pad3)")
     (net (code 21) (name "Net-(U2-Pad3)")
       (node (ref U2) (pin 3)))
       (node (ref U2) (pin 3)))
     (net (code 22) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 22) (name /PsuSwitchModule.Switch.1/GND_ISO)
@@ -746,40 +751,40 @@
       (node (ref C2) (pin 2)))
       (node (ref C2) (pin 2)))
     (net (code 24) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 24) (name /PsuSwitchModule.Switch.1/GND_ISO)
       (node (ref C1) (pin 2)))
       (node (ref C1) (pin 2)))
-    (net (code 25) (name "Net-(C17-Pad1)")
-      (node (ref D1) (pin 1))
-      (node (ref U2) (pin 6))
-      (node (ref R3) (pin 2))
-      (node (ref R10) (pin 1))
-      (node (ref C17) (pin 1)))
-    (net (code 26) (name /PsuSwitchModule.Switch.1/DRV_SIG)
+    (net (code 25) (name /PsuSwitchModule.Switch.1/GND_ISO)
+      (node (ref C3) (pin 1)))
+    (net (code 26) (name /PsuSwitchModule.Switch.1/GND_ISO)
+      (node (ref C4) (pin 2)))
+    (net (code 27) (name /PsuSwitchModule.Switch.1/DRV_SIG)
       (node (ref C4) (pin 1))
       (node (ref C4) (pin 1))
       (node (ref IC1) (pin 6))
       (node (ref IC1) (pin 6))
+      (node (ref IC1) (pin 7))
       (node (ref C3) (pin 2))
       (node (ref C3) (pin 2))
-      (node (ref R11) (pin 1))
-      (node (ref IC1) (pin 7)))
-    (net (code 27) (name /PsuSwitchModule.Switch.1/GND_ISO)
-      (node (ref C3) (pin 1)))
-    (net (code 28) (name /PsuSwitchModule.Switch.1/GND_ISO)
-      (node (ref C4) (pin 2)))
-    (net (code 29) (name "Net-(C1-Pad1)")
-      (node (ref IC1) (pin 8))
-      (node (ref U1) (pin 5))
+      (node (ref R11) (pin 1)))
+    (net (code 28) (name "Net-(C1-Pad1)")
       (node (ref C18) (pin 1))
       (node (ref C18) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref C1) (pin 1))
       (node (ref IC1) (pin 1))
       (node (ref IC1) (pin 1))
-      (node (ref R3) (pin 1)))
-    (net (code 30) (name /PsuSwitchModule.Switch.1/GND_ISO)
+      (node (ref R3) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref IC1) (pin 8))
+      (node (ref U1) (pin 5))
+      (node (ref C1) (pin 1)))
+    (net (code 29) (name /PsuSwitchModule.Switch.1/GND_ISO)
       (node (ref IC1) (pin 5)))
       (node (ref IC1) (pin 5)))
-    (net (code 31) (name /PsuSwitchModule.Switch.1/GND_ISO)
+    (net (code 30) (name /PsuSwitchModule.Switch.1/GND_ISO)
       (node (ref IC1) (pin 4)))
       (node (ref IC1) (pin 4)))
-    (net (code 32) (name "Net-(IC1-Pad3)")
+    (net (code 31) (name "Net-(IC1-Pad3)")
       (node (ref IC1) (pin 3)))
       (node (ref IC1) (pin 3)))
+    (net (code 32) (name "Net-(C17-Pad1)")
+      (node (ref R10) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref C17) (pin 1))
+      (node (ref U2) (pin 6))
+      (node (ref D1) (pin 1)))
     (net (code 33) (name /PsuSwitchModule.Switch.1/GND_ISO)
     (net (code 33) (name /PsuSwitchModule.Switch.1/GND_ISO)
-      (node (ref C17) (pin 2))
       (node (ref U2) (pin 5))
       (node (ref U2) (pin 5))
-      (node (ref D1) (pin 2)))
+      (node (ref D1) (pin 2))
+      (node (ref C17) (pin 2)))
     (net (code 34) (name /PsuSwitchModule.Switch.2/GND_ISO)
     (net (code 34) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref R13) (pin 2)))
       (node (ref R13) (pin 2)))
     (net (code 35) (name /PsuSwitchModule.Switch.2/GND_ISO)
     (net (code 35) (name /PsuSwitchModule.Switch.2/GND_ISO)
@@ -789,77 +794,77 @@
       (node (ref U4) (pin 4))
       (node (ref U4) (pin 4))
       (node (ref IC2) (pin 2)))
       (node (ref IC2) (pin 2)))
     (net (code 37) (name /PsuSwitchModule.Switch.2/GND_ISO)
     (net (code 37) (name /PsuSwitchModule.Switch.2/GND_ISO)
-      (node (ref J301) (pin 2)))
+      (node (ref J301) (pin 3)))
     (net (code 38) (name /PsuSwitchModule.Switch.2/DRV_SIG)
     (net (code 38) (name /PsuSwitchModule.Switch.2/DRV_SIG)
-      (node (ref J301) (pin 1)))
+      (node (ref J301) (pin 2)))
     (net (code 39) (name "Net-(C26-Pad1)")
     (net (code 39) (name "Net-(C26-Pad1)")
-      (node (ref R4) (pin 2))
       (node (ref U4) (pin 1))
       (node (ref U4) (pin 1))
+      (node (ref R4) (pin 2))
       (node (ref C26) (pin 1)))
       (node (ref C26) (pin 1)))
-    (net (code 40) (name /PsuSwitchModule.Switch.2/DRV_SIG)
-      (node (ref R13) (pin 1))
-      (node (ref IC2) (pin 6))
-      (node (ref IC2) (pin 7))
-      (node (ref C8) (pin 1))
-      (node (ref C7) (pin 2)))
-    (net (code 41) (name "Net-(U4-Pad3)")
+    (net (code 40) (name "Net-(U4-Pad3)")
       (node (ref U4) (pin 3)))
       (node (ref U4) (pin 3)))
-    (net (code 42) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 41) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref U3) (pin 7)))
       (node (ref U3) (pin 7)))
-    (net (code 43) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 42) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref C6) (pin 2)))
       (node (ref C6) (pin 2)))
-    (net (code 44) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 43) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref C5) (pin 2)))
       (node (ref C5) (pin 2)))
-    (net (code 45) (name "Net-(C19-Pad1)")
-      (node (ref U4) (pin 6))
-      (node (ref R5) (pin 2))
-      (node (ref C19) (pin 1))
-      (node (ref D2) (pin 1))
-      (node (ref R12) (pin 1)))
-    (net (code 46) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 44) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref C7) (pin 1)))
       (node (ref C7) (pin 1)))
-    (net (code 47) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 45) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref C8) (pin 2)))
       (node (ref C8) (pin 2)))
-    (net (code 48) (name "Net-(C20-Pad1)")
-      (node (ref IC2) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref IC2) (pin 8))
+    (net (code 46) (name "Net-(C20-Pad1)")
+      (node (ref R5) (pin 1))
       (node (ref C20) (pin 1))
       (node (ref C20) (pin 1))
+      (node (ref IC2) (pin 1))
+      (node (ref U3) (pin 5))
       (node (ref C6) (pin 1))
       (node (ref C6) (pin 1))
-      (node (ref R5) (pin 1))
-      (node (ref U3) (pin 5)))
-    (net (code 49) (name /PsuSwitchModule.Switch.2/GND_ISO)
+      (node (ref C5) (pin 1))
+      (node (ref IC2) (pin 8)))
+    (net (code 47) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref IC2) (pin 5)))
       (node (ref IC2) (pin 5)))
-    (net (code 50) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 48) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref IC2) (pin 4)))
       (node (ref IC2) (pin 4)))
-    (net (code 51) (name "Net-(IC2-Pad3)")
+    (net (code 49) (name "Net-(IC2-Pad3)")
       (node (ref IC2) (pin 3)))
       (node (ref IC2) (pin 3)))
-    (net (code 52) (name /PsuSwitchModule.Switch.2/GND_ISO)
+    (net (code 50) (name "Net-(C19-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref C19) (pin 1))
+      (node (ref U4) (pin 6))
+      (node (ref D2) (pin 1))
+      (node (ref R5) (pin 2)))
+    (net (code 51) (name /PsuSwitchModule.Switch.2/GND_ISO)
       (node (ref U4) (pin 5))
       (node (ref U4) (pin 5))
       (node (ref C19) (pin 2))
       (node (ref C19) (pin 2))
       (node (ref D2) (pin 2)))
       (node (ref D2) (pin 2)))
+    (net (code 52) (name /PsuSwitchModule.Switch.2/DRV_SIG)
+      (node (ref R13) (pin 1))
+      (node (ref IC2) (pin 6))
+      (node (ref IC2) (pin 7))
+      (node (ref C8) (pin 1))
+      (node (ref C7) (pin 2)))
     (net (code 53) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 53) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref R15) (pin 2)))
       (node (ref R15) (pin 2)))
     (net (code 54) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 54) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref C22) (pin 2)))
       (node (ref C22) (pin 2)))
     (net (code 55) (name "Net-(IC3-Pad2)")
     (net (code 55) (name "Net-(IC3-Pad2)")
+      (node (ref IC3) (pin 2))
       (node (ref U6) (pin 4))
       (node (ref U6) (pin 4))
-      (node (ref R14) (pin 2))
-      (node (ref IC3) (pin 2)))
+      (node (ref R14) (pin 2)))
     (net (code 56) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 56) (name /PsuSwitchModule.Switch.3/GND_ISO)
-      (node (ref J401) (pin 2)))
+      (node (ref J401) (pin 3)))
     (net (code 57) (name /PsuSwitchModule.Switch.3/DRV_SIG)
     (net (code 57) (name /PsuSwitchModule.Switch.3/DRV_SIG)
-      (node (ref J401) (pin 1)))
+      (node (ref J401) (pin 2)))
     (net (code 58) (name "Net-(C27-Pad1)")
     (net (code 58) (name "Net-(C27-Pad1)")
-      (node (ref C27) (pin 1))
       (node (ref U6) (pin 1))
       (node (ref U6) (pin 1))
-      (node (ref R6) (pin 2)))
+      (node (ref R6) (pin 2))
+      (node (ref C27) (pin 1)))
     (net (code 59) (name /PsuSwitchModule.Switch.3/DRV_SIG)
     (net (code 59) (name /PsuSwitchModule.Switch.3/DRV_SIG)
-      (node (ref C11) (pin 2))
-      (node (ref IC3) (pin 6))
-      (node (ref IC3) (pin 7))
       (node (ref C12) (pin 1))
       (node (ref C12) (pin 1))
-      (node (ref R15) (pin 1)))
+      (node (ref IC3) (pin 7))
+      (node (ref R15) (pin 1))
+      (node (ref IC3) (pin 6))
+      (node (ref C11) (pin 2)))
     (net (code 60) (name "Net-(U6-Pad3)")
     (net (code 60) (name "Net-(U6-Pad3)")
       (node (ref U6) (pin 3)))
       (node (ref U6) (pin 3)))
     (net (code 61) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 61) (name /PsuSwitchModule.Switch.3/GND_ISO)
@@ -869,22 +874,22 @@
     (net (code 63) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 63) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref C9) (pin 2)))
       (node (ref C9) (pin 2)))
     (net (code 64) (name "Net-(C21-Pad1)")
     (net (code 64) (name "Net-(C21-Pad1)")
-      (node (ref D3) (pin 1))
-      (node (ref R7) (pin 2))
-      (node (ref U6) (pin 6))
       (node (ref C21) (pin 1))
       (node (ref C21) (pin 1))
-      (node (ref R14) (pin 1)))
+      (node (ref R14) (pin 1))
+      (node (ref R7) (pin 2))
+      (node (ref D3) (pin 1))
+      (node (ref U6) (pin 6)))
     (net (code 65) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 65) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref C11) (pin 1)))
       (node (ref C11) (pin 1)))
     (net (code 66) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 66) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref C12) (pin 2)))
       (node (ref C12) (pin 2)))
     (net (code 67) (name "Net-(C10-Pad1)")
     (net (code 67) (name "Net-(C10-Pad1)")
-      (node (ref IC3) (pin 8))
-      (node (ref C10) (pin 1))
       (node (ref C22) (pin 1))
       (node (ref C22) (pin 1))
       (node (ref R7) (pin 1))
       (node (ref R7) (pin 1))
+      (node (ref C10) (pin 1))
       (node (ref C9) (pin 1))
       (node (ref C9) (pin 1))
       (node (ref U5) (pin 5))
       (node (ref U5) (pin 5))
+      (node (ref IC3) (pin 8))
       (node (ref IC3) (pin 1)))
       (node (ref IC3) (pin 1)))
     (net (code 68) (name /PsuSwitchModule.Switch.3/GND_ISO)
     (net (code 68) (name /PsuSwitchModule.Switch.3/GND_ISO)
       (node (ref IC3) (pin 5)))
       (node (ref IC3) (pin 5)))
@@ -905,13 +910,13 @@
       (node (ref U8) (pin 4))
       (node (ref U8) (pin 4))
       (node (ref R16) (pin 2)))
       (node (ref R16) (pin 2)))
     (net (code 75) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 75) (name /PsuSwitchModule.Switch.4/GND_ISO)
-      (node (ref J501) (pin 2)))
+      (node (ref J501) (pin 3)))
     (net (code 76) (name /PsuSwitchModule.Switch.4/DRV_SIG)
     (net (code 76) (name /PsuSwitchModule.Switch.4/DRV_SIG)
-      (node (ref J501) (pin 1)))
+      (node (ref J501) (pin 2)))
     (net (code 77) (name "Net-(C28-Pad1)")
     (net (code 77) (name "Net-(C28-Pad1)")
-      (node (ref R8) (pin 2))
       (node (ref U8) (pin 1))
       (node (ref U8) (pin 1))
-      (node (ref C28) (pin 1)))
+      (node (ref C28) (pin 1))
+      (node (ref R8) (pin 2)))
     (net (code 78) (name "Net-(U8-Pad3)")
     (net (code 78) (name "Net-(U8-Pad3)")
       (node (ref U8) (pin 3)))
       (node (ref U8) (pin 3)))
     (net (code 79) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 79) (name /PsuSwitchModule.Switch.4/GND_ISO)
@@ -925,19 +930,19 @@
     (net (code 83) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 83) (name /PsuSwitchModule.Switch.4/GND_ISO)
       (node (ref C16) (pin 2)))
       (node (ref C16) (pin 2)))
     (net (code 84) (name /PsuSwitchModule.Switch.4/DRV_SIG)
     (net (code 84) (name /PsuSwitchModule.Switch.4/DRV_SIG)
-      (node (ref C16) (pin 1))
-      (node (ref C15) (pin 2))
-      (node (ref R17) (pin 1))
       (node (ref IC4) (pin 7))
       (node (ref IC4) (pin 7))
-      (node (ref IC4) (pin 6)))
+      (node (ref R17) (pin 1))
+      (node (ref C15) (pin 2))
+      (node (ref IC4) (pin 6))
+      (node (ref C16) (pin 1)))
     (net (code 85) (name "Net-(C13-Pad1)")
     (net (code 85) (name "Net-(C13-Pad1)")
-      (node (ref IC4) (pin 8))
       (node (ref IC4) (pin 1))
       (node (ref IC4) (pin 1))
+      (node (ref IC4) (pin 8))
       (node (ref C14) (pin 1))
       (node (ref C14) (pin 1))
+      (node (ref R9) (pin 1))
       (node (ref C24) (pin 1))
       (node (ref C24) (pin 1))
       (node (ref C13) (pin 1))
       (node (ref C13) (pin 1))
-      (node (ref U7) (pin 5))
-      (node (ref R9) (pin 1)))
+      (node (ref U7) (pin 5)))
     (net (code 86) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 86) (name /PsuSwitchModule.Switch.4/GND_ISO)
       (node (ref IC4) (pin 5)))
       (node (ref IC4) (pin 5)))
     (net (code 87) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 87) (name /PsuSwitchModule.Switch.4/GND_ISO)
@@ -945,11 +950,11 @@
     (net (code 88) (name "Net-(IC4-Pad3)")
     (net (code 88) (name "Net-(IC4-Pad3)")
       (node (ref IC4) (pin 3)))
       (node (ref IC4) (pin 3)))
     (net (code 89) (name "Net-(C23-Pad1)")
     (net (code 89) (name "Net-(C23-Pad1)")
+      (node (ref C23) (pin 1))
       (node (ref R9) (pin 2))
       (node (ref R9) (pin 2))
       (node (ref U8) (pin 6))
       (node (ref U8) (pin 6))
-      (node (ref D4) (pin 1))
-      (node (ref C23) (pin 1))
-      (node (ref R16) (pin 1)))
+      (node (ref R16) (pin 1))
+      (node (ref D4) (pin 1)))
     (net (code 90) (name /PsuSwitchModule.Switch.4/GND_ISO)
     (net (code 90) (name /PsuSwitchModule.Switch.4/GND_ISO)
       (node (ref U8) (pin 5))
       (node (ref U8) (pin 5))
       (node (ref C23) (pin 2))
       (node (ref C23) (pin 2))

+ 5 - 0
PartsLibraries.pretty/NME1212DC.kicad_mod

@@ -58,4 +58,9 @@
   (pad 6 thru_hole circle (at 7.62 5.08 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
   (pad 6 thru_hole circle (at 7.62 5.08 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
   (pad 7 thru_hole circle (at 7.62 2.54 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
   (pad 7 thru_hole circle (at 7.62 2.54 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
   (pad 8 thru_hole circle (at 7.62 0 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
   (pad 8 thru_hole circle (at 7.62 0 90) (size 1.4859 1.4859) (drill 0.9906) (layers *.Cu *.Mask F.SilkS))
+  (model Housings_DIP.3dshapes/DIP-8_W7.62mm.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
 )
 )

+ 3 - 3
PartsLibraries.pretty/RJ45-shielded-Molex.kicad_mod

@@ -1,9 +1,9 @@
-(module RJ45-shielded-Molex (layer F.Cu) (tedit 5AC497C6)
+(module RJ45-shielded-Molex (layer F.Cu) (tedit 5AC4A305)
   (tags RJ45)
   (tags RJ45)
-  (fp_text reference J? (at 5.08 -6.35) (layer F.SilkS)
+  (fp_text reference J7 (at -0.6 -6.7) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
     (effects (font (size 1 1) (thickness 0.15)))
   )
   )
-  (fp_text value RJ45 (at 4.6 10.9) (layer F.Fab)
+  (fp_text value Control (at 9 -6.6) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
     (effects (font (size 1 1) (thickness 0.15)))
   )
   )
   (fp_line (start -3.2 13) (end 12.2 13) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.2 13) (end 12.2 13) (layer F.SilkS) (width 0.12))

+ 41 - 0
PartsLibraries.pretty/TerminalBlock_Altech_AK300-3_P5.00mm.kicad_mod

@@ -0,0 +1,41 @@
+(module TerminalBlock_Altech_AK300-3_P5.00mm (layer F.Cu) (tedit 5AC4BBAD)
+  (descr "Altech AK300 terminal block, pitch 5.0mm, 45 degree angled, see http://www.mouser.com/ds/2/16/PCBMETRC-24178.pdf")
+  (tags "Altech AK300 terminal block pitch 5.0mm")
+  (fp_text reference J401 (at -5.24 0 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Conn_01x03_Male (at 4.95 10) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user Shld (at 0 -7 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user Gnd (at 10 -6.5 270) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user Sig (at 5 -6.5 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -3 -5) (end -3 6) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3 6) (end 13 6) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13 6) (end 13 5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13 5) (end 13.5 5.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.5 5.5) (end 13.5 3.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.5 3.5) (end 13 4) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13 4) (end 13 -1.5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13 -1.5) (end 13.5 -1) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.5 -1) (end 13.5 -5) (layer F.SilkS) (width 0.12))
+  (fp_line (start 13.5 -5) (end -3 -5) (layer F.SilkS) (width 0.12))
+  (fp_line (start -3.5 -5.5) (end 14 -5.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -3.5 -5.5) (end -3.5 6.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 14 6.5) (end 14 -5.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 14 6.5) (end -3.5 6.5) (layer F.CrtYd) (width 0.05))
+  (pad 1 thru_hole rect (at 0 0) (size 1.98 3.96) (drill 1.32) (layers *.Cu *.Mask))
+  (pad 2 thru_hole oval (at 5 0) (size 1.98 3.96) (drill 1.32) (layers *.Cu *.Mask))
+  (pad 3 thru_hole oval (at 10 0) (size 1.98 3.96) (drill 1.32) (layers *.Cu *.Mask))
+  (model C:/Development/mlihardware/3D/17574.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)