Skip to content

Commit aa71177

Browse files
TarkusSC4TarkusSC4
committed
Merge branch 'staging' into nwm-diag-phase2a
2 parents b3339cd + 6a72ab6 commit aa71177

23 files changed

Lines changed: 1031 additions & 966 deletions

‎.github/workflows/scala.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ name: Scala CI
77

88
on:
99
push:
10-
branches: [ "master", "staging" ]
1110
pull_request:
12-
branches: [ "master", "staging" ]
1311

1412
permissions:
1513
contents: read

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

Lines changed: 398 additions & 398 deletions
Large diffs are not rendered by default.

‎Controller/RUL2/08_NWM/00_Orthogonal_NWM.txt‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@
251251
0x51000000,3,0,0x510F1100,3,0=0x51000000,3,0,0x510F2000,3,0; missing_paths
252252

253253
;00 to 27 (HSR)
254-
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51002700,0,0
255-
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51002700,0,0
256-
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51002700,2,0
257-
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51002700,2,0
254+
0x51000000,1,0,0x5DDD0200,0,0=0x51000000,1,0,0x51001A00,0,0
255+
0x51000000,3,0,0x5DDD0200,0,0=0x51000000,3,0,0x51001A00,0,0
256+
0x51000000,1,0,0x5DDD0200,2,0=0x51000000,1,0,0x51001A00,2,0
257+
0x51000000,3,0,0x5DDD0200,2,0=0x51000000,3,0,0x51001A00,2,0
258258

259259
;00 to 28 (TLA-5)
260260
0x51000000,1,0,0x51101100,3,0=0x51000000,1,0,0x51102000,3,0
@@ -3277,10 +3277,10 @@
32773277
0x51010000,3,0,0x51051100,3,0=0x51010000,3,0,0x51052100,3,0
32783278

32793279
;00 to 27 (HSR)
3280-
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51012700,0,0
3281-
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51012700,0,0
3282-
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51012700,2,0
3283-
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51012700,2,0
3280+
0x51010000,1,0,0x5DDD0200,0,0=0x51010000,1,0,0x51011A00,0,0
3281+
0x51010000,3,0,0x5DDD0200,0,0=0x51010000,3,0,0x51011A00,0,0
3282+
0x51010000,1,0,0x5DDD0200,2,0=0x51010000,1,0,0x51011A00,2,0
3283+
0x51010000,3,0,0x5DDD0200,2,0=0x51010000,3,0,0x51011A00,2,0
32843284

32853285
;00 to 28 (TLA-5)
32863286
0x51010000,1,0,0x51101100,3,0=0x51010000,1,0,0x51102100,3,0
@@ -6115,10 +6115,10 @@
61156115
0x51020000,3,0,0x51051100,3,0=0x51020000,3,0,0x51052200,3,0
61166116

61176117
;00 to 27 (HSR)
6118-
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51022700,0,0
6119-
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51022700,2,0
6120-
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51022700,0,0
6121-
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51022700,2,0
6118+
0x51020000,1,0,0x5DDD0200,0,0=0x51020000,1,0,0x51021A00,0,0
6119+
0x51020000,3,0,0x5DDD0200,0,0=0x51020000,3,0,0x51021A00,2,0
6120+
0x51020000,1,0,0x5DDD0200,2,0=0x51020000,1,0,0x51021A00,0,0
6121+
0x51020000,3,0,0x5DDD0200,2,0=0x51020000,3,0,0x51021A00,2,0
61226122

61236123
;00 to 28 (TLA-5)
61246124
0x51020000,1,0,0x51101100,3,0=0x51020000,1,0,0x51102200,1,1
@@ -9718,10 +9718,10 @@
97189718
0x51030000,3,0,0x51051200,3,0=0x51030000,3,0,0x51052300,3,0
97199719

97209720
;00 to 27 (HSR)
9721-
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51032700,0,0; missing_paths
9722-
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51032700,0,0; missing_paths
9723-
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51032700,2,0; missing_paths
9724-
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51032700,2,0; missing_paths
9721+
0x51030000,1,0,0x59DD0800,0,0=0x51030000,1,0,0x51031A00,0,0; missing_paths
9722+
0x51030000,3,0,0x59DD0800,0,0=0x51030000,3,0,0x51031A00,0,0; missing_paths
9723+
0x51030000,1,0,0x59DD0800,2,0=0x51030000,1,0,0x51031A00,2,0; missing_paths
9724+
0x51030000,3,0,0x59DD0800,2,0=0x51030000,3,0,0x51031A00,2,0; missing_paths
97259725

97269726
;00 to 28 (TLA-5)
97279727
0x51030000,1,0,0x51101200,3,0=0x51030000,1,0,0x51102300,3,0
@@ -12440,10 +12440,10 @@
1244012440
0x51040000,3,0,0x51051200,3,0=0x51040000,3,0,0x51052400,3,0
1244112441

