From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 2 Jan 2011 13:49:15 +0000 (+0000)
Subject: gui, etc.: re-enable slip2 (B9) as we should now be able to support it
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=34abd1c9a6520e4af6672a5702b9d97fe1386ac6;p=trains.git

gui, etc.: re-enable slip2 (B9) as we should now be able to support it
---

diff --git a/hostside/gui-layout.config b/hostside/gui-layout.config
index e501668..529f146 100644
--- a/hostside/gui-layout.config
+++ b/hostside/gui-layout.config
@@ -1,8 +1,8 @@
 set pages {bot}
 set movpos_bindings(bot) {
-	~Q=C5/P	~W=B7/P	E=B7/J	R=A6/J	T=A6/P	Y=X8/P
+	~Q=C5/P	~W=B7/P	E=B7/J	R++20=A6/J	T=A6/P	Y=X8/P
 					G~A2/P	H~X2/R	J=B0/P
-	~Z=C9/P	~X=B9/P	~C=B9/J	V=A5/J	B=A5/P	N=X7/P	M=C0/P
+	Z=C9/P	X++16=B9/P	C=B9/J	V+-20=A5/J	B=A5/P	N=X7/P	M=C0/P
 
 	J		I	O
 	M		K	L
diff --git a/layout/ours.wiring b/layout/ours.wiring
index 89de6ed..8c7b1a2 100644
--- a/layout/ours.wiring
+++ b/layout/ours.wiring
@@ -56,7 +56,7 @@ vanilla
 	B0	2.19
 
 movfeatposmap
-#broken	B9	S0-3	J0P1 J1P1 J0P0 J1P0
+	B9	S0-3	J0P1 J1P1 J0P0 J1P0
 
 points
 #	point	board.motor0	board.motor1
@@ -64,9 +64,9 @@ points
 	X8/P	2.1	.0
 	A6/P	2.3	.2
 	A5/P	0.3	.2
-	YC9/P	1.1	.0
-	KB9/J	1.3	.2
-	KB9/P	1.4	.5
+	C9/P	1.1	.0
+	B9/J	1.3	.2
+	B9/P	1.4	.5
 	A5/J	0.5	.4
 	KC5/P	2.4	.5
 	A6/J	3.0	.1
@@ -89,10 +89,6 @@ fixed
 	A2/P0
 	C5/P0
 	B7/P0
-	B9/S0
-# working fine but we disable it because the other half
-# of its crossover is the slip B9
-	C9/P0
 
 interferences
 	A5/J1P0 A6/J1P0