Skip to content

Commit ea323bf

Browse files
memo33memo33
committed
Merge branch 'driveside-fix'
2 parents c0673bd + f149b81 commit ea323bf

77 files changed

Lines changed: 4104 additions & 4096 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A1_Branch_RHD.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,10 @@
858858
;Long
859859
;----Other Base Crossings----
860860
;MIS Y-Split (D0)
861-
0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override
862-
0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override
863-
0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override
864-
0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override
861+
0x57860380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1
862+
0x57860380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0
863+
0x57860300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1
864+
0x57860300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0
865865
;Stability
866866
;REVERSE
867867
0x57860380,1,1,0x57602400,3,0=0x57860380,1,1,0x5702D000,1,1
@@ -1789,10 +1789,10 @@
17891789
;Long
17901790
;----Other Base Crossings----
17911791
;MIS Y-Split (D0)
1792-
0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override
1793-
0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override
1794-
0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override
1795-
0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override
1792+
0x57860399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1
1793+
0x57860399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0
1794+
0x57860319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1
1795+
0x57860319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0
17961796
;Stability
17971797
;REVERSE
17981798
0x57860399,1,1,0x57602400,3,0=0x57860399,1,1,0x5712D000,1,1
@@ -2753,10 +2753,10 @@
27532753
;Long
27542754
;----Other Base Crossings----
27552755
;MIS Y-Split (D0)
2756-
0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override
2757-
0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override
2758-
0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override
2759-
0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override
2756+
0x578603A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1
2757+
0x578603A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0
2758+
0x57860329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1
2759+
0x57860329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0
27602760
;Stability
27612761
;REVERSE
27622762
0x578603A9,1,1,0x57602400,3,0=0x578603A9,1,1,0x5722D000,1,1
@@ -3748,10 +3748,10 @@
37483748
;Long
37493749
;----Other Base Crossings----
37503750
;MIS Y-Split (D0)
3751-
0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override
3752-
0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override
3753-
0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override
3754-
0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override
3751+
0x578603B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1
3752+
0x578603B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0
3753+
0x57860339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1
3754+
0x57860339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0
37553755
;Stability
37563756
;REVERSE
37573757
0x578603B9,1,1,0x57602400,3,0=0x578603B9,1,1,0x5732D000,1,1
@@ -4747,10 +4747,10 @@
47474747
;Long
47484748
;----Other Base Crossings----
47494749
;MIS Y-Split (D0)
4750-
0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override
4751-
0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override
4752-
0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override
4753-
0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override
4750+
0x578603C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1
4751+
0x578603C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0
4752+
0x57860349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1
4753+
0x57860349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0
47544754
;Stability
47554755
;REVERSE
47564756
0x578603C9,1,1,0x57602400,3,0=0x578603C9,1,1,0x5742D000,1,1

