Skip to content

Commit 7410e11

Browse files
memo33jflann
memo33
authored and
jflann
committed
further RHW-3 T fixes
1 parent b8d318e commit 7410e11

4 files changed

Lines changed: 47 additions & 47 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@
741741
0x57610180,1,0,0x57600000,1,0=0x57610180,1,0,0x57610080,1,0
742742
0x57610100,3,1,0x57600000,3,0=0x57610100,3,1,0x57610000,3,0
743743
0x57610180,1,0,0x57600000,3,0=0x57610180,1,0,0x57610000,3,0
744-
0x57610100,3,1,0x57600000,1,0=0x57610100,3,1,0x57610000,1,0
744+
0x57610100,3,1,0x57600000,1,0=0x57610100,3,1,0x57610080,1,0
745745
;00 to T-01 (Road Ends)
746746
0x57610180,1,0,0x57600100,1,0=0x57610180,1,0,0x57610180,1,0
747747
0x57610100,3,1,0x57600100,3,0=0x57610100,3,1,0x57610100,3,0
@@ -753,9 +753,9 @@
753753
0x57610180,1,0,0x57600200,3,0=0x57610180,1,0,0x57610200,3,0
754754
0x57610100,3,1,0x57600200,1,0=0x57610100,3,1,0x57610280,1,0
755755
;00 to T-03 (Avenue Ends)
756-
0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610300,1,1
756+
0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1
757757
0x57610100,3,1,0x57600300,3,0=0x57610100,3,1,0x57610300,3,0
758-
0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610380,3,0
758+
0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0
759759
0x57610100,3,1,0x57600300,1,1=0x57610100,3,1,0x57610380,1,1
760760
;00 to T-04 (RHW-2 Ends)
761761
0x57610180,1,0,0x57600400,1,0=0x57610180,1,0,0x57610480,1,0
@@ -788,15 +788,15 @@
788788
0x57610180,1,0,0x57600A00,3,0=0x57610180,1,0,0x57610A00,3,0
789789
0x57610100,3,1,0x57600A00,1,0=0x57610100,3,1,0x57610A80,1,0
790790
;00 to T-0B (OWR-3 Ends)
791-
0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0
792-
0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610B00,3,0
793-
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610B00,3,0
794-
0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610B80,1,0
791+
0x57610180,1,0,0x57600B00,1,0=0x57610180,1,0,0x57610B80,1,0
792+
0x57610100,3,1,0x57600B00,3,0=0x57610100,3,1,0x57610B00,3,0
793+
0x57610180,1,0,0x57600B00,3,0=0x57610180,1,0,0x57610B00,3,0
794+
0x57610100,3,1,0x57600B00,1,0=0x57610100,3,1,0x57610B80,1,0
795795
;00 to T-0C (NRD-4 Ends)
796-
0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610B80,1,0; conflicting-override
797-
0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610C00,3,0; conflicting-override
798-
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0; conflicting-override
799-
0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610C80,1,0; conflicting-override
796+
0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0
797+
0x57610100,3,1,0x57600C00,3,0=0x57610100,3,1,0x57610C00,3,0
798+
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0
799+
0x57610100,3,1,0x57600C00,1,0=0x57610100,3,1,0x57610C80,1,0
800800
;00 to T-0D (TLA-5 Ends)
801801
0x57610180,1,0,0x57600D00,1,0=0x57610180,1,0,0x57610D80,1,0
802802
0x57610100,3,1,0x57600D00,3,0=0x57610100,3,1,0x57610D00,3,0

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -739,69 +739,69 @@
739739
;----OxO T Crossings----
740740
;00 to T-00 (Street Ends)
741741
0x57610100,1,0,0x57600000,1,0=0x57610100,1,0,0x57610000,1,0
742-
0x57610180,3,1,0x57600000,3,0=0x57610180,3,1,0x57610000,3,0
743-
0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610000,3,0
742+
0x57610180,3,1,0x57600000,3,0=0x57610180,3,1,0x57610080,3,0
743+
0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0
744744
0x57610180,3,1,0x57600000,1,0=0x57610180,3,1,0x57610000,1,0
745745
;00 to T-01 (Road Ends)
746746
0x57610100,1,0,0x57600100,1,0=0x57610100,1,0,0x57610100,1,0
747-
0x57610180,3,1,0x57600100,3,0=0x57610180,3,1,0x57610100,3,0
747+
0x57610180,3,1,0x57600100,3,0=0x57610180,3,1,0x57610180,3,0
748748
0x57610100,1,0,0x57600100,3,0=0x57610100,1,0,0x57610180,3,0
749-
0x57610180,3,1,0x57600100,1,0=0x57610180,3,1,0x57610180,1,0
749+
0x57610180,3,1,0x57600100,1,0=0x57610180,3,1,0x57610100,1,0
750750
;00 to T-02 (OWR Ends)
751751
0x57610100,1,0,0x57600200,1,0=0x57610100,1,0,0x57610200,1,0
752-
0x57610180,3,1,0x57600200,3,0=0x57610180,3,1,0x57610200,3,0
752+
0x57610180,3,1,0x57600200,3,0=0x57610180,3,1,0x57610280,3,0
753753
0x57610100,1,0,0x57600200,3,0=0x57610100,1,0,0x57610280,3,0
754-
0x57610180,3,1,0x57600200,1,0=0x57610180,3,1,0x57610280,1,0
754+
0x57610180,3,1,0x57600200,1,0=0x57610180,3,1,0x57610200,1,0
755755
;00 to T-03 (Avenue Ends)
756756
0x57610100,1,0,0x57600300,1,1=0x57610100,1,0,0x57610300,1,1
757-
0x57610180,3,1,0x57600300,3,0=0x57610180,3,1,0x57610300,3,0
757+
0x57610180,3,1,0x57600300,3,0=0x57610180,3,1,0x57610380,3,0
758758
0x57610100,1,0,0x57600300,3,0=0x57610100,1,0,0x57610380,3,0
759-
0x57610180,3,1,0x57600300,1,1=0x57610180,3,1,0x57610380,1,1
759+
0x57610180,3,1,0x57600300,1,1=0x57610180,3,1,0x57610300,1,1
760760
;00 to T-04 (RHW-2 Ends)
761761
0x57610100,1,0,0x57600400,1,0=0x57610100,1,0,0x57610400,1,0
762-
0x57610180,3,1,0x57600400,3,0=0x57610180,3,1,0x57610400,3,0
762+
0x57610180,3,1,0x57600400,3,0=0x57610180,3,1,0x57610480,3,0
763763
0x57610100,1,0,0x57600400,3,0=0x57610100,1,0,0x57610480,3,0
764-
0x57610180,3,1,0x57600400,1,0=0x57610180,3,1,0x57610480,1,0
764+
0x57610180,3,1,0x57600400,1,0=0x57610180,3,1,0x57610400,1,0
765765
;00 to T-05 (RHW-3 Ends)
766766
;00 to T-07 (TLA-3 Ends)
767767
0x57610100,1,0,0x57600700,1,0=0x57610100,1,0,0x57610700,1,0
768-
0x57610180,3,1,0x57600700,3,0=0x57610180,3,1,0x57610700,3,0
768+
0x57610180,3,1,0x57600700,3,0=0x57610180,3,1,0x57610780,3,0
769769
0x57610100,1,0,0x57600700,3,0=0x57610100,1,0,0x57610780,3,0
770-
0x57610180,3,1,0x57600700,1,0=0x57610180,3,1,0x57610780,1,0
770+
0x57610180,3,1,0x57600700,1,0=0x57610180,3,1,0x57610700,1,0
771771
;00 to T-08 (AVE-2 Ends)
772772
0x57610100,1,0,0x57600800,1,0=0x57610100,1,0,0x57610800,1,0
773-
0x57610180,3,1,0x57600800,3,0=0x57610180,3,1,0x57610800,3,0
773+
0x57610180,3,1,0x57600800,3,0=0x57610180,3,1,0x57610880,3,0
774774
0x57610100,1,0,0x57600800,3,0=0x57610100,1,0,0x57610880,3,0
775-
0x57610180,3,1,0x57600800,1,0=0x57610180,3,1,0x57610880,1,0
775+
0x57610180,3,1,0x57600800,1,0=0x57610180,3,1,0x57610800,1,0
776776
;00 to T-09 (ARD-3 Ends)
777777
0x57610100,1,0,0x57600900,1,0=0x57610100,1,0,0x57610900,1,0
778-
0x57610180,3,1,0x57600900,3,0=0x57610180,3,1,0x57610900,3,0
778+
0x57610180,3,1,0x57600900,3,0=0x57610180,3,1,0x57610980,3,0
779779
0x57610100,1,0,0x57600900,3,0=0x57610100,1,0,0x57610980,3,0
780-
0x57610180,3,1,0x57600900,1,0=0x57610180,3,1,0x57610980,1,0
780+
0x57610180,3,1,0x57600900,1,0=0x57610180,3,1,0x57610900,1,0
781781
0x57610100,1,0,0x57600909,1,0=0x57610100,1,0,0x57610909,1,0
782-
0x57610180,3,1,0x57600909,3,0=0x57610180,3,1,0x57610909,3,0
782+
0x57610180,3,1,0x57600909,3,0=0x57610180,3,1,0x57610989,3,0
783783
0x57610100,1,0,0x57600909,3,0=0x57610100,1,0,0x57610989,3,0
784-
0x57610180,3,1,0x57600909,1,0=0x57610180,3,1,0x57610989,1,0
784+
0x57610180,3,1,0x57600909,1,0=0x57610180,3,1,0x57610909,1,0
785785
;00 to T-0A (OWR-1 Ends)
786786
0x57610100,1,0,0x57600A00,1,0=0x57610100,1,0,0x57610A00,1,0
787-
0x57610180,3,1,0x57600A00,3,0=0x57610180,3,1,0x57610A00,3,0
787+
0x57610180,3,1,0x57600A00,3,0=0x57610180,3,1,0x57610A80,3,0
788788
0x57610100,1,0,0x57600A00,3,0=0x57610100,1,0,0x57610A80,3,0
789-
0x57610180,3,1,0x57600A00,1,0=0x57610180,3,1,0x57610A80,1,0
789+
0x57610180,3,1,0x57600A00,1,0=0x57610180,3,1,0x57610A00,1,0
790790
;00 to T-0B (OWR-3 Ends)
791791
0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610B00,1,0
792-
0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610B00,3,0
792+
0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610B80,3,0
793793
0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610B80,3,0
794-
0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610B80,1,0
794+
0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610B00,1,0
795795
;00 to T-0C (NRD-4 Ends)
796796
0x57610100,1,0,0x57600C00,1,0=0x57610100,1,0,0x57610C00,1,0; conflicting-override
797-
0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610C00,3,0; conflicting-override
797+
0x57610180,3,1,0x57600C00,3,0=0x57610180,3,1,0x57610C80,3,0; conflicting-override
798798
0x57610100,1,0,0x57600C00,3,0=0x57610100,1,0,0x57610C80,3,0; conflicting-override
799-
0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610C80,1,0; conflicting-override
799+
0x57610180,3,1,0x57600C00,1,0=0x57610180,3,1,0x57610C00,1,0; conflicting-override
800800
;00 to T-0D (TLA-5 Ends)
801801
0x57610100,1,0,0x57600D00,1,0=0x57610100,1,0,0x57610D00,1,0
802-
0x57610180,3,1,0x57600D00,3,0=0x57610180,3,1,0x57610D00,3,0
802+
0x57610180,3,1,0x57600D00,3,0=0x57610180,3,1,0x57610D80,3,0
803803
0x57610100,1,0,0x57600D00,3,0=0x57610100,1,0,0x57610D80,3,0
804-
0x57610180,3,1,0x57600D00,1,0=0x57610180,3,1,0x57610D80,1,0
804+
0x57610180,3,1,0x57600D00,1,0=0x57610180,3,1,0x57610D00,1,0
805805
;00 to T-0E (OWR-4 Ends)
806806
;00 to T-0F (OWR-5 Ends)
807807
;00 to T-10 (Street Thru)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@
740740
;00 to T-00 (Street Ends)
741741
0x57610100,1,0,0x57600000,1,0=0x57610100,1,0,0x57610000,1,0
742742
0x57610100,3,0,0x57600000,3,0=0x57610100,3,0,0x57610000,3,0
743-
0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0; conflicting-override_rhd
743+
0x57610100,1,0,0x57600000,3,0=0x57610100,1,0,0x57610080,3,0
744744
0x57610100,3,0,0x57600000,1,0=0x57610100,3,0,0x57610080,1,0
745745
;00 to T-01 (Road Ends)
746746
0x57610100,1,0,0x57600100,1,0=0x57610100,1,0,0x57610100,1,0

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -754,9 +754,9 @@
754754
0x57610180,1,0,0x57600200,1,0=0x57610180,1,0,0x57610280,1,0
755755
;00 to T-03 (Avenue Ends)
756756
0x57610180,3,0,0x57600300,1,1=0x57610180,3,0,0x57610300,1,1
757-
0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0; conflicting-override
757+
0x57610180,1,0,0x57600300,3,0=0x57610180,1,0,0x57610300,3,0
758758
0x57610180,3,0,0x57600300,3,0=0x57610180,3,0,0x57610380,3,0
759-
0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1; conflicting-override
759+
0x57610180,1,0,0x57600300,1,1=0x57610180,1,0,0x57610380,1,1
760760
;00 to T-04 (RHW-2 Ends)
761761
0x57610180,3,0,0x57600400,1,0=0x57610180,3,0,0x57610400,1,0
762762
0x57610180,1,0,0x57600400,3,0=0x57610180,1,0,0x57610400,3,0
@@ -788,14 +788,14 @@
788788
0x57610180,3,0,0x57600A00,3,0=0x57610180,3,0,0x57610A80,3,0
789789
0x57610180,1,0,0x57600A00,1,0=0x57610180,1,0,0x57610A80,1,0
790790
;00 to T-0B (OWR-3 Ends)
791-
0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610B00,1,0
792-
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610B00,3,0
793-
0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610B80,3,0
794-
0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610B80,1,0; conflicting-override_lhd
791+
0x57610180,3,0,0x57600B00,1,0=0x57610180,3,0,0x57610B00,1,0
792+
0x57610180,1,0,0x57600B00,3,0=0x57610180,1,0,0x57610B00,3,0
793+
0x57610180,3,0,0x57600B00,3,0=0x57610180,3,0,0x57610B80,3,0
794+
0x57610180,1,0,0x57600B00,1,0=0x57610180,1,0,0x57610B80,1,0
795795
;00 to T-0C (NRD-4 Ends)
796-
0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610C00,1,0; conflicting-override
797-
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0; conflicting-override
798-
0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610C80,3,0; conflicting-override
796+
0x57610180,3,0,0x57600C00,1,0=0x57610180,3,0,0x57610C00,1,0
797+
0x57610180,1,0,0x57600C00,3,0=0x57610180,1,0,0x57610C00,3,0
798+
0x57610180,3,0,0x57600C00,3,0=0x57610180,3,0,0x57610C80,3,0
799799
0x57610180,1,0,0x57600C00,1,0=0x57610180,1,0,0x57610C80,1,0
800800
;00 to T-0D (TLA-5 Ends)
801801
0x57610180,3,0,0x57600D00,1,0=0x57610180,3,0,0x57610D00,1,0

0 commit comments

Comments
 (0)