1244212442
;00 to 27 (HSR)
12443-
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51042700,0,0; missing_paths
12444-
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51042700,0,0; missing_paths
12445-
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51042700,2,0; missing_paths
12446-
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51042700,2,0; missing_paths
12443+
0x51040000,1,0,0x59DD0800,0,0=0x51040000,1,0,0x51041A00,0,0; missing_paths
12444+
0x51040000,3,0,0x59DD0800,0,0=0x51040000,3,0,0x51041A00,0,0; missing_paths
12445+
0x51040000,1,0,0x59DD0800,2,0=0x51040000,1,0,0x51041A00,2,0; missing_paths
12446+
0x51040000,3,0,0x59DD0800,2,0=0x51040000,3,0,0x51041A00,2,0; missing_paths
1244712447

1244812448
;00 to 28 (TLA-5)
1244912449
0x51040000,1,0,0x51101200,3,0=0x51040000,1,0,0x51102400,3,0
@@ -15210,10 +15210,10 @@
1521015210
0x51050000,3,0,0x51051100,3,0=0x51050000,3,0,0x51052500,2,0
1521115211

1521215212
;00 to 27 (HSR)
15213-
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51052700,0,0
15214-
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51052700,0,0
15215-
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51052700,2,0
15216-
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51052700,2,0
15213+
0x51050000,1,0,0x5DDD0200,0,0=0x51050000,1,0,0x51051A00,0,0
15214+
0x51050000,3,0,0x5DDD0200,0,0=0x51050000,3,0,0x51051A00,0,0
15215+
0x51050000,1,0,0x5DDD0200,2,0=0x51050000,1,0,0x51051A00,2,0
15216+
0x51050000,3,0,0x5DDD0200,2,0=0x51050000,3,0,0x51051A00,2,0
1521715217

1521815218
;00 to 28 (TLA-5)
1521915219
0x51050000,1,0,0x51101100,3,0=0x51050000,1,0,0x51102500,3,0
@@ -18039,10 +18039,10 @@
1803918039
;00 to 26
1804018040

1804118041
;00 to 27 (HSR)
18042-
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51102700,0,0
18043-
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51102700,0,0
18044-
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51102700,2,0
18045-
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51102700,2,0
18042+
0x51100000,1,0,0x5ddd0200,0,0=0x51100000,1,0,0x51101A00,0,0
18043+
0x51100000,1,0,0x5ddd0200,2,0=0x51100000,1,0,0x51101A00,0,0
18044+
0x51100000,3,0,0x5ddd0200,0,0=0x51100000,3,0,0x51101A00,2,0
18045+
0x51100000,3,0,0x5ddd0200,2,0=0x51100000,3,0,0x51101A00,2,0
1804618046

1804718047
;00 to 28 (TLA-5)
1804818048
0x51100000,1,0,0x51101100,3,0=0x51100000,1,0,0x51102800,0,0
@@ -21419,10 +21419,10 @@
2141921419
;00 to 26
2142021420

2142121421
;00 to 27 (HSR)
21422-
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51112700,0,0
21423-
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51112700,0,0
21424-
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51112700,2,0
21425-
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51112700,2,0
21422+
0x51110000,1,0,0x59dd0200,0,0=0x51110000,1,0,0x51111A00,0,0
21423+
0x51110000,1,0,0x59dd0200,2,0=0x51110000,1,0,0x51111A00,0,0
21424+
0x51110000,3,0,0x59dd0200,0,0=0x51110000,3,0,0x51111A00,2,0
21425+
0x51110000,3,0,0x59dd0200,2,0=0x51110000,3,0,0x51111A00,2,0
2142621426

2142721427
;00 to 28 (TLA-5)
2142821428
0x51110000,1,0,0x51101200,3,0=0x51110000,1,0,0x51112800,0,0
@@ -24733,10 +24733,10 @@
2473324733
;00 to 26
2473424734

2473524735
;00 to 27 (HSR)
24736-
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51122700,0,0
24737-
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51122700,0,0
24738-
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51122700,2,0
24739-
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51122700,2,0
24736+
0x51120000,1,0,0x59dd0200,0,0=0x51120000,1,0,0x51121A00,0,0
24737+
0x51120000,1,0,0x59dd0200,2,0=0x51120000,1,0,0x51121A00,0,0
24738+
0x51120000,3,0,0x59dd0200,0,0=0x51120000,3,0,0x51121A00,2,0
24739+
0x51120000,3,0,0x59dd0200,2,0=0x51120000,3,0,0x51121A00,2,0
2474024740

2474124741
;00 to 28 (TLA-5)
2474224742
0x51120000,1,0,0x51101200,3,0=0x51120000,1,0,0x51122800,0,0
@@ -28067,10 +28067,10 @@
2806728067
;00 to 26
2806828068

2806928069
;00 to 27 (HSR)
28070-
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51132700,0,0
28071-
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51132700,0,0
28072-
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51132700,2,0
28073-
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51132700,2,0
28070+
0x51130000,1,0,0x5ddd0200,0,0=0x51130000,1,0,0x51131A00,0,0
28071+
0x51130000,1,0,0x5ddd0200,2,0=0x51130000,1,0,0x51131A00,0,0
28072+
0x51130000,3,0,0x5ddd0200,0,0=0x51130000,3,0,0x51131A00,2,0
28073+
0x51130000,3,0,0x5ddd0200,2,0=0x51130000,3,0,0x51131A00,2,0
2807428074

