Merge branch 'master' into newstuff

2026-02-06 10:23:58 +08:00 · 2016-12-26 18:24:04 +01:00
parent 284ef1f55e 8203cf744d
commit 66e53c0e8e
23 changed files with 5721 additions and 5697 deletions
--- a/hw/kicad/v4.0/cmd.sch
+++ b/hw/kicad/v4.0/cmd.sch
@@ -136,10 +136,10 @@ F 3 "" H 6500 1400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR90
 U 1 1 565DD8E9
 P 5450 1900
-F 0 "#PWR087" H 5450 1650 50  0001 C CNN
+F 0 "#PWR90" H 5450 1650 50  0001 C CNN
 F 1 "GND" H 5450 1750 50  0000 C CNN
 F 2 "" H 5450 1900 60  0000 C CNN
 F 3 "" H 5450 1900 60  0000 C CNN
@@ -184,10 +184,10 @@ F 3 "" H 6500 2800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR088
+L GND #PWR91
 U 1 1 565DDCB0
 P 5450 3300
-F 0 "#PWR088" H 5450 3050 50  0001 C CNN
+F 0 "#PWR91" H 5450 3050 50  0001 C CNN
 F 1 "GND" H 5450 3150 50  0000 C CNN
 F 2 "" H 5450 3300 60  0000 C CNN
 F 3 "" H 5450 3300 60  0000 C CNN
@@ -232,10 +232,10 @@ F 3 "" H 6500 4200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR089
+L GND #PWR92
 U 1 1 565DDF1B
 P 5450 4700
-F 0 "#PWR089" H 5450 4450 50  0001 C CNN
+F 0 "#PWR92" H 5450 4450 50  0001 C CNN
 F 1 "GND" H 5450 4550 50  0000 C CNN
 F 2 "" H 5450 4700 60  0000 C CNN
 F 3 "" H 5450 4700 60  0000 C CNN
@@ -280,10 +280,10 @@ F 3 "" H 6500 5600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR93
 U 1 1 565DDF51
 P 5450 6100
-F 0 "#PWR090" H 5450 5850 50  0001 C CNN
+F 0 "#PWR93" H 5450 5850 50  0001 C CNN
 F 1 "GND" H 5450 5950 50  0000 C CNN
 F 2 "" H 5450 6100 60  0000 C CNN
 F 3 "" H 5450 6100 60  0000 C CNN
@@ -317,10 +317,10 @@ F 3 "" H 2900 4350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR89
 U 1 1 565DE705
 P 3000 4550
-F 0 "#PWR091" H 3000 4300 50  0001 C CNN
+F 0 "#PWR89" H 3000 4300 50  0001 C CNN
 F 1 "GND" H 3000 4400 50  0000 C CNN
 F 2 "" H 3000 4550 60  0000 C CNN
 F 3 "" H 3000 4550 60  0000 C CNN
@@ -328,10 +328,10 @@ F 3 "" H 3000 4550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR092
+L GND #PWR87
 U 1 1 565DE73D
 P 2100 3950
-F 0 "#PWR092" H 2100 3700 50  0001 C CNN
+F 0 "#PWR87" H 2100 3700 50  0001 C CNN
 F 1 "GND" H 2100 3800 50  0000 C CNN
 F 2 "" H 2100 3950 60  0000 C CNN
 F 3 "" H 2100 3950 60  0000 C CNN
@@ -339,10 +339,10 @@ F 3 "" H 2100 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR093
+L GND #PWR86
 U 1 1 565DE775
 P 2100 3250
-F 0 "#PWR093" H 2100 3000 50  0001 C CNN
+F 0 "#PWR86" H 2100 3000 50  0001 C CNN
 F 1 "GND" H 2100 3100 50  0000 C CNN
 F 2 "" H 2100 3250 60  0000 C CNN
 F 3 "" H 2100 3250 60  0000 C CNN
@@ -475,10 +475,10 @@ F 3 "" H 6900 1600 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR94
 U 1 1 57758BC5
 P 6900 1800
-F 0 "#PWR094" H 6900 1550 50  0001 C CNN
+F 0 "#PWR94" H 6900 1550 50  0001 C CNN
 F 1 "GND" H 6900 1650 50  0000 C CNN
 F 2 "" H 6900 1800 60  0000 C CNN
 F 3 "" H 6900 1800 60  0000 C CNN
@@ -497,10 +497,10 @@ F 3 "" H 6900 3000 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR095
+L GND #PWR95
 U 1 1 57758FA1
 P 6900 3200
-F 0 "#PWR095" H 6900 2950 50  0001 C CNN
+F 0 "#PWR95" H 6900 2950 50  0001 C CNN
 F 1 "GND" H 6900 3050 50  0000 C CNN
 F 2 "" H 6900 3200 60  0000 C CNN
 F 3 "" H 6900 3200 60  0000 C CNN
@@ -519,10 +519,10 @@ F 3 "" H 6900 4400 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR096
+L GND #PWR96
 U 1 1 577591B7
 P 6900 4600
-F 0 "#PWR096" H 6900 4350 50  0001 C CNN
+F 0 "#PWR96" H 6900 4350 50  0001 C CNN
 F 1 "GND" H 6900 4450 50  0000 C CNN
 F 2 "" H 6900 4600 60  0000 C CNN
 F 3 "" H 6900 4600 60  0000 C CNN
@@ -541,10 +541,10 @@ F 3 "" H 6900 5800 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR097
+L GND #PWR97
 U 1 1 57759291
 P 6900 6000
-F 0 "#PWR097" H 6900 5750 50  0001 C CNN
+F 0 "#PWR97" H 6900 5750 50  0001 C CNN
 F 1 "GND" H 6900 5850 50  0000 C CNN
 F 2 "" H 6900 6000 60  0000 C CNN
 F 3 "" H 6900 6000 60  0000 C CNN
@@ -582,10 +582,10 @@ F 3 "" H 8100 1200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR098
+L GND #PWR99
 U 1 1 57AD9057
 P 8100 1450
-F 0 "#PWR098" H 8100 1200 50  0001 C CNN
+F 0 "#PWR99" H 8100 1200 50  0001 C CNN
 F 1 "GND" H 8100 1300 50  0000 C CNN
 F 2 "" H 8100 1450 60  0000 C CNN
 F 3 "" H 8100 1450 60  0000 C CNN
@@ -936,10 +936,10 @@ Wire Wire Line
 	4700 4250 4700 4350
 Connection ~ 4700 4350
 $Comp
-L +5F #PWR099
+L +5F #PWR98
 U 1 1 57D6FF89
 P 8100 850
-F 0 "#PWR099" H 8100 700 50  0001 C CNN
+F 0 "#PWR98" H 8100 700 50  0001 C CNN
 F 1 "+5F" H 8100 990 50  0000 C CNN
 F 2 "" H 8100 850 50  0000 C CNN
 F 3 "" H 8100 850 50  0000 C CNN
@@ -947,10 +947,10 @@ F 3 "" H 8100 850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDD #PWR0100
+L GNDD #PWR88
 U 1 1 57F8452B
 P 2700 4250
-F 0 "#PWR0100" H 2700 4000 50  0001 C CNN
+F 0 "#PWR88" H 2700 4000 50  0001 C CNN
 F 1 "GNDD" H 2700 4100 50  0000 C CNN
 F 2 "" H 2700 4250 50  0000 C CNN
 F 3 "" H 2700 4250 50  0000 C CNN
--- a/hw/kicad/v4.0/ctrl.sch
+++ b/hw/kicad/v4.0/ctrl.sch
@@ -270,10 +270,10 @@ Wire Wire Line
 Wire Wire Line
 	1600 1800 1650 1800
 $Comp
-L +3.3V #PWR065
+L +3.3V #PWR65
 U 1 1 578427DC
 P 1650 1550
-F 0 "#PWR065" H 1650 1400 50  0001 C CNN
+F 0 "#PWR65" H 1650 1400 50  0001 C CNN
 F 1 "+3.3V" H 1650 1690 50  0000 C CNN
 F 2 "" H 1650 1550 50  0000 C CNN
 F 3 "" H 1650 1550 50  0000 C CNN
@@ -285,10 +285,10 @@ Wire Wire Line
 Wire Wire Line
 	1650 1600 1600 1600
 $Comp
-L GND #PWR066
+L GND #PWR66
 U 1 1 57848EA2
 P 1650 1950
-F 0 "#PWR066" H 1650 1700 50  0001 C CNN
+F 0 "#PWR66" H 1650 1700 50  0001 C CNN
 F 1 "GND" H 1650 1800 50  0000 C CNN
 F 2 "" H 1650 1950 50  0000 C CNN
 F 3 "" H 1650 1950 50  0000 C CNN