‎Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_A3_Branch_RHD.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
;RHW-8S Type A3 Branch Continuation Adjacency Code
22
;RHD Version
3-
0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0; conflicting-override
4-
0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0; conflicting-override
5-
0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0; conflicting-override
6-
0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0; conflicting-override
7-
0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0; conflicting-override
8-
0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0; conflicting-override
9-
0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0; conflicting-override
10-
0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0; conflicting-override
3+
0x57460880,1,1,0x57000000,1,0=0x57460880,1,1,0x57040000,1,0
4+
0x57460880,1,1,0x57000000,3,0=0x57460880,1,1,0x57040000,1,0
5+
0x57460800,3,0,0x57000000,1,0=0x57460800,3,0,0x57040000,3,0
6+
0x57460800,3,0,0x57000000,3,0=0x57460800,3,0,0x57040000,3,0
7+
0x57460880,1,1,0x57000000,1,1=0x57460880,1,1,0x57040000,1,0
8+
0x57460880,1,1,0x57000000,3,1=0x57460880,1,1,0x57040000,1,0
9+
0x57460800,3,0,0x57000000,1,1=0x57460800,3,0,0x57040000,3,0
10+
0x57460800,3,0,0x57000000,3,1=0x57460800,3,0,0x57040000,3,0
1111
0x57460880,1,1,0x57000100,1,0=0x57460880,1,1,0x57040100,1,0
1212
0x57460800,3,0,0x57000100,1,0=0x57460800,3,0,0x57040100,3,1
1313
0x57460880,1,1,0x57000400,3,0=0x57460880,1,1,0x57040B00,3,0
@@ -348,14 +348,14 @@
348348
0x57460880,1,1,0x5700FA00,3,0=0x57460880,1,1,0x5704FA00,1,0
349349
0x57460800,3,0,0x5700FA00,1,0=0x57460800,3,0,0x5704FA00,3,0
350350
0x57460800,3,0,0x5700FA00,3,0=0x57460800,3,0,0x5704FA00,3,0
351-
0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0; conflicting-override
352-
0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0; conflicting-override
353-
0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0; conflicting-override
354-
0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0; conflicting-override
355-
0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0; conflicting-override
356-
0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0; conflicting-override
357-
0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0; conflicting-override
358-
0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0; conflicting-override
351+
0x57460899,1,1,0x57000000,1,0=0x57460899,1,1,0x57140000,1,0
352+
0x57460899,1,1,0x57000000,3,0=0x57460899,1,1,0x57140000,1,0
353+
0x57460819,3,0,0x57000000,1,0=0x57460819,3,0,0x57140000,3,0
354+
0x57460819,3,0,0x57000000,3,0=0x57460819,3,0,0x57140000,3,0
355+
0x57460899,1,1,0x57000000,1,1=0x57460899,1,1,0x57140000,1,0
356+
0x57460899,1,1,0x57000000,3,1=0x57460899,1,1,0x57140000,1,0
357+
0x57460819,3,0,0x57000000,1,1=0x57460819,3,0,0x57140000,3,0
358+
0x57460819,3,0,0x57000000,3,1=0x57460819,3,0,0x57140000,3,0
359359
0x57460899,1,1,0x57000100,1,0=0x57460899,1,1,0x57140100,1,0
360360
0x57460819,3,0,0x57000100,1,0=0x57460819,3,0,0x57140100,3,1
361361
0x57460899,1,1,0x57000400,3,0=0x57460899,1,1,0x57140B00,3,0
@@ -914,14 +914,14 @@
914914
0x574608A9,1,1,0x5E600B00,3,0=0x574608A9,1,1,0x5E600B29,3,0
915915
0x57460829,3,0,0x5E600B00,1,0=0x57460829,3,0,0x5E600B29,1,0
916916
0x57460829,3,0,0x5E600B00,3,0=0x57460829,3,0,0x5E600B29,3,0
917-
0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override
918-
0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0; conflicting-override
919-
0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0; conflicting-override
920-
0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0; conflicting-override
921-
0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override
922-
0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0; conflicting-override
923-
0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0; conflicting-override
924-
0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0; conflicting-override
917+
0x574608A9,1,1,0x57000000,1,0=0x574608A9,1,1,0x57240000,1,0
918+
0x574608A9,1,1,0x57000000,3,0=0x574608A9,1,1,0x57240000,1,0
919+
0x57460829,3,0,0x57000000,1,0=0x57460829,3,0,0x57240000,3,0
920+
0x57460829,3,0,0x57000000,3,0=0x57460829,3,0,0x57240000,3,0
921+
0x574608A9,1,1,0x57000000,1,1=0x574608A9,1,1,0x57240000,1,0
922+
0x574608A9,1,1,0x57000000,3,1=0x574608A9,1,1,0x57240000,1,0
923+
0x57460829,3,0,0x57000000,1,1=0x57460829,3,0,0x57240000,3,0
924+
0x57460829,3,0,0x57000000,3,1=0x57460829,3,0,0x57240000,3,0
925925
0x574608A9,1,1,0x57000100,1,0=0x574608A9,1,1,0x57240100,1,0
926926
0x57460829,3,0,0x57000100,1,0=0x57460829,3,0,0x57240100,3,1
927927
0x574608A9,1,1,0x57000400,3,0=0x574608A9,1,1,0x57240B00,3,0

