Merge remote-tracking branch 'remotes/jared/master'

.gitignore

@@ -15,3 +15,5 @@ doxygen/
 workspace.xml
 java_console_binary
 .vscode
+*.cmp
+*.net

hardware/frankenso/DD_HIP9011.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A 11000 8500
 encoding utf-8
@@ -72,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L HIP9011 U161
+L rusEFI_Older:HIP9011 U161
 U 1 1 52928107
 P 5250 4450
 F 0 "U161" H 5100 5000 60  0000 C CNN
@@ -85,7 +27,7 @@ F 5 "DIGI,296-34575-5-ND" H 5250 4450 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C165
+L rusEFI_Older:C C165
 U 1 1 52928976
 P 4050 4250
 F 0 "C165" H 4050 4350 40  0000 L CNN
@@ -98,7 +40,7 @@ F 5 "DIGI,478-1395-1-ND" H 4050 4250 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C166
+L rusEFI_Older:C C166
 U 1 1 52928F04
 P 5950 5200
 F 0 "C166" H 5950 5300 40  0000 L CNN
@@ -111,7 +53,7 @@ F 5 "DIGI,712-1383-1-ND" V 1630 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C168
+L rusEFI_Older:C C168
 U 1 1 529299B0
 P 4300 3750
 F 0 "C168" H 4300 3850 40  0000 L CNN
@@ -218,7 +160,7 @@ Wire Wire Line
 Text Label 4350 4350 0    60   ~ 0
 INTOUT
 $Comp
-L R R170
+L rusEFI_Older:R R170
 U 1 1 52A255C1
 P 7350 3600
 F 0 "R170" V 7430 3600 40  0000 C CNN
@@ -257,7 +199,7 @@ GND
 Text Label 8400 3200 0    60   ~ 0
 INTOUT
 $Comp
-L CONN_2 P165
+L rusEFI_Older:CONN_2 P165
 U 1 1 52AEADCD
 P 8000 5450
 F 0 "P165" V 7950 5450 40  0000 C CNN
@@ -274,7 +216,7 @@ INT/HLD
 Text Label 8350 5550 0    60   ~ 0
 TEST
 $Comp
-L CONN_2 P166
+L rusEFI_Older:CONN_2 P166
 U 1 1 52AEAE96
 P 8000 5850
 F 0 "P166" V 7950 5850 40  0000 C CNN
@@ -291,7 +233,7 @@ OUT
 Text Label 8350 5950 0    60   ~ 0
 GND
 $Comp
-L CRYSTAL X161
+L rusEFI_Older:CRYSTAL X161
 U 1 1 538954BF
 P 5500 6000
 F 0 "X161" H 5500 6150 60  0000 C CNN
@@ -330,7 +272,7 @@ INT/HLD
 Text HLabel 8400 3700 0    60   Input ~ 0
 OUT
 $Comp
-L R R162
+L rusEFI_Older:R R162
 U 1 1 53C4F9B0
 P 2300 3400
 F 0 "R162" V 2380 3400 40  0000 C CNN
@@ -343,7 +285,7 @@ F 5 "DNP,DNP" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R166
+L rusEFI_Older:R R166
 U 1 1 53C4F9D6
 P 4650 5500
 F 0 "R166" V 4730 5500 40  0000 C CNN
@@ -356,7 +298,7 @@ F 5 "DIGI,541-2.00MCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R164
+L rusEFI_Older:R R164
 U 1 1 53C502A3
 P 3300 3150
 F 0 "R164" V 3380 3150 40  0000 C CNN
@@ -369,7 +311,7 @@ F 5 "DIGI,P39KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R175
+L rusEFI_Older:R R175
 U 1 1 53C502AB
 P 8400 3450
 F 0 "R175" V 8480 3450 40  0000 C CNN
@@ -383,7 +325,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R176
+L rusEFI_Older:R R176
 U 1 1 53C502B3
 P 8400 3950
 F 0 "R176" V 8480 3950 40  0000 C CNN
@@ -397,7 +339,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C163
+L rusEFI_Older:C C163
 U 1 1 54722D2E
 P 2750 3150
 F 0 "C163" H 2750 3250 40  0000 L CNN
@@ -410,7 +352,7 @@ F 5 "DIGI,490-1632-1-ND" H 2750 3150 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R171
+L rusEFI_Older:R R171
 U 1 1 54C463B1
 P 7500 3600
 F 0 "R171" V 7580 3600 40  0000 C CNN
@@ -428,7 +370,7 @@ CS
 Connection ~ 7500 3350
 Connection ~ 7350 3350
 $Comp
-L C C501
+L rusEFI_Older:C C501
 U 1 1 54C8139E
 P 3800 4250
 F 0 "C501" H 3800 4350 40  0000 L CNN
@@ -442,7 +384,7 @@ F 5 "DIGI,445-7882-6-ND" V -520 1050 60  0001 C CNN "VEND1,VEND1#"
 $EndComp
 Connection ~ 3800 4450
 $Comp
-L R R177
+L rusEFI_Older:R R177
 U 1 1 55188A70
 P 5500 5450
 F 0 "R177" V 5580 5450 40  0000 C CNN
@@ -459,7 +401,7 @@ Wire Wire Line
 	4150 4850 4150 4750
 Connection ~ 4150 4750
 $Comp
-L C C167
+L rusEFI_Older:C C167
 U 1 1 55225D31
 P 5950 6300
 F 0 "C167" H 5950 6400 40  0000 L CNN
@@ -472,7 +414,7 @@ F 5 "DIGI,712-1383-1-ND" V 1630 3700 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C169
+L rusEFI_Older:C C169
 U 1 1 552266E1
 P 4350 4850
 F 0 "C169" H 4350 4950 40  0000 L CNN
@@ -488,7 +430,7 @@ $EndComp
 Text Notes 1950 7400 0    60   ~ 0
 http://www.crystek.com/documents/appnotes/Pierce-GateIntroduction.pdf\nPCB per predictions with SaturnPCB has less then 3.5pF traces, \nTPIC pins assumed 5pF\nESR = 80ohms max\nRf = 2meg could be between 1meg and 10meg.\nCload should be 18pF per XTAL datasheet\nCload = ([Cin+C1][C2+Cout])/(Cin+C1+C2_Cout)+PCBstray\nCload = ([5+24][24+5])/(5+24+24+5)+3.5= 18.0pF\nC1=C2=C166=C167 = 24pF\nRs = 1/(2piFC2) = 1/(2*pi*8MHz*24pF) = 829ohms, 820ohms is close enough = R177
 $Comp
-L R R161
+L rusEFI_Older:R R161
 U 1 1 5581A409
 P 2300 2650
 F 0 "R161" V 2380 2650 40  0000 C CNN
@@ -501,7 +443,7 @@ F 5 "DNP,DNP" V 1130 1850 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R163
+L rusEFI_Older:R R163
 U 1 1 5581B37B
 P 3250 2400
 F 0 "R163" V 3330 2400 40  0000 C CNN
@@ -514,7 +456,7 @@ F 5 "DIGI,P39KDACT-ND" V 1080 1850 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C162
+L rusEFI_Older:C C162
 U 1 1 5581B8E1
 P 2700 2400
 F 0 "C162" H 2700 2500 40  0000 L CNN
@@ -527,7 +469,7 @@ F 5 "DIGI,490-1632-1-ND" H 2700 2400 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R172
+L rusEFI_Older:R R172
 U 1 1 55A307C6
 P 7650 3600
 F 0 "R172" V 7730 3600 40  0000 C CNN
@@ -541,7 +483,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R173
+L rusEFI_Older:R R173
 U 1 1 55A307CE
 P 7800 3600
 F 0 "R173" V 7880 3600 40  0000 C CNN
@@ -555,7 +497,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R174
+L rusEFI_Older:R R174
 U 1 1 55A307D6
 P 7950 3600
 F 0 "R174" V 8030 3600 40  0000 C CNN
@@ -569,7 +511,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R167
+L rusEFI_Older:R R167
 U 1 1 55A31B1D
 P 6200 4250
 F 0 "R167" V 6270 4250 40  0000 C CNN
@@ -582,7 +524,7 @@ F 5 "DIGI,P39KDACT-ND" V 4030 3700 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R168
+L rusEFI_Older:R R168
 U 1 1 55A31B41
 P 6200 4350
 F 0 "R168" V 6275 4350 40  0000 C CNN

hardware/frankenso/Misc_Vias.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -72,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L TEST JPO2
+L rusEFI_Older:TEST JPO2
 U 1 1 539C7A79
 P 1000 9200
 F 0 "JPO2" V 1000 9200 40  0000 C CNN
@@ -87,7 +29,7 @@ $EndComp
 Text Notes 575  9050 0    60   ~ 0
 These two jumpers \nare here to accomodate \nstm32f4discovery
 $Comp
-L TEST JPO3
+L rusEFI_Older:TEST JPO3
 U 1 1 539C7A95
 P 1000 9350
 F 0 "JPO3" V 1000 9350 40  0000 C CNN
@@ -108,7 +50,7 @@ GND
 Text Label 800  9350 2    60   ~ 0
 GND
 $Comp
-L TEST TEST2
+L rusEFI_Older:TEST TEST2
 U 1 1 539DA1B1
 P 1100 10400
 F 0 "TEST2" V 1100 10400 40  0000 C CNN
@@ -123,7 +65,7 @@ $EndComp
 Text Notes 550  10225 0    60   ~ 0
 That's alternative signal \nOUTPUT - these traces \nshould be routable to PC6 \nand PA5 via jumpers. \nAleternative to W212 and \nW212 routung of op-amps \nch 11 and ch 12
 $Comp
-L CONN_12X2 P7
+L rusEFI_Older:CONN_12X2 P7
 U 1 1 5445D37F
 P 1250 3100
 F 0 "P7" H 1250 3750 60  0000 C CNN
@@ -157,7 +99,7 @@ NoConn ~ 850  3050
 NoConn ~ 850  2950
 NoConn ~ 850  2750
 $Comp
-L CONN_12X2 P8
+L rusEFI_Older:CONN_12X2 P8
 U 1 1 5445E017
 P 2450 3100
 F 0 "P8" H 2450 3750 60  0000 C CNN
@@ -194,7 +136,7 @@ NoConn ~ 2050 2650
 NoConn ~ 2050 2750
 NoConn ~ 2050 2550
 $Comp
-L CONN_12X2 P14
+L rusEFI_Older:CONN_12X2 P14
 U 1 1 5445E2AE
 P 3500 3100
 F 0 "P14" H 3500 3750 60  0000 C CNN
@@ -274,7 +216,7 @@ PROTO AREA
 Wire Notes Line
 	4050 8700 475  8700
 $Comp
-L TEST JPO6
+L rusEFI_Older:TEST JPO6
 U 1 1 5446F00B
 P 2325 9200
 F 0 "JPO6" V 2325 9200 40  0000 C CNN
@@ -287,7 +229,7 @@ F 5 "DNP,dnp" V 2325 9200 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST JPO7
+L rusEFI_Older:TEST JPO7
 U 1 1 5446F013
 P 2325 9350
 F 0 "JPO7" V 2325 9350 40  0000 C CNN
@@ -300,7 +242,7 @@ F 5 "DNP,dnp" V 2325 9350 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L TEST JPO8
+L rusEFI_Older:TEST JPO8
 U 1 1 5446F01B
 P 3650 9200
 F 0 "JPO8" V 3650 9200 40  0000 C CNN
@@ -315,7 +257,7 @@ $EndComp
 Text Label 2525 9350 0    60   ~ 0
 GND
 $Comp
-L TEST JPO9
+L rusEFI_Older:TEST JPO9
 U 1 1 5446F519
 P 3650 9350
 F 0 "JPO9" V 3650 9350 40  0000 C CNN
@@ -366,7 +308,7 @@ CRANK
 Text HLabel 1300 10400 2    60   Input ~ 0
 CAM
 $Comp
-L CONN_12X2 P28
+L rusEFI_Older:CONN_12X2 P28
 U 1 1 553A3905
 P 4450 3100
 F 0 "P28" H 4450 3750 60  0000 C CNN
@@ -380,7 +322,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P29
+L rusEFI_Older:CONN_5X2 P29
 U 1 1 553A3914
 P 1250 6000
 F 0 "P29" H 1250 6300 60  0000 C CNN
@@ -394,7 +336,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_6X2 P27
+L rusEFI_Older:CONN_6X2 P27
 U 1 1 553A3923
 P 1250 5250
 F 0 "P27" H 1250 5600 60  0000 C CNN
@@ -408,7 +350,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_13X2 P50
+L rusEFI_Older:CONN_13X2 P50
 U 1 1 553A3932
 P 1250 1650
 F 0 "P50" H 1250 2350 60  0000 C CNN
@@ -422,7 +364,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_4X2 P31
+L rusEFI_Older:CONN_4X2 P31
 U 1 1 553A3941
 P 1250 6700
 F 0 "P31" H 1250 6950 50  0000 C CNN
@@ -436,7 +378,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_8X2 P33
+L rusEFI_Older:CONN_8X2 P33
 U 1 1 553A3950
 P 4450 4300
 F 0 "P33" H 4450 4750 60  0000 C CNN
@@ -450,7 +392,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_2X2 P49
+L rusEFI_Older:CONN_2X2 P49
 U 1 1 553A395F
 P 1250 7350
 F 0 "P49" H 1250 7500 50  0000 C CNN
@@ -464,7 +406,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_12X2 P35
+L rusEFI_Older:CONN_12X2 P35
 U 1 1 553A8F5F
 P 5400 3100
 F 0 "P35" H 5400 3750 60  0000 C CNN
@@ -478,7 +420,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_12X2 P36
+L rusEFI_Older:CONN_12X2 P36
 U 1 1 553A8F65
 P 6300 3100
 F 0 "P36" H 6300 3750 60  0000 C CNN
