Skip to content

Commit 4e1b106

Browse files
memo33memo33
committed
remove viaduct OST RUL2 overrides
In particular stub-based, T-based or any other form of disconnected OST overrides. Some RUL2 code for alt viaducts and viaduct FTLs is kept unchanged.
1 parent c229e8e commit 4e1b106

6 files changed

Lines changed: 19 additions & 2011 deletions

File tree

‎Controller/RUL2/03_Turn_Lanes/Sec3d_FTL.txt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,7 @@
248248
0x5B204600,1,0,0x00004b00,3,0=0x5B204600,1,0,0x5B200F00,1,0 ;RHD
249249
0x5B204600,3,1,0x00004b00,3,0=0x5B204600,3,1,0x5B200F00,3,1 ;LHD
250250
;Transitions to OnSlope
251-
0x5B204000,3,0,0x57700000,1,0=0x5B204000,3,0,0x5C060000,1,0 ;RHD
252-
0x5B204000,1,1,0x57700000,1,0=0x5B204000,1,1,0x5C060000,1,0 ;LHD
253-
0x5B204000,3,0,0x57700100,1,0=0x5B204000,3,0,0x5C060100,1,0 ;RHD
254-
0x5B204000,1,1,0x57700100,1,0=0x5B204000,1,1,0x5C060100,1,0 ;LHD
255251
;
256-
0x5B204400,3,0,0x57700000,1,0=0x5B204400,3,0,0x5C060000,1,0 ;RHD
257-
0x5B204400,1,1,0x57700000,1,0=0x5B204400,1,1,0x5C060000,1,0 ;LHD
258-
0x5B204400,3,0,0x57700100,1,0=0x5B204400,3,0,0x5C060100,1,0 ;RHD
259-
0x5B204400,1,1,0x57700100,1,0=0x5B204400,1,1,0x5C060100,1,0 ;LHD
260252
;
261253
;>> INTERSECTIONS
262254
;
@@ -1234,15 +1226,7 @@
12341226
0x5B224300,1,1,0x51100100,1,0=0x5B224300,1,1,0x5B220080,3,1
12351227
;OnSlope Adjacencies
12361228
;RHD
1237-
0x5B224080,3,0,0x57700000,1,0=0x5B224080,3,0,0x5C080000,1,0
1238-
0x5B224000,3,0,0x57700000,1,0=0x5B224000,3,0,0x5C080000,3,1
1239-
0x5B224080,3,0,0x57700100,1,0=0x5B224080,3,0,0x5C080100,1,0
1240-
0x5B224000,3,0,0x57700100,1,0=0x5B224000,3,0,0x5C080100,3,1
12411229
;LHD
1242-
0x5B224000,1,1,0x57700000,1,0=0x5B224000,1,1,0x5C080000,1,0
1243-
0x5B224080,1,1,0x57700000,1,0=0x5B224080,1,1,0x5C080000,3,1
1244-
0x5B224000,1,1,0x57700100,1,0=0x5B224000,1,1,0x5C080100,1,0
1245-
0x5B224080,1,1,0x57700100,1,0=0x5B224080,1,1,0x5C080100,3,1
12461230
;RHW Transitions
12471231
;Side Override
12481232
;RHD

