Merge branch 'master' into ft-footprints

30 files changed, 33 insertions, 92 deletions

diff --git a/Cryptech Alpha.pro.template b/Cryptech Alpha.pro.template
index 7f68cd3..79da2f5 100644
--- a/Cryptech Alpha.pro.template
+++ b/Cryptech Alpha.pro.template
@@ -27,35 +27,7 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=Cryptech Alpha
+LibName1=Cryptech_Alpha
+LibName2=power
 [general]
 version=1
diff --git a/convert.sh b/convert.sh
index bfdcfe7..f808bef 100755
--- a/convert.sh
+++ b/convert.sh
@@ -93,7 +93,7 @@ ls Cryptech\ Alpha.sch rev02*sch | while read file; do
 done
 
 # Replace slashes in component names, seems to not work in KiCAD nightly
-ls Cryptech\ Alpha.lib rev02*sch | while read file; do
+ls Cryptech*Alpha.lib rev02*sch | while read file; do
     sed -i -e "s#I/SN#I_SN#g" "${file}"
 done
 
diff --git a/rev03-KiCad/Cryptech Alpha.kicad_pcb b/rev03-KiCad/Cryptech Alpha.kicad_pcb
index 3ab76c0..a572e00 100644
--- a/rev03-KiCad/Cryptech Alpha.kicad_pcb
+++ b/rev03-KiCad/Cryptech Alpha.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown-9f5316e~63~ubuntu17.10.1)
+(kicad_pcb (version 20171130) (host pcbnew 5.0.0-rc2-dev-unknown-482fd86~64~ubuntu17.10.1)
 
   (general
     (thickness 1.6)
diff --git a/rev03-KiCad/Cryptech Alpha.pro b/rev03-KiCad/Cryptech Alpha.pro
index 7f68cd3..280b598 100644
--- a/rev03-KiCad/Cryptech Alpha.pro
+++ b/rev03-KiCad/Cryptech Alpha.pro
@@ -1,4 +1,4 @@
-update=lör 15 okt 2016 14:22:46
+update=ons 25 apr 2018 10:29:32
 version=1
 last_client=kicad
 [pcbnew]
@@ -23,39 +23,8 @@ ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
+[general]
+version=1
 [eeschema]
 version=1
 LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=Cryptech Alpha
-[general]
-version=1
diff --git a/rev03-KiCad/rev02_00.sch b/rev03-KiCad/rev02_00.sch
index 198428d..c1f940c 100644
--- a/rev03-KiCad/rev02_00.sch
+++ b/rev03-KiCad/rev02_00.sch
@@ -52,4 +52,4 @@ F 0 "LOGO1" H 11388 9865 60  0000 L BNN
 	1    11840 10320
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_01.sch b/rev03-KiCad/rev02_01.sch
index d62564a..e8a62b7 100644
--- a/rev03-KiCad/rev02_01.sch
+++ b/rev03-KiCad/rev02_01.sch
@@ -845,4 +845,4 @@ F 3 "" H 9200 7770 60  0000 C CNN
 	1    9200 7700
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_02.sch b/rev03-KiCad/rev02_02.sch
index b6ea739..ae160a8 100644
--- a/rev03-KiCad/rev02_02.sch
+++ b/rev03-KiCad/rev02_02.sch
@@ -409,4 +409,4 @@ F 3 "" H 8270 4530 60  0000 C CNN
 	1    8500 4700
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_03.sch b/rev03-KiCad/rev02_03.sch
index 613c588..5b49a90 100644
--- a/rev03-KiCad/rev02_03.sch
+++ b/rev03-KiCad/rev02_03.sch
@@ -508,4 +508,4 @@ F 3 "" H 13160 5560 60  0000 C CNN
 	1    13200 6800
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_04.sch b/rev03-KiCad/rev02_04.sch
index d7a6b0a..aad0e83 100644
--- a/rev03-KiCad/rev02_04.sch
+++ b/rev03-KiCad/rev02_04.sch
@@ -765,4 +765,4 @@ F 3 "" H 12520 4920 60  0000 C CNN
 	1    12800 5300
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_05.sch b/rev03-KiCad/rev02_05.sch
index 3bd7da9..15c095b 100644
--- a/rev03-KiCad/rev02_05.sch
+++ b/rev03-KiCad/rev02_05.sch
@@ -652,4 +652,4 @@ F 0 "U4_4" H 3190 2390 60  0000 L BNN
 	1    4700 5600
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_06.sch b/rev03-KiCad/rev02_06.sch
index 01e6a08..eaa1887 100644
--- a/rev03-KiCad/rev02_06.sch
+++ b/rev03-KiCad/rev02_06.sch
@@ -1460,4 +1460,4 @@ F 3 "" H 3120 7920 60  0000 C CNN
 	1    3500 8000
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_07.sch b/rev03-KiCad/rev02_07.sch
index 8bb7603..baf8ff2 100644
--- a/rev03-KiCad/rev02_07.sch
+++ b/rev03-KiCad/rev02_07.sch
@@ -194,4 +194,4 @@ F 3 "" H 6250 4780 60  0000 C CNN
 	1    6200 5100
 	0    1    1    0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_08.sch b/rev03-KiCad/rev02_08.sch
index 063d789..3f2b693 100644
--- a/rev03-KiCad/rev02_08.sch
+++ b/rev03-KiCad/rev02_08.sch
@@ -271,4 +271,4 @@ F 3 "" H 8690 6110 60  0000 C CNN
 	1    8900 5200
 	0    1    1    0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_09.sch b/rev03-KiCad/rev02_09.sch
index d858d88..a8ffa01 100644
--- a/rev03-KiCad/rev02_09.sch
+++ b/rev03-KiCad/rev02_09.sch
@@ -1046,4 +1046,4 @@ F 3 "" H 4990 8020 60  0000 C CNN
 	1    4900 8000
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_10.sch b/rev03-KiCad/rev02_10.sch
index daa64de..09240e3 100644
--- a/rev03-KiCad/rev02_10.sch
+++ b/rev03-KiCad/rev02_10.sch
@@ -1050,4 +1050,4 @@ F 3 "" H 5100 8110 60  0000 C CNN
 	1    5000 8100
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_11.sch b/rev03-KiCad/rev02_11.sch
index 13034c1..f5e478f 100644
--- a/rev03-KiCad/rev02_11.sch
+++ b/rev03-KiCad/rev02_11.sch
@@ -757,4 +757,4 @@ F 3 "" H 13960 7920 60  0000 C CNN
 	1    14000 8900
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_12.sch b/rev03-KiCad/rev02_12.sch
index b0b3045..069297c 100644
--- a/rev03-KiCad/rev02_12.sch
+++ b/rev03-KiCad/rev02_12.sch
@@ -453,4 +453,4 @@ F 3 "" H 5500 5820 60  0000 C CNN
 	1    5800 5400
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_13.sch b/rev03-KiCad/rev02_13.sch
index 94f1986..05d7b56 100644
--- a/rev03-KiCad/rev02_13.sch
+++ b/rev03-KiCad/rev02_13.sch
@@ -646,4 +646,4 @@ F 3 "" H 4670 8560 60  0000 C CNN
 	1    4700 8700
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_14.sch b/rev03-KiCad/rev02_14.sch
index 77df0e4..23edf9a 100644
--- a/rev03-KiCad/rev02_14.sch
+++ b/rev03-KiCad/rev02_14.sch
@@ -177,4 +177,4 @@ F 0 "U13_6" H 4890 4390 60  0000 L BNN
 	1    5300 4900
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_15.sch b/rev03-KiCad/rev02_15.sch
index 4f25c38..ec13cdc 100644
--- a/rev03-KiCad/rev02_15.sch
+++ b/rev03-KiCad/rev02_15.sch
@@ -607,4 +607,4 @@ F 3 "" H 3040 7710 60  0000 C CNN
 	1    2960 7630
 	0    1    1    0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_16.sch b/rev03-KiCad/rev02_16.sch
index 9dc5018..48adfc7 100644
--- a/rev03-KiCad/rev02_16.sch
+++ b/rev03-KiCad/rev02_16.sch
@@ -138,4 +138,4 @@ F 0 "U13_8" H 4990 4090 60  0000 L BNN
 	1    5400 7100
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_17.sch b/rev03-KiCad/rev02_17.sch
index c09d5dd..538f46f 100644
--- a/rev03-KiCad/rev02_17.sch
+++ b/rev03-KiCad/rev02_17.sch
@@ -364,4 +364,4 @@ F 0 "U13_10" H 1190 4290 60  0000 L BNN
 	1    1600 7300
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_18.sch b/rev03-KiCad/rev02_18.sch
index 5e98002..42010a1 100644
--- a/rev03-KiCad/rev02_18.sch
+++ b/rev03-KiCad/rev02_18.sch
@@ -779,4 +779,4 @@ F 3 "" H 1570 9470 60  0000 C CNN
 	1    1600 9600
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_19.sch b/rev03-KiCad/rev02_19.sch
index 72dbe13..32fca39 100644
--- a/rev03-KiCad/rev02_19.sch
+++ b/rev03-KiCad/rev02_19.sch
@@ -630,4 +630,4 @@ F 0 "U13_11" H 1290 4090 60  0000 L BNN
 	1    1700 7100
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_20.sch b/rev03-KiCad/rev02_20.sch
index e7a4c9e..b2bec22 100644
--- a/rev03-KiCad/rev02_20.sch
+++ b/rev03-KiCad/rev02_20.sch
@@ -261,4 +261,4 @@ F 0 "U13_12" H 1790 4190 60  0000 L BNN
 	1    2200 7200
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_21.sch b/rev03-KiCad/rev02_21.sch
index 9b65a6d..3ff0503 100644
--- a/rev03-KiCad/rev02_21.sch
+++ b/rev03-KiCad/rev02_21.sch
@@ -570,4 +570,4 @@ F 0 "U13_17" H 5190 7410 60  0000 L TNN
 	1    5600 6600
 	1   0    0    1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_22.sch b/rev03-KiCad/rev02_22.sch
index b5c2451..e5f2d62 100644
--- a/rev03-KiCad/rev02_22.sch
+++ b/rev03-KiCad/rev02_22.sch
@@ -1342,4 +1342,4 @@ F 0 "C131" H 2380 6310 60  0000 L BNN
 	1    2300 6500
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_23.sch b/rev03-KiCad/rev02_23.sch
index 4741dae..db366fa 100644
--- a/rev03-KiCad/rev02_23.sch
+++ b/rev03-KiCad/rev02_23.sch
@@ -1272,4 +1272,4 @@ F 0 "C183" H 4680 6210 60  0000 L BNN
 	1    4600 6400
 	1    0    0    -1
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_24.sch b/rev03-KiCad/rev02_24.sch
index ca80c27..dd8f669 100644
--- a/rev03-KiCad/rev02_24.sch
+++ b/rev03-KiCad/rev02_24.sch
@@ -479,4 +479,4 @@ F 3 "" H 5440 7540 60  0000 C CNN
 	1    5500 7300
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC
diff --git a/rev03-KiCad/rev02_25.sch b/rev03-KiCad/rev02_25.sch
index e889a62..37c65a3 100644
--- a/rev03-KiCad/rev02_25.sch
+++ b/rev03-KiCad/rev02_25.sch
@@ -473,4 +473,4 @@ F 3 "" H 6660 7740 60  0000 C CNN
 	1    6800 7900
 	0    -1   -1   0
 $EndComp
-$EndSCHEMATC
\ No newline at end of file
+$EndSCHEMATC