From ec65374827250792885fd2ddf44d0f9cf90eae0f Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Sun, 18 Dec 2016 18:05:59 -0700
Subject: [PATCH] move clk_1802 to tim4 to avoid conflict with vga hack

---
 cortex.sch |  26 +++++----
 elf.pcb    | 155 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 100 insertions(+), 81 deletions(-)

diff --git a/cortex.sch b/cortex.sch
index add2037..46c344f 100644
--- a/cortex.sch
+++ b/cortex.sch
@@ -574,9 +574,9 @@ N 48800 54100 50100 54100 4
 T 48800 54200 5 10 1 1 0 0 1
 netname=\_1802\_
 }
-N 48800 54500 50100 54500 4
+N 59600 55300 61000 55300 4
 {
-T 48800 54600 5 10 1 1 0 0 1
+T 60200 55400 5 10 1 1 0 0 1
 netname=clk_1802
 }
 C 50100 46900 1 0 0 STM32L151-100.sym
@@ -772,8 +772,16 @@ T 60500 59400 5 10 1 1 0 0 1
 netname=cs_sd
 }
 N 50100 55700 47300 55700 4
+{
+T 48800 55800 5 10 1 1 0 0 1
+netname=swdio
+}
 N 47300 55700 47300 61700 4
 N 50100 55300 46900 55300 4
+{
+T 48800 55400 5 10 1 1 0 0 1
+netname=swclk
+}
 N 46900 55300 46900 61300 4
 C 64000 70300 1 0 0 5V-plus.sym
 C 45500 58800 1 0 0 5V-plus.sym
@@ -910,13 +918,6 @@ value=NoConnection
 T 59700 56300 5 10 0 0 0 0 1
 device=DRC_Directive
 }
-C 59600 55200 1 0 0 nc-right.sym
-{
-T 59700 55700 5 10 0 0 0 0 1
-value=NoConnection
-T 59700 55900 5 10 0 0 0 0 1
-device=DRC_Directive
-}
 N 50100 57700 48300 57700 4
 {
 T 48800 57800 5 10 1 1 0 0 1
@@ -931,3 +932,10 @@ netname=vga_select
 }
 N 47800 60500 47800 54900 4
 N 47800 54900 50100 54900 4
