Skip to content

Commit 62b47d7

Browse files
TarkusSC4TarkusSC4
committed
Commented out some problematic RHW x OWR-5 adjacency code.
1 parent ff27dac commit 62b47d7

8 files changed

Lines changed: 32 additions & 32 deletions

‎Controller/RUL2/08_NWM/DD_RHW-4_Mirror_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
0x57532F00,2,1,0x09004b00,3,0=0x57532F00,2,1,0x51120000,3,0
163163
;00 to 01 (Orth Stub)
164164
;00 to 05/06 (Orth-Diag Bottom)
165-
0x57532F00,0,1,0x09004d00,1,1=0x57532F00,0,1,0x51120500,1,1
166-
0x57532F00,0,1,0x09004d00,3,0=0x57532F00,0,1,0x51120600,3,0; conflicting-override
167-
0x57532F00,2,1,0x09004d00,1,1=0x57532F00,2,1,0x51120600,1,1; conflicting-override
168-
0x57532F00,2,1,0x09004d00,3,0=0x57532F00,2,1,0x51120500,3,0
165+
;0x57532F00,0,1,0x09004d00,1,1=0x57532F00,0,1,0x51120500,1,1
166+
;0x57532F00,0,1,0x09004d00,3,0=0x57532F00,0,1,0x51120600,3,0; conflicting-override
167+
;0x57532F00,2,1,0x09004d00,1,1=0x57532F00,2,1,0x51120600,1,1; conflicting-override
168+
;0x57532F00,2,1,0x09004d00,3,0=0x57532F00,2,1,0x51120500,3,0
169169
;----Other Base Crossings----
170170
;----Special----
171171
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_MIS_Mirror_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
0x57022F00,2,1,0x09004b00,3,0=0x57022F00,2,1,0x51120000,3,0
163163
;00 to 01 (Orth Stub)
164164
;00 to 05/06 (Orth-Diag Bottom)
165-
0x57022F00,0,1,0x09004d00,1,1=0x57022F00,0,1,0x51120500,1,1
166-
0x57022F00,0,1,0x09004d00,3,0=0x57022F00,0,1,0x51120600,3,0; conflicting-override
167-
0x57022F00,2,1,0x09004d00,1,1=0x57022F00,2,1,0x51120600,1,1; conflicting-override
168-
0x57022F00,2,1,0x09004d00,3,0=0x57022F00,2,1,0x51120500,3,0
165+
;0x57022F00,0,1,0x09004d00,1,1=0x57022F00,0,1,0x51120500,1,1
166+
;0x57022F00,0,1,0x09004d00,3,0=0x57022F00,0,1,0x51120600,3,0; conflicting-override
167+
;0x57022F00,2,1,0x09004d00,1,1=0x57022F00,2,1,0x51120600,1,1; conflicting-override
168+
;0x57022F00,2,1,0x09004d00,3,0=0x57022F00,2,1,0x51120500,3,0
169169
;----Other Base Crossings----
170170
;----Special----
171171
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_MIS_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@
359359
0x57022F00,2,0,0x09004b00,3,0=0x57022F00,2,0,0x51120000,3,0
360360
;00 to 01 (Orth Stub)
361361
;00 to 05/06 (Orth-Diag Bottom)
362-
0x57022F00,0,0,0x09004d00,1,1=0x57022F00,0,0,0x51120500,1,1
363-
0x57022F00,0,0,0x09004d00,3,0=0x57022F00,0,0,0x51120600,3,0; conflicting-override
364-
0x57022F00,2,0,0x09004d00,1,1=0x57022F00,2,0,0x51120600,1,1; conflicting-override
365-
0x57022F00,2,0,0x09004d00,3,0=0x57022F00,2,0,0x51120500,3,0
362+
;0x57022F00,0,0,0x09004d00,1,1=0x57022F00,0,0,0x51120500,1,1
363+
;0x57022F00,0,0,0x09004d00,3,0=0x57022F00,0,0,0x51120600,3,0; conflicting-override
364+
;0x57022F00,2,0,0x09004d00,1,1=0x57022F00,2,0,0x51120600,1,1; conflicting-override
365+
;0x57022F00,2,0,0x09004d00,3,0=0x57022F00,2,0,0x51120500,3,0
366366
;----Other Base Crossings----
367367
;----Special----
368368
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_RHW-2_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@
359359
0x57002F00,2,0,0x09004b00,3,0=0x57002F00,2,0,0x51120000,3,0
360360
;00 to 01 (Orth Stub)
361361
;00 to 05/06 (Orth-Diag Bottom)
362-
0x57002F00,0,0,0x09004d00,1,1=0x57002F00,0,0,0x51120500,1,1
363-
0x57002F00,0,0,0x09004d00,3,0=0x57002F00,0,0,0x51120600,3,0; conflicting-override
364-
0x57002F00,2,0,0x09004d00,1,1=0x57002F00,2,0,0x51120600,1,1; conflicting-override
365-
0x57002F00,2,0,0x09004d00,3,0=0x57002F00,2,0,0x51120500,3,0
362+
;0x57002F00,0,0,0x09004d00,1,1=0x57002F00,0,0,0x51120500,1,1
363+
;0x57002F00,0,0,0x09004d00,3,0=0x57002F00,0,0,0x51120600,3,0; conflicting-override
364+
;0x57002F00,2,0,0x09004d00,1,1=0x57002F00,2,0,0x51120600,1,1; conflicting-override
365+
;0x57002F00,2,0,0x09004d00,3,0=0x57002F00,2,0,0x51120500,3,0
366366
;----Other Base Crossings----
367367
;----Special----
368368
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_RHW-3_Mirror_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
0x57012F00,2,1,0x09004b00,3,0=0x57012F00,2,1,0x51120000,3,0; missing_paths
163163
;00 to 01 (Orth Stub)
164164
;00 to 05/06 (Orth-Diag Bottom)
165-
0x57012F00,0,1,0x09004d00,1,1=0x57012F00,0,1,0x51120500,1,1; missing_paths
166-
0x57012F00,0,1,0x09004d00,3,0=0x57012F00,0,1,0x51120600,3,0; conflicting-override; missing_paths
167-
0x57012F00,2,1,0x09004d00,1,1=0x57012F00,2,1,0x51120600,1,1; conflicting-override; missing_paths
168-
0x57012F00,2,1,0x09004d00,3,0=0x57012F00,2,1,0x51120500,3,0; missing_paths
165+
;0x57012F00,0,1,0x09004d00,1,1=0x57012F00,0,1,0x51120500,1,1; missing_paths
166+
;0x57012F00,0,1,0x09004d00,3,0=0x57012F00,0,1,0x51120600,3,0; conflicting-override; missing_paths
167+
;0x57012F00,2,1,0x09004d00,1,1=0x57012F00,2,1,0x51120600,1,1; conflicting-override; missing_paths
168+
;0x57012F00,2,1,0x09004d00,3,0=0x57012F00,2,1,0x51120500,3,0; missing_paths
169169
;----Other Base Crossings----
170170
;----Special----
171171
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_RHW-3_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@
359359
0x57012F00,2,0,0x09004b00,3,0=0x57012F00,2,0,0x51120000,3,0; missing_paths
360360
;00 to 01 (Orth Stub)
361361
;00 to 05/06 (Orth-Diag Bottom)
362-
0x57012F00,0,0,0x09004d00,1,1=0x57012F00,0,0,0x51120500,1,1; missing_paths
363-
0x57012F00,0,0,0x09004d00,3,0=0x57012F00,0,0,0x51120600,3,0; conflicting-override; missing_paths
364-
0x57012F00,2,0,0x09004d00,1,1=0x57012F00,2,0,0x51120600,1,1; conflicting-override; missing_paths
365-
0x57012F00,2,0,0x09004d00,3,0=0x57012F00,2,0,0x51120500,3,0; missing_paths
362+
;0x57012F00,0,0,0x09004d00,1,1=0x57012F00,0,0,0x51120500,1,1; missing_paths
363+
;0x57012F00,0,0,0x09004d00,3,0=0x57012F00,0,0,0x51120600,3,0; conflicting-override; missing_paths
364+
;0x57012F00,2,0,0x09004d00,1,1=0x57012F00,2,0,0x51120600,1,1; conflicting-override; missing_paths
365+
;0x57012F00,2,0,0x09004d00,3,0=0x57012F00,2,0,0x51120500,3,0; missing_paths
366366
;----Other Base Crossings----
367367
;----Special----
368368
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_RHW-4_Mirror_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
0x57032F00,2,1,0x09004b00,3,0=0x57032F00,2,1,0x51120000,3,0; missing_paths
163163
;00 to 01 (Orth Stub)
164164
;00 to 05/06 (Orth-Diag Bottom)
165-
0x57032F00,0,1,0x09004d00,1,1=0x57032F00,0,1,0x51120500,1,1; missing_paths
166-
0x57032F00,0,1,0x09004d00,3,0=0x57032F00,0,1,0x51120600,3,0; conflicting-override; missing_paths
167-
0x57032F00,2,1,0x09004d00,1,1=0x57032F00,2,1,0x51120600,1,1; conflicting-override; missing_paths
168-
0x57032F00,2,1,0x09004d00,3,0=0x57032F00,2,1,0x51120500,3,0; missing_paths
165+
;0x57032F00,0,1,0x09004d00,1,1=0x57032F00,0,1,0x51120500,1,1; missing_paths
166+
;0x57032F00,0,1,0x09004d00,3,0=0x57032F00,0,1,0x51120600,3,0; conflicting-override; missing_paths
167+
;0x57032F00,2,1,0x09004d00,1,1=0x57032F00,2,1,0x51120600,1,1; conflicting-override; missing_paths
168+
;0x57032F00,2,1,0x09004d00,3,0=0x57032F00,2,1,0x51120500,3,0; missing_paths
169169
;----Other Base Crossings----
170170
;----Special----
171171
;--Roundabouts--