--- a/hw/kicad/v4.0/cur.sch
+++ b/hw/kicad/v4.0/cur.sch
@@ -104,10 +104,10 @@ A_IV
 Text HLabel 7200 3000 2    60   Input ~ 0
 A_IW
 $Comp
-L +3.3VP #PWR059
+L +3.3VP #PWR59
 U 1 1 57747146
 P 4700 2500
-F 0 "#PWR059" H 4850 2450 50  0001 C CNN
+F 0 "#PWR59" H 4850 2450 50  0001 C CNN
 F 1 "+3.3VP" H 4700 2600 50  0000 C CNN
 F 2 "" H 4700 2500 50  0000 C CNN
 F 3 "" H 4700 2500 50  0000 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 4700 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR060
+L GNDPWR #PWR60
 U 1 1 5774715A
 P 4700 3500
-F 0 "#PWR060" H 4700 3300 50  0001 C CNN
+F 0 "#PWR60" H 4700 3300 50  0001 C CNN
 F 1 "GNDPWR" H 4700 3370 50  0000 C CNN
 F 2 "" H 4700 3450 50  0000 C CNN
 F 3 "" H 4700 3450 50  0000 C CNN
@@ -170,10 +170,10 @@ Connection ~ 4700 3000
 Wire Wire Line
 	4700 2500 4700 2600
 $Comp
-L +3.3VP #PWR061
+L +3.3VP #PWR61
 U 1 1 57747506
 P 5900 2500
-F 0 "#PWR061" H 6050 2450 50  0001 C CNN
+F 0 "#PWR61" H 6050 2450 50  0001 C CNN
 F 1 "+3.3VP" H 5900 2600 50  0000 C CNN
 F 2 "" H 5900 2500 50  0000 C CNN
 F 3 "" H 5900 2500 50  0000 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 5900 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR062
+L GNDPWR #PWR62
 U 1 1 5774750C
 P 5900 3500
-F 0 "#PWR062" H 5900 3300 50  0001 C CNN
+F 0 "#PWR62" H 5900 3300 50  0001 C CNN
 F 1 "GNDPWR" H 5900 3370 50  0000 C CNN
 F 2 "" H 5900 3450 50  0000 C CNN
 F 3 "" H 5900 3450 50  0000 C CNN
@@ -236,10 +236,10 @@ Connection ~ 5900 3000
 Wire Wire Line
 	5900 2500 5900 2600
 $Comp
-L +3.3VP #PWR063
+L +3.3VP #PWR63
 U 1 1 5774767B
 P 7100 2500
-F 0 "#PWR063" H 7250 2450 50  0001 C CNN
+F 0 "#PWR63" H 7250 2450 50  0001 C CNN
 F 1 "+3.3VP" H 7100 2600 50  0000 C CNN
 F 2 "" H 7100 2500 50  0000 C CNN
 F 3 "" H 7100 2500 50  0000 C CNN
@@ -247,10 +247,10 @@ F 3 "" H 7100 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR064
+L GNDPWR #PWR64
 U 1 1 57747681
 P 7100 3500
-F 0 "#PWR064" H 7100 3300 50  0001 C CNN
+F 0 "#PWR64" H 7100 3300 50  0001 C CNN
 F 1 "GNDPWR" H 7100 3370 50  0000 C CNN
 F 2 "" H 7100 3450 50  0000 C CNN
 F 3 "" H 7100 3450 50  0000 C CNN
--- a/hw/kicad/v4.0/f3.sch
+++ b/hw/kicad/v4.0/f3.sch
@@ -92,10 +92,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GNDPWR #PWR011
+L GNDPWR #PWR32
 U 1 1 5663134A
 P 9900 5000
-F 0 "#PWR011" H 9900 4800 50  0001 C CNN
+F 0 "#PWR32" H 9900 4800 50  0001 C CNN
 F 1 "GNDPWR" H 9900 4870 50  0000 C CNN
 F 2 "" H 9900 4950 60  0000 C CNN
 F 3 "" H 9900 4950 60  0000 C CNN
@@ -114,10 +114,10 @@ F 3 "" H 9600 850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR012
+L GNDPWR #PWR30
 U 1 1 566314BF
 P 9300 700
-F 0 "#PWR012" H 9300 500 50  0001 C CNN
+F 0 "#PWR30" H 9300 500 50  0001 C CNN
 F 1 "GNDPWR" H 9300 570 50  0000 C CNN
 F 2 "" H 9300 650 60  0000 C CNN
 F 3 "" H 9300 650 60  0000 C CNN
@@ -125,10 +125,10 @@ F 3 "" H 9300 650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR013
+L +3.3VP #PWR31
 U 1 1 566314F4
 P 9300 1000
-F 0 "#PWR013" H 9450 950 50  0001 C CNN
+F 0 "#PWR31" H 9450 950 50  0001 C CNN
 F 1 "+3.3VP" H 9300 1100 50  0000 C CNN
 F 2 "" H 9300 1000 60  0000 C CNN
 F 3 "" H 9300 1000 60  0000 C CNN
@@ -180,10 +180,10 @@ F 3 "" H 1900 2250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDPWR #PWR014
+L GNDPWR #PWR15
 U 1 1 566315E8
 P 1400 2100
-F 0 "#PWR014" H 1400 1900 50  0001 C CNN
+F 0 "#PWR15" H 1400 1900 50  0001 C CNN
 F 1 "GNDPWR" H 1400 1970 50  0000 C CNN
 F 2 "" H 1400 2050 60  0000 C CNN
 F 3 "" H 1400 2050 60  0000 C CNN
@@ -202,10 +202,10 @@ F 3 "" H 1650 2100 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDPWR #PWR015
+L GNDPWR #PWR16
 U 1 1 5663163A
 P 1400 2400
-F 0 "#PWR015" H 1400 2200 50  0001 C CNN
+F 0 "#PWR16" H 1400 2200 50  0001 C CNN
 F 1 "GNDPWR" H 1400 2270 50  0000 C CNN
 F 2 "" H 1400 2350 60  0000 C CNN
 F 3 "" H 1400 2350 60  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 1100 2250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR016
+L GNDPWR #PWR14
 U 1 1 56631848
 P 1100 2500
-F 0 "#PWR016" H 1100 2300 50  0001 C CNN
+F 0 "#PWR14" H 1100 2300 50  0001 C CNN
 F 1 "GNDPWR" H 1100 2370 50  0000 C CNN
 F 2 "" H 1100 2450 60  0000 C CNN
 F 3 "" H 1100 2450 60  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 1100 2450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR017
+L +3.3VP #PWR13
 U 1 1 56631891
 P 1100 1900
-F 0 "#PWR017" H 1250 1850 50  0001 C CNN
+F 0 "#PWR13" H 1250 1850 50  0001 C CNN
 F 1 "+3.3VP" H 1100 2000 50  0000 C CNN
 F 2 "" H 1100 1900 60  0000 C CNN
 F 3 "" H 1100 1900 60  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 2150 1600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDPWR #PWR018
+L GNDPWR #PWR17
 U 1 1 56631CB6
 P 1900 1600
-F 0 "#PWR018" H 1900 1400 50  0001 C CNN
+F 0 "#PWR17" H 1900 1400 50  0001 C CNN
 F 1 "GNDPWR" H 1900 1470 50  0000 C CNN
 F 2 "" H 1900 1550 60  0000 C CNN
 F 3 "" H 1900 1550 60  0000 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 18350 4250 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GNDPWR #PWR019
+L GNDPWR #PWR36
 U 1 1 566325FB
 P 17800 4300
-F 0 "#PWR019" H 17800 4100 50  0001 C CNN
+F 0 "#PWR36" H 17800 4100 50  0001 C CNN
 F 1 "GNDPWR" H 17800 4170 50  0000 C CNN
 F 2 "" H 17800 4250 60  0000 C CNN
 F 3 "" H 17800 4250 60  0000 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 800 2050 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR020
+L GNDPWR #PWR12
 U 1 1 566A7E7E
 P 800 2300
-F 0 "#PWR020" H 800 2100 50  0001 C CNN
+F 0 "#PWR12" H 800 2100 50  0001 C CNN
 F 1 "GNDPWR" H 800 2170 50  0000 C CNN
 F 2 "" H 800 2250 60  0000 C CNN
 F 3 "" H 800 2250 60  0000 C CNN
@@ -349,10 +349,10 @@ F 3 "" H 800 2250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR021
+L +3.3VP #PWR11
 U 1 1 566A7F0A
 P 800 1400
-F 0 "#PWR021" H 950 1350 50  0001 C CNN
+F 0 "#PWR11" H 950 1350 50  0001 C CNN
 F 1 "+3.3VP" H 800 1500 50  0000 C CNN
 F 2 "" H 800 1400 60  0000 C CNN
 F 3 "" H 800 1400 60  0000 C CNN