‎Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D1_Branch_RHD.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,10 @@
858858
;Long
859859
;----Other Base Crossings----
860860
;MIS Y-Split (D0)
861-
0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1; conflicting-override
862-
0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0; conflicting-override
863-
0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1; conflicting-override
864-
0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0; conflicting-override
861+
0x57863380,1,1,0x57602400,1,0=0x5702D089,3,1,0x5702D080,3,1
862+
0x57863380,1,1,0x57602400,3,1=0x5702D009,1,0,0x5702D000,1,0
863+
0x57863300,3,0,0x57602400,1,0=0x5702D009,3,1,0x5702D000,3,1
864+
0x57863300,3,0,0x57602400,3,1=0x5702D089,1,0,0x5702D080,1,0
865865
;Stability
866866
;REVERSE
867867
0x57863380,1,1,0x57602400,3,0=0x57863380,1,1,0x5702D000,1,1
@@ -1789,10 +1789,10 @@
17891789
;Long
17901790
;----Other Base Crossings----
17911791
;MIS Y-Split (D0)
1792-
0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1; conflicting-override
1793-
0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0; conflicting-override
1794-
0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1; conflicting-override
1795-
0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0; conflicting-override
1792+
0x57863399,1,1,0x57602400,1,0=0x5712D085,3,1,0x5712D080,3,1
1793+
0x57863399,1,1,0x57602400,3,1=0x5712D005,1,0,0x5712D000,1,0
1794+
0x57863319,3,0,0x57602400,1,0=0x5712D005,3,1,0x5712D000,3,1
1795+
0x57863319,3,0,0x57602400,3,1=0x5712D085,1,0,0x5712D080,1,0
17961796
;Stability
17971797
;REVERSE
17981798
0x57863399,1,1,0x57602400,3,0=0x57863399,1,1,0x5712D000,1,1
@@ -2753,10 +2753,10 @@
27532753
;Long
27542754
;----Other Base Crossings----
27552755
;MIS Y-Split (D0)
2756-
0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1; conflicting-override
2757-
0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0; conflicting-override
2758-
0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1; conflicting-override
2759-
0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0; conflicting-override
2756+
0x578633A9,1,1,0x57602400,1,0=0x5722D085,3,1,0x5722D080,3,1
2757+
0x578633A9,1,1,0x57602400,3,1=0x5722D005,1,0,0x5722D000,1,0
2758+
0x57863329,3,0,0x57602400,1,0=0x5722D005,3,1,0x5722D000,3,1
2759+
0x57863329,3,0,0x57602400,3,1=0x5722D085,1,0,0x5722D080,1,0
27602760
;Stability
27612761
;REVERSE
27622762
0x578633A9,1,1,0x57602400,3,0=0x578633A9,1,1,0x5722D000,1,1
@@ -3748,10 +3748,10 @@
37483748
;Long
37493749
;----Other Base Crossings----
37503750
;MIS Y-Split (D0)
3751-
0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1; conflicting-override
3752-
0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0; conflicting-override
3753-
0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1; conflicting-override
3754-
0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0; conflicting-override
3751+
0x578633B9,1,1,0x57602400,1,0=0x5732D085,3,1,0x5732D080,3,1
3752+
0x578633B9,1,1,0x57602400,3,1=0x5732D005,1,0,0x5732D000,1,0
3753+
0x57863339,3,0,0x57602400,1,0=0x5732D005,3,1,0x5732D000,3,1
3754+
0x57863339,3,0,0x57602400,3,1=0x5732D085,1,0,0x5732D080,1,0
37553755
;Stability
37563756
;REVERSE
37573757
0x578633B9,1,1,0x57602400,3,0=0x578633B9,1,1,0x5732D000,1,1
@@ -4747,10 +4747,10 @@
47474747
;Long
47484748
;----Other Base Crossings----
47494749
;MIS Y-Split (D0)
4750-
0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1; conflicting-override
4751-
0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0; conflicting-override
4752-
0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1; conflicting-override
4753-
0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0; conflicting-override
4750+
0x578633C9,1,1,0x57602400,1,0=0x5742D085,3,1,0x5742D080,3,1
4751+
0x578633C9,1,1,0x57602400,3,1=0x5742D005,1,0,0x5742D000,1,0
4752+
0x57863349,3,0,0x57602400,1,0=0x5742D005,3,1,0x5742D000,3,1
4753+
0x57863349,3,0,0x57602400,3,1=0x5742D085,1,0,0x5742D080,1,0
47544754
;Stability
47554755
;REVERSE
47564756
0x578633C9,1,1,0x57602400,3,0=0x578633C9,1,1,0x5742D000,1,1

