final top

diff --git a/layout/ours.m4 b/layout/ours.m4
index 12dcdd45429a9a321db4a982c74a96782a76f9b5..8b31bfefa2318666f2b7dfab71ff1268de1ad33f 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -349,14 +349,18 @@ layer 20
 extend high_6s4 highr_6jt_c ang 45 230
 part highr_6jt pt_peco_sr c
 
-rel sta_1far -high_sta6far 0 -37
+rel sta_1far -high_sta6far -10 -37
 extend high_sta6far high_sta6near upto sta_2y0_a
 
 extend highr_6jt_b highr_x_br uptoang -120 230
 
 part highr_x cross_atlas_90m br
-extend highr_x_tl highr_6out ang 15 230
+
+extend highr_x_tl highr_6sc_c ang 20 230
+part highr_6sc pt_peco_sr c
+extend highr_6sc_a highr_6out ang 15 230
 join highr_6out high_sta6far 230
+
 #extend -high_sta6far -highr_6out ang 30 -230
 
 layer s
@@ -370,9 +374,14 @@ join highr_6jb_b highr_x_bl 230
 join highr_6jt_a -highr_6jb_a 230 arcline
 join high_6br1 highr_6jb_c 230
 
-extend highr_x_tr highr_7out uptoang 225 -230
+extend highr_x_tr highr_7kink uptoang 225 -230
+extend highr_7kink -highr_7sc_a ang 30 230
 rel high_sta6near high_sta7near 0 37
-join highr_7out high_sta7near 230
+
+part highr_7sc pt_peco_sr a
+join -highr_7sc_c high_sta7near 230
+
+join highr_7sc_b -highr_6sc_b 230
 
 part high_67j pt_peco_sr c high_6bl5
 join high_67j_b -high_sta6near 267