‎Controller/RUL2/03_Turn_Lanes/Sec3k_L1_FTL.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,6 @@
956956
;RHD
957957
0x5C020000,1,0,0x5B224000,1,0=0x5C020000,1,0,0x5B22401F,1,0
958958
0x5C020000,3,0,0x5B224080,1,0=0x5C020000,3,0,0x5B22409F,1,0
959-
0x5C080000,1,0,0x5B224000,1,0=0x5C080000,1,0,0x5B22401F,1,0
960-
0x5C080000,3,1,0x5B224080,1,0=0x5C080000,3,1,0x5B22409F,1,0
961959
;
962960
0x5B224000,0,0,0x5C020000,2,0=0x5B22401F,0,0,0x5B22409F,0,0
963961
0x5C020000,0,0,0x5B224080,0,0=0x5B22401F,0,0,0x5B22409F,0,0
@@ -982,8 +980,6 @@
982980
;LHD
983981
0x5C020000,1,0,0x5B224080,3,1=0x5C020000,1,0,0x5B22401F,3,1
984982
0x5C020000,3,0,0x5B224000,3,1=0x5C020000,3,0,0x5B22409F,3,1
985-
0x5C080000,1,0,0x5B224080,3,1=0x5C080000,1,0,0x5B22401F,3,1; conflicting-override
986-
0x5C080000,3,1,0x5B224000,3,1=0x5C080000,3,1,0x5B22409F,3,1; conflicting-override
987983
;
988984
0x5B224080,0,1,0x5C020000,2,0=0x5B22409F,0,1,0x5B22401F,0,1
989985
0x5C020000,0,0,0x5B224000,0,1=0x5B22409F,0,1,0x5B22401F,0,1
@@ -1837,8 +1833,6 @@
18371833
;RHD
18381834
0x5C020000,1,0,0x5B224200,1,0=0x5C020000,1,0,0x5B22421F,1,0
18391835
0x5C020000,3,0,0x5B224280,1,0=0x5C020000,3,0,0x5B22429F,1,0
1840-
0x5C080000,1,0,0x5B224200,1,0=0x5C080000,1,0,0x5B22421F,1,0
1841-
0x5C080000,3,1,0x5B224280,1,0=0x5C080000,3,1,0x5B22429F,1,0
18421836
;
18431837
0x5B224200,0,0,0x5C020000,2,0=0x5B22421F,0,0,0x5B22429F,0,0
18441838
0x5C020000,0,0,0x5B224280,0,0=0x5B22421F,0,0,0x5B22429F,0,0
@@ -1877,8 +1871,6 @@
18771871
;LHD
18781872
0x5C020000,1,0,0x5B224280,3,1=0x5C020000,1,0,0x5B22421F,3,1
18791873
0x5C020000,3,0,0x5B224200,3,1=0x5C020000,3,0,0x5B22429F,3,1
1880-
0x5C080000,1,0,0x5B224280,3,1=0x5C080000,1,0,0x5B22421F,3,1; conflicting-override
1881-
0x5C080000,3,1,0x5B224200,3,1=0x5C080000,3,1,0x5B22429F,3,1; conflicting-override
18821874
;
18831875
0x5B224280,0,1,0x5C020000,2,0=0x5B22429F,0,1,0x5B22421F,0,1
18841876
0x5C020000,0,0,0x5B224200,0,1=0x5B22429F,0,1,0x5B22421F,0,1
@@ -2102,8 +2094,6 @@
21022094
;RHD
21032095
0x5C020000,1,0,0x5B225100,1,0=0x5C020000,1,0,0x5B22511F,1,0
21042096
0x5C020000,3,0,0x5B225180,1,0=0x5C020000,3,0,0x5B22519F,1,0
2105-
0x5C080000,1,0,0x5B225100,1,0=0x5C080000,1,0,0x5B22511F,1,0
2106-
0x5C080000,3,1,0x5B225180,1,0=0x5C080000,3,1,0x5B22519F,1,0
21072097
;
21082098
0x5B225100,0,0,0x5C020000,2,0=0x5B22511F,0,0,0x5B22519F,0,0
21092099
0x5C020000,0,0,0x5B225180,0,0=0x5B22511F,0,0,0x5B22519F,0,0
@@ -2142,8 +2132,6 @@
21422132
;LHD
21432133
0x5C020000,1,0,0x5B225180,3,1=0x5C020000,1,0,0x5B22511F,3,1
21442134
0x5C020000,3,0,0x5B225100,3,1=0x5C020000,3,0,0x5B22519F,3,1
2145-
0x5C080000,1,0,0x5B225180,3,1=0x5C080000,1,0,0x5B22511F,3,1; conflicting-override
2146-
0x5C080000,3,1,0x5B225100,3,1=0x5C080000,3,1,0x5B22519F,3,1; conflicting-override
21472135
;
21482136
0x5B225180,0,1,0x5C020000,2,0=0x5B22519F,0,1,0x5B22511F,0,1
21492137
0x5C020000,0,0,0x5B225100,0,1=0x5B22519F,0,1,0x5B22511F,0,1