+C 49600 54400 1 0 0 nc-left.sym
+{
+T 49600 54800 5 10 0 0 0 0 1
+value=NoConnection
+T 49600 55200 5 10 0 0 0 0 1
+device=DRC_Directive
+}
diff --git a/elf.pcb b/elf.pcb
index 4e032dd..80a0c3c 100644
--- a/elf.pcb
+++ b/elf.pcb
@@ -1016,7 +1016,6 @@ Via[3022.00mil 3413.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[3001.00mil 3351.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[3060.00mil 2690.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[1582.00mil 2689.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
-Via[2594.00mil 3039.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[1189.00mil 3039.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[2396.00mil 2975.00mil 30.00mil 16.00mil 0.0000 15.00mil "" "thermal(0S)"]
 Via[2353.00mil 2860.00mil 30.00mil 16.00mil 0.0000 15.00mil "" "thermal(0S)"]
@@ -1080,6 +1079,9 @@ Via[3490.00mil 2947.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[3490.00mil 3529.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[2540.00mil 3013.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 Via[3711.00mil 3132.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
+Via[3520.00mil 3057.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
+Via[3517.00mil 3475.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
+Via[3095.00mil 3475.00mil 30.00mil 16.00mil 0.0000 15.00mil "" ""]
 
 Element["" "hole-M3" "H4" "unknown" 125.00mil 5625.00mil -169.00mil -210.00mil 0 100 ""]
 (
@@ -2498,6 +2500,10 @@ Layer(1 "top")
 	Line[2927.00mil 3013.00mil 2942.00mil 3028.00mil 10.00mil 16.00mil "clearline"]
 	Line[3156.00mil 4006.00mil 2393.00mil 4006.00mil 15.00mil 12.00mil "clearline"]
 	Line[2907.00mil 3949.00mil 284.00mil 3949.00mil 10.00mil 16.00mil "clearline"]
+	Line[2593.00mil 3039.00mil 2907.00mil 3039.00mil 10.00mil 16.00mil "clearline"]
+	Line[2907.00mil 3039.00mil 2925.00mil 3057.00mil 10.00mil 16.00mil "clearline"]
+	Line[2925.00mil 3057.00mil 3520.00mil 3057.00mil 10.00mil 16.00mil "clearline"]
+	Line[3095.00mil 3475.00mil 3517.00mil 3475.00mil 10.00mil 16.00mil "clearline"]
 	Polygon("clearpoly,lock")
 	(
 		[10.00mil 10.00mil] [4490.00mil 10.00mil] [4490.00mil 5740.00mil] [10.00mil 5740.00mil] 
@@ -3552,8 +3558,6 @@ Layer(2 "bottom")
 	Line[2605.90mil 3171.10mil 2635.00mil 3142.00mil 10.00mil 16.00mil "clearline"]
 	Line[2635.00mil 3142.00mil 2635.00mil 3025.00mil 10.00mil 16.00mil "clearline"]
 	Line[2635.00mil 3025.00mil 2603.00mil 2993.00mil 10.00mil 16.00mil "clearline"]
-	Line[65.6897mm 3315.00mil 65.6897mm 77.3885mm 10.00mil 16.00mil "clearline"]
-	Line[65.6897mm 77.3885mm 2594.00mil 3039.00mil 10.00mil 16.00mil "clearline"]
 	Line[1079.00mil 2150.00mil 1079.00mil 2394.00mil 10.00mil 16.00mil "clearline"]
 	Line[1079.00mil 2394.00mil 1189.00mil 2504.00mil 10.00mil 16.00mil "clearline"]
 	Line[1189.00mil 2504.00mil 1189.00mil 3039.00mil 10.00mil 16.00mil "clearline"]
@@ -3724,6 +3728,13 @@ Layer(2 "bottom")
 	Line[66.6897mm 83.1703mm 2636.00mil 3264.00mil 10.00mil 16.00mil "clearline"]
 	Line[4022.00mil 389.00mil 102.5111mm 389.00mil 10.00mil 16.00mil "clearline"]
 	Line[102.5111mm 389.00mil 103.7664mm 11.1359mm 10.00mil 16.00mil "clearline"]
+	Line[74.9395mm 89.9511mm 76.1141mm 89.9511mm 10.00mil 16.00mil "clearline"]
+	Line[76.1141mm 89.9511mm 3007.00mil 3531.00mil 10.00mil 16.00mil "clearline"]
+	Line[3007.00mil 3531.00mil 3066.00mil 3531.00mil 10.00mil 16.00mil "clearline"]
+	Line[3066.00mil 3531.00mil 3095.00mil 3502.00mil 10.00mil 16.00mil "clearline"]
+	Line[3095.00mil 3502.00mil 3095.00mil 3475.00mil 10.00mil 16.00mil "clearline"]
+	Line[3517.00mil 3475.00mil 3517.00mil 3060.00mil 10.00mil 16.00mil "clearline"]
+	Line[3517.00mil 3060.00mil 3520.00mil 3057.00mil 10.00mil 16.00mil "clearline"]
 )
 Layer(3 "outline")
 (
@@ -4130,7 +4141,7 @@ NetList()
 	Net("clk_1802" "(unknown)")
 	(
 		Connect("U1-1")
-		Connect("U6-35")
+		Connect("U6-59")
 	)
 	Net("cs_led" "(unknown)")
 	(
@@ -4467,6 +4478,16 @@ NetList()
 		Connect("SW2-2")
 		Connect("U6-78")
 	)
+	Net("swclk" "(unknown)")
+	(
+		Connect("J3-4")
+		Connect("U6-76")
+	)
+	Net("swdio" "(unknown)")
+	(
+		Connect("J3-3")
+		Connect("U6-72")
+	)
 	Net("TPA" "(unknown)")
 	(
 		Connect("U1-34")
@@ -4595,113 +4616,103 @@ NetList()
 		Connect("J5-4")
 	)
 	Net("unnamed_net24" "(unknown)")
-	(
-		Connect("J3-3")
-		Connect("U6-72")
-	)
-	Net("unnamed_net25" "(unknown)")
-	(
-		Connect("J3-4")
-		Connect("U6-76")
-	)
-	Net("unnamed_net26" "(unknown)")
 	(
 		Connect("R101-2")
 		Connect("U6-70")
 	)
-	Net("unnamed_net27" "(unknown)")
+	Net("unnamed_net25" "(unknown)")
 	(
 		Connect("R102-2")
 		Connect("U6-71")
 	)
-	Net("unnamed_net28" "(unknown)")
+	Net("unnamed_net26" "(unknown)")
 	(
 		Connect("C603-2")
 		Connect("U6-6")
 	)
-	Net("unnamed_net29" "(unknown)")
+	Net("unnamed_net27" "(unknown)")
 	(
 		Connect("C38-1")
 		Connect("U7-4")
 	)
-	Net("unnamed_net30" "(unknown)")
+	Net("unnamed_net28" "(unknown)")
 	(
 		Connect("U6-20")
 	)
-	Net("unnamed_net31" "(unknown)")
+	Net("unnamed_net29" "(unknown)")
 	(
 		Connect("U6-21")
 	)
-	Net("unnamed_net32" "(unknown)")
+	Net("unnamed_net30" "(unknown)")
 	(
 		Connect("U6-7")
 	)
-	Net("unnamed_net33" "(unknown)")
+	Net("unnamed_net31" "(unknown)")
 	(
 		Connect("U6-8")
 	)
-	Net("unnamed_net34" "(unknown)")
+	Net("unnamed_net32" "(unknown)")
 	(
 		Connect("U6-9")
 	)
-	Net("unnamed_net35" "(unknown)")
+	Net("unnamed_net33" "(unknown)")
+	(
+		Connect("U6-35")
+	)
+	Net("unnamed_net34" "(unknown)")
 	(
 		Connect("U6-55")
 	)
-	Net("unnamed_net36" "(unknown)")
+	Net("unnamed_net35" "(unknown)")
 	(
 		Connect("U6-58")
 	)
-	Net("unnamed_net37" "(unknown)")
+	Net("unnamed_net36" "(unknown)")
 	(
 		Connect("U6-73")
 	)
-	Net("unnamed_net38" "(unknown)")
-	(
-		Connect("U6-59")
-	)
-	Net("unnamed_net39" "(unknown)")
+	Net("unnamed_net37" "(unknown)")
 	(
 		Connect("U6-88")
 	)
-	Net("unnamed_net40" "(unknown)")
+	Net("unnamed_net38" "(unknown)")
 	(
 		Connect("U6-80")
 	)
-	Net("unnamed_net41" "(unknown)")
+	Net("unnamed_net39" "(unknown)")
 	(
 		Connect("J1-1")
 		Connect("J8-1")
 	)
-	Net("unnamed_net42" "(unknown)")
+	Net("unnamed_net40" "(unknown)")
 	(
 		Connect("J7-8")
 	)
-	Net("unnamed_net43" "(unknown)")
+	Net("unnamed_net41" "(unknown)")
 	(
 		Connect("J7-1")
 	)
-	Net("unnamed_net44" "(unknown)")
+	Net("unnamed_net42" "(unknown)")
 	(
 		Connect("Q1-1")
 		Connect("R13-2")
 	)
-	Net("unnamed_net45" "(unknown)")
+	Net("unnamed_net43" "(unknown)")
 	(
 		Connect("Q1-3")
 		Connect("U10-1")
 	)
-	Net("unnamed_net46" "(unknown)")
+	Net("unnamed_net44" "(unknown)")
 	(
 		Connect("D10-2")
 		Connect("R9-2")
 	)
-	Net("unnamed_net47" "(unknown)")
+	Net("unnamed_net45" "(unknown)")
 	(
 		Connect("J10-2")
 		Connect("U10-2")
 	)
-	Net("unnamed_net48" "(unknown)")
+	Net("unnamed_net46" "(unknown)")
 	(
 		Connect("D4-1")
 		Connect("J2-1")
@@ -4709,148 +4720,148 @@ NetList()
 		Connect("J2-3")
 		Connect("R1-2")
 	)
-	Net("unnamed_net49" "(unknown)")
+	Net("unnamed_net47" "(unknown)")
 	(
 		Connect("J2-4")
 	)
-	Net("unnamed_net50" "(unknown)")
+	Net("unnamed_net48" "(unknown)")
 	(
 		Connect("J2-11")
 	)
-	Net("unnamed_net51" "(unknown)")
+	Net("unnamed_net49" "(unknown)")
 	(
 		Connect("J2-12")
 	)
-	Net("unnamed_net52" "(unknown)")
+	Net("unnamed_net50" "(unknown)")
 	(
 		Connect("J2-15")
 	)
-	Net("unnamed_net53" "(unknown)")
+	Net("unnamed_net51" "(unknown)")
 	(
 		Connect("J6-1")
 		Connect("R3-1")
 	)
-	Net("unnamed_net54" "(unknown)")
+	Net("unnamed_net52" "(unknown)")
 	(
 		Connect("J6-2")
 	)
-	Net("unnamed_net55" "(unknown)")
+	Net("unnamed_net53" "(unknown)")
 	(
 		Connect("J6-5")
 		Connect("R5-1")
 	)
-	Net("unnamed_net56" "(unknown)")
+	Net("unnamed_net54" "(unknown)")
 	(
 		Connect("J6-6")
 	)
-	Net("unnamed_net57" "(unknown)")
+	Net("unnamed_net55" "(unknown)")
 	(
 		Connect("U11-8")
 	)
-	Net("unnamed_net58" "(unknown)")
+	Net("unnamed_net56" "(unknown)")
 	(
 		Connect("R6-1")
 		Connect("U11-18")
 	)
-	Net("unnamed_net59" "(unknown)")
+	Net("unnamed_net57" "(unknown)")
 	(
 		Connect("U11-24")
 	)
-	Net("unnamed_net60" "(unknown)")
+	Net("unnamed_net58" "(unknown)")
 	(
 		Connect("C17-1")
 		Connect("U12-2")
 	)
-	Net("unnamed_net61" "(unknown)")
+	Net("unnamed_net59" "(unknown)")
 	(
 		Connect("C15-1")
 		Connect("U12-3")
 	)
-	Net("unnamed_net62" "(unknown)")
+	Net("unnamed_net60" "(unknown)")
 	(
 		Connect("C16-2")
 		Connect("U12-4")
 	)
-	Net("unnamed_net63" "(unknown)")
+	Net("unnamed_net61" "(unknown)")
 	(
 		Connect("C16-1")
 		Connect("U12-5")
 	)
-	Net("unnamed_net64" "(unknown)")
+	Net("unnamed_net62" "(unknown)")
 	(
 		Connect("C18-1")
 		Connect("U12-6")
 	)
-	Net("unnamed_net65" "(unknown)")
+	Net("unnamed_net63" "(unknown)")
 	(
 		Connect("J12-3")
 		Connect("U12-7")
 	)
-	Net("unnamed_net66" "(unknown)")
+	Net("unnamed_net64" "(unknown)")
 	(
 		Connect("J12-2")
 		Connect("U12-8")
 	)
-	Net("unnamed_net67" "(unknown)")
+	Net("unnamed_net65" "(unknown)")
 	(
 		Connect("J11-2")
 		Connect("U12-13")
 	)
-	Net("unnamed_net68" "(unknown)")
+	Net("unnamed_net66" "(unknown)")
 	(
 		Connect("J11-3")
 		Connect("U12-14")
 	)
-	Net("unnamed_net69" "(unknown)")
+	Net("unnamed_net67" "(unknown)")
 	(
 		Connect("C15-2")
 		Connect("U12-1")
 	)
-	Net("unnamed_net70" "(unknown)")
+	Net("unnamed_net68" "(unknown)")
 	(
 		Connect("J11-1")
 	)
-	Net("unnamed_net71" "(unknown)")
+	Net("unnamed_net69" "(unknown)")
 	(
 		Connect("J11-4")
 	)
-	Net("unnamed_net72" "(unknown)")
+	Net("unnamed_net70" "(unknown)")
 	(
 		Connect("J11-6")
 	)
-	Net("unnamed_net73" "(unknown)")
+	Net("unnamed_net71" "(unknown)")
 	(
 		Connect("J11-7")
 	)
-	Net("unnamed_net74" "(unknown)")
+	Net("unnamed_net72" "(unknown)")
 	(
 		Connect("J11-8")
 	)
-	Net("unnamed_net75" "(unknown)")
+	Net("unnamed_net73" "(unknown)")
 	(
 		Connect("J11-9")
 	)
-	Net("unnamed_net76" "(unknown)")
+	Net("unnamed_net74" "(unknown)")
 	(
 		Connect("J12-1")
 	)
-	Net("unnamed_net77" "(unknown)")
+	Net("unnamed_net75" "(unknown)")
 	(
 		Connect("J12-4")
 	)
-	Net("unnamed_net78" "(unknown)")
+	Net("unnamed_net76" "(unknown)")
 	(
 		Connect("J12-6")
 	)
-	Net("unnamed_net79" "(unknown)")
+	Net("unnamed_net77" "(unknown)")
 	(
 		Connect("J12-7")
 	)
-	Net("unnamed_net80" "(unknown)")
+	Net("unnamed_net78" "(unknown)")
 	(
 		Connect("J12-8")
 	)
-	Net("unnamed_net81" "(unknown)")
+	Net("unnamed_net79" "(unknown)")
 	(
 		Connect("J12-9")
 	)
-- 
2.47.2