@@ -492,7 +434,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_12X2 P42
+L rusEFI_Older:CONN_12X2 P42
 U 1 1 553A8F6B
 P 7250 3100
 F 0 "P42" H 7250 3750 60  0000 C CNN
@@ -506,7 +448,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_12X2 P43
+L rusEFI_Older:CONN_12X2 P43
 U 1 1 553A8F71
 P 8200 3100
 F 0 "P43" H 8200 3750 60  0000 C CNN
@@ -520,7 +462,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_8X2 P39
+L rusEFI_Older:CONN_8X2 P39
 U 1 1 553A8F77
 P 5400 4300
 F 0 "P39" H 5400 4750 60  0000 C CNN
@@ -534,7 +476,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_8X2 P40
+L rusEFI_Older:CONN_8X2 P40
 U 1 1 553A8F7D
 P 6300 4300
 F 0 "P40" H 6300 4750 60  0000 C CNN
@@ -548,21 +490,21 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X08 P58
+L Connector_Generic:Conn_01x08 P58
 U 1 1 553A8F83
-P 11025 4825
-F 0 "P58" H 11025 5275 60  0000 C CNN
-F 1 "CONN_8X1" V 11025 4825 50  0001 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" V 3805 3950 60  0001 C CNN
-F 3 "" H 7325 3975 60  0001 C CNN
-F 4 "DNP,DNP" V 3805 3950 60  0001 C CNN "MFG,MFG#"
-F 5 "DNP,DNP" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
-F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-	1    11025 4825
+P 11025 4775
+F 0 "P58" H 11025 5225 60  0000 C CNN
+F 1 "CONN_8X1" V 11025 4775 50  0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" V 3805 3900 60  0001 C CNN
+F 3 "" H 7325 3925 60  0001 C CNN
+F 4 "DNP,DNP" V 3805 3900 60  0001 C CNN "MFG,MFG#"
+F 5 "DNP,DNP" V 3805 3900 60  0001 C CNN "VEND1,VEND1#"
+F 6 "," H 7325 3925 60  0001 C CNN "VEND2,VEND2#"
+	1    11025 4775
 	-1   0    0    -1  
 $EndComp
 $Comp
-L CONN_8X2 P46
+L rusEFI_Older:CONN_8X2 P46
 U 1 1 553A8F89
 P 8200 4300
 F 0 "P46" H 8200 4750 60  0000 C CNN
@@ -576,7 +518,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P34
+L rusEFI_Older:CONN_5X2 P34
 U 1 1 553A8F8F
 P 2450 6000
 F 0 "P34" H 2450 6300 60  0000 C CNN
@@ -590,7 +532,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P37
+L rusEFI_Older:CONN_5X2 P37
 U 1 1 553A8F95
 P 3500 6000
 F 0 "P37" H 3500 6300 60  0000 C CNN
@@ -604,7 +546,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P38
+L rusEFI_Older:CONN_5X2 P38
 U 1 1 553A8F9B
 P 4450 6000
 F 0 "P38" H 4450 6300 60  0000 C CNN
@@ -618,7 +560,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P41
+L rusEFI_Older:CONN_5X2 P41
 U 1 1 553A8FA1
 P 5400 6000
 F 0 "P41" H 5400 6300 60  0000 C CNN
@@ -632,7 +574,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P45
+L rusEFI_Older:CONN_5X2 P45
 U 1 1 553A8FA7
 P 6300 6000
 F 0 "P45" H 6300 6300 60  0000 C CNN
@@ -646,7 +588,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P47
+L rusEFI_Older:CONN_5X2 P47
 U 1 1 553A8FAD
 P 7450 6000
 F 0 "P47" H 7450 6300 60  0000 C CNN
@@ -660,7 +602,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_4X2 P32
+L rusEFI_Older:CONN_4X2 P32
 U 1 1 553A8FB3
 P 2450 6700
 F 0 "P32" H 2450 6950 50  0000 C CNN
@@ -674,7 +616,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_4X2 P48
+L rusEFI_Older:CONN_4X2 P48
 U 1 1 553A8FB9
 P 3500 6700
 F 0 "P48" H 3500 6950 50  0000 C CNN
@@ -1016,7 +958,7 @@ Text Label 7850 6200 0    60   ~ 0
 Text Label 7050 6200 2    60   ~ 0
 GND
 $Comp
-L CONN_5X2 P54
+L rusEFI_Older:CONN_5X2 P54
 U 1 1 56CA8F18
 P 8450 6000
 F 0 "P54" H 8450 6300 60  0000 C CNN
@@ -1040,7 +982,7 @@ NoConn ~ 8050 6000
 NoConn ~ 8050 5900
 NoConn ~ 8050 5800
 $Comp
-L CONN_4X2 P53
+L rusEFI_Older:CONN_4X2 P53
 U 1 1 56CA9222
 P 4425 6700
 F 0 "P53" H 4425 6950 50  0000 C CNN
@@ -1062,7 +1004,7 @@ NoConn ~ 4825 6650
 NoConn ~ 4825 6750
 NoConn ~ 4825 6850
 $Comp
-L POLOLU_DRV8880 U6
+L rusEFI_Polo:POLOLU_DRV8880 U6
 U 1 1 58A6B293
 P 11825 4825
 F 0 "U6" H 11575 5275 60  0000 C CNN
@@ -1076,21 +1018,21 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X08 P57
+L Connector_Generic:Conn_01x08 P57
 U 1 1 58A6BC56
-P 12625 4825
-F 0 "P57" H 12625 5275 60  0000 C CNN
-F 1 "CONN_8X1" V 12625 4825 50  0001 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" V 3805 3950 60  0001 C CNN
-F 3 "" H 7325 3975 60  0001 C CNN
-F 4 "DNP,DNP" V 3805 3950 60  0001 C CNN "MFG,MFG#"
-F 5 "DNP,DNP" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
-F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-	1    12625 4825
+P 12625 4775
+F 0 "P57" H 12625 5225 60  0000 C CNN
+F 1 "CONN_8X1" V 12625 4775 50  0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" V 3805 3900 60  0001 C CNN
+F 3 "" H 7325 3925 60  0001 C CNN
+F 4 "DNP,DNP" V 3805 3900 60  0001 C CNN "MFG,MFG#"
+F 5 "DNP,DNP" V 3805 3900 60  0001 C CNN "VEND1,VEND1#"
+F 6 "," H 7325 3925 60  0001 C CNN "VEND2,VEND2#"
+	1    12625 4775
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_01X01 P55
+L Connector_Generic:Conn_01x01 P55
 U 1 1 58A6C051
 P 11825 3925
 F 0 "P55" V 11925 3925 60  0000 C CNN
@@ -1104,7 +1046,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L CONN_01X01 P56
+L Connector_Generic:Conn_01x01 P56
 U 1 1 58A6C356
 P 11825 5725
 F 0 "P56" V 11950 5725 60  0000 C CNN
@@ -1118,7 +1060,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L CONN_8X2 P44
+L rusEFI_Older:CONN_8X2 P44
 U 1 1 58A6DCF3
 P 7250 4300
 F 0 "P44" H 7250 4750 60  0000 C CNN
@@ -1150,7 +1092,7 @@ NoConn ~ 6850 4650
 Text Label 12425 4475 1    60   ~ 0
 12V-SWITCH
 $Comp
-L GND #PWR0188
+L rusEFI_Older:GND #PWR0188
 U 1 1 58A6F0E6
 P 12425 4575
 F 0 "#PWR0188" H 12425 4575 30  0001 C CNN
@@ -1161,7 +1103,7 @@ F 3 "" H 12425 4575 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0189
+L rusEFI_Older:GND #PWR0189
 U 1 1 58A6F179
 P 12425 5175
 F 0 "#PWR0189" H 12425 5175 30  0001 C CNN
@@ -1177,4 +1119,6 @@ Text Notes 4300 10400 0    60   ~ 0
 See below links about barriers in GND planes. The current loops in the layout do not appear to need barriers. \n\nhttp://rusefi.com/wiki/index.php?title=Manual:Hardware:PCB_design_rules\nhttp://www.maximintegrated.com/en/app-notes/index.mvp/id/5450
 Text GLabel 2525 9200 2    60   Input ~ 0
 12V-SNUB
+Connection ~ 12425 4575
+Connection ~ 12425 5175
 $EndSCHEMATC

hardware/frankenso/PWR_buck_12V_switcher.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A 11000 8500
 encoding utf-8
@@ -71,9 +13,8 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Connection ~ -4675 3450
 $Comp
-L CONN_1 P1002
+L rusEFI_Older:CONN_1 P1002
 U 1 1 58F64B72
 P 7750 6700
 F 0 "P1002" H 7830 6700 40  0000 L CNN
@@ -86,7 +27,7 @@ F 5 "DNP,DNP" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L CP1 C1001
+L rusEFI_Older:CP1 C1001
 U 1 1 58F64B73
 P 6800 6600
 F 0 "C1001" V 6650 6350 50  0000 L CNN
@@ -99,7 +40,7 @@ F 5 "DIGI,565-2479-1-ND" H 6800 6600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R1002
+L rusEFI_Older:R R1002
 U 1 1 58F64B74
 P 8650 6600
 F 0 "R1002" V 8730 6600 50  0000 C CNN
@@ -112,7 +53,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L LED D1005
+L rusEFI_Older:LED D1005
 U 1 1 58F64B75
 P 8600 6750
 F 0 "D1005" H 8600 6600 50  0000 C CNN
@@ -125,7 +66,7 @@ F 5 "DIGI,160-1423-1-ND" H 8600 6750 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LM2596 U1001
+L rusEFI_Older:LM2596 U1001
 U 1 1 58F64B76
 P 7450 6550
 F 0 "U1001" H 7600 6850 60  0000 C CNN
@@ -145,7 +86,7 @@ FB
 Text Label 8200 6450 0    60   ~ 0
 OUT
 $Comp
-L GND #PWR0115
+L rusEFI_Older:GND #PWR0115
 U 1 1 58F64B77
 P 7450 6900
 F 0 "#PWR0115" H 7450 6900 30  0001 C CNN
@@ -156,7 +97,7 @@ F 3 "" H 7450 6900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MOS_Pro Q1001
+L rusEFI_Older:MOS_Pro Q1001
 U 1 1 58F64B78
 P 5350 6500
 F 0 "Q1001" H 5350 6650 60  0000 R CNN
@@ -169,7 +110,7 @@ F 5 "DIGI,SI2323DS-T1-E3CT-ND" H 5350 6500 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R1001
+L rusEFI_Older:R R1001
 U 1 1 58F64B79
 P 5900 6700
 F 0 "R1001" V 5980 6700 50  0000 C CNN
@@ -182,7 +123,7 @@ F 5 "DIGI,P39KDACT-ND" V 1530 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D_Zener_Small D1001
+L Device:D_Zener_Small D1001
 U 1 1 58F64B7A
 P 5650 6500
 F 0 "D1001" H 5650 6600 40  0000 C CNN
@@ -196,20 +137,7 @@ F 6 "sky-macau.com,5633100308" H 5650 6500 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L FUSE-Part F1001
-U 1 1 58F64B7B
-P 3850 6150
-F 0 "F1001" H 3950 6200 40  0000 C CNN
-F 1 "2A" H 3750 6100 40  0000 C CNN
-F 2 "rusEFI_LIB:Blank" H 3850 6150 60  0001 C CNN
-F 3 "~" H 3850 6150 60  0000 C CNN
-F 4 "Littelfuse ,0297002.WXNV" H 3850 6150 60  0001 C CNN "MFG,MFG#"
-F 5 "DIGI,F986-ND" H 3850 6150 60  0001 C CNN "VEND1,VEND1#"
-	1    3850 6150
-	1    0    0    -1  
-$EndComp
-$Comp
-L D_Schottky D1006
+L Device:D_Schottky D1006
 U 1 1 58F64B7C
 P 8100 6650
 F 0 "D1006" H 8100 6750 40  0000 C CNN
@@ -225,7 +153,7 @@ $EndComp
 Text Label 4100 6400 0    60   ~ 0
 Vf
 $Comp
-L CP1 C1002
+L rusEFI_Older:CP1 C1002
 U 1 1 58F64B7D
 P 9050 6650
 F 0 "C1002" V 8900 6550 50  0000 L CNN
@@ -241,7 +169,7 @@ $EndComp
 Text HLabel 9650 6450 1    60   Input ~ 0
 5V-REG
 $Comp
-L CP1 C1003
+L rusEFI_Older:CP1 C1003
 U 1 1 58F64B7E
 P 9650 6650
 F 0 "C1003" V 9500 6550 50  0000 L CNN
@@ -255,7 +183,7 @@ F 6 "sky-macau.com,8702041755" H 9650 6650 60  0001 C CNN "VEND2,VEND2#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L CONN_1 P901
+L rusEFI_Older:CONN_1 P901
 U 1 1 58F64B7F
 P 3450 6250
 F 0 "P901" H 3530 6250 40  0000 L CNN
@@ -268,7 +196,7 @@ F 5 "DNP,dnp" H 3450 6250 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L CONN_1 P902
+L rusEFI_Older:CONN_1 P902
 U 1 1 58F64B80
 P 5650 6250
 F 0 "P902" H 5730 6250 40  0000 L CNN
@@ -281,7 +209,7 @@ F 5 "DNP,dnp" H 5650 6250 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Q_NMOS_GDS Q1002
+L Device:Q_NMOS_GDS Q1002
 U 1 1 58F64B81
 P 4800 6500
 F 0 "Q1002" H 4800 6350 60  0000 R CNN
@@ -294,7 +222,7 @@ F 5 "digikey,DN2625K4-GCT-ND" H 4800 6500 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D_Zener_Small D1002
+L Device:D_Zener_Small D1002
 U 1 1 58F64B82
 P 4600 6750
 F 0 "D1002" H 4600 6850 40  0000 C CNN