@@ -383,10 +383,10 @@ F 4 "TRANSIENT VOLTAGE SUPPRESSOR" H 9400 6350 50  0000 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR022
+L GNDPWR #PWR29
 U 1 1 56821409
 P 8250 6800
-F 0 "#PWR022" H 8250 6600 50  0001 C CNN
+F 0 "#PWR29" H 8250 6600 50  0001 C CNN
 F 1 "GNDPWR" H 8250 6670 50  0000 C CNN
 F 2 "" H 8250 6750 60  0000 C CNN
 F 3 "" H 8250 6750 60  0000 C CNN
@@ -394,10 +394,10 @@ F 3 "" H 8250 6750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR023
+L +3.3VP #PWR33
 U 1 1 56821444
 P 10550 6400
-F 0 "#PWR023" H 10700 6350 50  0001 C CNN
+F 0 "#PWR33" H 10700 6350 50  0001 C CNN
 F 1 "+3.3VP" H 10550 6500 50  0000 C CNN
 F 2 "" H 10550 6400 60  0000 C CNN
 F 3 "" H 10550 6400 60  0000 C CNN
@@ -523,10 +523,10 @@ F 3 "" H 10700 900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR024
+L +3.3VP #PWR34
 U 1 1 57B2E8A4
 P 10950 1000
-F 0 "#PWR024" H 11100 950 50  0001 C CNN
+F 0 "#PWR34" H 11100 950 50  0001 C CNN
 F 1 "+3.3VP" H 10950 1100 50  0000 C CNN
 F 2 "" H 10950 1000 60  0000 C CNN
 F 3 "" H 10950 1000 60  0000 C CNN
@@ -545,10 +545,10 @@ F 3 "" H 7450 6600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR025
+L GNDPWR #PWR28
 U 1 1 57B30D4B
 P 7450 6850
-F 0 "#PWR025" H 7450 6650 50  0001 C CNN
+F 0 "#PWR28" H 7450 6650 50  0001 C CNN
 F 1 "GNDPWR" H 7450 6720 50  0000 C CNN
 F 2 "" H 7450 6800 60  0000 C CNN
 F 3 "" H 7450 6800 60  0000 C CNN
@@ -556,10 +556,10 @@ F 3 "" H 7450 6800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR026
+L +3.3VP #PWR27
 U 1 1 57B30D51
 P 7450 6350
-F 0 "#PWR026" H 7600 6300 50  0001 C CNN
+F 0 "#PWR27" H 7600 6300 50  0001 C CNN
 F 1 "+3.3VP" H 7450 6450 50  0000 C CNN
 F 2 "" H 7450 6350 60  0000 C CNN
 F 3 "" H 7450 6350 60  0000 C CNN
@@ -592,10 +592,10 @@ F 3 "" H 4100 6500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR027
+L GNDPWR #PWR21
 U 1 1 57DF4034
 P 4100 6750
-F 0 "#PWR027" H 4100 6550 50  0001 C CNN
+F 0 "#PWR21" H 4100 6550 50  0001 C CNN
 F 1 "GNDPWR" H 4100 6620 50  0000 C CNN
 F 2 "" H 4100 6700 60  0000 C CNN
 F 3 "" H 4100 6700 60  0000 C CNN
@@ -603,10 +603,10 @@ F 3 "" H 4100 6700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR028
+L +3.3VP #PWR22
 U 1 1 57DF403A
 P 5500 5650
-F 0 "#PWR028" H 5650 5600 50  0001 C CNN
+F 0 "#PWR22" H 5650 5600 50  0001 C CNN
 F 1 "+3.3VP" H 5500 5750 50  0000 C CNN
 F 2 "" H 5500 5650 60  0000 C CNN
 F 3 "" H 5500 5650 60  0000 C CNN
@@ -642,10 +642,10 @@ IO_TX
 Text HLabel 5500 5750 2    60   Input ~ 0
 IO_RX
 $Comp
-L GNDPWR #PWR029
+L GNDPWR #PWR37
 U 1 1 57F61589
 P 18300 3700
-F 0 "#PWR029" H 18300 3500 50  0001 C CNN
+F 0 "#PWR37" H 18300 3500 50  0001 C CNN
 F 1 "GNDPWR" H 18300 3570 50  0000 C CNN
 F 2 "" H 18300 3650 60  0000 C CNN
 F 3 "" H 18300 3650 60  0000 C CNN
@@ -835,10 +835,10 @@ Wire Wire Line
 Wire Wire Line
 	18300 3700 18200 3700
 $Comp
-L GNDPWR #PWR030
+L GNDPWR #PWR19
 U 1 1 58253463
 P 3200 5650
-F 0 "#PWR030" H 3200 5450 50  0001 C CNN
+F 0 "#PWR19" H 3200 5450 50  0001 C CNN
 F 1 "GNDPWR" H 3200 5520 50  0000 C CNN
 F 2 "" H 3200 5600 60  0000 C CNN
 F 3 "" H 3200 5600 60  0000 C CNN
@@ -850,10 +850,10 @@ Wire Wire Line
 Wire Wire Line
 	5500 5650 5400 5650
 $Comp
-L +3.3VP #PWR031
+L +3.3VP #PWR20
 U 1 1 58254A0F
 P 4100 6250
-F 0 "#PWR031" H 4250 6200 50  0001 C CNN
+F 0 "#PWR20" H 4250 6200 50  0001 C CNN
 F 1 "+3.3VP" H 4100 6350 50  0000 C CNN
 F 2 "" H 4100 6250 60  0000 C CNN
 F 3 "" H 4100 6250 60  0000 C CNN
@@ -880,10 +880,10 @@ F 3 "" V 6850 5550 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GNDPWR #PWR032
+L GNDPWR #PWR25
 U 1 1 5825A690
 P 6800 6250
-F 0 "#PWR032" H 6800 6050 50  0001 C CNN
+F 0 "#PWR25" H 6800 6050 50  0001 C CNN
 F 1 "GNDPWR" H 6800 6120 50  0000 C CNN
 F 2 "" H 6800 6200 60  0000 C CNN
 F 3 "" H 6800 6200 60  0000 C CNN
@@ -940,10 +940,10 @@ Wire Wire Line
 	7300 5450 7300 5650
 Connection ~ 7300 5650
 $Comp
-L +3.3VP #PWR033
+L +3.3VP #PWR26
 U 1 1 5825BBE2
 P 7300 5050
-F 0 "#PWR033" H 7450 5000 50  0001 C CNN
+F 0 "#PWR26" H 7450 5000 50  0001 C CNN
 F 1 "+3.3VP" H 7300 5150 50  0000 C CNN
 F 2 "" H 7300 5050 60  0000 C CNN
 F 3 "" H 7300 5050 60  0000 C CNN
@@ -969,10 +969,10 @@ Wire Wire Line
 Wire Wire Line
 	5800 6600 5900 6600
 $Comp
-L GNDPWR #PWR034
+L GNDPWR #PWR24
 U 1 1 5825F749
 P 5800 6900
-F 0 "#PWR034" H 5800 6700 50  0001 C CNN
+F 0 "#PWR24" H 5800 6700 50  0001 C CNN
 F 1 "GNDPWR" H 5800 6770 50  0000 C CNN
 F 2 "" H 5800 6850 60  0000 C CNN
 F 3 "" H 5800 6850 60  0000 C CNN
@@ -1026,10 +1026,10 @@ F 3 "" H 6100 6650 60  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L +3.3VP #PWR035
+L +3.3VP #PWR23
 U 1 1 58343912
 P 5800 6400
-F 0 "#PWR035" H 5950 6350 50  0001 C CNN
+F 0 "#PWR23" H 5950 6350 50  0001 C CNN
 F 1 "+3.3VP" H 5800 6500 50  0000 C CNN
 F 2 "" H 5800 6400 60  0000 C CNN
 F 3 "" H 5800 6400 60  0000 C CNN
@@ -1041,10 +1041,10 @@ Wire Wire Line
 Wire Wire Line
 	5800 6500 5900 6500
 $Comp
-L GNDPWR #PWR036
+L GNDPWR #PWR18
 U 1 1 58350C19
 P 2400 3100
-F 0 "#PWR036" H 2400 2900 50  0001 C CNN
+F 0 "#PWR18" H 2400 2900 50  0001 C CNN
 F 1 "GNDPWR" H 2400 2970 50  0000 C CNN
 F 2 "" H 2400 3050 60  0000 C CNN
 F 3 "" H 2400 3050 60  0000 C CNN
@@ -1054,10 +1054,10 @@ $EndComp
 Wire Wire Line
 	2400 3100 2500 3100
 $Comp