2807528075
;00 to 28 (TLA-5)
2807628076
0x51130000,1,0,0x51101100,3,0=0x51130000,1,0,0x51132800,0,0
@@ -31454,10 +31454,10 @@
3145431454
;00 to 26
3145531455

3145631456
;00 to 27 (HSR)
31457-
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51142700,0,0
31458-
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51142700,0,0
31459-
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51142700,2,0
31460-
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51142700,2,0
31457+
0x51140000,1,0,0x5ddd0200,0,0=0x51140000,1,0,0x51141A00,0,0
31458+
0x51140000,1,0,0x5ddd0200,2,0=0x51140000,1,0,0x51141A00,0,0
31459+
0x51140000,3,0,0x5ddd0200,0,0=0x51140000,3,0,0x51141A00,2,0
31460+
0x51140000,3,0,0x5ddd0200,2,0=0x51140000,3,0,0x51141A00,2,0
3146131461

3146231462
;00 to 28 (TLA-5)
3146331463
0x51140000,1,0,0x51101100,3,0=0x51140000,1,0,0x51142800,0,0
@@ -34814,10 +34814,10 @@
3481434814
;00 to 26
3481534815

3481634816
;00 to 27 (HSR)
34817-
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51202700,0,0
34818-
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51202700,0,0
34819-
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51202700,2,0
34820-
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51202700,2,0
34817+
0x51200000,1,0,0x5ddd0200,0,0=0x51200000,1,0,0x51201A00,0,0
34818+
0x51200000,1,0,0x5ddd0200,2,0=0x51200000,1,0,0x51201A00,0,0
34819+
0x51200000,3,0,0x5ddd0200,0,0=0x51200000,3,0,0x51201A00,2,0
34820+
0x51200000,3,0,0x5ddd0200,2,0=0x51200000,3,0,0x51201A00,2,0
3482134821

3482234822
;00 to 28 (TLA-5)
3482334823
0x51200000,1,0,0x51101100,3,0=0x51200000,1,0,0x51202800,0,0
@@ -38210,10 +38210,10 @@
3821038210
;00 to 26
3821138211

3821238212
;00 to 27 (HSR)
38213-
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51212700,0,0
38214-
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51212700,0,0
38215-
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51212700,2,0
38216-
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51212700,2,0
38213+
0x51210000,1,0,0x59dd0200,0,0=0x51210000,1,0,0x51211A00,0,0
38214+
0x51210000,1,0,0x59dd0200,2,0=0x51210000,1,0,0x51211A00,0,0
38215+
0x51210000,3,0,0x59dd0200,0,0=0x51210000,3,0,0x51211A00,2,0
38216+
0x51210000,3,0,0x59dd0200,2,0=0x51210000,3,0,0x51211A00,2,0
3821738217

3821838218
;00 to 28 (TLA-5)
3821938219
0x51210000,1,0,0x51101200,3,0=0x51210000,1,0,0x51212800,0,0; missing_paths
@@ -41628,10 +41628,10 @@
4162841628
0x51200080,3,0,0x510F1100,3,0=0x51200080,3,0,0x510F2000,3,0; missing_paths
4162941629

4163041630
;00 to 27 (HSR)
41631-
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51202780,0,0
41632-
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51202780,0,0
41633-
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51202780,2,0
41634-
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51202780,2,0
41631+
0x51200080,1,0,0x5DDD0200,0,0=0x51200080,1,0,0x51201A80,0,0
41632+
0x51200080,3,0,0x5DDD0200,0,0=0x51200080,3,0,0x51201A80,0,0
41633+
0x51200080,1,0,0x5DDD0200,2,0=0x51200080,1,0,0x51201A80,2,0
41634+
0x51200080,3,0,0x5DDD0200,2,0=0x51200080,3,0,0x51201A80,2,0
4163541635

4163641636
;00 to 28 (TLA-5)
4163741637
0x51200080,1,0,0x51101100,3,0=0x51200080,1,0,0x51202880,0,0
@@ -43911,10 +43911,10 @@
4391143911
0x51210080,3,0,0x510F1100,3,0=0x51210080,3,0,0x510F2000,3,0; missing_paths
4391243912

4391343913
;00 to 27 (HSR)
43914-
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51212780,0,0
43915-
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51212780,0,0
43916-
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51212780,2,0
43917-
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51212780,2,0
43914+
0x51210080,1,0,0x5DDD0200,0,0=0x51210080,1,0,0x51211A80,0,0
43915+
0x51210080,3,0,0x5DDD0200,0,0=0x51210080,3,0,0x51211A80,0,0
43916+
0x51210080,1,0,0x5DDD0200,2,0=0x51210080,1,0,0x51211A80,2,0
43917+
0x51210080,3,0,0x5DDD0200,2,0=0x51210080,3,0,0x51211A80,2,0
4391843918

4391943919
;00 to 28 (TLA-5)
4392043920
0x51210080,1,0,0x51101100,3,0=0x51210080,1,0,0x51212880,0,0

0 commit comments

Comments
 (0)