@@ -308,7 +236,7 @@ F 6 " " H 4600 6750 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R1003
+L rusEFI_Older:R R1003
 U 1 1 58F64B83
 P 4350 6600
 F 0 "R1003" V 4430 6600 50  0000 C CNN
@@ -331,12 +259,12 @@ Connection ~ 8800 6850
 Wire Wire Line
 	8400 6750 8400 6600
 Wire Wire Line
-	8900 6300 8900 6600
+	8900 6300 8900 6450
 Wire Wire Line
 	8900 6450 9050 6450
 Connection ~ 9050 6450
 Wire Wire Line
-	5550 6400 6200 6400
+	5550 6400 5650 6400
 Wire Wire Line
 	6800 6400 7000 6400
 Connection ~ 6800 6400
@@ -354,9 +282,9 @@ Connection ~ 9650 6850
 Wire Wire Line
 	10000 6450 9650 6450
 Wire Wire Line
-	7900 6450 7900 6700
+	7900 6450 7900 6550
 Wire Wire Line
-	7900 6450 8300 6450
+	7900 6450 8100 6450
 Connection ~ 7900 6550
 Connection ~ 9650 6450
 Wire Wire Line
@@ -378,7 +306,7 @@ Connection ~ 5650 6400
 Connection ~ 8100 6450
 Connection ~ 8100 6850
 Wire Wire Line
-	3500 6850 10000 6850
+	3500 6850 4600 6850
 Wire Wire Line
 	3600 6400 3600 6250
 Wire Wire Line
@@ -395,7 +323,7 @@ Wire Wire Line
 Wire Wire Line
 	4700 6600 4700 6700
 $Comp
-L D_Zener_Small D1003
+L Device:D_Zener_Small D1003
 U 1 1 58F64B84
 P 6200 6500
 F 0 "D1003" H 6200 6600 40  0000 C CNN
@@ -422,9 +350,9 @@ Brief overview\n-- Q1002, R1003, D1002 preform an active transient protection. I
 Text Notes 9750 6375 0    60   ~ 0
 5V  5mVp-p 1A\nSuggested \nexternal wires \n18awg min
 Text Notes 3400 6000 0    60   ~ 0
-200V surge, 18V to 7V typical. \nSuggested mininium 16awg \nUpstream 1A fuse littel fuse 0287001
+200V surge, 18V to 7V typical. \nSuggested mininium 16awg \nUpstream 1A fuse litteL rusEFI_Older:FUse 0287001
 $Comp
-L INDUCTOR L1003
+L rusEFI_Older:INDUCTOR L1003
 U 1 1 58F64B85
 P 6500 6400
 F 0 "L1003" V 6450 6400 40  0000 C CNN
@@ -438,7 +366,7 @@ F 6 "na,na" V 6500 6400 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L INDUCTOR L1001
+L rusEFI_Older:INDUCTOR L1001
 U 1 1 58F64B86
 P 8600 6450
 F 0 "L1001" V 8550 6450 40  0000 C CNN
@@ -452,7 +380,7 @@ F 6 "sky-macau.com,9900528212" V 8600 6450 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L INDUCTOR L1002
+L rusEFI_Older:INDUCTOR L1002
 U 1 1 58F64B87
 P 9350 6450
 F 0 "L1002" V 9300 6450 40  0000 C CNN
@@ -468,7 +396,7 @@ $EndComp
 Wire Bus Line
 	4710 6470 4890 6470
 $Comp
-L SCHDPAK D1004
+L rusEFI_Older:SCHDPAK D1004
 U 1 1 58F64B8B
 P 8300 6650
 F 0 "D1004" H 8300 6750 40  0000 C CNN
@@ -504,7 +432,7 @@ GND
 Text HLabel 3500 6400 0    60   Input ~ 0
 Vin
 $Comp
-L CONN_1 FB901
+L rusEFI_Older:CONN_1 FB901
 U 1 1 590520C8
 P 3750 6400
 F 0 "FB901" H 3650 6475 40  0000 L CNN
@@ -517,7 +445,7 @@ F 5 "DNP,dnp" H 3750 6400 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L CONN_1 FB902
+L rusEFI_Older:CONN_1 FB902
 U 1 1 59052183
 P 3950 6400
 F 0 "FB902" H 4025 6475 40  0000 R CNN
@@ -535,4 +463,49 @@ Wire Notes Line
 	3600 6250 3600 6150
 Text Notes 9725 7200 0    60   ~ 0
 3A possible with \nmore expensive \ncomponents. 
+Wire Wire Line
+	9050 6850 9650 6850
+Wire Wire Line
+	7450 6850 8100 6850
+Wire Wire Line
+	6800 6850 7000 6850
+Wire Wire Line
+	8800 6850 9050 6850
+Wire Wire Line
+	7000 6850 7450 6850
+Wire Wire Line
+	8900 6450 8900 6600
+Wire Wire Line
+	9650 6850 10000 6850
+Wire Wire Line
+	7900 6550 7900 6700
+Wire Wire Line
+	6200 6850 6800 6850
+Wire Wire Line
+	6150 6850 6200 6850
+Wire Wire Line
+	5650 6400 6200 6400
+Wire Wire Line
+	8100 6450 8300 6450
+Wire Wire Line
+	8100 6850 8250 6850
+Wire Wire Line
+	4600 6850 6150 6850
+Wire Wire Line
+	8250 6850 8350 6850
+Wire Wire Line
+	8350 6850 8800 6850
+$Comp
+L rusEFI_Older:FUSE F1001
+U 1 1 58F64B7B
+P 3850 6150
+F 0 "F1001" H 3950 6200 40  0000 C CNN
+F 1 "2A" H 3750 6100 40  0000 C CNN
+F 2 "rusEFI_LIB:Blank" H 3850 6150 60  0001 C CNN
+F 3 "~" H 3850 6150 60  0000 C CNN
+F 4 "Littelfuse ,0297002.WXNV" H 3850 6150 60  0001 C CNN "MFG,MFG#"
+F 5 "DIGI,F986-ND" H 3850 6150 60  0001 C CNN "VEND1,VEND1#"
+	1    3850 6150
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

hardware/frankenso/can_brd_1.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A 11000 8500
 encoding utf-8
@@ -72,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L PWR_FLAG #FLG078
+L power:PWR_FLAG #FLG078
 U 1 1 52CAD8E7
 P 3375 3000
 F 0 "#FLG078" H 3375 3095 30  0001 C CNN
@@ -83,7 +25,7 @@ F 3 "" H 3375 3000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C472
+L rusEFI_Older:C C472
 U 1 1 52CAD8F6
 P 3550 3250
 F 0 "C472" H 3600 3350 50  0000 L CNN
@@ -96,7 +38,7 @@ F 5 "DIGI,445-7882-6-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C471
+L rusEFI_Older:C C471
 U 1 1 52CAD8F7
 P 3550 2700
 F 0 "C471" H 3600 2800 50  0000 L CNN
@@ -109,7 +51,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR079
+L rusEFI_Older:GND #PWR079
 U 1 1 52CAD8F8
 P 3550 3450
 F 0 "#PWR079" H 3550 3450 30  0001 C CNN
@@ -120,7 +62,7 @@ F 3 "" H 3550 3450 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR080
+L rusEFI_Older:GND #PWR080
 U 1 1 52CAD8F9
 P 3550 2500
 F 0 "#PWR080" H 3550 2500 30  0001 C CNN
@@ -131,7 +73,7 @@ F 3 "" H 3550 2500 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR081
+L rusEFI_Older:GND #PWR081
 U 1 1 52CADB40
 P 4950 2500
 F 0 "#PWR081" H 4950 2500 30  0001 C CNN
@@ -143,7 +85,7 @@ F 3 "" H 4950 2500 60  0001 C CNN
 $EndComp
 NoConn ~ 4900 1200
 $Comp
-L R R472
+L rusEFI_Older:R R472
 U 1 1 52CADB46
 P 4000 1850
 F 0 "R472" V 4080 1850 50  0000 C CNN
@@ -157,7 +99,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR082
+L rusEFI_Older:GND #PWR082
 U 1 1 52CADB51
 P 3750 1850
 F 0 "#PWR082" H 3750 1850 30  0001 C CNN
@@ -168,7 +110,7 @@ F 3 "" H 3750 1850 60  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR083
+L rusEFI_Older:GND #PWR083
 U 1 1 52CADB3B
 P 2200 1650
 F 0 "#PWR083" H 2200 1650 30  0001 C CNN
@@ -216,7 +158,7 @@ Text Label 5050 1100 0    60   ~ 0
 Wire Wire Line
 	5050 1200 5050 1100
 $Comp
-L SN65HVD230 U471
+L rusEFI_Older:SN65HVD230 U471
 U 1 1 52CD2CA4
 P 4800 1850
 F 0 "U471" H 4400 2400 60  0000 C CNN
@@ -229,7 +171,7 @@ F 5 "DIGI,296-13123-5-ND" H 4800 1850 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R473
+L rusEFI_Older:R R473
 U 1 1 52CD2DE2
 P 5975 2625
 F 0 "R473" V 6055 2625 50  0000 C CNN
@@ -242,7 +184,7 @@ F 5 "DIGI,P120DACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L JUMPER JP471
+L rusEFI_Older:JUMPER JP471
 U 1 1 52CD2DEF
 P 6650 2625
 F 0 "JP471" H 6650 2775 60  0000 C CNN
@@ -285,7 +227,7 @@ CAN_TX
 Text Label 3250 3000 2    60   ~ 0
 3.3V
 $Comp
-L CONN_4 P401
+L rusEFI_Older:CONN_4 P401
 U 1 1 54959C46
 P 6700 3150
 F 0 "P401" V 6650 3150 50  0000 C CNN
@@ -303,7 +245,7 @@ CANL
 Text Label 6350 3100 2    60   ~ 0
 CANH
 $Comp
-L GND #PWR084
+L rusEFI_Older:GND #PWR084
 U 1 1 54959C55
 P 6350 3300
 F 0 "#PWR084" H 6350 3300 30  0001 C CNN

hardware/frankenso/cps_vrs_io_1.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -121,7 +63,7 @@ Wire Wire Line
 Wire Wire Line
 	14450 3200 15150 3200
 $Comp
-L C C104
+L rusEFI_Older:C C104
 U 1 1 50D6291F
 P 14425 2325
 F 0 "C104" H 14200 2425 50  0000 L CNN
@@ -142,7 +84,7 @@ The resistors across pins 9,10 and 15,16 are not typically installed, they \nare
 NoConn ~ 13900 3125
 NoConn ~ 13900 2625
 $Comp
-L R R107
+L rusEFI_Older:R R107
 U 1 1 4E39E3AD
 P 11500 2125
 F 0 "R107" V 11400 2125 50  0000 C CNN
@@ -155,7 +97,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R102
+L rusEFI_Older:R R102
 U 1 1 4E39E3A9
 P 10900 2125
 F 0 "R102" V 10800 2125 50  0000 C CNN
@@ -168,7 +110,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R103
+L rusEFI_Older:R R103
 U 1 1 4E39E3A5
 P 10900 2625
 F 0 "R103" V 10800 2625 50  0000 C CNN
@@ -181,7 +123,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R108
+L rusEFI_Older:R R108
 U 1 1 4E39E3A0
 P 11500 2625
 F 0 "R108" V 11400 2625 50  0000 C CNN
@@ -194,7 +136,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R106
+L rusEFI_Older:R R106
 U 1 1 4E39E39D
 P 10900 3625
 F 0 "R106" V 10980 3625 50  0000 C CNN
@@ -207,7 +149,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R104
+L rusEFI_Older:R R104
 U 1 1 4E39E39B
 P 10900 3125
 F 0 "R104" V 10800 3125 50  0000 C CNN
@@ -220,7 +162,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R109
+L rusEFI_Older:R R109
 U 1 1 4E39E396
 P 11500 3125
 F 0 "R109" V 11400 3125 50  0000 C CNN
@@ -233,7 +175,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R110
+L rusEFI_Older:R R110
 U 1 1 4E39E393
 P 11500 3625
 F 0 "R110" V 11580 3625 50  0000 C CNN
@@ -246,7 +188,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L R R111
+L rusEFI_Older:R R111
 U 1 1 4E39E390
 P 12250 2375
 F 0 "R111" V 12330 2375 50  0000 C CNN
@@ -259,7 +201,7 @@ F 5 "DIGI,RNCP0805FTD4K99CT-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R112
+L rusEFI_Older:R R112
 U 1 1 4E39E38D
 P 12250 3375
 F 0 "R112" V 12330 3375 50  0000 C CNN
@@ -274,7 +216,7 @@ $EndComp
 Text Notes 12875 2250 0    60   ~ 0
 CRANK /CAM \nHALL OR VR
 $Comp
-L GND #PWR0109
+L rusEFI_Older:GND #PWR0109
 U 1 1 4E078585
 P 13900 2550
 F 0 "#PWR0109" H 13900 2550 30  0001 C CNN
@@ -285,7 +227,7 @@ F 3 "" H 13900 2550 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0110
+L rusEFI_Older:GND #PWR0110
 U 1 1 4C1C1D02
 P 13900 3250
 F 0 "#PWR0110" H 13900 3250 30  0001 C CNN
@@ -296,7 +238,7 @@ F 3 "" H 13900 3250 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0111
+L rusEFI_Older:GND #PWR0111
 U 1 1 4C1C1D00
 P 13900 2750
 F 0 "#PWR0111" H 13900 2750 30  0001 C CNN
@@ -307,7 +249,7 @@ F 3 "" H 13900 2750 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L MAX9926/9927 U101
+L rusEFI_Older:MAX9926_9927 U101
 U 1 1 4BF90B79
 P 13150 2875
 F 0 "U101" H 13150 3325 60  0000 C CNN