-L GNDPWR #PWR037
+L GNDPWR #PWR35
 U 1 1 5835165C
 P 17200 2900
-F 0 "#PWR037" H 17200 2700 50  0001 C CNN
+F 0 "#PWR35" H 17200 2700 50  0001 C CNN
 F 1 "GNDPWR" H 17200 2770 50  0000 C CNN
 F 2 "" H 17200 2850 60  0000 C CNN
 F 3 "" H 17200 2850 60  0000 C CNN
--- a/hw/kicad/v4.0/f4.sch
+++ b/hw/kicad/v4.0/f4.sch
--- a/hw/kicad/v4.0/fb.sch
+++ b/hw/kicad/v4.0/fb.sch
--- a/hw/kicad/v4.0/hv.sch
+++ b/hw/kicad/v4.0/hv.sch
@@ -172,10 +172,10 @@ TX
 Text HLabel 3100 2100 0    60   Input ~ 0
 RX
 $Comp
-L GND #PWR01
+L GND #PWR5
 U 1 1 566A2E2E
 P 3700 2800
-F 0 "#PWR01" H 3700 2550 50  0001 C CNN
+F 0 "#PWR5" H 3700 2550 50  0001 C CNN
 F 1 "GND" H 3700 2650 50  0000 C CNN
 F 2 "" H 3700 2800 60  0000 C CNN
 F 3 "" H 3700 2800 60  0000 C CNN
@@ -183,10 +183,10 @@ F 3 "" H 3700 2800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR02
+L GNDPWR #PWR7
 U 1 1 566A2FC8
 P 4400 2800
-F 0 "#PWR02" H 4400 2600 50  0001 C CNN
+F 0 "#PWR7" H 4400 2600 50  0001 C CNN
 F 1 "GNDPWR" H 4400 2670 50  0000 C CNN
 F 2 "" H 4400 2750 60  0000 C CNN
 F 3 "" H 4400 2750 60  0000 C CNN
@@ -194,10 +194,10 @@ F 3 "" H 4400 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR03
+L +3.3V #PWR4
 U 1 1 566A3162
 P 3700 1050
-F 0 "#PWR03" H 3700 900 50  0001 C CNN
+F 0 "#PWR4" H 3700 900 50  0001 C CNN
 F 1 "+3.3V" H 3700 1190 50  0000 C CNN
 F 2 "" H 3700 1050 60  0000 C CNN
 F 3 "" H 3700 1050 60  0000 C CNN
@@ -205,10 +205,10 @@ F 3 "" H 3700 1050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR04
+L +3.3VP #PWR6
 U 1 1 566A32FC
 P 4400 1050
-F 0 "#PWR04" H 4550 1000 50  0001 C CNN
+F 0 "#PWR6" H 4550 1000 50  0001 C CNN
 F 1 "+3.3VP" H 4400 1150 50  0000 C CNN
 F 2 "" H 4400 1050 60  0000 C CNN
 F 3 "" H 4400 1050 60  0000 C CNN
@@ -238,10 +238,10 @@ F 3 "" H 4650 1150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR3
 U 1 1 566A4897
 P 3200 1150
-F 0 "#PWR05" H 3200 900 50  0001 C CNN
+F 0 "#PWR3" H 3200 900 50  0001 C CNN
 F 1 "GND" H 3200 1000 50  0000 C CNN
 F 2 "" H 3200 1150 60  0000 C CNN
 F 3 "" H 3200 1150 60  0000 C CNN
@@ -249,10 +249,10 @@ F 3 "" H 3200 1150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GNDPWR #PWR06
+L GNDPWR #PWR8
 U 1 1 566A4A42
 P 4900 1150
-F 0 "#PWR06" H 4900 950 50  0001 C CNN
+F 0 "#PWR8" H 4900 950 50  0001 C CNN
 F 1 "GNDPWR" H 4900 1020 50  0000 C CNN
 F 2 "" H 4900 1100 60  0000 C CNN
 F 3 "" H 4900 1100 60  0000 C CNN
@@ -276,10 +276,10 @@ TX
 Text HLabel 2550 1800 2    60   Input ~ 0
 RX
 $Comp
-L +3.3V #PWR07
+L +3.3V #PWR1
 U 1 1 5784C75E
 P 2550 1550
-F 0 "#PWR07" H 2550 1400 50  0001 C CNN
+F 0 "#PWR1" H 2550 1400 50  0001 C CNN
 F 1 "+3.3V" H 2550 1690 50  0000 C CNN
 F 2 "" H 2550 1550 50  0000 C CNN
 F 3 "" H 2550 1550 50  0000 C CNN
@@ -287,10 +287,10 @@ F 3 "" H 2550 1550 50  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR2
 U 1 1 5784C766
 P 2550 1950
-F 0 "#PWR08" H 2550 1700 50  0001 C CNN
+F 0 "#PWR2" H 2550 1700 50  0001 C CNN
 F 1 "GND" H 2550 1800 50  0000 C CNN
 F 2 "" H 2550 1950 50  0000 C CNN
 F 3 "" H 2550 1950 50  0000 C CNN
@@ -320,10 +320,10 @@ F 3 "" H 10200 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +15V #PWR09
+L +15V #PWR9
 U 1 1 57DCE570
 P 9900 1150
-F 0 "#PWR09" H 9900 1000 50  0001 C CNN
+F 0 "#PWR9" H 9900 1000 50  0001 C CNN
 F 1 "+15V" H 9900 1290 50  0000 C CNN
 F 2 "" H 9900 1150 50  0000 C CNN
 F 3 "" H 9900 1150 50  0000 C CNN
@@ -375,10 +375,10 @@ F 3 "" H 9100 1900 30  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDPWR #PWR010
+L GNDPWR #PWR10
 U 1 1 57DD49BF
 P 9900 2250
-F 0 "#PWR010" H 9900 2050 50  0001 C CNN
+F 0 "#PWR10" H 9900 2050 50  0001 C CNN
 F 1 "GNDPWR" H 9900 2120 50  0000 C CNN
 F 2 "" H 9900 2200 60  0000 C CNN
 F 3 "" H 9900 2200 60  0000 C CNN
--- a/hw/kicad/v4.0/hv_drive.sch
+++ b/hw/kicad/v4.0/hv_drive.sch
@@ -196,10 +196,10 @@ en
 Text HLabel 7150 3050 2    60   Input ~ 0
 itirp
 $Comp
-L GNDPWR #PWR052
+L GNDPWR #PWR57
 U 1 1 56697E7C
 P 7550 5150
-F 0 "#PWR052" H 7550 4950 50  0001 C CNN
+F 0 "#PWR57" H 7550 4950 50  0001 C CNN
 F 1 "GNDPWR" H 7550 5020 50  0000 C CNN
 F 2 "" H 7550 5100 60  0000 C CNN
 F 3 "" H 7550 5100 60  0000 C CNN
@@ -207,10 +207,10 @@ F 3 "" H 7550 5100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +15V #PWR053
+L +15V #PWR56
 U 1 1 56697EBC
 P 7550 4650
-F 0 "#PWR053" H 7550 4500 50  0001 C CNN
+F 0 "#PWR56" H 7550 4500 50  0001 C CNN
 F 1 "+15V" H 7550 4790 50  0000 C CNN
 F 2 "" H 7550 4650 60  0000 C CNN
 F 3 "" H 7550 4650 60  0000 C CNN
@@ -321,10 +321,10 @@ Wire Wire Line
 	5700 5050 5700 4950
 Connection ~ 5700 4950
 $Comp
-L GNDPWR #PWR054
+L GNDPWR #PWR53
 U 1 1 5668FA38
 P 2950 4650
-F 0 "#PWR054" H 2950 4450 50  0001 C CNN
+F 0 "#PWR53" H 2950 4450 50  0001 C CNN
 F 1 "GNDPWR" H 2950 4520 50  0000 C CNN
 F 2 "" H 2950 4600 60  0000 C CNN
 F 3 "" H 2950 4600 60  0000 C CNN
@@ -382,10 +382,10 @@ F 3 "" H 3900 1950 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GNDPWR #PWR055
+L GNDPWR #PWR55
 U 1 1 566CF13E
 P 4200 2100
-F 0 "#PWR055" H 4200 1900 50  0001 C CNN
+F 0 "#PWR55" H 4200 1900 50  0001 C CNN
 F 1 "GNDPWR" H 4200 1970 50  0000 C CNN
 F 2 "" H 4200 2050 60  0000 C CNN
 F 3 "" H 4200 2050 60  0000 C CNN
@@ -393,10 +393,10 @@ F 3 "" H 4200 2050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VPP #PWR056
+L VPP #PWR54
 U 1 1 566CF184
 P 4200 1800