‎Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_D3_Branch_RHD.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
;RHW-8S Type D3 Branch Continuation Adjacency Code
22
;RHD Version
3-
0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0; conflicting-override
4-
0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0; conflicting-override
5-
0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0; conflicting-override
6-
0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0; conflicting-override
7-
0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0; conflicting-override
8-
0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0; conflicting-override
9-
0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0; conflicting-override
10-
0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0; conflicting-override
3+
0x57463880,1,1,0x57000000,1,0=0x57463880,1,1,0x57040000,1,0
4+
0x57463880,1,1,0x57000000,3,0=0x57463880,1,1,0x57040000,1,0
5+
0x57463800,3,0,0x57000000,1,0=0x57463800,3,0,0x57040000,3,0
6+
0x57463800,3,0,0x57000000,3,0=0x57463800,3,0,0x57040000,3,0
7+
0x57463880,1,1,0x57000000,1,1=0x57463880,1,1,0x57040000,1,0
8+
0x57463880,1,1,0x57000000,3,1=0x57463880,1,1,0x57040000,1,0
9+
0x57463800,3,0,0x57000000,1,1=0x57463800,3,0,0x57040000,3,0
10+
0x57463800,3,0,0x57000000,3,1=0x57463800,3,0,0x57040000,3,0
1111
0x57463880,1,1,0x57000100,1,0=0x57463880,1,1,0x57040100,1,0
1212
0x57463800,3,0,0x57000100,1,0=0x57463800,3,0,0x57040100,3,1
1313
0x57463880,1,1,0x57000400,3,0=0x57463880,1,1,0x57040B00,3,0
@@ -348,14 +348,14 @@
348348
0x57463880,1,1,0x5700FA00,3,0=0x57463880,1,1,0x5704FA00,1,0
349349
0x57463800,3,0,0x5700FA00,1,0=0x57463800,3,0,0x5704FA00,3,0
350350
0x57463800,3,0,0x5700FA00,3,0=0x57463800,3,0,0x5704FA00,3,0
351-
0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0; conflicting-override
352-
0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0; conflicting-override
353-
0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0; conflicting-override
354-
0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0; conflicting-override
355-
0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0; conflicting-override
356-
0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0; conflicting-override
357-
0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0; conflicting-override
358-
0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0; conflicting-override
351+
0x57463899,1,1,0x57000000,1,0=0x57463899,1,1,0x57140000,1,0
352+
0x57463899,1,1,0x57000000,3,0=0x57463899,1,1,0x57140000,1,0
353+
0x57463819,3,0,0x57000000,1,0=0x57463819,3,0,0x57140000,3,0
354+
0x57463819,3,0,0x57000000,3,0=0x57463819,3,0,0x57140000,3,0
355+
0x57463899,1,1,0x57000000,1,1=0x57463899,1,1,0x57140000,1,0
356+
0x57463899,1,1,0x57000000,3,1=0x57463899,1,1,0x57140000,1,0
357+
0x57463819,3,0,0x57000000,1,1=0x57463819,3,0,0x57140000,3,0
358+
0x57463819,3,0,0x57000000,3,1=0x57463819,3,0,0x57140000,3,0
359359
0x57463899,1,1,0x57000100,1,0=0x57463899,1,1,0x57140100,1,0
360360
0x57463819,3,0,0x57000100,1,0=0x57463819,3,0,0x57140100,3,1
361361
0x57463899,1,1,0x57000400,3,0=0x57463899,1,1,0x57140B00,3,0
@@ -914,14 +914,14 @@
914914
0x574638A9,1,1,0x5E600B00,3,0=0x574638A9,1,1,0x5E600B29,3,0
915915
0x57463829,3,0,0x5E600B00,1,0=0x57463829,3,0,0x5E600B29,1,0
916916
0x57463829,3,0,0x5E600B00,3,0=0x57463829,3,0,0x5E600B29,3,0
917-
0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override
918-
0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0; conflicting-override
919-
0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0; conflicting-override
920-
0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0; conflicting-override
921-
0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override
922-
0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0; conflicting-override
923-
0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0; conflicting-override
924-
0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0; conflicting-override
917+
0x574638A9,1,1,0x57000000,1,0=0x574638A9,1,1,0x57240000,1,0
918+
0x574638A9,1,1,0x57000000,3,0=0x574638A9,1,1,0x57240000,1,0
919+
0x57463829,3,0,0x57000000,1,0=0x57463829,3,0,0x57240000,3,0
920+
0x57463829,3,0,0x57000000,3,0=0x57463829,3,0,0x57240000,3,0
921+
0x574638A9,1,1,0x57000000,1,1=0x574638A9,1,1,0x57240000,1,0
922+
0x574638A9,1,1,0x57000000,3,1=0x574638A9,1,1,0x57240000,1,0
923+
0x57463829,3,0,0x57000000,1,1=0x57463829,3,0,0x57240000,3,0
924+
0x57463829,3,0,0x57000000,3,1=0x57463829,3,0,0x57240000,3,0
925925
0x574638A9,1,1,0x57000100,1,0=0x574638A9,1,1,0x57240100,1,0
926926
0x57463829,3,0,0x57000100,1,0=0x57463829,3,0,0x57240100,3,1
927927
0x574638A9,1,1,0x57000400,3,0=0x574638A9,1,1,0x57240B00,3,0