@@ -321,7 +263,7 @@ F 6 "mouser,700-MAX9926UAEE" V 16380 4425 60  0001 C CNN "VEND2,VEND2#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R114
+L rusEFI_Older:R R114
 U 1 1 5101D08D
 P 14700 2925
 F 0 "R114" V 14780 2925 50  0000 C CNN
@@ -335,7 +277,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	0    -1   1    0   
 $EndComp
 $Comp
-L C C102
+L rusEFI_Older:C C102
 U 1 1 4AD9CD25
 P 11900 3325
 F 0 "C102" H 12000 3425 50  0000 L CNN
@@ -348,7 +290,7 @@ F 5 "DIGI,478-1339-1-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L C C103
+L rusEFI_Older:C C103
 U 1 1 4AD9CB8E
 P 13900 2325
 F 0 "C103" H 13925 2225 50  0000 L CNN
@@ -361,7 +303,7 @@ F 5 "DIGI,490-3905-1-ND" V 12255 4125 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR0112
+L rusEFI_Older:GND #PWR0112
 U 1 1 4AD9C8E8
 P 12400 3050
 F 0 "#PWR0112" H 12400 3050 30  0001 C CNN
@@ -372,7 +314,7 @@ F 3 "" H 12400 3050 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C101
+L rusEFI_Older:C C101
 U 1 1 4AD9C851
 P 11900 2425
 F 0 "C101" H 11950 2525 50  0000 L CNN
@@ -385,7 +327,7 @@ F 5 "DIGI,478-1339-1-ND" V 530 3600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R113
+L rusEFI_Older:R R113
 U 1 1 4AD9C75B
 P 14700 2825
 F 0 "R113" V 14780 2825 50  0000 C CNN
@@ -431,7 +373,7 @@ Text Label 11575 1925 3    60   ~ 0
 Text Label 11575 3425 3    60   ~ 0
 5V
 $Comp
-L TEST W1003
+L rusEFI_Older:TEST W1003
 U 1 1 50CE3E18
 P 10850 3425
 F 0 "W1003" H 10850 3485 40  0000 C CNN
@@ -444,7 +386,7 @@ F 5 "DNP,DNP" H 10850 3425 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST W1002
+L rusEFI_Older:TEST W1002
 U 1 1 50CE3DD7
 P 10850 1925
 F 0 "W1002" H 10850 1985 40  0000 C CNN
@@ -457,7 +399,7 @@ F 5 "DNP,DNP" H 10850 1925 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R137
+L rusEFI_Older:R R137
 U 1 1 4E39E3AF
 P 11325 1925
 F 0 "R137" V 11405 1925 50  0000 C CNN
@@ -470,7 +412,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 780 3300 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R141
+L rusEFI_Older:R R141
 U 1 1 4E39E399
 P 11325 3425
 F 0 "R141" V 11405 3425 50  0000 C CNN
@@ -485,7 +427,7 @@ $EndComp
 Wire Wire Line
 	10650 2125 10650 1925
 $Comp
-L R R801
+L rusEFI_Older:R R801
 U 1 1 53FD4D54
 P 11325 1825
 F 0 "R801" V 11405 1825 50  0000 C CNN
@@ -498,7 +440,7 @@ F 5 "DNP,DNP" V 780 3200 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR0113
+L rusEFI_Older:GND #PWR0113
 U 1 1 53FD4D89
 P 11575 1825
 F 0 "#PWR0113" H 11575 1825 30  0001 C CNN
@@ -509,7 +451,7 @@ F 3 "" H 11575 1825 60  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R802
+L rusEFI_Older:R R802
 U 1 1 53FD4DD7
 P 11325 3325
 F 0 "R802" V 11405 3325 50  0000 C CNN
@@ -522,7 +464,7 @@ F 5 "DNP,DNP" V 780 4700 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR0114
+L rusEFI_Older:GND #PWR0114
 U 1 1 53FD4DDD
 P 11575 3325
 F 0 "#PWR0114" H 11575 3325 30  0001 C CNN
@@ -561,7 +503,7 @@ Wire Wire Line
 Wire Wire Line
 	12325 3225 12325 3125
 $Comp
-L LED D801
+L rusEFI_Older:LED D801
 U 1 1 55237975
 P 15150 2825
 F 0 "D801" H 14900 2775 50  0000 C CNN
@@ -574,7 +516,7 @@ F 5 "DIGI,160-1427-1-ND" H 15150 2825 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L LED D802
+L rusEFI_Older:LED D802
 U 1 1 5523B6C7
 P 15150 2975
 F 0 "D802" H 14925 2925 50  0000 C CNN

hardware/frankenso/frankenso.pro

@@ -1,4 +1,4 @@
-update=4/21/2019 5:40:10 AM
+update=3/22/2020 10:13:11 AM
 version=1
 last_client=kicad
 [cvpcb]
@@ -27,67 +27,6 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.127
 BoardOutlineThickness=0.127
 ModuleOutlineThickness=0.254
-[eeschema]
-version=1
-LibDir=../rusefi_lib
-[eeschema/libraries]
-LibName1=KICAD_Older_Version
-LibName2=power
-LibName3=device
-LibName4=transistors
-LibName5=conn
-LibName6=linear
-LibName7=regul
-LibName8=74xx
-LibName9=cmos4000
-LibName10=adc-dac
-LibName11=memory
-LibName12=xilinx
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=opto
-LibName28=atmel
-LibName29=contrib
-LibName30=valves
-LibName31=176122-6
-LibName32=art-electro-conn
-LibName33=art-electro-conn_2
-LibName34=art-electro-ic
-LibName35=art-electro-max
-LibName36=art-electro-power
-LibName37=LMV324IDR
-LibName38=logo
-LibName39=logo_flipped
-LibName40=MAX9926-9927
-LibName41=max9939
-LibName42=max31855
-LibName43=stm32
-LibName44=tc4427
-LibName45=lm2596
-LibName46=mos_p_numbered-pins
-LibName47=rn-41
-LibName48=skqucaa010_joystick
-LibName49=itead_hc-0X_bluetooth
-LibName50=joystick_SKRHAAE010
-LibName51=STM32F407IGT6
-LibName52=slc_oem
-LibName53=mos_n_numbered-pins
-LibName54=crystal(mc306)
-LibName55=pololu_a4988
-LibName56=Pololu_DRV8880
-LibName57=fuse_BOM_only_no_pins
 [schematic_editor]
 version=1
 PageLayoutDescrFile=../rusefi_lib/Border.kicad_wks
@@ -98,3 +37,6 @@ NetFmtName=Pcbnew
 SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
+[eeschema]
+version=1
+LibDir=

hardware/frankenso/hi-lo.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -72,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L C C603
+L rusEFI_Older:C C603
 U 1 1 53B976EE
 P 7450 7550
 F 0 "C603" V 7500 7600 40  0000 L CNN
@@ -85,7 +27,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR04
+L rusEFI_Older:GND #PWR04
 U 1 1 52E5BE5C
 P 8450 7700
 F 0 "#PWR04" H 8450 7700 30  0001 C CNN
@@ -102,7 +44,7 @@ Wire Wire Line
 Wire Wire Line
 	7000 7450 7550 7450
 $Comp
-L LED LD606
+L rusEFI_Older:LED LD606
 U 1 1 52E5BF3C
 P 8250 7650
 F 0 "LD606" H 8100 7550 50  0000 C CNN
@@ -115,7 +57,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 7650 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R611
+L rusEFI_Older:R R611
 U 1 1 52E5BF4C
 P 7800 7650
 F 0 "R611" V 7880 7650 40  0000 C CNN
@@ -130,7 +72,7 @@ $EndComp
 Wire Wire Line
 	7000 7650 7550 7650
 $Comp
-L R R612
+L rusEFI_Older:R R612
 U 1 1 52E5BFE6
 P 7800 7850
 F 0 "R612" V 7880 7850 40  0000 C CNN
@@ -150,7 +92,7 @@ Wire Wire Line
 	8450 7450 8450 7700
 Connection ~ 8450 7650
 $Comp
-L GND #PWR05
+L rusEFI_Older:GND #PWR05
 U 1 1 52E5C23D
 P 6300 7550
 F 0 "#PWR05" H 6300 7550 30  0001 C CNN
@@ -164,7 +106,7 @@ Wire Wire Line
 	7650 7550 8450 7550
 Connection ~ 8450 7550
 $Comp
-L GND #PWR06
+L rusEFI_Older:GND #PWR06
 U 1 1 52E5C2F1
 P 8450 6800
 F 0 "#PWR06" H 8450 6800 30  0001 C CNN
@@ -190,7 +132,7 @@ Wire Wire Line
 	8450 6550 8450 6800
 Connection ~ 8450 6750
 $Comp
-L GND #PWR07
+L rusEFI_Older:GND #PWR07
 U 1 1 52E5C31B
 P 6300 6650
 F 0 "#PWR07" H 6300 6650 30  0001 C CNN
@@ -202,7 +144,7 @@ F 3 "" H 6300 6650 60  0000 C CNN
 $EndComp
 Connection ~ 8450 6650
 $Comp
-L GND #PWR08
+L rusEFI_Older:GND #PWR08
 U 1 1 52E5C33E
 P 8450 5900
 F 0 "#PWR08" H 8450 5900 30  0001 C CNN
@@ -228,7 +170,7 @@ Wire Wire Line
 	8450 5650 8450 5900
 Connection ~ 8450 5850
 $Comp
-L GND #PWR09
+L rusEFI_Older:GND #PWR09
 U 1 1 52E5C368
 P 6300 5750
 F 0 "#PWR09" H 6300 5750 30  0001 C CNN
@@ -243,7 +185,7 @@ Connection ~ 7100 7550
 Connection ~ 7100 6650
 Connection ~ 7100 5750
 $Comp
-L R R610
+L rusEFI_Older:R R610
 U 1 1 52E63CB5
 P 7800 7450
 F 0 "R610" V 7880 7450 40  0000 C CNN
@@ -256,7 +198,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R609
+L rusEFI_Older:R R609
 U 1 1 52E63CBE
 P 7800 7250
 F 0 "R609" V 7880 7250 40  0000 C CNN
@@ -269,7 +211,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L LED LD605
+L rusEFI_Older:LED LD605
 U 1 1 52E63CC7
 P 8250 7450
 F 0 "LD605" H 8100 7350 50  0000 C CNN
@@ -282,7 +224,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 7450 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R606
+L rusEFI_Older:R R606
 U 1 1 52E63D08
 P 7800 6550
 F 0 "R606" V 7880 6550 40  0000 C CNN
@@ -295,7 +237,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R605
+L rusEFI_Older:R R605
 U 1 1 52E63D11
 P 7800 6350
 F 0 "R605" V 7880 6350 40  0000 C CNN
@@ -308,7 +250,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R602
+L rusEFI_Older:R R602
 U 1 1 52E63D1A
 P 7800 5650
 F 0 "R602" V 7880 5650 40  0000 C CNN
@@ -321,7 +263,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R601
+L rusEFI_Older:R R601
 U 1 1 52E63D23
 P 7800 5450
 F 0 "R601" V 7880 5450 40  0000 C CNN
@@ -334,7 +276,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L LED LD602
+L rusEFI_Older:LED LD602
 U 1 1 52E63D2C
 P 8250 5850
 F 0 "LD602" H 8100 5750 50  0000 C CNN
@@ -347,7 +289,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 5850 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED LD601
+L rusEFI_Older:LED LD601
 U 1 1 52E63D36
 P 8250 5650
 F 0 "LD601" H 8100 5550 50  0000 C CNN
@@ -360,7 +302,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 5650 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED LD604
+L rusEFI_Older:LED LD604
 U 1 1 52E63D3F
 P 8250 6750
 F 0 "LD604" H 8100 6650 50  0000 C CNN
@@ -373,7 +315,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 6750 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED LD603
+L rusEFI_Older:LED LD603
 U 1 1 52E63D48
 P 8250 6550
 F 0 "LD603" H 8100 6450 50  0000 C CNN
@@ -386,7 +328,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 6550 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R607
+L rusEFI_Older:R R607
 U 1 1 52E63D51
 P 7800 6750
 F 0 "R607" V 7880 6750 40  0000 C CNN
@@ -399,7 +341,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R608
+L rusEFI_Older:R R608
 U 1 1 52E63D5A
 P 7800 6950
 F 0 "R608" V 7880 6950 40  0000 C CNN
@@ -412,7 +354,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R603
+L rusEFI_Older:R R603
 U 1 1 52E63D63
 P 7800 5850
 F 0 "R603" V 7880 5850 40  0000 C CNN
@@ -425,7 +367,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R604
+L rusEFI_Older:R R604
 U 1 1 52E63D6C
 P 7800 6050
 F 0 "R604" V 7880 6050 40  0000 C CNN
@@ -438,7 +380,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L C C602
+L rusEFI_Older:C C602
 U 1 1 52E63D75
 P 7450 6650
 F 0 "C602" V 7500 6700 40  0000 L CNN
@@ -451,7 +393,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L C C601
+L rusEFI_Older:C C601
 U 1 1 52E63D7E
 P 7450 5750
 F 0 "C601" V 7500 5800 40  0000 L CNN
@@ -470,7 +412,7 @@ Wire Wire Line
 Text Notes 6250 3300 0    160  ~ 0
 8 channel high / low side driver
 $Comp
-L TC4427 U601
+L rusEFI_Older:TC4427 U601
 U 1 1 531CB7D3
 P 6650 5700
 F 0 "U601" H 6650 5950 60  0000 C CNN
@@ -483,7 +425,7 @@ F 5 "MOUSER,579-TC4427AVOA" H 6650 5700 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L TC4427 U602
+L rusEFI_Older:TC4427 U602
 U 1 1 531CB8D8
 P 6650 6600
 F 0 "U602" H 6650 6850 60  0000 C CNN
