From: ian <ian>
Date: Mon, 2 Feb 2004 01:26:24 +0000 (+0000)
Subject: hill loop, ok
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=9ba8e19fa4689d7391eb118a098c9179e56fa752;p=trains.git

hill loop, ok
---

diff --git a/layout/ours.m4 b/layout/ours.m4
index ec6717f..1f79347 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -1,5 +1,7 @@
 include(`parts.i4')
 
+layer 10
+
 abs midx_m 930 700 90
 part midx cross_peco_s m
 
@@ -41,14 +43,10 @@ rel l2_ptl l3_ptl 0 -37
 rel l3_ptl l4_ptl 0 -37
 rel l4_ptl l5_ptl 0 -37
 
-extend -midx_bl -hj_a len 10 315
-part hj ^pt_peco_sr a
-
-#rel l0_jblx_c l2_pblx 0 37
-#rel l2_pblx l3_pblx 0 37
-#extend -l0_lst l0_jblx_c uptoang 0 -315
+extend -midx_bl hj_c len 10 315
+part hj pt_peco_sr c
 
-extend -hj_c -l0_jbl_b parallel demos!right_main_up 315
+extend hj_a -l0_jbl_b parallel demos!right_main_up 315
 part l0_jbl ^pt_main_r b
 
 extend -l0_jbl_c l0_lst uptoang 90 315
@@ -85,8 +83,7 @@ rel sq_br_o sq_br_i 0 0 -90
 
 extend sq_br_i sq_bl_o2 upto sq_bl_o
 
-layer 5
-
+layer 10
 
 rel sq_tl_i l4_ct 352 37 180
 rel l4_ct l5_ct 0 37
@@ -104,6 +101,40 @@ extend -l0_jtl_c -l0_tcl7 ang 60 -315
 # top level
 
 
+layer 20
+
+rel sq_bl_i h_bl_l 230 0 180
+extend h_bl_l h_bl_b ang 90 -230
+
+extend -h_bl_l -h_bre upto l0_lst 230
+extend -h_bre -h_brj1 len 20 230
+extend -h_brj1 -h_brjm len 30
+extend -h_brjm -h_brj0 len 30
+extend -h_brj0 -h_brh  len 80 230
+extend -h_brh -h_8m uptoang -35 230
+extend -h_8m -h_8b uptoang 245 -230
+
+rel l0_tlc5 h_ub 0 45
+join h_ub h_8b 230
+
+#extend -h_ub -h_pbl_c parallel l0_jbl_c -270
+rel l0_jbl_c -h_pbl_c 0 -45
+rel l0_jbl_b -h_pbl_b 0 -45
+join h_pbl_c h_ub 230
+join h_pbl_b h_pbl_c 230
+extend -h_pbl_b -hj_p ang 40 -270
+join hj_b hj_p 230
+
+
+#extend -h_pbl_c -h_pbl_p parallel l0_jbl_c -278
+#extend -h_ub -hj_p parallel hj_b -278
+#join hj_b hj_p 230
+
+eof
+
+layer 20s
+extend -sq_bl_o 
+
 extend -sq_bl_o h_bbll_c len 150
 part h_bbll ^pt_peco_sr c
 extend h_bbll_b -h_bll_b uptoang 80 -230
diff --git a/pcb/Makefile b/pcb/Makefile
index 42b6e05..8178c6a 100644
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -1,19 +1,23 @@
 
 M4INCS=		parts.i4
 
-LAYOUTOPTS=	-EArC
+E_TRACK=	ArsCLMNo
+LAYOUTOPTS=	-E$(E_TRACK)
 
-all:		ours-l0.ps \
+default:	ours-a.ps
+
+all:		default \
+		ours-l0.ps \
 		ours-l10.ps \
 		ours-l20.ps
 
 o=>$@.new && mv -f $@.new $@
 
-%.d4:		%.m4 $(M4INCS)
+%.d4:		%.m4 $(M4INCS) Makefile
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< -E10=100ArC $o
+		./layout <$< -E10=100$(E_TRACK) $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o
diff --git a/pic.make b/pic.make
index 42b6e05..8178c6a 100644
--- a/pic.make
+++ b/pic.make
@@ -1,19 +1,23 @@
 
 M4INCS=		parts.i4
 
-LAYOUTOPTS=	-EArC
+E_TRACK=	ArsCLMNo
+LAYOUTOPTS=	-E$(E_TRACK)
 
-all:		ours-l0.ps \
+default:	ours-a.ps
+
+all:		default \
+		ours-l0.ps \
 		ours-l10.ps \
 		ours-l20.ps
 
 o=>$@.new && mv -f $@.new $@
 
-%.d4:		%.m4 $(M4INCS)
+%.d4:		%.m4 $(M4INCS) Makefile
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< -E10=100ArC $o
+		./layout <$< -E10=100$(E_TRACK) $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o
diff --git a/spice/Makefile b/spice/Makefile
index 42b6e05..8178c6a 100644
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -1,19 +1,23 @@
 
 M4INCS=		parts.i4
 
-LAYOUTOPTS=	-EArC
+E_TRACK=	ArsCLMNo
+LAYOUTOPTS=	-E$(E_TRACK)
 
-all:		ours-l0.ps \
+default:	ours-a.ps
+
+all:		default \
+		ours-l0.ps \
 		ours-l10.ps \
 		ours-l20.ps
 
 o=>$@.new && mv -f $@.new $@
 
-%.d4:		%.m4 $(M4INCS)
+%.d4:		%.m4 $(M4INCS) Makefile
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< -E10=100ArC $o
+		./layout <$< -E10=100$(E_TRACK) $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o