-F 0 "#PWR056" H 4200 1650 50  0001 C CNN
+F 0 "#PWR54" H 4200 1650 50  0001 C CNN
 F 1 "VPP" H 4200 1950 50  0000 C CNN
 F 2 "" H 4200 1800 60  0000 C CNN
 F 3 "" H 4200 1800 60  0000 C CNN
@@ -414,10 +414,10 @@ Wire Wire Line
 Wire Wire Line
 	2950 4250 5850 4250
 $Comp
-L VPP #PWR057
+L VPP #PWR52
 U 1 1 566CF322
 P 2950 4150
-F 0 "#PWR057" H 2950 4000 50  0001 C CNN
+F 0 "#PWR52" H 2950 4000 50  0001 C CNN
 F 1 "VPP" H 2950 4300 50  0000 C CNN
 F 2 "" H 2950 4150 60  0000 C CNN
 F 3 "" H 2950 4150 60  0000 C CNN
@@ -445,10 +445,10 @@ Wire Wire Line
 Wire Wire Line
 	7050 4650 7150 4650
 $Comp
-L +3.3VP #PWR058
+L +3.3VP #PWR58
 U 1 1 566DE47B
 P 7800 4050
-F 0 "#PWR058" H 7950 4000 50  0001 C CNN
+F 0 "#PWR58" H 7950 4000 50  0001 C CNN
 F 1 "+3.3VP" H 7800 4150 50  0000 C CNN
 F 2 "" H 7800 4050 60  0000 C CNN
 F 3 "" H 7800 4050 60  0000 C CNN
--- a/hw/kicad/v4.0/hv_sense.sch
+++ b/hw/kicad/v4.0/hv_sense.sch
@@ -129,10 +129,10 @@ F 3 "" H 2900 4250 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR047
+L GNDPWR #PWR47
 U 1 1 566961CF
 P 2900 4500
-F 0 "#PWR047" H 2900 4300 50  0001 C CNN
+F 0 "#PWR47" H 2900 4300 50  0001 C CNN
 F 1 "GNDPWR" H 2900 4370 50  0000 C CNN
 F 2 "" H 2900 4450 60  0000 C CNN
 F 3 "" H 2900 4450 60  0000 C CNN
@@ -177,10 +177,10 @@ F 3 "" H 3700 4250 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR048
+L GNDPWR #PWR48
 U 1 1 566962B2
 P 3700 4500
-F 0 "#PWR048" H 3700 4300 50  0001 C CNN
+F 0 "#PWR48" H 3700 4300 50  0001 C CNN
 F 1 "GNDPWR" H 3700 4370 50  0000 C CNN
 F 2 "" H 3700 4450 60  0000 C CNN
 F 3 "" H 3700 4450 60  0000 C CNN
@@ -225,10 +225,10 @@ F 3 "" H 4500 4250 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR049
+L GNDPWR #PWR49
 U 1 1 5669635D
 P 4500 4500
-F 0 "#PWR049" H 4500 4300 50  0001 C CNN
+F 0 "#PWR49" H 4500 4300 50  0001 C CNN
 F 1 "GNDPWR" H 4500 4370 50  0000 C CNN
 F 2 "" H 4500 4450 60  0000 C CNN
 F 3 "" H 4500 4450 60  0000 C CNN
@@ -271,10 +271,10 @@ F 3 "" H 5400 4250 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR050
+L GNDPWR #PWR51
 U 1 1 566963FC
 P 5400 4500
-F 0 "#PWR050" H 5400 4300 50  0001 C CNN
+F 0 "#PWR51" H 5400 4300 50  0001 C CNN
 F 1 "GNDPWR" H 5400 4370 50  0000 C CNN
 F 2 "" H 5400 4450 60  0000 C CNN
 F 3 "" H 5400 4450 60  0000 C CNN
@@ -326,10 +326,10 @@ F 3 "" H 5200 4250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VPP #PWR051
+L VPP #PWR50
 U 1 1 5775CE00
 P 5400 3100
-F 0 "#PWR051" H 5400 2950 50  0001 C CNN
+F 0 "#PWR50" H 5400 2950 50  0001 C CNN
 F 1 "VPP" H 5400 3250 50  0000 C CNN
 F 2 "" H 5400 3100 50  0000 C CNN
 F 3 "" H 5400 3100 50  0000 C CNN
--- a/hw/kicad/v4.0/hv_supply.sch
+++ b/hw/kicad/v4.0/hv_supply.sch
@@ -137,10 +137,10 @@ F 4 "25V" H 7200 4250 60  0001 C CNN "Voltage"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR038
+L GNDPWR #PWR44
 U 1 1 56659A1F
 P 8200 4650
-F 0 "#PWR038" H 8200 4450 50  0001 C CNN
+F 0 "#PWR44" H 8200 4450 50  0001 C CNN
 F 1 "GNDPWR" H 8200 4520 50  0000 C CNN
 F 2 "" H 8200 4600 60  0000 C CNN
 F 3 "" H 8200 4600 60  0000 C CNN
@@ -148,10 +148,10 @@ F 3 "" H 8200 4600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +15V #PWR039
+L +15V #PWR43
 U 1 1 56659B14
 P 8200 3900
-F 0 "#PWR039" H 8200 3750 50  0001 C CNN
+F 0 "#PWR43" H 8200 3750 50  0001 C CNN
 F 1 "+15V" H 8200 4040 50  0000 C CNN
 F 2 "" H 8200 3900 60  0000 C CNN
 F 3 "" H 8200 3900 60  0000 C CNN
@@ -159,10 +159,10 @@ F 3 "" H 8200 3900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VPP #PWR040
+L VPP #PWR41
 U 1 1 56659BEB
 P 4200 3300
-F 0 "#PWR040" H 4200 3150 50  0001 C CNN
+F 0 "#PWR41" H 4200 3150 50  0001 C CNN
 F 1 "VPP" H 4200 3450 50  0000 C CNN
 F 2 "" H 4200 3300 60  0000 C CNN
 F 3 "" H 4200 3300 60  0000 C CNN
@@ -273,10 +273,10 @@ F 3 "" H 8700 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GNDPWR #PWR041
+L GNDPWR #PWR46
 U 1 1 57752AE5
 P 8700 4650
-F 0 "#PWR041" H 8700 4450 50  0001 C CNN
+F 0 "#PWR46" H 8700 4450 50  0001 C CNN
 F 1 "GNDPWR" H 8700 4520 50  0000 C CNN
 F 2 "" H 8700 4600 60  0000 C CNN
 F 3 "" H 8700 4600 60  0000 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 8700 3900 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +15V #PWR042
+L +15V #PWR45
 U 1 1 57752BA2
 P 8700 3250
-F 0 "#PWR042" H 8700 3100 50  0001 C CNN
+F 0 "#PWR45" H 8700 3100 50  0001 C CNN
 F 1 "+15V" H 8700 3390 50  0000 C CNN
 F 2 "" H 8700 3250 60  0000 C CNN
 F 3 "" H 8700 3250 60  0000 C CNN
@@ -404,10 +404,10 @@ NoConn ~ 1550 6050
 Connection ~ 2950 6050
 Connection ~ 2950 7100
 $Comp
-L GNDPWR #PWR043
+L GNDPWR #PWR39
 U 1 1 57828DB1
 P 1450 7200
-F 0 "#PWR043" H 1450 7000 50  0001 C CNN
+F 0 "#PWR39" H 1450 7000 50  0001 C CNN
 F 1 "GNDPWR" H 1450 7070 50  0000 C CNN
 F 2 "" H 1450 7150 60  0000 C CNN
 F 3 "" H 1450 7150 60  0000 C CNN
@@ -415,10 +415,10 @@ F 3 "" H 1450 7150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +15V #PWR044
+L +15V #PWR38
 U 1 1 578291C8
 P 1450 5800
-F 0 "#PWR044" H 1450 5650 50  0001 C CNN
+F 0 "#PWR38" H 1450 5650 50  0001 C CNN
 F 1 "+15V" H 1450 5940 50  0000 C CNN
 F 2 "" H 1450 5800 60  0000 C CNN
 F 3 "" H 1450 5800 60  0000 C CNN
@@ -426,10 +426,10 @@ F 3 "" H 1450 5800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3VP #PWR045
+L +3.3VP #PWR40
 U 1 1 5782990B
 P 3750 5950
-F 0 "#PWR045" H 3900 5900 50  0001 C CNN
+F 0 "#PWR40" H 3900 5900 50  0001 C CNN
 F 1 "+3.3VP" H 3750 6050 50  0000 C CNN
 F 2 "" H 3750 5950 60  0000 C CNN
 F 3 "" H 3750 5950 60  0000 C CNN
@@ -528,10 +528,10 @@ F 3 "" H 4200 4400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDPWR #PWR046
+L GNDPWR #PWR42
 U 1 1 5806941B
 P 4200 4650
