From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/lib/params/nmra-s.xtp | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'app/lib/params/nmra-s.xtp')

diff --git a/app/lib/params/nmra-s.xtp b/app/lib/params/nmra-s.xtp
index 3ce08a3..78500cf 100644
--- a/app/lib/params/nmra-s.xtp
+++ b/app/lib/params/nmra-s.xtp
@@ -591,28 +591,27 @@ TURNOUT S "NMRA S	#6 Single Slip	6SS"
 	C 0 0.000000 105.957235 1.748056 -105.957235 0.000076 9.527435
 	END
 TURNOUT S "NMRA S	#8 Single Slip	8SS"
-	U "Double Slipswitch" "" "NMRA S" "#8 Single Slip" "8SS" 29.468000 7.152669 29.468000 0.000000 0.000000 0
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+	U "Single Slipswitch" "" "NMRA S" "#8 Single Slip" "8SS" 29.468000 7.152669 29.468000 0.000000 0.000000 0
+	P "Normal" 1 2 0 3 4
+	P "Reverse" 1 5 4
 	E 0.000000 0.000000 270.000000
 	E 29.468000 0.000000 90.000000
 	E 0.114659 1.834563 277.152669
 	E 29.353341 -1.834563 97.152669
 	S 0 0.000000 0.000000 0.000000 1.748901 0.000000
-	S 0 0.000000 1.748901 0.000000 27.719099 0.000000
-	S 0 0.000000 27.719099 0.000000 29.468000 0.000000
-	S 0 0.000000 0.114659 1.834563 1.848507 1.616945
-	S 0 0.000000 1.848507 1.616945 27.619493 -1.616945
+	S 0 0.000000 1.748901 0.000000 29.468000 0.000000
+	S 0 0.000000 0.114659 1.834563 27.619493 -1.616945
 	S 0 0.000000 27.619493 -1.616945 29.353341 -1.834563
 	C 0 0.000000 207.768967 1.748074 -207.768967 0.000076 7.152821
-	C 0 0.000000 -207.768967 27.719372 207.768933 180.000076 7.152821
 	END
 
 SUBCONTENTS NMRA S Scale Double Slip Turnouts
-TURNOUT S "NMRA S	#6 Double Slip	6DS"
+TURNOUT S "NMRA S	#6 Double Slip	6DS" 512
 	U "Double Slipswitch" "" "NMRA S" "#6 Double Slip" "6DS" 21.156000 9.527283 21.156000 0.000000 0.000000 0
-	P "Normal" 1 2 3 0 4 5 6
-	P "Reverse" 1 7 6 0 4 8 3
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 21.156000 0.000000 90.000000
 	E 0.145901 1.750826 279.527283
@@ -626,17 +625,22 @@ TURNOUT S "NMRA S	#6 Double Slip	6DS"
 	C 0 0.000000 105.957235 1.748056 -105.957235 0.000076 9.527435
 	C 0 0.000000 -105.957235 19.407661 105.957212 180.000076 9.527435
 	END
-TURNOUT S "NMRA S	#8 Double Slip	8DS"
-	U "Single Slipswitch" "" "NMRA S" "#8 Double Slip" "8DS" 29.468000 7.152669 29.468000 0.000000 0.000000 0
-	P "Normal" 1 2 0 3 4
-	P "Reverse" 1 5 4
+TURNOUT S "NMRA S	#8 Double Slip	8DS" 512
+	U "Double Slipswitch" "" "NMRA S" "#8 Double Slip" "8DS" 29.468000 7.152669 29.468000 0.000000 0.000000 0
+	P "Cross1" 1 2 3
+	P "Cross2" 4 5 6
+	P "Slip1" 1 7 6
+	P "Slip2" 4 8 3
 	E 0.000000 0.000000 270.000000
 	E 29.468000 0.000000 90.000000
 	E 0.114659 1.834563 277.152669
 	E 29.353341 -1.834563 97.152669
 	S 0 0.000000 0.000000 0.000000 1.748901 0.000000
-	S 0 0.000000 1.748901 0.000000 29.468000 0.000000
-	S 0 0.000000 0.114659 1.834563 27.619493 -1.616945
+	S 0 0.000000 1.748901 0.000000 27.719099 0.000000
+	S 0 0.000000 27.719099 0.000000 29.468000 0.000000
+	S 0 0.000000 0.114659 1.834563 1.848507 1.616945
+	S 0 0.000000 1.848507 1.616945 27.619493 -1.616945
 	S 0 0.000000 27.619493 -1.616945 29.353341 -1.834563
 	C 0 0.000000 207.768967 1.748074 -207.768967 0.000076 7.152821
+	C 0 0.000000 -207.768967 27.719372 207.768933 180.000076 7.152821
 	END
-- 
cgit v1.2.3