@@ -496,7 +438,7 @@ F 5 "MOUSER,579-TC4427AVOA" H 6650 6600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L TC4427 U603
+L rusEFI_Older:TC4427 U603
 U 1 1 531CB8E1
 P 6650 7500
 F 0 "U603" H 6650 7750 60  0000 C CNN
@@ -509,7 +451,7 @@ F 5 "MOUSER,579-TC4427AVOA" H 6650 7500 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L rusEFI_Older:GND #PWR010
 U 1 1 531CB9E5
 P 6650 7800
 F 0 "#PWR010" H 6650 7800 30  0001 C CNN
@@ -520,7 +462,7 @@ F 3 "" H 6650 7800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L rusEFI_Older:GND #PWR011
 U 1 1 531CB9EB
 P 6650 6900
 F 0 "#PWR011" H 6650 6900 30  0001 C CNN
@@ -531,7 +473,7 @@ F 3 "" H 6650 6900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L rusEFI_Older:GND #PWR012
 U 1 1 531CB9F1
 P 6650 6000
 F 0 "#PWR012" H 6650 6000 30  0001 C CNN
@@ -574,7 +516,7 @@ VP2
 Wire Wire Line
 	6250 6250 7100 6250
 $Comp
-L CONN_3 P605
+L rusEFI_Older:CONN_3 P605
 U 1 1 554C8F13
 P 5900 6250
 F 0 "P605" V 5850 6250 50  0000 C CNN
@@ -594,7 +536,7 @@ VP3
 Wire Wire Line
 	6250 7150 7100 7150
 $Comp
-L CONN_3 P606
+L rusEFI_Older:CONN_3 P606
 U 1 1 554C8FB7
 P 5900 7150
 F 0 "P606" V 5850 7150 50  0000 C CNN
@@ -610,7 +552,7 @@ $EndComp
 Wire Wire Line
 	7100 7050 7100 7550
 $Comp
-L C C604
+L rusEFI_Older:C C604
 U 1 1 554C9004
 P 7450 8450
 F 0 "C604" V 7500 8500 40  0000 L CNN
@@ -623,7 +565,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 3500 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L GND #PWR013
+L rusEFI_Older:GND #PWR013
 U 1 1 554C900A
 P 8450 8600
 F 0 "#PWR013" H 8450 8600 30  0001 C CNN
@@ -640,7 +582,7 @@ Wire Wire Line
 Wire Wire Line
 	7000 8350 7550 8350
 $Comp
-L LED LD608
+L rusEFI_Older:LED LD608
 U 1 1 554C9017
 P 8250 8550
 F 0 "LD608" H 8100 8450 50  0000 C CNN
@@ -653,7 +595,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 8550 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R615
+L rusEFI_Older:R R615
 U 1 1 554C901F
 P 7800 8550
 F 0 "R615" V 7880 8550 40  0000 C CNN
@@ -668,7 +610,7 @@ $EndComp
 Wire Wire Line
 	7000 8550 7550 8550
 $Comp
-L R R616
+L rusEFI_Older:R R616
 U 1 1 554C9028
 P 7800 8750
 F 0 "R616" V 7880 8750 40  0000 C CNN
@@ -688,7 +630,7 @@ Wire Wire Line
 	8450 8350 8450 8600
 Connection ~ 8450 8550
 $Comp
-L GND #PWR014
+L rusEFI_Older:GND #PWR014
 U 1 1 554C9032
 P 6300 8450
 F 0 "#PWR014" H 6300 8450 30  0001 C CNN
@@ -703,7 +645,7 @@ Wire Wire Line
 Connection ~ 8450 8450
 Connection ~ 7100 8450
 $Comp
-L R R614
+L rusEFI_Older:R R614
 U 1 1 554C9041
 P 7800 8350
 F 0 "R614" V 7880 8350 40  0000 C CNN
@@ -716,7 +658,7 @@ F 5 "DIGI,P2.70KCCT-ND" V 1130 3500 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R613
+L rusEFI_Older:R R613
 U 1 1 554C9049
 P 7800 8150
 F 0 "R613" V 7880 8150 40  0000 C CNN
@@ -729,7 +671,7 @@ F 5 "DIGI,P100CTR-ND" V 1130 3500 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L LED LD607
+L rusEFI_Older:LED LD607
 U 1 1 554C9052
 P 8250 8350
 F 0 "LD607" H 8100 8250 50  0000 C CNN
@@ -742,7 +684,7 @@ F 5 "DIGI,160-1579-1-ND" H 8250 8350 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L TC4427 U604
+L rusEFI_Older:TC4427 U604
 U 1 1 554C905B
 P 6650 8400
 F 0 "U604" H 6650 8650 60  0000 C CNN
@@ -755,7 +697,7 @@ F 5 "MOUSER,579-TC4427AVOA" H 6650 8400 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L rusEFI_Older:GND #PWR015
 U 1 1 554C9061
 P 6650 8700
 F 0 "#PWR015" H 6650 8700 30  0001 C CNN
@@ -774,7 +716,7 @@ VP4
 Wire Wire Line
 	6250 8050 7100 8050
 $Comp
-L CONN_3 P607
+L rusEFI_Older:CONN_3 P607
 U 1 1 554C906D
 P 5900 8050
 F 0 "P607" V 5850 8050 50  0000 C CNN
@@ -802,7 +744,7 @@ Text HLabel 6250 5250 1    60   Input ~ 0
 Wire Wire Line
 	6250 5350 7100 5350
 $Comp
-L CONN_3 P604
+L rusEFI_Older:CONN_3 P604
 U 1 1 554C9C34
 P 5900 5350
 F 0 "P604" V 5850 5350 50  0000 C CNN
@@ -818,7 +760,7 @@ $EndComp
 Wire Wire Line
 	7100 5250 7100 5750
 $Comp
-L R R618
+L rusEFI_Older:R R618
 U 1 1 5799ADE5
 P 6050 5750
 F 0 "R618" V 6125 5750 40  0000 C CNN
@@ -831,7 +773,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 2900 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R617
+L rusEFI_Older:R R617
 U 1 1 5799B622
 P 5550 5650
 F 0 "R617" V 5625 5650 40  0000 C CNN
@@ -844,7 +786,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V -1120 2800 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R620
+L rusEFI_Older:R R620
 U 1 1 5799F9FE
 P 6050 5950
 F 0 "R620" V 6125 5950 40  0000 C CNN
@@ -857,7 +799,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 3100 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R619
+L rusEFI_Older:R R619
 U 1 1 5799FAB5
 P 5550 5850
 F 0 "R619" V 5625 5850 40  0000 C CNN
@@ -878,7 +820,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 5850 6300 5850
 $Comp
-L GND #PWR016
+L rusEFI_Older:GND #PWR016
 U 1 1 579A0A68
 P 6300 5950
 F 0 "#PWR016" H 6300 5950 30  0001 C CNN
@@ -889,7 +831,7 @@ F 3 "" H 6300 5950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R622
+L rusEFI_Older:R R622
 U 1 1 579A0D29
 P 6050 6650
 F 0 "R622" V 6125 6650 40  0000 C CNN
@@ -902,7 +844,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 3800 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R621
+L rusEFI_Older:R R621
 U 1 1 579A0D31
 P 5550 6550
 F 0 "R621" V 5625 6550 40  0000 C CNN
@@ -915,7 +857,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V -1120 3700 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R624
+L rusEFI_Older:R R624
 U 1 1 579A0D39
 P 6050 6850
 F 0 "R624" V 6125 6850 40  0000 C CNN
@@ -928,7 +870,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 4000 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R623
+L rusEFI_Older:R R623
 U 1 1 579A0D41
 P 5550 6750
 F 0 "R623" V 5625 6750 40  0000 C CNN
@@ -949,7 +891,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 6750 6300 6750
 $Comp
-L R R626
+L rusEFI_Older:R R626
 U 1 1 579A1161
 P 6050 7550
 F 0 "R626" V 6125 7550 40  0000 C CNN
@@ -962,7 +904,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 4700 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R625
+L rusEFI_Older:R R625
 U 1 1 579A1169
 P 5550 7450
 F 0 "R625" V 5625 7450 40  0000 C CNN
@@ -975,7 +917,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V -1120 4600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R628
+L rusEFI_Older:R R628
 U 1 1 579A1171
 P 6050 7750
 F 0 "R628" V 6125 7750 40  0000 C CNN
@@ -988,7 +930,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 4900 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R627
+L rusEFI_Older:R R627
 U 1 1 579A1179
 P 5550 7650
 F 0 "R627" V 5625 7650 40  0000 C CNN
@@ -1009,7 +951,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 7650 6300 7650
 $Comp
-L GND #PWR017
+L rusEFI_Older:GND #PWR017
 U 1 1 579A1383
 P 6300 6850
 F 0 "#PWR017" H 6300 6850 30  0001 C CNN
@@ -1020,7 +962,7 @@ F 3 "" H 6300 6850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L rusEFI_Older:GND #PWR018
 U 1 1 579A141E
 P 6300 7750
 F 0 "#PWR018" H 6300 7750 30  0001 C CNN
@@ -1031,7 +973,7 @@ F 3 "" H 6300 7750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R630
+L rusEFI_Older:R R630
 U 1 1 579A31F7
 P 6050 8450
 F 0 "R630" V 6125 8450 40  0000 C CNN
@@ -1044,7 +986,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 5600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R629
+L rusEFI_Older:R R629
 U 1 1 579A31FF
 P 5550 8350
 F 0 "R629" V 5625 8350 40  0000 C CNN
@@ -1057,7 +999,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V -1120 5500 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R632
+L rusEFI_Older:R R632
 U 1 1 579A3207
 P 6050 8650
 F 0 "R632" V 6125 8650 40  0000 C CNN
@@ -1070,7 +1012,7 @@ F 5 "DIGI,P1.0KDACT-ND" V -620 5800 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R631
+L rusEFI_Older:R R631
 U 1 1 579A320F
 P 5550 8550
 F 0 "R631" V 5625 8550 40  0000 C CNN
@@ -1091,7 +1033,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 8550 6300 8550
 $Comp
-L GND #PWR019
+L rusEFI_Older:GND #PWR019
 U 1 1 579A3289
 P 6300 8650
 F 0 "#PWR019" H 6300 8650 30  0001 C CNN
@@ -1102,7 +1044,7 @@ F 3 "" H 6300 8650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R633
+L rusEFI_Older:R R633
 U 1 1 5CBCBF18
 P 6850 5250
 F 0 "R633" V 6925 5250 40  0000 C CNN
@@ -1116,7 +1058,7 @@ F 5 "DIGI,P0.0ADKR-ND" V 180 2400 60  0001 C CNN "VEND1,VEND1#"
 $EndComp
 Connection ~ 7100 5350
 $Comp
-L R R634
+L rusEFI_Older:R R634
 U 1 1 5CBD10A3
 P 6850 6150
 F 0 "R634" V 6925 6150 40  0000 C CNN
@@ -1130,7 +1072,7 @@ F 5 "DIGI,P0.0ADKR-ND" V 180 3300 60  0001 C CNN "VEND1,VEND1#"
 $EndComp
 Connection ~ 7100 6250
 $Comp
-L R R635
+L rusEFI_Older:R R635
 U 1 1 5CBD1637
 P 6850 7050
 F 0 "R635" V 6925 7050 40  0000 C CNN

hardware/frankenso/inj_12ch.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr B 17000 11000
 encoding utf-8
@@ -78,7 +20,7 @@ INJECTOR
 Text Notes 11075 4975 0    60   ~ 0
 RELAY
 $Comp
-L GND #PWR085
+L rusEFI_Older:GND #PWR085
 U 1 1 50D4F374
 P 7725 6875
 F 0 "#PWR085" H 7725 6875 30  0001 C CNN
@@ -93,7 +35,7 @@ MISC NOTES\n\nTHE GENERAL SYSTEM LAYOUT IS SHOWN IN BLUE. THIS IS NOT\nTHE SUGGE
 Text Notes 12575 5425 0    60   ~ 0
 BAT
 $Comp
-L FDS2734 Q407
+L rusEFI_Older:FDS2734 Q407
 U 1 1 50D3B114
 P 7325 5325
 F 0 "Q407" H 7275 5125 70  0000 C CNN
@@ -107,7 +49,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L FDS2734 Q408
+L rusEFI_Older:FDS2734 Q408
 U 1 1 50D3B113
 P 7325 5925
 F 0 "Q408" H 7275 5725 70  0000 C CNN
@@ -121,7 +63,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R417
+L rusEFI_Older:R R417
 U 1 1 50D3B111
 P 6875 5825
 F 0 "R417" V 6955 5825 50  0000 C CNN
@@ -140,7 +82,7 @@ INJ-08_5V
 Text Label 6075 5425 2    60   ~ 0
 INJ-07_5V
 $Comp
-L R R416
+L rusEFI_Older:R R416
 U 1 1 50D3B10F
 P 6875 5475
 F 0 "R416" V 6955 5475 50  0000 C CNN
@@ -153,7 +95,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L FDS2734 Q409
+L rusEFI_Older:FDS2734 Q409
 U 1 1 50D3B0FD
 P 7325 6575
 F 0 "Q409" H 7275 6375 70  0000 C CNN
@@ -167,7 +109,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L FDS2734 Q410
+L rusEFI_Older:FDS2734 Q410
 U 1 1 50D3B0FC
 P 7325 7175
 F 0 "Q410" H 7275 6975 70  0000 C CNN
@@ -181,7 +123,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R421
+L rusEFI_Older:R R421
 U 1 1 50D3B0FA
 P 6875 7075
 F 0 "R421" V 6955 7075 50  0000 C CNN
@@ -198,7 +140,7 @@ INJ-10_5V
 Text Label 6075 6675 2    60   ~ 0
 INJ-09_5V
 $Comp
-L R R420
+L rusEFI_Older:R R420
 U 1 1 50D3B0F8
 P 6875 6725
 F 0 "R420" V 6955 6725 50  0000 C CNN