-F 0 "#PWR046" H 4200 4450 50  0001 C CNN
+F 0 "#PWR42" H 4200 4450 50  0001 C CNN
 F 1 "GNDPWR" H 4200 4520 50  0000 C CNN
 F 2 "" H 4200 4600 60  0000 C CNN
 F 3 "" H 4200 4600 60  0000 C CNN
--- a/hw/kicad/v4.0/io.sch
+++ b/hw/kicad/v4.0/io.sch
--- a/hw/kicad/v4.0/stmbl.pretty/C_Radial_D26_L45_P10.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/C_Radial_D26_L45_P10.kicad_mod
@@ -1,7 +1,7 @@
-(module C_Radial_D26_L45_P10 (layer F.Cu) (tedit 582F712C)
+(module C_Radial_D26_L45_P10 (layer F.Cu) (tedit 584F5F8D)
  (descr "Radial Electrolytic Capacitor Diameter 26mm x Length 45mm, Pitch 10mm")
  (tags "Electrolytic Capacitor")
-  (fp_text reference C22 (at 0 -14.3) (layer F.SilkS)
+  (fp_text reference C21 (at 0 -14.3) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.15)))
  )
  (fp_text value 270µ (at 0 14.3) (layer F.Fab)
@@ -9,8 +9,8 @@
  )
  (fp_circle (center 0 0) (end 0 -13.0375) (layer F.SilkS) (width 0.15))
  (fp_circle (center 0 0) (end 0 -13.3) (layer F.CrtYd) (width 0.05))
-  (pad 2 thru_hole roundrect (at 5 0) (size 3.5 3.5) (drill 2) (layers *.Cu *.Mask F.SilkS)(roundrect_rratio 0.25))
-  (pad 1 thru_hole circle (at -5 0) (size 3.5 3.5) (drill 2) (layers *.Cu *.Mask F.SilkS))
+  (pad 1 thru_hole roundrect (at -5 0) (size 3.3 3.3) (drill 2) (layers *.Cu *.Mask F.SilkS)(roundrect_rratio 0.25))
+  (pad 2 thru_hole circle (at 5 0) (size 3.3 3.3) (drill 2) (layers *.Cu *.Mask F.SilkS))
  (model Capacitors_ThroughHole.3dshapes/C_Radial_D26_L45_P10.wrl
    (at (xyz 0 0 0))
    (scale (xyz 1 1 1))
--- a/hw/kicad/v4.0/stmbl.pretty/LED-0805.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/LED-0805.kicad_mod
@@ -0,0 +1,31 @@
+(module LED-0805 (layer F.Cu) (tedit 583723B0)
+  (descr "LED 0805 smd package")
+  (tags "LED 0805 SMD")
+  (attr smd)
+  (fp_text reference D1 (at -2.214 0.02 -270) (layer F.SilkS)
+    (effects (font (size 0.8 0.8) (thickness 0.2)))
+  )
+  (fp_text value red (at 0 1.75) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.6 0.75) (end 1.1 0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.6 -0.75) (end 1.1 -0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.1 0.15) (end -0.1 -0.1) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.1 -0.1) (end -0.25 0.05) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.35 -0.35) (end -0.35 0.35) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0 0) (end 0.35 0) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.35 0) (end 0 -0.35) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0 -0.35) (end 0 0.35) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0 0.35) (end -0.35 0) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.9 -0.95) (end 1.9 0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 1.9 0.95) (end -1.9 0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.9 0.95) (end -1.9 -0.95) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -1.9 -0.95) (end 1.9 -0.95) (layer F.CrtYd) (width 0.05))
+  (pad 1 smd rect (at -1.04902 0 180) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 1.04902 0 180) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask))
+  (model LEDs.3dshapes/LED-0805.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
--- a/hw/kicad/v4.0/stmbl.pretty/RM5.08_1x2.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/RM5.08_1x2.kicad_mod
@@ -1,4 +1,4 @@
-(module RM5.08_1x2 (layer F.Cu) (tedit 58352CF9)
+(module RM5.08_1x2 (layer F.Cu) (tedit 584F5FEA)
  (fp_text reference P6 (at -1.27 -10.795) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.15)))
  )
@@ -9,8 +9,8 @@
  (fp_line (start 8.22 -10) (end -3.14 -10) (layer F.SilkS) (width 0.15))
  (fp_line (start 8.22 2.1) (end 8.22 -10) (layer F.SilkS) (width 0.15))
  (fp_line (start -3.14 2.1) (end 8.22 2.1) (layer F.SilkS) (width 0.15))
