From dd8d65928bb37ef85ea10a66bf671026ef161abd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 Dec 2010 19:34:49 +0000 Subject: [PATCH] ours: rename segments from P* to * --- layout/ours.m4 | 56 +++++++++++++++++++++++----------------------- layout/ours.wiring | 10 ++++----- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/layout/ours.m4 b/layout/ours.m4 index bcb25ec..af9680c 100644 --- a/layout/ours.m4 +++ b/layout/ours.m4 @@ -173,19 +173,19 @@ layer 0 rel sq_br_i bot_3rj_c 345 rel bot_0rm_c bot_2rk 0 -37 -segment -PB10 +segment -B10 extend bot_2rk bot_2rx_br len 130 -segment -PC9 +segment -C9 part bot_3rj pt_main_r c -segment -PB9 +segment -B9 part bot_2rx slip2_pecof br -segment -PB9 +segment -B9 join bot_3rj_b bot_2rx_bl 450 -segment -PB9 +segment -B9 extend bot_2rx_tr bot_0mx_bl len 19 1400 segmap bot_0mx_B -A5 bot_0mx_F -A6 @@ -213,33 +213,33 @@ join bot_0rj_a -bot_0lj_a 450 segment -A6 join -bot_0lj_c -bot_0lm_a 450 -segment -PB7 +segment -B7 extend bot_0mx_tl -bot_02lj_b uptoang 194 -315 segment / -segment PB7 -segmap PB7/P J +segment B7 +segmap B7/P J part bot_02lj ^pt_main_r b -segmap PB7/P P -segment -PB7 +segmap B7/P P +segment -B7 part bot_23lj ^pt_main_r c -bot_02lj_c -segment -PB8 +segment -B8 join bot_2rx_tl -bot_02lj_a 450 -segment PC5 +segment C5 part bot_3lj ^pt_main_r c -bot_3lk -segment PC6 211 PC7 181 PC8 +segment C6 211 C7 181 C8 join bot_3lj_a -bot_3rj_a 450 -segment -PC5/P1 +segment -C5/P1 join bot_23lj_b -bot_3lj_b 315 twoarcs -segment -PC5 120 -PC4 245 -PC3 +segment -C5 120 -C4 245 -C3 join bot_3lk -leb_3k 315 arcline -segment -PB6 234 -PB5 222 -PB4 +segment -B6 234 -B5 222 -B4 join bot_23lj_a bot_2lk 450 join bot_2lk -leb_2k 352 @@ -248,12 +248,12 @@ join rim_0t bot_0rm_c 315 arcline segment / layer 2 -segment PB10 145 PB11 +segment B10 145 B11 join -bot_2rk -rim_2t 352 arcline segment / layer 2 -segment -PC0 90 -PC10 368 -PC9 +segment -C0 90 -C10 368 -C9 join rim_3t bot_3rj_c 315 arcline segment / @@ -273,10 +273,10 @@ extend -leb_4e top_4le0 ang 70 315 #join -top_45x_br -top_4le0 550 twoarcs layer 2 -segment -PC3 556 -PC2 +segment -C3 556 -C2 join -leb_3k top_3lk 389 arcsline -segment -PB4 215 -PB3 +segment -B4 215 -B3 join -leb_2k top_2lk 352 arcsline layer 0 @@ -304,20 +304,20 @@ join -top_4le1 -top_4le0 315 #---------- top main-line/station junction layer 6 -segment PB11 224 PB12 +segment B11 224 B12 #extend -rim_2t top_2j_c len 420 -352 extend -rim_2t top_2j_c len 445 -352 #extend -rim_2t top_2j_c upto top_0rme1 -352 layer 8 -segment PB0 +segment B0 part top_2j pt_peco_cl c #rel top_2j_r top_2j_a #rel top_2j_l top_2j_b #part top_2j pt_pecofguess_ll c layer 4 -segment -PB3 8 -PB2 493 -PB1 +segment -B3 8 -B2 493 -B1 extend top_2lk top_2j21 len 300 layer 8 @@ -359,7 +359,7 @@ join top_45x_tl top_5j3b 1000 twoarcs layer 0 -segment -PC2 +segment -C2 extend top_3lk top_3u1 len 270 rel -top_0rm_a top_3u2 35 -111 @@ -367,18 +367,18 @@ join top_3u1 top_3u2 800 twoarcs !arcsline #cross layer 4 -segment PC0 +segment C0 extend -rim_3t -rim_3tt len 27.0 #extend -rim_3tt1 -rim_3tt ang 0.0 -315 -segment PC0 +segment C0 part top_3j pt_peco_cl c -rim_3tt segment / layer 2 -segment PC1 +segment C1 extend top_3j_b -top_3u3 len 40 -315 -segment -PC2 239 -PC1 +segment -C2 239 -C1 join top_3u2 top_3u3 315 arcline segment / diff --git a/layout/ours.wiring b/layout/ours.wiring index 962a7d1..de203c5 100644 --- a/layout/ours.wiring +++ b/layout/ours.wiring @@ -28,7 +28,7 @@ vanilla A6 2.6 movfeatposmap - PB9 S0-3 J0P1 J1P1 J0P0 J1P0 + B9 S0-3 J0P1 J1P1 J0P0 J1P0 points # point board.motor0 board.motor1 @@ -37,11 +37,11 @@ points A6/P 2.3 .2 A5/P 0.3 .2 A6/J 3.0 .1 - PC9/P 1.0 .1 - PB9/J 1.4 .5 - PB9/P 1.2 .3 + C9/P 1.0 .1 + B9/J 1.4 .5 + B9/P 1.2 .3 A5/J 0.4 .5 - PC5/P 2.4 .5 + C5/P 2.4 .5 relays # relay board.netname # INDIV0-pin to board conn purpose -- 2.30.2