@@ -211,7 +153,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R424
+L rusEFI_Older:R R424
 U 1 1 50D3AF9A
 P 6875 7975
 F 0 "R424" V 6955 7975 50  0000 C CNN
@@ -230,7 +172,7 @@ INJ-12_5V
 Text Label 7550 8075 0    60   ~ 0
 iGND1
 $Comp
-L R R425
+L rusEFI_Older:R R425
 U 1 1 50D3AF94
 P 6875 8325
 F 0 "R425" V 6955 8325 50  0000 C CNN
@@ -245,7 +187,7 @@ $EndComp
 Text Notes 11550 4975 0    60   ~ 0
 FUSE
 $Comp
-L FDS2734 Q412
+L rusEFI_Older:FDS2734 Q412
 U 1 1 4E3ED60F
 P 7325 8425
 F 0 "Q412" H 7275 8225 70  0000 C CNN
@@ -259,7 +201,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L FDS2734 Q411
+L rusEFI_Older:FDS2734 Q411
 U 1 1 4E3ED60B
 P 7325 7825
 F 0 "Q411" H 7275 7625 70  0000 C CNN
@@ -273,7 +215,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODE D413
+L rusEFI_Older:DIODE D413
 U 1 1 527FB789
 P 7175 925
 F 0 "D413" H 7175 1025 40  0000 C CNN
@@ -286,7 +228,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7175 925 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R427
+L rusEFI_Older:R R427
 U 1 1 527FB7A2
 P 7825 725
 F 0 "R427" V 7905 725 50  0000 C CNN
@@ -299,7 +241,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L R R401
+L rusEFI_Older:R R401
 U 1 1 527FFC06
 P 8075 975
 F 0 "R401" V 8155 975 50  0000 C CNN
@@ -312,7 +254,7 @@ F 5 "DNP,DNP" V 8075 975 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R402
+L rusEFI_Older:R R402
 U 1 1 527FFC31
 P 8075 1475
 F 0 "R402" V 8155 1475 50  0000 C CNN
@@ -327,7 +269,7 @@ $EndComp
 Text Notes 8625 1425 0    60   ~ 0
 OPTION FOR IGNITION DRIVER\n75 OHM   1/2 WATT\n\n\n\n\n100 OHM    1 WATT
 $Comp
-L R R415
+L rusEFI_Older:R R415
 U 1 1 529A8640
 P 6325 5425
 F 0 "R415" V 6405 5425 50  0000 C CNN
@@ -340,7 +282,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 3050 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R418
+L rusEFI_Older:R R418
 U 1 1 529A8879
 P 6325 5925
 F 0 "R418" V 6405 5925 50  0000 C CNN
@@ -353,7 +295,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 3550 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R419
+L rusEFI_Older:R R419
 U 1 1 529A8883
 P 6325 6675
 F 0 "R419" V 6405 6675 50  0000 C CNN
@@ -366,7 +308,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 4300 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R422
+L rusEFI_Older:R R422
 U 1 1 529A888D
 P 6325 7175
 F 0 "R422" V 6405 7175 50  0000 C CNN
@@ -379,7 +321,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 4800 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R423
+L rusEFI_Older:R R423
 U 1 1 529A8899
 P 6325 7925
 F 0 "R423" V 6405 7925 50  0000 C CNN
@@ -392,7 +334,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 5550 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R426
+L rusEFI_Older:R R426
 U 1 1 529A88A3
 P 6325 8425
 F 0 "R426" V 6405 8425 50  0000 C CNN
@@ -405,7 +347,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 6050 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR086
+L rusEFI_Older:GND #PWR086
 U 1 1 52AC74CB
 P 7725 3025
 F 0 "#PWR086" H 7725 3025 30  0001 C CNN
@@ -416,7 +358,7 @@ F 3 "" H 7725 3025 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FDS2734 Q401
+L rusEFI_Older:FDS2734 Q401
 U 1 1 52AC74D4
 P 7325 1475
 F 0 "Q401" H 7300 1275 70  0000 C CNN
@@ -430,7 +372,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L FDS2734 Q402
+L rusEFI_Older:FDS2734 Q402
 U 1 1 52AC74DC
 P 7325 2075
 F 0 "Q402" H 7300 1875 70  0000 C CNN
@@ -444,7 +386,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R405
+L rusEFI_Older:R R405
 U 1 1 52AC74E4
 P 6875 1975
 F 0 "R405" V 6955 1975 50  0000 C CNN
@@ -463,7 +405,7 @@ INJ-02_5V
 Text Label 6075 1575 2    60   ~ 0
 INJ-01_5V
 $Comp
-L R R404
+L rusEFI_Older:R R404
 U 1 1 52AC74EF
 P 6875 1625
 F 0 "R404" V 6955 1625 50  0000 C CNN
@@ -478,7 +420,7 @@ $EndComp
 Text Label 7550 1225 0    60   ~ 0
 INJ-01
 $Comp
-L FDS2734 Q403
+L rusEFI_Older:FDS2734 Q403
 U 1 1 52AC74F9
 P 7325 2725
 F 0 "Q403" H 7275 2525 70  0000 C CNN
@@ -492,7 +434,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L FDS2734 Q404
+L rusEFI_Older:FDS2734 Q404
 U 1 1 52AC7501
 P 7325 3325
 F 0 "Q404" H 7275 3125 70  0000 C CNN
@@ -506,7 +448,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R409
+L rusEFI_Older:R R409
 U 1 1 52AC7509
 P 6875 3225
 F 0 "R409" V 6955 3225 50  0000 C CNN
@@ -525,7 +467,7 @@ INJ-04_5V
 Text Label 6075 2825 2    60   ~ 0
 INJ-03_5V
 $Comp
-L R R408
+L rusEFI_Older:R R408
 U 1 1 52AC7514
 P 6875 2875
 F 0 "R408" V 6955 2875 50  0000 C CNN
@@ -538,7 +480,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R412
+L rusEFI_Older:R R412
 U 1 1 52AC7520
 P 6875 4125
 F 0 "R412" V 6955 4125 50  0000 C CNN
@@ -555,7 +497,7 @@ INJ-05_5V
 Text Label 6075 4575 2    60   ~ 0
 INJ-06_5V
 $Comp
-L R R413
+L rusEFI_Older:R R413
 U 1 1 52AC752B
 P 6875 4475
 F 0 "R413" V 6955 4475 50  0000 C CNN
@@ -568,7 +510,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    1    -1   0   
 $EndComp
 $Comp
-L FDS2734 Q406
+L rusEFI_Older:FDS2734 Q406
 U 1 1 52AC7533
 P 7325 4575
 F 0 "Q406" H 7300 4375 70  0000 C CNN
@@ -582,7 +524,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    1   
 $EndComp
 $Comp
-L FDS2734 Q405
+L rusEFI_Older:FDS2734 Q405
 U 1 1 52AC753B
 P 7325 3975
 F 0 "Q405" H 7300 3775 70  0000 C CNN
@@ -596,7 +538,7 @@ F 6 "MOUSER,511-VNS14NV04PTR-E" H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R403
+L rusEFI_Older:R R403
 U 1 1 52AC757A
 P 6325 1575
 F 0 "R403" V 6405 1575 50  0000 C CNN
@@ -609,7 +551,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 -800 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R406
+L rusEFI_Older:R R406
 U 1 1 52AC7583
 P 6325 2075
 F 0 "R406" V 6405 2075 50  0000 C CNN
@@ -622,7 +564,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 -300 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R407
+L rusEFI_Older:R R407
 U 1 1 52AC758B
 P 6325 2825
 F 0 "R407" V 6405 2825 50  0000 C CNN
@@ -635,7 +577,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 450 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R410
+L rusEFI_Older:R R410
 U 1 1 52AC7593
 P 6325 3325
 F 0 "R410" V 6405 3325 50  0000 C CNN
@@ -648,7 +590,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 950 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R411
+L rusEFI_Older:R R411
 U 1 1 52AC759B
 P 6325 4075
 F 0 "R411" V 6405 4075 50  0000 C CNN
@@ -661,7 +603,7 @@ F 5 "DIGI,ERJ-6ENF20R0V" V 3255 1700 60  0001 C CNN "VEND1,VEND1#"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R414
+L rusEFI_Older:R R414
 U 1 1 52AC75A3
 P 6325 4575
 F 0 "R414" V 6405 4575 50  0000 C CNN
@@ -1075,7 +1017,7 @@ Wire Wire Line
 Wire Wire Line
 	7125 2975 7725 2975
 $Comp
-L GND #PWR087
+L rusEFI_Older:GND #PWR087
 U 1 1 52E4981F
 P 7950 4275
 F 0 "#PWR087" H 7950 4275 30  0001 C CNN
@@ -1105,7 +1047,7 @@ Wire Notes Line
 Text Notes 9400 6650 0    160  ~ 0
 12 channel injector driver\nalso suitable for fuel pump relay, IAC solenoid etc
 $Comp
-L LED_0805 D414
+L rusEFI_Older:LED_0805 D414
 U 1 1 539EA6FA
 P 7375 725
 F 0 "D414" H 7375 825 50  0000 C CNN
@@ -1170,7 +1112,7 @@ INJ-01_2
 Text HLabel 7725 6825 1    60   Input ~ 0
 iGND1
 $Comp
-L DIODE D416
+L rusEFI_Older:DIODE D416
 U 1 1 5457FE1A
 P 7325 2325
 F 0 "D416" H 7325 2425 40  0000 C CNN
@@ -1183,7 +1125,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 2325 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_0805 D415
+L rusEFI_Older:LED_0805 D415
 U 1 1 5457FE61
 P 6925 2325
 F 0 "D415" H 6925 2425 50  0000 C CNN
@@ -1196,7 +1138,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 4200 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R438
+L rusEFI_Older:R R438
 U 1 1 5457FE69
 P 6475 2325
 F 0 "R438" V 6555 2325 50  0000 C CNN
@@ -1211,7 +1153,7 @@ $EndComp
 Text Label 6225 2325 2    60   ~ 0
 5V
 $Comp
-L DIODE D418
+L rusEFI_Older:DIODE D418
 U 1 1 5457FEEA
 P 7325 2475
 F 0 "D418" H 7325 2575 40  0000 C CNN
@@ -1224,7 +1166,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 2475 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D417
+L rusEFI_Older:LED_0805 D417
 U 1 1 5457FEF2
 P 6925 2475
 F 0 "D417" H 6925 2575 50  0000 C CNN
@@ -1237,7 +1179,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 4350 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R428
+L rusEFI_Older:R R428
 U 1 1 5457FEFA
 P 6475 2475
 F 0 "R428" V 6555 2475 50  0000 C CNN
@@ -1252,7 +1194,7 @@ $EndComp
 Text Label 6225 2475 2    60   ~ 0
 5V
 $Comp
-L DIODE D420
+L rusEFI_Older:DIODE D420
 U 1 1 54580041
 P 7325 3575
 F 0 "D420" H 7325 3675 40  0000 C CNN
@@ -1265,7 +1207,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 3575 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_0805 D419
+L rusEFI_Older:LED_0805 D419
 U 1 1 54580049
 P 6925 3575
 F 0 "D419" H 6925 3675 50  0000 C CNN
@@ -1278,7 +1220,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 5450 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R429
+L rusEFI_Older:R R429
 U 1 1 54580051
 P 6475 3575
 F 0 "R429" V 6555 3575 50  0000 C CNN
@@ -1293,7 +1235,7 @@ $EndComp
 Text Label 6225 3575 2    60   ~ 0
 5V
 $Comp
-L DIODE D422
+L rusEFI_Older:DIODE D422
 U 1 1 5458005A
 P 7325 3725
 F 0 "D422" H 7325 3825 40  0000 C CNN
@@ -1306,7 +1248,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 3725 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D421
+L rusEFI_Older:LED_0805 D421
 U 1 1 54580062
 P 6925 3725
 F 0 "D421" H 6925 3825 50  0000 C CNN
@@ -1319,7 +1261,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 5600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R430
+L rusEFI_Older:R R430
 U 1 1 5458006A
 P 6475 3725
 F 0 "R430" V 6555 3725 50  0000 C CNN
@@ -1334,7 +1276,7 @@ $EndComp
 Wire Wire Line
 	6225 3575 6225 3725
 $Comp
-L DIODE D424
+L rusEFI_Older:DIODE D424
 U 1 1 54580073
 P 7325 4825
 F 0 "D424" H 7325 4925 40  0000 C CNN
@@ -1347,7 +1289,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 4825 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_0805 D423
+L rusEFI_Older:LED_0805 D423
 U 1 1 5458007B
 P 6925 4825
 F 0 "D423" H 6925 4925 50  0000 C CNN
@@ -1360,7 +1302,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 6700 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R431
+L rusEFI_Older:R R431
 U 1 1 54580083
 P 6475 4825
 F 0 "R431" V 6555 4825 50  0000 C CNN
@@ -1375,7 +1317,7 @@ $EndComp
 Text Label 6225 4825 2    60   ~ 0
 5V
 $Comp
-L DIODE D426
+L rusEFI_Older:DIODE D426
 U 1 1 5458008C
 P 7325 5075
 F 0 "D426" H 7325 5175 40  0000 C CNN
@@ -1388,7 +1330,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 5075 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D425
+L rusEFI_Older:LED_0805 D425
 U 1 1 54580094
 P 6925 5075
 F 0 "D425" H 6925 5175 50  0000 C CNN
@@ -1401,7 +1343,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 6950 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R432
+L rusEFI_Older:R R432
 U 1 1 5458009C
 P 6475 5075
 F 0 "R432" V 6555 5075 50  0000 C CNN
@@ -1416,7 +1358,7 @@ $EndComp
 Wire Wire Line
 	6225 4825 6225 5075
 $Comp
-L DIODE D428
+L rusEFI_Older:DIODE D428
 U 1 1 545800A5
 P 7325 6175
 F 0 "D428" H 7325 6275 40  0000 C CNN