‎Controller/RUL2/08_NWM/L0_RHW-4_OxO_+_NWM.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@
359359
0x57032F00,2,0,0x09004b00,3,0=0x57032F00,2,0,0x51120000,3,0; missing_paths
360360
;00 to 01 (Orth Stub)
361361
;00 to 05/06 (Orth-Diag Bottom)
362-
0x57032F00,0,0,0x09004d00,1,1=0x57032F00,0,0,0x51120500,1,1; missing_paths
363-
0x57032F00,0,0,0x09004d00,3,0=0x57032F00,0,0,0x51120600,3,0; conflicting-override; missing_paths
364-
0x57032F00,2,0,0x09004d00,1,1=0x57032F00,2,0,0x51120600,1,1; conflicting-override; missing_paths
365-
0x57032F00,2,0,0x09004d00,3,0=0x57032F00,2,0,0x51120500,3,0; missing_paths
362+
;0x57032F00,0,0,0x09004d00,1,1=0x57032F00,0,0,0x51120500,1,1; missing_paths
363+
;0x57032F00,0,0,0x09004d00,3,0=0x57032F00,0,0,0x51120600,3,0; conflicting-override; missing_paths
364+
;0x57032F00,2,0,0x09004d00,1,1=0x57032F00,2,0,0x51120600,1,1; conflicting-override; missing_paths
365+
;0x57032F00,2,0,0x09004d00,3,0=0x57032F00,2,0,0x51120500,3,0; missing_paths
366366
;----Other Base Crossings----
367367
;----Special----
368368
;--Roundabouts--

0 commit comments

Comments
 (0)