‎Controller/RUL2/07_RHW/Sec7b_BaseNetwork/Ramp_10S_E1_Branch_RHD.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -836,8 +836,8 @@
836836
;02 to R3
837837
0x57864500,2,0,0x57906800,1,0=0x57864500,2,0,0x57926800,1,0
838838
0x57864580,0,1,0x57906800,3,1=0x57864580,0,1,0x57926800,3,1
839-
0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0; conflicting-override
840-
0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1; conflicting-override
839+
0x57864E00,2,0,0x57906800,1,0=0x57864500,2,0,0x57926880,1,0
840+
0x57864E80,0,1,0x57906800,3,1=0x57864580,0,1,0x57926880,3,1
841841
;02 to R4
842842
0x57864E80,0,1,0x57907b00,2,0=0x57864E80,0,1,0x57927b00,2,0
843843
0x57864E00,2,0,0x57907b00,0,1=0x57864E00,2,0,0x57927b00,0,1
@@ -1723,8 +1723,8 @@
17231723
;02 to R3
17241724
0x57864519,2,0,0x57906800,1,0=0x57864519,2,0,0x57926815,1,0
17251725
0x57864599,0,1,0x57906800,3,1=0x57864599,0,1,0x57926815,3,1
1726-
0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0; conflicting-override
1727-
0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1; conflicting-override
1726+
0x57864E19,2,0,0x57906800,1,0=0x57864519,2,0,0x57926895,1,0
1727+
0x57864E99,0,1,0x57906800,3,1=0x57864599,0,1,0x57926895,3,1
17281728
;02 to R4
17291729
0x57864E99,0,1,0x57907b00,2,0=0x57864E99,0,1,0x57927b15,2,0
17301730
0x57864E19,2,0,0x57907b00,0,1=0x57864E19,2,0,0x57927b15,0,1
@@ -2590,8 +2590,8 @@
25902590
;02 to R3
25912591
0x57864529,2,0,0x57906800,1,0=0x57864529,2,0,0x57926825,1,0
25922592
0x578645A9,0,1,0x57906800,3,1=0x578645A9,0,1,0x57926825,3,1
2593-
0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0; conflicting-override
2594-
0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1; conflicting-override
2593+
0x57864E29,2,0,0x57906800,1,0=0x57864529,2,0,0x579268A5,1,0
2594+
0x57864EA9,0,1,0x57906800,3,1=0x578645A9,0,1,0x579268A5,3,1
25952595
;02 to R4
25962596
0x57864EA9,0,1,0x57907b00,2,0=0x57864EA9,0,1,0x57927b25,2,0
25972597
0x57864E29,2,0,0x57907b00,0,1=0x57864E29,2,0,0x57927b25,0,1
@@ -3488,8 +3488,8 @@
34883488
;02 to R3
34893489
0x57864539,2,0,0x57906800,1,0=0x57864539,2,0,0x57926835,1,0
34903490
0x578645B9,0,1,0x57906800,3,1=0x578645B9,0,1,0x57926835,3,1
3491-
0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0; conflicting-override
3492-
0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1; conflicting-override
3491+
0x57864E39,2,0,0x57906800,1,0=0x57864539,2,0,0x579268B5,1,0
3492+
0x57864EB9,0,1,0x57906800,3,1=0x578645B9,0,1,0x579268B5,3,1
34933493
;02 to R4
34943494
0x57864EB9,0,1,0x57907b00,2,0=0x57864EB9,0,1,0x57927b35,2,0
34953495
0x57864E39,2,0,0x57907b00,0,1=0x57864E39,2,0,0x57927b35,0,1
@@ -4386,8 +4386,8 @@
43864386
;02 to R3
43874387
0x57864549,2,0,0x57906800,1,0=0x57864549,2,0,0x57926845,1,0
43884388
0x578645C9,0,1,0x57906800,3,1=0x578645C9,0,1,0x57926845,3,1
4389-
0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0; conflicting-override
4390-
0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1; conflicting-override
4389+
0x57864E49,2,0,0x57906800,1,0=0x57864549,2,0,0x579268C5,1,0
4390+
0x57864EC9,0,1,0x57906800,3,1=0x578645C9,0,1,0x579268C5,3,1
43914391
;02 to R4
43924392
0x57864EC9,0,1,0x57907b00,2,0=0x57864EC9,0,1,0x57927b45,2,0
43934393
0x57864E49,2,0,0x57907b00,0,1=0x57864E49,2,0,0x57927b45,0,1

0 commit comments

Comments
 (0)