@@ -1429,7 +1371,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 6175 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_0805 D427
+L rusEFI_Older:LED_0805 D427
 U 1 1 545800AD
 P 6925 6175
 F 0 "D427" H 6925 6275 50  0000 C CNN
@@ -1442,7 +1384,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 8050 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R433
+L rusEFI_Older:R R433
 U 1 1 545800B5
 P 6475 6175
 F 0 "R433" V 6555 6175 50  0000 C CNN
@@ -1457,7 +1399,7 @@ $EndComp
 Text Label 6225 6175 2    60   ~ 0
 5V
 $Comp
-L DIODE D430
+L rusEFI_Older:DIODE D430
 U 1 1 545800BE
 P 7325 6325
 F 0 "D430" H 7325 6425 40  0000 C CNN
@@ -1470,7 +1412,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 6325 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D429
+L rusEFI_Older:LED_0805 D429
 U 1 1 545800C6
 P 6925 6325
 F 0 "D429" H 6925 6425 50  0000 C CNN
@@ -1483,7 +1425,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 8200 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R434
+L rusEFI_Older:R R434
 U 1 1 545800CE
 P 6475 6325
 F 0 "R434" V 6555 6325 50  0000 C CNN
@@ -1498,7 +1440,7 @@ $EndComp
 Wire Wire Line
 	6225 6175 6225 6325
 $Comp
-L DIODE D432
+L rusEFI_Older:DIODE D432
 U 1 1 545800D7
 P 7325 7425
 F 0 "D432" H 7325 7525 40  0000 C CNN
@@ -1511,7 +1453,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 7425 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED_0805 D431
+L rusEFI_Older:LED_0805 D431
 U 1 1 545800DF
 P 6925 7425
 F 0 "D431" H 6925 7525 50  0000 C CNN
@@ -1524,7 +1466,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 9300 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R435
+L rusEFI_Older:R R435
 U 1 1 545800E7
 P 6475 7425
 F 0 "R435" V 6555 7425 50  0000 C CNN
@@ -1539,7 +1481,7 @@ $EndComp
 Text Label 6225 7425 2    60   ~ 0
 5V
 $Comp
-L DIODE D434
+L rusEFI_Older:DIODE D434
 U 1 1 545800F0
 P 7325 7575
 F 0 "D434" H 7325 7675 40  0000 C CNN
@@ -1552,7 +1494,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 7575 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D433
+L rusEFI_Older:LED_0805 D433
 U 1 1 545800F8
 P 6925 7575
 F 0 "D433" H 6925 7675 50  0000 C CNN
@@ -1565,7 +1507,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 9450 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R436
+L rusEFI_Older:R R436
 U 1 1 54580100
 P 6475 7575
 F 0 "R436" V 6555 7575 50  0000 C CNN
@@ -1580,7 +1522,7 @@ $EndComp
 Wire Wire Line
 	6225 7425 6225 7575
 $Comp
-L DIODE D436
+L rusEFI_Older:DIODE D436
 U 1 1 54580109
 P 7325 8675
 F 0 "D436" H 7325 8775 40  0000 C CNN
@@ -1593,7 +1535,7 @@ F 5 "DIGI,BAT54T1GOSCT-ND" H 7325 8675 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L LED_0805 D435
+L rusEFI_Older:LED_0805 D435
 U 1 1 54580111
 P 6925 8675
 F 0 "D435" H 6925 8775 50  0000 C CNN
@@ -1606,7 +1548,7 @@ F 5 "DIGI,160-1427-1-ND" V 680 10550 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    1   
 $EndComp
 $Comp
-L R R437
+L rusEFI_Older:R R437
 U 1 1 54580119
 P 6475 8675
 F 0 "R437" V 6555 8675 50  0000 C CNN

hardware/frankenso/mmc_usb_1.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A 11000 8500
 encoding utf-8
@@ -74,7 +16,7 @@ $EndDescr
 Text Label 4600 2200 0    60   ~ 0
 FTVCC
 $Comp
-L C C354
+L rusEFI_Older:C C354
 U 1 1 52A59B20
 P 4200 2000
 F 0 "C354" H 4250 2100 50  0000 L CNN
@@ -87,7 +29,7 @@ F 5 "DIGI,445-7882-6-ND" V 1130 3025 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR088
+L rusEFI_Older:GND #PWR088
 U 1 1 52A59B21
 P 6275 4050
 F 0 "#PWR088" H 6275 4050 30  0001 C CNN
@@ -98,7 +40,7 @@ F 3 "" H 6275 4050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR089
+L rusEFI_Older:GND #PWR089
 U 1 1 52A59B2B
 P 3225 1250
 F 0 "#PWR089" H 3225 1250 30  0001 C CNN
@@ -109,7 +51,7 @@ F 3 "" H 3225 1250 60  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L R R352
+L rusEFI_Older:R R352
 U 1 1 52A59B2D
 P 3225 1950
 F 0 "R352" V 3305 1950 50  0000 C CNN
@@ -122,7 +64,7 @@ F 5 "DIGI,P1.0KDACT-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR090
+L rusEFI_Older:GND #PWR090
 U 1 1 52A59B2E
 P 4200 1800
 F 0 "#PWR090" H 4200 1800 30  0001 C CNN
@@ -133,7 +75,7 @@ F 3 "" H 4200 1800 60  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L C C355
+L rusEFI_Older:C C355
 U 1 1 52A59B31
 P 4525 2000
 F 0 "C355" H 4575 2100 50  0000 L CNN
@@ -146,7 +88,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 3025 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L rusEFI_Older:GND #PWR091
 U 1 1 52A59B32
 P 4525 1800
 F 0 "#PWR091" H 4525 1800 30  0001 C CNN
@@ -157,7 +99,7 @@ F 3 "" H 4525 1800 60  0001 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR092
+L rusEFI_Older:GND #PWR092
 U 1 1 52A59B33
 P 6125 4050
 F 0 "#PWR092" H 6125 4050 30  0001 C CNN
@@ -168,7 +110,7 @@ F 3 "" H 6125 4050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR093
+L rusEFI_Older:GND #PWR093
 U 1 1 52A59B34
 P 5975 4050
 F 0 "#PWR093" H 5975 4050 30  0001 C CNN
@@ -179,7 +121,7 @@ F 3 "" H 5975 4050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L rusEFI_Older:GND #PWR094
 U 1 1 52A59B35
 P 5825 4050
 F 0 "#PWR094" H 5825 4050 30  0001 C CNN
@@ -190,7 +132,7 @@ F 3 "" H 5825 4050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR095
+L rusEFI_Older:GND #PWR095
 U 1 1 52A59B36
 P 5675 4050
 F 0 "#PWR095" H 5675 4050 30  0001 C CNN
@@ -201,7 +143,7 @@ F 3 "" H 5675 4050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR096
+L rusEFI_Older:GND #PWR096
 U 1 1 52A59B37
 P 5025 3750
 F 0 "#PWR096" H 5025 3750 30  0001 C CNN
@@ -212,7 +154,7 @@ F 3 "" H 5025 3750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C356
+L rusEFI_Older:C C356
 U 1 1 52A59B38
 P 5025 3550
 F 0 "C356" H 5075 3650 50  0000 L CNN
@@ -225,7 +167,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 3425 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C351
+L rusEFI_Older:C C351
 U 1 1 52A59B39
 P 2700 3200
 F 0 "C351" H 2750 3050 50  0000 L CNN
@@ -238,7 +180,7 @@ F 5 "DIGI,478-1379-2-ND" V 1730 2925 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L R R351
+L rusEFI_Older:R R351
 U 1 1 52A59B3A
 P 2900 3250
 F 0 "R351" V 3000 3225 50  0000 C CNN
@@ -256,7 +198,7 @@ NoConn ~ 6875 2650
 NoConn ~ 5025 3150
 NoConn ~ 5025 3050
 $Comp
-L FT232RL U351
+L rusEFI_Older:FT232RL U351
 U 1 1 52A59B51
 P 5975 2850
 F 0 "U351" H 5975 3750 60  0000 C CNN
@@ -269,7 +211,7 @@ F 5 "DIGI,768-1007-2-ND" V 1130 3425 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR097
+L rusEFI_Older:GND #PWR097
 U 1 1 52A5A5A0
 P 2900 2600
 F 0 "#PWR097" H 2900 2600 30  0001 C CNN
@@ -280,7 +222,7 @@ F 3 "" H 2900 2600 60  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR098
+L rusEFI_Older:GND #PWR098
 U 1 1 52A5A60C
 P 2700 3600
 F 0 "#PWR098" H 2700 3600 30  0001 C CNN
@@ -292,7 +234,7 @@ F 3 "" H 2700 3600 60  0001 C CNN
 $EndComp
 NoConn ~ 2900 2500
 $Comp
-L C C352
+L rusEFI_Older:C C352
 U 1 1 52A5A67B
 P 3825 2750
 F 0 "C352" H 3875 2850 50  0000 L CNN
@@ -305,7 +247,7 @@ F 5 "DIGI,478-1282-1-ND" V 2005 3075 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C353
+L rusEFI_Older:C C353
 U 1 1 52A5A68B
 P 4175 2750
 F 0 "C353" H 4225 2850 50  0000 L CNN
@@ -318,7 +260,7 @@ F 5 "DIGI,478-1282-1-ND" V 2005 3025 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR099
+L rusEFI_Older:GND #PWR099
 U 1 1 52A5A701
 P 3975 3025
 F 0 "#PWR099" H 3975 3025 30  0001 C CNN
@@ -329,7 +271,7 @@ F 3 "" H 3975 3025 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MICRO-SDCARD-CONNECTOR-3300060P1 P352
+L rusEFI_Older:MICRO-SDCARD-CONNECTOR-3300060P1 P352
 U 1 1 52A75274
 P 3300 5000
 F 0 "P352" H 3150 5500 60  0000 C CNN
@@ -346,7 +288,7 @@ NoConn ~ 3700 4600
 NoConn ~ 3700 5300
 NoConn ~ 3700 5400
 $Comp
-L GND #PWR0100
+L rusEFI_Older:GND #PWR0100
 U 1 1 52A752F4
 P 3700 5100
 F 0 "#PWR0100" H 3700 5100 30  0001 C CNN
@@ -361,24 +303,23 @@ For right conn
 Connection ~ 2700 3500
 Wire Wire Line
 	2700 3000 2900 3000
-Connection ~ -4675 3450
 Wire Wire Line
 	2900 3500 2700 3500
 Connection ~ 4525 2200
 Wire Wire Line
 	3225 1650 3225 1700
 Wire Wire Line
-	3925 2200 5025 2200
+	3925 2200 4200 2200
 Connection ~ 4200 2200
 Wire Wire Line
-	2700 3400 2700 3600
+	2700 3400 2700 3500
 Wire Wire Line
 	2900 3000 2900 2700
 Connection ~ 2900 3000
 Wire Wire Line
 	2900 2200 3225 2200
 Wire Wire Line
-	3825 2950 4175 2950
+	3825 2950 3975 2950
 Wire Wire Line
 	3975 3025 3975 2950
 Connection ~ 3975 2950
@@ -397,7 +338,7 @@ Wire Wire Line
 Wire Wire Line
 	3875 4700 3700 4700
 $Comp
-L C C358
+L rusEFI_Older:C C358
 U 1 1 52BEFB29
 P 6900 5725
 F 0 "C358" H 6950 5825 50  0000 L CNN
@@ -410,7 +351,7 @@ F 5 "DIGI,445-7882-6-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L C C357
+L rusEFI_Older:C C357
 U 1 1 52BEFB4C
 P 6900 5175
 F 0 "C357" H 6950 5275 50  0000 L CNN
@@ -423,12 +364,12 @@ F 5 "DIGI,478-1395-1-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6900 5375 6900 5525
+	6900 5375 6900 5475
 Wire Wire Line
 	6600 5475 6900 5475
 Connection ~ 6900 5475
 $Comp
-L GND #PWR0101
+L rusEFI_Older:GND #PWR0101
 U 1 1 52BEFC07
 P 6900 5925
 F 0 "#PWR0101" H 6900 5925 30  0001 C CNN
@@ -439,7 +380,7 @@ F 3 "" H 6900 5925 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0102
+L rusEFI_Older:GND #PWR0102
 U 1 1 52BEFC0D
 P 6900 4975
 F 0 "#PWR0102" H 6900 4975 30  0001 C CNN
@@ -452,7 +393,7 @@ $EndComp
 Text Label 6600 5475 2    60   ~ 0
 3.3V
 $Comp
-L MINI-USB-5P-3400020P1 J351
+L rusEFI_Older:MINI-USB-5P-3400020P1 J351
 U 1 1 52C034E1
 P 2700 2450
 F 0 "J351" H 2425 2800 60  0000 C CNN
@@ -465,7 +406,7 @@ F 5 "DIGI,670-1190-1-ND" V 1730 2925 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0103
+L rusEFI_Older:GND #PWR0103
 U 1 1 52C0C35C
 P 2700 5200
 F 0 "#PWR0103" H 2700 5200 30  0001 C CNN
@@ -476,7 +417,7 @@ F 3 "" H 2700 5200 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2700 4850 2700 5200
+	2700 4850 2700 4950
 Connection ~ 2700 4950
 Connection ~ 2700 5050
 Connection ~ 2700 5150
@@ -493,13 +434,13 @@ Wire Wire Line
 Text Label 3000 2300 0    60   ~ 0
 D-
 Wire Wire Line
-	2900 2300 4250 2300
+	2900 2300 3825 2300
 Text Label 3000 2400 0    60   ~ 0
 D+
 Wire Wire Line
 	2900 2400 4175 2400
 $Comp
-L LED_0805 D351
+L rusEFI_Older:LED_0805 D351
 U 1 1 53070C5F
 P 3225 1450
 F 0 "D351" H 3225 1550 50  0000 C CNN
