sta going well

diff --git a/layout/ours.m4 b/layout/ours.m4
index a2165fad893ae578781a51dff5b4cedfa214f72e..b122104dd8b9ea5a4bf19cb499c639579ead968e 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -142,7 +142,9 @@ part top_45x scis_shino tl top_4le
 
 #---------- station
 
-layer 0
+# left bridge, `leb'
+
+layer 10
 
 part leb_4y pt_peco_sl c leb_4e
 extend leb_4y_a sta_4neare uptoang 5 -315
@@ -157,9 +159,10 @@ extend -sta_5neare1 -sta_5neare2 len 50 450
 extend leb_5e leb_5eb upto leb_4y_a
 join leb_5eb sta_5neare2 352
 
-
 layer 20
 
+# high-level lines and platforms
+
 rel sta_4neare sta_6far 500 76
 part sta_67r pt_peco_sl a -sta_6far
 
@@ -174,6 +177,8 @@ extend -sta_67l_c high_6bl5 uptoang 90 230
 
 layer p10
 
+# medium-level platforms
+
 rel sta_4far sta_4far_platnear 0 -14.5
 rel sta_4far_platnear sta_4far_platfar 0 -17
 extend -sta_4far_platnear -sta_4neare_plat upto sta_4neare
@@ -190,8 +195,11 @@ join sta_5far_platnear -sta_5far_platfar 1
 
 layer 10
 
-rel sta_4far_platnear sta_tt_mid -50 -115
+# turntable
+
+rel sta_4far_platnear sta_tt_mid -50 -120
 part sta_tt tt_atlas mid
+part sta_ttmotor tt_atlas_motor cout sta_tt_out90
 
 #rel sta_4far_platnear sta_2fars -350 -58.5
 #rel sta_2fars sta_3fars 100 27
@@ -200,11 +208,11 @@ part sta_tt tt_atlas mid
 #join sta_2fars -sta_jfar23_b 230
 #extend -sta_jfar23_c sta_2far3m len 160 -450
 
-rel sta_4neare sta_3nears 15 -48 -8
-part sta_3sc pt_peco_sr c -sta_3nears
+rel sta_4neare sta_3neare 15 -48 -8
+part sta_3sc pt_peco_sr c -sta_3neare
 join leb_4y_b -sta_3sc_a 230
 
-extend sta_3nears sta_3y0_c uptoang 3.5 -230
+extend sta_3neare sta_3y0_c uptoang 5 -230
 part sta_3y0 pt_peco_sl c
 
 extend sta_3sc_b -leb_0sc uptoang 90 300
@@ -213,6 +221,18 @@ extend sta_3y0_b sta_0y1_c ang 1 -230
 part sta_0y1 pt_peco_sl c
 extend sta_0y1_b h_8b ang 90 -230
 
+rel sta_4neare sta_3nears 280 -46
+part sta_3y1 pt_peco_sl c sta_3y0_a
+join sta_3y1_a sta_3nears 450
+
+extend sta_3nears sta_3far len 500
+extend sta_3far sta_3far1 len 30 -650
+join sta_3far1 -sta_tt_out210 230
+
+extend sta_3y1_b sta_2nears parallel sta_3nears 230
+extend sta_2nears sta_2far upto sta_3far1
+join sta_2far -sta_tt_out195 230
+
 #extend leb_4y_b -l3s_jth_a len 20
 #part l3s_jth pt_peco_sr a