-  (pad 1 thru_hole oval (at 0 0) (size 2 3) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
-  (pad 2 thru_hole oval (at 5.08 0) (size 2 3) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
+  (pad 1 thru_hole oval (at 0 0) (size 2 3.5) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
+  (pad 2 thru_hole oval (at 5.08 0) (size 2 3.5) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
  (model ${KIPRJMOD}/stmbl.pretty/akl230_2.wrl
    (at (xyz -0.1240157480314961 -0.07874015748031496 0))
    (scale (xyz 0.394 0.394 0.394))
--- a/hw/kicad/v4.0/stmbl.pretty/RM5.08_1x3.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/RM5.08_1x3.kicad_mod
@@ -1,4 +1,4 @@
-(module RM5.08_1x3 (layer F.Cu) (tedit 58352AC5)
+(module RM5.08_1x3 (layer F.Cu) (tedit 584F6018)
  (fp_text reference P8 (at -1.27 -10.795) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.15)))
  )
@@ -9,9 +9,9 @@
  (fp_line (start 13.3 -10) (end -3.14 -10) (layer F.SilkS) (width 0.15))
  (fp_line (start 13.3 2) (end 13.3 -10) (layer F.SilkS) (width 0.15))
  (fp_line (start -3.14 2) (end 13.3 2) (layer F.SilkS) (width 0.15))
-  (pad 1 thru_hole oval (at 0 0) (size 2 3) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
-  (pad 2 thru_hole oval (at 5.08 0) (size 2 3) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
-  (pad 3 thru_hole oval (at 10.16 0) (size 2 3) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
+  (pad 1 thru_hole oval (at 0 0) (size 2 3.5) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
+  (pad 2 thru_hole oval (at 5.08 0) (size 2 3.5) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
+  (pad 3 thru_hole oval (at 10.16 0) (size 2 3.5) (drill 1.5) (layers *.Cu *.Mask F.SilkS))
  (model ${KIPRJMOD}/stmbl.pretty/akl230_3.wrl
    (at (xyz -0.1240157480314961 -0.07874015748031496 0))
    (scale (xyz 0.394 0.394 0.394))
--- a/hw/kicad/v4.0/stmbl.pretty/SOIC-7.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/SOIC-7.kicad_mod
@@ -1,4 +1,4 @@
-(module SOIC-7 (layer F.Cu) (tedit 583726AD)
+(module SOIC-7 (layer F.Cu) (tedit 584F7026)
  (attr smd)
  (fp_text reference U5 (at 0 3.5) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.2)))
@@ -13,7 +13,7 @@
  (fp_line (start -2 -2.5) (end -2 2.5) (layer F.SilkS) (width 0.15))
  (pad 8 smd rect (at 2.45 -1.905 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
  (pad 7 smd rect (at 2.45 -0.635 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
-  (pad 3 smd rect (at -2.5 0.635 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
+  (pad 6 smd rect (at 2.5 0.635 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
  (pad 5 smd rect (at 2.45 1.905 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
  (pad 4 smd rect (at -2.45 1.905 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
  (pad 2 smd rect (at -2.45 -0.635 270) (size 0.6 2) (layers F.Cu F.Paste F.Mask))
--- a/hw/kicad/v4.0/stmbl.pretty/SOIC-8-N.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/SOIC-8-N.kicad_mod
@@ -2,10 +2,10 @@
  (descr "Module Narrow CMS SOJ 8 pins large")
  (tags "CMS SOJ")
  (attr smd)
-  (fp_text reference U11 (at 0 -1.27) (layer F.SilkS)
+  (fp_text reference U3 (at 0 -1.27) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.15)))
  )
-  (fp_text value SN65176B (at 0 1.27) (layer F.Fab)
+  (fp_text value SI8621 (at 0 1.27) (layer F.Fab)
    (effects (font (size 1 1) (thickness 0.15)))
  )
  (fp_line (start 2.286 -2.54) (end 2.286 2.54) (layer F.SilkS) (width 0.15))
@@ -24,8 +24,8 @@
  (pad 7 smd rect (at 3.175 -0.635 270) (size 0.508 1.143) (layers F.Cu F.Paste F.Mask))
  (pad 8 smd rect (at 3.175 -1.905 270) (size 0.508 1.143) (layers F.Cu F.Paste F.Mask))
  (model ${KIPRJMOD}/stmbl.pretty/so8.wrl
-    (at (xyz 0.09842519685039371 -0.1220472440944882 0))
+    (at (xyz -0.1220472440944882 -0.09842519685039371 0))
    (scale (xyz 0.394 0.394 0.394))
-    (rotate (xyz 0 0 -90))
+    (rotate (xyz 0 0 0))
  )
 )
--- a/hw/kicad/v4.0/stmbl.pretty/SOT-223.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/SOT-223.kicad_mod
@@ -24,6 +24,6 @@
  (model TO_SOT_Packages_SMD.3dshapes/SOT-223.wrl
    (at (xyz 0 0 0))
    (scale (xyz 0.4 0.4 0.4))
-    (rotate (xyz 0 0 0))
+    (rotate (xyz 0 0 90))
  )
 )
--- a/hw/kicad/v4.0/stmbl.pretty/akl182-6.kicad_mod
+++ b/hw/kicad/v4.0/stmbl.pretty/akl182-6.kicad_mod
@@ -1,5 +1,5 @@
-(module akl182-6 (layer F.Cu) (tedit 58352E03)
-  (fp_text reference P5 (at -0.6 -3) (layer F.SilkS)
+(module akl182-6 (layer F.Cu) (tedit 584F5D63)
+  (fp_text reference P5 (at -3.572 1.52 270) (layer F.SilkS)
    (effects (font (size 1 1) (thickness 0.15)))
  )
  (fp_text value CONN_01X06 (at 6 9.8) (layer F.Fab)
@@ -9,12 +9,12 @@
  (fp_line (start -2.55 -1.2) (end 20.05 -1.2) (layer F.SilkS) (width 0.15))
  (fp_line (start 20.05 -1.2) (end 20.05 8) (layer F.SilkS) (width 0.15))
  (fp_line (start -2.55 8) (end 20.05 8) (layer F.SilkS) (width 0.15))
-  (pad 6 thru_hole oval (at 17.5 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
-  (pad 5 thru_hole oval (at 14 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
-  (pad 4 thru_hole oval (at 10.5 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
-  (pad 1 thru_hole oval (at 0 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
-  (pad 2 thru_hole oval (at 3.5 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
-  (pad 3 thru_hole oval (at 7 0) (size 2.5 3.5) (drill 1.5 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 3 thru_hole oval (at 7 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 2 thru_hole oval (at 3.5 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 1 thru_hole oval (at 0 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 4 thru_hole oval (at 10.5 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 5 thru_hole oval (at 14 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
+  (pad 6 thru_hole oval (at 17.5 0) (size 2.5 3.5) (drill 1.2 (offset 0 0.5)) (layers *.Cu *.Mask F.SilkS))
  (model ${KIPRJMOD}/stmbl.pretty/akl182_6.wrl
    (at (xyz 0.7893700787401575 0.125984251968504 0))
    (scale (xyz 0.394 0.394 0.394))
--- a/hw/kicad/v4.0/stmbl_4.0-cache.lib
+++ b/hw/kicad/v4.0/stmbl_4.0-cache.lib
@@ -31,21 +31,6 @@ X +15V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# +24P
-#
-DEF +24P #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+24P" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +24P 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
 # +24V
 #
 DEF +24V #PWR 0 0 Y Y 1 F P
@@ -1095,11 +1080,11 @@ F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
 S -150 150 150 -450 0 1 0 N
-X S 1 350 -100 200 L 50 50 1 1 w
-X S 2 350 -200 200 L 50 50 1 1 w
-X BP 3 350 100 200 L 50 50 1 1 W
-X FB 4 -350 100 200 R 50 50 1 1 I
-X D 5 -350 -100 200 R 50 50 1 1 W
+X BP 1 350 100 200 L 50 50 1 1 W
+X FB 2 -350 100 200 R 50 50 1 1 I
+X D 4 -350 -100 200 R 50 50 1 1 W
+X S 5 350 -100 200 L 50 50 1 1 w
+X S 6 350 -200 200 L 50 50 1 1 w
 X S 7 350 -300 200 L 50 50 1 1 w
 X S 8 350 -400 200 L 50 50 1 1 w
 ENDDRAW
--- a/hw/kicad/v4.0/stmbl_4.0.kicad_pcb
+++ b/hw/kicad/v4.0/stmbl_4.0.kicad_pcb
--- a/hw/kicad/v4.0/stmbl_4.0.net
+++ b/hw/kicad/v4.0/stmbl_4.0.net
--- a/hw/kicad/v4.0/supply.sch
+++ b/hw/kicad/v4.0/supply.sch
@@ -127,10 +127,10 @@ F 4 "16V" H 1500 5350 60  0001 C CNN "Voltage"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR067
+L +5V #PWR67
 U 1 1 5660786F
 P 1200 5000
-F 0 "#PWR067" H 1200 4850 50  0001 C CNN
+F 0 "#PWR67" H 1200 4850 50  0001 C CNN
 F 1 "+5V" H 1200 5140 50  0000 C CNN
 F 2 "" H 1200 5000 60  0000 C CNN
 F 3 "" H 1200 5000 60  0000 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 1200 5000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR068
+L +3.3V #PWR70
 U 1 1 566078DE
 P 2950 5000
-F 0 "#PWR068" H 2950 4850 50  0001 C CNN
+F 0 "#PWR70" H 2950 4850 50  0001 C CNN
 F 1 "+3.3V" H 2950 5140 50  0000 C CNN
 F 2 "" H 2950 5000 60  0000 C CNN
 F 3 "" H 2950 5000 60  0000 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 550 3000 60  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR68
 U 1 1 57744A84
 P 1200 5650
-F 0 "#PWR069" H 1200 5400 50  0001 C CNN
+F 0 "#PWR68" H 1200 5400 50  0001 C CNN
 F 1 "GND" H 1200 5500 50  0000 C CNN
 F 2 "" H 1200 5650 60  0000 C CNN
 F 3 "" H 1200 5650 60  0000 C CNN
@@ -238,10 +238,10 @@ F 3 "" H 6650 4950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR73
 U 1 1 57AD27D2
 P 4050 5700
-F 0 "#PWR070" H 4050 5450 50  0001 C CNN
+F 0 "#PWR73" H 4050 5450 50  0001 C CNN
 F 1 "GND" H 4050 5550 50  0000 C CNN
 F 2 "" H 4050 5700 60  0000 C CNN
 F 3 "" H 4050 5700 60  0000 C CNN
@@ -249,10 +249,10 @@ F 3 "" H 4050 5700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +24V #PWR071
+L +24V #PWR72
 U 1 1 57AD27DC
 P 4050 4700
-F 0 "#PWR071" H 4050 4550 50  0001 C CNN
+F 0 "#PWR72" H 4050 4550 50  0001 C CNN
 F 1 "+24V" H 4050 4840 50  0000 C CNN
 F 2 "" H 4050 4700 60  0000 C CNN
 F 3 "" H 4050 4700 60  0000 C CNN
@@ -338,10 +338,10 @@ F 3 "" H 5250 3150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR072
+L GND #PWR77
 U 1 1 57AD3DDA
 P 4100 3900
-F 0 "#PWR072" H 4100 3650 50  0001 C CNN
+F 0 "#PWR77" H 4100 3650 50  0001 C CNN
 F 1 "GND" H 4100 3750 50  0000 C CNN
 F 2 "" H 4100 3900 60  0000 C CNN
 F 3 "" H 4100 3900 60  0000 C CNN
@@ -349,10 +349,10 @@ F 3 "" H 4100 3900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +24V #PWR073
+L +24V #PWR76
 U 1 1 57AD3DE4
 P 4100 2900
-F 0 "#PWR073" H 4100 2750 50  0001 C CNN
+F 0 "#PWR76" H 4100 2750 50  0001 C CNN
 F 1 "+24V" H 4100 3040 50  0000 C CNN
 F 2 "" H 4100 2900 60  0000 C CNN
 F 3 "" H 4100 2900 60  0000 C CNN
@@ -361,10 +361,10 @@ F 3 "" H 4100 2900 60  0000 C CNN
 $EndComp
 NoConn ~ 4850 3150
 $Comp
-L +5V #PWR074
+L +5V #PWR79
 U 1 1 57AD3DF9
 P 7050 3050
-F 0 "#PWR074" H 7050 2900 50  0001 C CNN
+F 0 "#PWR79" H 7050 2900 50  0001 C CNN
 F 1 "+5V" H 7050 3190 50  0000 C CNN
 F 2 "" H 7050 3050 50  0000 C CNN
 F 3 "" H 7050 3050 50  0000 C CNN
@@ -372,10 +372,10 @@ F 3 "" H 7050 3050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +12V #PWR075
+L +12V #PWR80
 U 1 1 57AD61BC
 P 7050 4850
-F 0 "#PWR075" H 7050 4700 50  0001 C CNN
+F 0 "#PWR80" H 7050 4700 50  0001 C CNN
 F 1 "+12V" H 7050 4990 50  0000 C CNN
 F 2 "" H 7050 4850 50  0000 C CNN
 F 3 "" H 7050 4850 50  0000 C CNN
@@ -472,10 +472,10 @@ F 3 "" H 1750 3150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR69
 U 1 1 57B218AB
 P 2500 3550
-F 0 "#PWR076" H 2500 3300 50  0001 C CNN
+F 0 "#PWR69" H 2500 3300 50  0001 C CNN
 F 1 "GND" H 2500 3400 50  0000 C CNN
 F 2 "" H 2500 3550 60  0000 C CNN
 F 3 "" H 2500 3550 60  0000 C CNN
@@ -572,10 +572,10 @@ F 3 "" H 5250 1650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR75
 U 1 1 57D63C3E
 P 4100 2400
-F 0 "#PWR077" H 4100 2150 50  0001 C CNN
+F 0 "#PWR75" H 4100 2150 50  0001 C CNN
 F 1 "GND" H 4100 2250 50  0000 C CNN
 F 2 "" H 4100 2400 60  0000 C CNN
 F 3 "" H 4100 2400 60  0000 C CNN
@@ -583,10 +583,10 @@ F 3 "" H 4100 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +24V #PWR078
+L +24V #PWR74
 U 1 1 57D63C47
 P 4100 1400
-F 0 "#PWR078" H 4100 1250 50  0001 C CNN
+F 0 "#PWR74" H 4100 1250 50  0001 C CNN
 F 1 "+24V" H 4100 1540 50  0000 C CNN
 F 2 "" H 4100 1400 60  0000 C CNN
 F 3 "" H 4100 1400 60  0000 C CNN
@@ -628,10 +628,10 @@ F 4 "6.3V" H 7250 2050 60  0001 C CNN "Voltage"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5F #PWR079
+L +5F #PWR78
 U 1 1 57D6418F
 P 7050 1550
-F 0 "#PWR079" H 7050 1400 50  0001 C CNN
+F 0 "#PWR78" H 7050 1400 50  0001 C CNN
 F 1 "+5F" H 7050 1690 50  0000 C CNN
 F 2 "" H 7050 1550 50  0000 C CNN
 F 3 "" H 7050 1550 50  0000 C CNN
@@ -669,10 +669,10 @@ F 3 "" H 8400 1800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5F #PWR080
+L +5F #PWR81
 U 1 1 57D95C13
 P 8200 1700
-F 0 "#PWR080" H 8200 1550 50  0001 C CNN
+F 0 "#PWR81" H 8200 1550 50  0001 C CNN
 F 1 "+5F" H 8200 1840 50  0000 C CNN
 F 2 "" H 8200 1700 50  0000 C CNN
 F 3 "" H 8200 1700 50  0000 C CNN
@@ -680,10 +680,10 @@ F 3 "" H 8200 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR081
+L +5V #PWR82
 U 1 1 57D95CA2
 P 8600 1700
-F 0 "#PWR081" H 8600 1550 50  0001 C CNN
+F 0 "#PWR82" H 8600 1550 50  0001 C CNN
 F 1 "+5V" H 8600 1840 50  0000 C CNN
 F 2 "" H 8600 1700 50  0000 C CNN
 F 3 "" H 8600 1700 50  0000 C CNN
@@ -813,7 +813,7 @@ Wire Wire Line
 	7250 3800 7250 3700
 Connection ~ 7000 3800
 Wire Wire Line
-	1750 2800 1750 3000
+	1750 2900 1750 3000
 Connection ~ 1750 2900
 Wire Wire Line
 	2250 2900 2250 3000
@@ -928,39 +928,17 @@ L D_Schottky D22
 U 1 1 581AE161
 P 1500 3150
 F 0 "D22" H 1500 3250 50  0000 C CNN
-F 1 "SS34A" H 1500 3050 50  0000 C CNN
+F 1 "TVS 24V" H 1500 3050 50  0000 C CNN
 F 2 "stmbl:SMA_Standard" H 1500 3150 60  0001 C CNN
 F 3 "" H 1500 3150 60  0000 C CNN
 	1    1500 3150
 	0    1    1    0   
 $EndComp
 $Comp
-L D_Schottky D23
-U 1 1 581B02CB
-P 2000 2900
-F 0 "D23" H 2000 3000 50  0000 C CNN
-F 1 "SS34A" H 2000 2800 50  0000 C CNN
-F 2 "stmbl:SMA_Standard" H 2000 2900 60  0001 C CNN
-F 3 "" H 2000 2900 60  0000 C CNN
-	1    2000 2900
-	-1   0    0    1   
-$EndComp
-$Comp
-L +24P #PWR082
-U 1 1 581B5480
-P 1750 2800
-F 0 "#PWR082" H 1750 2650 50  0001 C CNN
-F 1 "+24P" H 1750 2940 50  0000 C CNN
-F 2 "" H 1750 2800 50  0000 C CNN
-F 3 "" H 1750 2800 50  0000 C CNN
-	1    1750 2800
-	1    0    0    -1  
-$EndComp
-$Comp
-L +24V #PWR083
+L +24V #PWR71
 U 1 1 581B5518
 P 3500 2800
-F 0 "#PWR083" H 3500 2650 50  0001 C CNN
+F 0 "#PWR71" H 3500 2650 50  0001 C CNN
 F 1 "+24V" H 3500 2940 50  0000 C CNN
 F 2 "" H 3500 2800 60  0000 C CNN
 F 3 "" H 3500 2800 60  0000 C CNN
@@ -971,7 +949,7 @@ Connection ~ 2250 2900
 Wire Wire Line
 	1750 3450 1750 3300
 Wire Wire Line
-	1500 2900 1850 2900
+	1500 2900 3500 2900
 $Comp
 L R R149
 U 1 1 5817A2EE
@@ -1208,8 +1186,6 @@ Wire Wire Line
 Connection ~ 4350 2300
 Wire Wire Line
 	850  3450 3500 3450
-Wire Wire Line
-	2150 2900 3500 2900
 Connection ~ 4750 2300
 Wire Wire Line
 	950  2800 950  2650
@@ -1319,10 +1295,10 @@ F 3 "" H 9500 1650 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L +5V #PWR084
+L +5V #PWR83
 U 1 1 5832AF71
 P 9150 1550
-F 0 "#PWR084" H 9150 1400 50  0001 C CNN
+F 0 "#PWR83" H 9150 1400 50  0001 C CNN
 F 1 "+5V" H 9150 1690 50  0000 C CNN
 F 2 "" H 9150 1550 50  0000 C CNN
 F 3 "" H 9150 1550 50  0000 C CNN
@@ -1330,10 +1306,10 @@ F 3 "" H 9150 1550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR085
+L +3.3V #PWR85
 U 1 1 5832B0AA
 P 9850 1550
-F 0 "#PWR085" H 9850 1400 50  0001 C CNN
+F 0 "#PWR85" H 9850 1400 50  0001 C CNN
 F 1 "+3.3V" H 9850 1690 50  0000 C CNN
 F 2 "" H 9850 1550 50  0000 C CNN
 F 3 "" H 9850 1550 50  0000 C CNN
@@ -1341,10 +1317,10 @@ F 3 "" H 9850 1550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5VA #PWR086
+L +5VA #PWR84
 U 1 1 5832B172
 P 9500 1450
-F 0 "#PWR086" H 9500 1300 50  0001 C CNN
+F 0 "#PWR84" H 9500 1300 50  0001 C CNN
 F 1 "+5VA" H 9500 1590 50  0000 C CNN
 F 2 "" H 9500 1450 50  0000 C CNN
 F 3 "" H 9500 1450 50  0000 C CNN
@@ -1362,4 +1338,21 @@ Wire Wire Line
 Wire Wire Line
 	9850 1650 9850 1550
 NoConn ~ 4850 4950
+$Comp
+L CP C143
+U 1 1 584F61D7
+P 2000 3150
+F 0 "C143" H 2025 3250 50  0000 L CNN
+F 1 "47µ" H 2025 3050 50  0000 L CNN
+F 2 "Capacitors_SMD:c_elec_8x5.4" H 2038 3000 50  0000 C CNN
+F 3 "" H 2000 3150 50  0000 C CNN
+	1    2000 3150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2000 3000 2000 2900
+Connection ~ 2000 2900
+Wire Wire Line
+	2000 3300 2000 3450
+Connection ~ 2000 3450
 $EndSCHEMATC