@@ -532,7 +473,7 @@ USART_RX
 Text HLabel 7175 2150 2    60   Input ~ 0
 USART_TX
 $Comp
-L MINI-USB-5P-3400020P1 J352
+L rusEFI_Older:MINI-USB-5P-3400020P1 J352
 U 1 1 53B66307
 P 2550 1625
 F 0 "J352" H 2275 1975 60  0000 C CNN
@@ -549,7 +490,7 @@ D-
 Text Label 2750 1575 0    60   ~ 0
 D+
 $Comp
-L GND #PWR0104
+L rusEFI_Older:GND #PWR0104
 U 1 1 53B6630F
 P 2750 1775
 F 0 "#PWR0104" H 2750 1775 30  0001 C CNN
@@ -565,7 +506,7 @@ Text Label 2750 1875 0    60   ~ 0
 shield
 Connection ~ 3225 2200
 $Comp
-L R R702
+L rusEFI_Older:R R702
 U 1 1 53EADD67
 P 7750 3075
 F 0 "R702" V 7850 3075 50  0000 C CNN
@@ -580,7 +521,7 @@ $EndComp
 Wire Wire Line
 	7450 3075 7500 3075
 $Comp
-L LED_0805 D702
+L rusEFI_Older:LED_0805 D702
 U 1 1 53EADD70
 P 7250 3075
 F 0 "D702" H 7400 2950 50  0000 C CNN
@@ -593,7 +534,7 @@ F 5 "DIGI,160-1423-1-ND" V 5755 2600 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R701
+L rusEFI_Older:R R701
 U 1 1 53EADD7E
 P 7750 2925
 F 0 "R701" V 7850 2925 50  0000 C CNN
@@ -608,7 +549,7 @@ $EndComp
 Wire Wire Line
 	7450 2925 7500 2925
 $Comp
-L LED_0805 D701
+L rusEFI_Older:LED_0805 D701
 U 1 1 53EADD87
 P 7250 2925
 F 0 "D701" H 7400 2800 50  0000 C CNN
@@ -633,7 +574,7 @@ Wire Wire Line
 Text Label 2975 2200 0    60   ~ 0
 Vbus
 $Comp
-L C C702
+L rusEFI_Older:C C702
 U 1 1 53E789EF
 P 8475 2175
 F 0 "C702" H 8525 2275 50  0000 L CNN
@@ -646,7 +587,7 @@ F 5 "DIGI,478-1395-1-ND" V 5080 3200 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R703
+L rusEFI_Older:R R703
 U 1 1 53E789F9
 P 7775 3350
 F 0 "R703" V 7875 3350 50  0000 C CNN
@@ -667,7 +608,7 @@ Wire Wire Line
 Wire Wire Line
 	7050 3250 6875 3250
 $Comp
-L C C701
+L rusEFI_Older:C C701
 U 1 1 53E78B3A
 P 8475 1775
 F 0 "C701" H 8525 1875 50  0000 L CNN
@@ -680,7 +621,7 @@ F 5 "DIGI,478-1395-1-ND" V 5080 2800 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0105
+L rusEFI_Older:GND #PWR0105
 U 1 1 53E78B4E
 P 8475 2375
 F 0 "#PWR0105" H 8475 2375 30  0001 C CNN
@@ -706,7 +647,7 @@ Wire Wire Line
 	3825 2550 3825 2300
 Connection ~ 3825 2300
 $Comp
-L MOS_Pro Q701
+L rusEFI_Older:MOS_Pro Q701
 U 1 1 53E7E9F8
 P 8100 1575
 F 0 "Q701" H 8100 1765 60  0000 R CNN
@@ -719,7 +660,7 @@ F 5 "DIGI,SI2323DS-T1-E3CT-ND" H 8100 1575 60  0001 C CNN "VEND1,VEND1#"
 	-1   0    0    1   
 $EndComp
 $Comp
-L FILTER FB701
+L rusEFI_Older:FILTER FB701
 U 1 1 53E80C5E
 P 3575 2200
 F 0 "FB701" H 3575 2350 60  0000 C CNN
@@ -735,7 +676,7 @@ Wire Wire Line
 	3925 1375 8000 1375
 Connection ~ 8000 2925
 Wire Wire Line
-	8300 1575 8775 1575
+	8300 1575 8475 1575
 Wire Wire Line
 	8475 1975 8000 1975
 Connection ~ 8000 1975
@@ -744,7 +685,7 @@ Wire Wire Line
 Connection ~ 8475 1575
 Connection ~ 8000 1775
 $Comp
-L DOUBLE_SCHOTTKY D703
+L rusEFI_Older:DOUBLE_SCHOTTKY D703
 U 1 1 53E8881D
 P 7600 1775
 F 0 "D703" H 7700 1675 40  0000 C CNN
@@ -759,7 +700,7 @@ F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
 $EndComp
 NoConn ~ 7200 1775
 $Comp
-L TEST W701
+L rusEFI_Older:TEST W701
 U 1 1 53E8C964
 P 7800 1975
 F 0 "W701" H 7800 2035 40  0000 C CNN
@@ -777,13 +718,13 @@ Wire Wire Line
 Wire Wire Line
 	7600 2075 8000 2075
 Wire Wire Line
-	8000 2075 8000 3075
+	8000 2075 8000 2925
 Wire Wire Line
 	8000 1975 8000 1775
 Text Notes 1650 650  0    60   ~ 0
 JUMPER WJ01 IS A BACKUP PLAN. THE VOLTAGE DROP ACROSS D703 MAY BE NOT TOLERABLE, SO WE HAVE A BACK UP PLAN IF WE NEED TO BYPASS THE DIODE WITH A LOWER VOLTAGE DROP
 $Comp
-L TEST W702
+L rusEFI_Older:TEST W702
 U 1 1 53EB8ABE
 P 7475 3775
 F 0 "W702" H 7475 3700 40  0000 C CNN
@@ -804,7 +745,7 @@ CB2
 Text Label 7275 3775 2    60   ~ 0
 CB4
 $Comp
-L TEST W703
+L rusEFI_Older:TEST W703
 U 1 1 53EB8AF0
 P 7475 3900
 F 0 "W703" H 7475 3960 40  0000 C CNN
@@ -825,7 +766,7 @@ RI
 Text Label 5025 2850 2    60   ~ 0
 RESET
 $Comp
-L PWR_FLAG #FLG0106
+L power:PWR_FLAG #FLG0106
 U 1 1 5518AC8A
 P 5025 2100
 F 0 "#FLG0106" H 5025 2195 30  0001 C CNN
@@ -836,7 +777,7 @@ F 3 "" H 5025 2100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG0107
+L power:PWR_FLAG #FLG0107
 U 1 1 5518ACA4
 P 2750 1675
 F 0 "#FLG0107" H 2750 1770 30  0001 C CNN
@@ -847,7 +788,7 @@ F 3 "" H 2750 1675 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L CONN_01X05 P701
+L Connector_Generic:Conn_01x05 P701
 U 1 1 591101CE
 P 7075 2250
 F 0 "P701" H 7100 2575 50  0000 C CNN
@@ -859,10 +800,8 @@ F 5 "DNP,DNP" H 7075 2250 60  0001 C CNN "VEND1,VEND1#"
 	1    7075 2250
 	1    0    0    -1  
 $EndComp
-Connection ~ 6875 2250
-Connection ~ 6875 2150
 $Comp
-L GND #PWR0108
+L rusEFI_Older:GND #PWR0108
 U 1 1 5911FDF1
 P 6875 2050
 F 0 "#PWR0108" H 6875 2050 30  0001 C CNN
@@ -872,4 +811,26 @@ F 3 "" H 6875 2050 60  0001 C CNN
 	1    6875 2050
 	0    1    1    0   
 $EndComp
+Wire Wire Line
+	2700 3500 2700 3600
+Wire Wire Line
+	4525 2200 5025 2200
+Wire Wire Line
+	4200 2200 4525 2200
+Wire Wire Line
+	3975 2950 4175 2950
+Wire Wire Line
+	6900 5475 6900 5525
+Wire Wire Line
+	2700 4950 2700 5050
+Wire Wire Line
+	2700 5050 2700 5150
+Wire Wire Line
+	2700 5150 2700 5200
+Wire Wire Line
+	3825 2300 4250 2300
+Wire Wire Line
+	8000 2925 8000 3075
+Wire Wire Line
+	8475 1575 8775 1575
 $EndSCHEMATC

hardware/frankenso/sym-lib-table

@@ -0,0 +1,7 @@
+(sym_lib_table
+  (lib (name rusEFI_176122-6)(type Legacy)(uri ${KIPRJMOD}/../rusefi_lib/176122-6.lib)(options "")(descr ""))
+  (lib (name rusEFI_LOGO)(type Legacy)(uri ${KIPRJMOD}/../rusefi_lib/logo.lib)(options "")(descr ""))
+  (lib (name rusEFI_ITEAD)(type Legacy)(uri ${KIPRJMOD}/../rusefi_lib/itead_hc-0X_bluetooth.lib)(options "")(descr ""))
+  (lib (name rusEFI_Older)(type Legacy)(uri ${KIPRJMOD}/../rusefi_lib/KICAD_Older_Version.lib)(options "")(descr ""))
+  (lib (name rusEFI_Polo)(type Legacy)(uri ${KIPRJMOD}/../rusefi_lib/Pololu_DRV8880.lib)(options "")(descr ""))
+)

hardware/frankenso/thermocouple_module.sch

@@ -1,63 +1,5 @@
-EESchema Schematic File Version 2
-LIBS:KICAD_Older_Version
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:176122-6
-LIBS:art-electro-conn
-LIBS:art-electro-conn_2
-LIBS:art-electro-ic
-LIBS:art-electro-max
-LIBS:art-electro-power
-LIBS:LMV324IDR
-LIBS:logo
-LIBS:logo_flipped
-LIBS:MAX9926-9927
-LIBS:max9939
-LIBS:max31855
-LIBS:stm32
-LIBS:tc4427
-LIBS:lm2596
-LIBS:mos_p_numbered-pins
-LIBS:rn-41
-LIBS:skqucaa010_joystick
-LIBS:itead_hc-0X_bluetooth
-LIBS:joystick_SKRHAAE010
-LIBS:STM32F407IGT6
-LIBS:slc_oem
-LIBS:mos_n_numbered-pins
-LIBS:crystal(mc306)
-LIBS:pololu_a4988
-LIBS:Pololu_DRV8880
-LIBS:fuse_BOM_only_no_pins
-LIBS:frankenso-cache
-EELAYER 25 0
+EESchema Schematic File Version 4
+EELAYER 30 0
 EELAYER END
 $Descr A 11000 8500
 encoding utf-8
@@ -96,7 +38,7 @@ Wire Wire Line
 	4800 4150 4800 4050
 Connection ~ 4800 4050
 $Comp
-L C C1101
+L rusEFI_Older:C C1101
 U 1 1 4E4C6B54
 P 4800 4350
 AR Path="/53BE1FC9/4E4C6B54" Ref="C1101"  Part="1" 
@@ -121,7 +63,7 @@ Text Notes 5600 4900 0    30   ~ 0
 Datasheet:\nhttp://datasheets.maxim-ic.com/en/ds/MAX31855.pdf
 NoConn ~ 6500 4250
 $Comp
-L GND #PWR0180
+L rusEFI_Older:GND #PWR0180
 U 1 1 4E13FFF9
 P 7000 4000
 AR Path="/53BE1FC9/4E13FFF9" Ref="#PWR0180"  Part="1" 
@@ -136,7 +78,7 @@ F 3 "" H 7000 4000 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C1102
+L rusEFI_Older:C C1102
 U 1 1 4E13FFE2
 P 7000 3800
 AR Path="/53BE1FC9/4E13FFE2" Ref="C1102"  Part="1" 
@@ -154,7 +96,7 @@ F 5 "DIGI,478-1395-1-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0181
+L rusEFI_Older:GND #PWR0181
 U 1 1 4E13FFDB
 P 5400 4250
 AR Path="/53BE1FC9/4E13FFDB" Ref="#PWR0181"  Part="1" 
@@ -169,7 +111,7 @@ F 3 "" H 5400 4250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MAX31855 U1101
+L rusEFI_Older:MAX31855 U1101
 U 1 1 4E13FF86
 P 5950 4400
 AR Path="/53BE1FC9/4E13FF86" Ref="U1101"  Part="1" 
@@ -187,7 +129,7 @@ F 5 "DIGI,MAX31855KASA+-ND" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_2 P1104
+L rusEFI_Older:CONN_2 P1104
 U 1 1 535A15DB
 P 4350 4350
 AR Path="/53BE1FC9/535A15DB" Ref="P1104"  Part="1" 
@@ -210,7 +152,7 @@ Wire Wire Line
 	4700 4250 4700 4050
 Connection ~ 5400 4250
 $Comp
-L CONN_2 P1103
+L rusEFI_Older:CONN_2 P1103
 U 1 1 535A1B1D
 P 4350 3650
 AR Path="/53BE1FC9/535A1B1D" Ref="P1103"  Part="1" 
@@ -236,7 +178,7 @@ TCPL-
 Text Label 4700 3750 0    40   ~ 0
 TCPL+
 $Comp
-L CONN_1 P1101
+L rusEFI_Older:CONN_1 P1101
 U 1 1 53BE36C5
 P 3875 4200
 AR Path="/53BE1FC9/53BE36C5" Ref="P1101"  Part="1" 
@@ -254,7 +196,7 @@ F 5 "DNP,DNP" V 1130 2600 60  0001 C CNN "VEND1,VEND1#"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONN_1 P1102
+L rusEFI_Older:CONN_1 P1102
 U 1 1 53BE36F6
 P 4075 4200
 AR Path="/53BE1FC9/53BE36F6" Ref="P1102"  Part="1"