‎Controller/RUL2/03_Turn_Lanes/Sec3l_L2_FTL.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -966,8 +966,6 @@
966966
;RHD
967967
0x5C050000,1,0,0x5B224000,1,0=0x5C050000,1,0,0x5B22402F,1,0
968968
0x5C050000,3,0,0x5B224080,1,0=0x5C050000,3,0,0x5B2240AF,1,0
969-
0x5C080100,1,0,0x5B224000,1,0=0x5C080100,1,0,0x5B22402F,1,0
970-
0x5C080100,3,1,0x5B224080,1,0=0x5C080100,3,1,0x5B2240AF,1,0
971969
;
972970
0x5B224000,0,0,0x5C050000,2,0=0x5B22402F,0,0,0x5B2240AF,0,0
973971
0x5C050000,0,0,0x5B224080,0,0=0x5B22402F,0,0,0x5B2240AF,0,0
@@ -992,8 +990,6 @@
992990
;LHD
993991
0x5C050000,1,0,0x5B224080,3,1=0x5C050000,1,0,0x5B22402F,3,1
994992
0x5C050000,3,0,0x5B224000,3,1=0x5C050000,3,0,0x5B2240AF,3,1
995-
0x5C080100,1,0,0x5B224080,3,1=0x5C080100,1,0,0x5B22402F,3,1; conflicting-override
996-
0x5C080100,3,1,0x5B224000,3,1=0x5C080100,3,1,0x5B2240AF,3,1; conflicting-override
997993
;
998994
0x5B224080,0,1,0x5C050000,2,0=0x5B2240AF,0,1,0x5B22402F,0,1
999995
0x5C050000,0,0,0x5B224000,0,1=0x5B2240AF,0,1,0x5B22402F,0,1
@@ -1930,8 +1926,6 @@
19301926
;RHD
19311927
0x5C050000,1,0,0x5B224200,1,0=0x5C050000,1,0,0x5B22422F,1,0
19321928
0x5C050000,3,0,0x5B224280,1,0=0x5C050000,3,0,0x5B2242AF,1,0
1933-
0x5C080100,1,0,0x5B224200,1,0=0x5C080100,1,0,0x5B22422F,1,0
1934-
0x5C080100,3,1,0x5B224280,1,0=0x5C080100,3,1,0x5B2242AF,1,0
19351929
;
19361930
0x5B224200,0,0,0x5C050000,2,0=0x5B22422F,0,0,0x5B2242AF,0,0
19371931
0x5C050000,0,0,0x5B224280,0,0=0x5B22422F,0,0,0x5B2242AF,0,0
@@ -1970,8 +1964,6 @@
19701964
;LHD
19711965
0x5C050000,1,0,0x5B224280,3,1=0x5C050000,1,0,0x5B22422F,3,1
19721966
0x5C050000,3,0,0x5B224200,3,1=0x5C050000,3,0,0x5B2242AF,3,1
1973-
0x5C080100,1,0,0x5B224280,3,1=0x5C080100,1,0,0x5B22422F,3,1; conflicting-override
1974-
0x5C080100,3,1,0x5B224200,3,1=0x5C080100,3,1,0x5B2242AF,3,1; conflicting-override
19751967
;
19761968
0x5B224280,0,1,0x5C050000,2,0=0x5B2242AF,0,1,0x5B22422F,0,1
19771969
0x5C050000,0,0,0x5B224200,0,1=0x5B2242AF,0,1,0x5B22422F,0,1
@@ -2199,8 +2191,6 @@
21992191
;RHD
22002192
0x5C050000,1,0,0x5B225100,1,0=0x5C050000,1,0,0x5B22512F,1,0
22012193
0x5C050000,3,0,0x5B225180,1,0=0x5C050000,3,0,0x5B2251AF,1,0
2202-
0x5C080100,1,0,0x5B225100,1,0=0x5C080100,1,0,0x5B22512F,1,0
2203-
0x5C080100,3,1,0x5B225180,1,0=0x5C080100,3,1,0x5B2251AF,1,0
22042194
;
22052195
0x5B225100,0,0,0x5C050000,2,0=0x5B22512F,0,0,0x5B2251AF,0,0
22062196
0x5C050000,0,0,0x5B225180,0,0=0x5B22512F,0,0,0x5B2251AF,0,0
@@ -2239,8 +2229,6 @@
22392229
;LHD
22402230
0x5C050000,1,0,0x5B225180,3,1=0x5C050000,1,0,0x5B22512F,3,1
22412231
0x5C050000,3,0,0x5B225100,3,1=0x5C050000,3,0,0x5B2251AF,3,1
2242-
0x5C080100,1,0,0x5B225180,3,1=0x5C080100,1,0,0x5B22512F,3,1; conflicting-override
2243-
0x5C080100,3,1,0x5B225100,3,1=0x5C080100,3,1,0x5B2251AF,3,1; conflicting-override
22442232
;
22452233
0x5B225180,0,1,0x5C050000,2,0=0x5B2251AF,0,1,0x5B22512F,0,1
22462234
0x5C050000,0,0,0x5B225100,0,1=0x5B2251AF,0,1,0x5B22512F,0,1

0 commit comments

Comments
 (0)