From d8688fbefd6823d03546ff8a1ac4b31424883b71 Mon Sep 17 00:00:00 2001
From: jflann <26899145+jflann@users.noreply.github.com>
Date: Thu, 30 Mar 2023 18:04:42 -0500
Subject: [PATCH 1/2] Change FLEXRamp D1 INRUL for side-by-side placing

Current INRUL pattern makes it impossible to place two adjacent D1 FlexRAMPs traveling the same direction.  See issue #375.  This tentative fix modifies the D1 INRUL so that there is no pattern confusion when these are placed next to each other.  Note that this would probably require the user to rebuild D1 ramps, so we may still want to consider other options.
---
 .../DirtroadAdvanced/RUL14_RHW_Advanced.rul      | 16 ++++++++--------
 .../DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul  | 16 ++++++++--------
 Controller/RUL0/5000_RHW/51F0_FlexRamps.txt      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
index f51a88267..6a4e89db0 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
@@ -4550,7 +4550,7 @@
 
 ;---Type D1---
 ;NOTE: Will eventually be changed to be RHW-3 by default
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,2,0,2
 2,7,0,2,0,2
@@ -4561,7 +4561,7 @@
 3,7,0x57813400,0,0
 3,8,0x57813300,0,0
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
@@ -4572,7 +4572,7 @@
 3,3,0x57813100,1,0
 3,5,0x57813000,1,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
@@ -4583,7 +4583,7 @@
 3,5,0x57813100,2,0
 3,7,0x57813000,2,0
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,2,0,2,0
 2,6,2,0,2,0
@@ -4594,7 +4594,7 @@
 3,6,0x57813300,3,0
 3,7,0x57813100,3,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,5,4,0,4,2
 2,6,0,2,0,2
@@ -4605,7 +4605,7 @@
 3,6,0x57813380,0,1
 3,7,0x57813480,0,1
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,3,0,4,2,4
 2,4,2,0,2,0
@@ -4616,7 +4616,7 @@
 3,4,0x57813380,1,1
 3,5,0x57813480,1,1
 ;
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
@@ -4627,7 +4627,7 @@
 3,3,0x57813480,2,1
 3,7,0x57813080,2,1
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,2,0,2,0
 2,7,2,4,0,4
diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
index d417d7f23..8fff599c5 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
@@ -4549,7 +4549,7 @@
 
 ;---Type D1---
 ;NOTE: Will eventually be changed to be RHW-3 by default
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,2,0,2
 2,7,0,2,0,2
@@ -4560,7 +4560,7 @@
 3,7,0x57813480,0,0
 3,8,0x57813380,0,0
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,2,2,0,2,0
 2,3,2,4,0,4
@@ -4571,7 +4571,7 @@
 3,3,0x57813180,1,0
 3,5,0x57813080,1,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,4,0,2,0,2
 2,5,4,2,4,0
@@ -4582,7 +4582,7 @@
 3,5,0x57813180,2,0
 3,7,0x57813080,2,0
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,2,0,2,0
 2,6,2,0,2,0
@@ -4593,7 +4593,7 @@
 3,6,0x57813380,3,0
 3,7,0x57813180,3,0
 ;
-1,4,2,4,2
+1,0,2,4,2
 2,3,0,2,0,2
 2,5,4,0,4,2
 2,6,0,2,0,2
@@ -4604,7 +4604,7 @@
 3,6,0x57813300,0,1
 3,7,0x57813400,0,1
 ;
-1,2,4,2,4
+1,2,4,2,0
 2,1,2,0,2,0
 2,3,0,4,2,4
 2,4,2,0,2,0
@@ -4615,7 +4615,7 @@
 3,4,0x57813300,1,1
 3,5,0x57813400,1,1
 ;
-1,4,2,4,2
+1,4,2,0,2
 2,1,4,2,4,0
 2,2,0,2,0,2
 2,3,0,2,0,2
@@ -4626,7 +4626,7 @@
 3,3,0x57813400,2,1
 3,7,0x57813000,2,1
 ;
-1,2,4,2,4
+1,2,0,2,4
 2,1,2,0,2,0
 2,5,2,0,2,0
 2,7,2,4,0,4
diff --git a/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt b/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
index 6526a7786..e87d8d61a 100644
--- a/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
+++ b/Controller/RUL0/5000_RHW/51F0_FlexRamps.txt
@@ -272,7 +272,7 @@ CellLayout =.......
 CellLayout =..^....
 
 CheckType = a - dirtroad: 0x02040004, 0xffffffff optional
-CheckType = b - dirtroad: 0x02040204, 0xffffffff optional
+CheckType = b - dirtroad: 0x02000204, 0xffffffff optional
 CheckType = c - dirtroad: 0x02000200, 0xffffffff optional
 CheckType = d - dirtroad: 0x02000000, 0x0000ff00 optional
 CheckType = e - dirtroad: 0x00000200, 0xff000000 optional

From bf95f23b3b59b031a5aeeec362a5ca97a5fa5b86 Mon Sep 17 00:00:00 2001
From: jflann <26899145+jflann@users.noreply.github.com>
Date: Sat, 1 Apr 2023 13:46:50 -0500
Subject: [PATCH 2/2] Keep original FLEXRamp D1 INRUL for legacy support

---
 .../DirtroadAdvanced/RUL14_RHW_Advanced.rul   | 92 ++++++++++++++++++-
 .../RUL14_RHW_Advanced_LHD.rul                | 92 ++++++++++++++++++-
 2 files changed, 180 insertions(+), 4 deletions(-)

diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
index 6a4e89db0..0c908b66b 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced.rul
@@ -4548,8 +4548,7 @@
 3,5,0x57801480,1,1
 3,16,0x57801580,1,1
 
-;---Type D1---
-;NOTE: Will eventually be changed to be RHW-3 by default
+;---Type D1--- (new pattern)
 1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,2,0,2
@@ -4638,6 +4637,95 @@
 3,7,0x57813180,3,1
 3,8,0x57813380,3,1
 
+;---Type D1--- (legacy support - original pattern)
+1,4,2,4,2
+2,1,4,0,4,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+2,8,0,2,0,2
+3,0,0x57813200,0,0
+3,1,0x57813100,0,0
+3,3,0x57813000,0,0
+3,7,0x57813400,0,0
+3,8,0x57813300,0,0
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,2,2,0,2,0
+2,3,2,4,0,4
+2,5,2,0,2,0
+3,0,0x57813200,1,0
+3,1,0x57813400,1,0
+3,2,0x57813300,1,0
+3,3,0x57813100,1,0
+3,5,0x57813000,1,0
+;
+1,4,2,4,2
+2,3,0,2,0,2
+2,4,0,2,0,2
+2,5,4,2,4,0
+2,7,0,2,0,2
+3,0,0x57813200,2,0
+3,3,0x57813400,2,0
+3,4,0x57813300,2,0
+3,5,0x57813100,2,0
+3,7,0x57813000,2,0
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,0
+2,6,2,0,2,0
+2,7,0,4,2,4
+3,0,0x57813200,3,0
+3,1,0x57813000,3,0
+3,5,0x57813400,3,0
+3,6,0x57813300,3,0
+3,7,0x57813100,3,0
+;
+1,4,2,4,2
+2,3,0,2,0,2
+2,5,4,0,4,2
+2,6,0,2,0,2
+2,7,0,2,0,2
+3,0,0x57813280,0,1
+3,3,0x57813080,0,1
+3,5,0x57813180,0,1
+3,6,0x57813380,0,1
+3,7,0x57813480,0,1
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,3,0,4,2,4
+2,4,2,0,2,0
+2,5,2,0,2,0
+3,0,0x57813280,1,1
+3,1,0x57813080,1,1
+3,3,0x57813180,1,1
+3,4,0x57813380,1,1
+3,5,0x57813480,1,1
+;
+1,4,2,4,2
+2,1,4,2,4,0
+2,2,0,2,0,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+3,0,0x57813280,2,1
+3,1,0x57813180,2,1
+3,2,0x57813380,2,1
+3,3,0x57813480,2,1
+3,7,0x57813080,2,1
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,0
+2,7,2,4,0,4
+2,8,2,0,2,0
+3,0,0x57813280,3,1
+3,1,0x57813480,3,1
+3,5,0x57813080,3,1
+3,7,0x57813180,3,1
+3,8,0x57813380,3,1
+
 ;---Type E1---
 ;NOTE: Will eventually be changed to be RHW-2 by default
 1,4,2,4,2
diff --git a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
index 8fff599c5..75d3a20c8 100644
--- a/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
+++ b/Controller/INRULs/DirtroadAdvanced/RUL14_RHW_Advanced_LHD.rul
@@ -4547,8 +4547,7 @@
 3,5,0x57801400,1,1
 3,16,0x57801500,1,1
 
-;---Type D1---
-;NOTE: Will eventually be changed to be RHW-3 by default
+;---Type D1--- (new pattern)
 1,4,2,0,2
 2,1,4,0,4,2
 2,3,0,2,0,2
@@ -4637,6 +4636,95 @@
 3,7,0x57813100,3,1
 3,8,0x57813300,3,1
 
+;---Type D1--- (legacy support - original pattern)
+1,4,2,4,2
+2,1,4,0,4,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+2,8,0,2,0,2
+3,0,0x57813280,0,0
+3,1,0x57813180,0,0
+3,3,0x57813080,0,0
+3,7,0x57813480,0,0
+3,8,0x57813380,0,0
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,2,2,0,2,0
+2,3,2,4,0,4
+2,5,2,0,2,0
+3,0,0x57813280,1,0
+3,1,0x57813480,1,0
+3,2,0x57813380,1,0
+3,3,0x57813180,1,0
+3,5,0x57813080,1,0
+;
+1,4,2,4,2
+2,3,0,2,0,2
+2,4,0,2,0,2
+2,5,4,2,4,0
+2,7,0,2,0,2
+3,0,0x57813280,2,0
+3,3,0x57813480,2,0
+3,4,0x57813380,2,0
+3,5,0x57813180,2,0
+3,7,0x57813080,2,0
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,0
+2,6,2,0,2,0
+2,7,0,4,2,4
+3,0,0x57813280,3,0
+3,1,0x57813080,3,0
+3,5,0x57813480,3,0
+3,6,0x57813380,3,0
+3,7,0x57813180,3,0
+;
+1,4,2,4,2
+2,3,0,2,0,2
+2,5,4,0,4,2
+2,6,0,2,0,2
+2,7,0,2,0,2
+3,0,0x57813200,0,1
+3,3,0x57813000,0,1
+3,5,0x57813100,0,1
+3,6,0x57813300,0,1
+3,7,0x57813400,0,1
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,3,0,4,2,4
+2,4,2,0,2,0
+2,5,2,0,2,0
+3,0,0x57813200,1,1
+3,1,0x57813000,1,1
+3,3,0x57813100,1,1
+3,4,0x57813300,1,1
+3,5,0x57813400,1,1
+;
+1,4,2,4,2
+2,1,4,2,4,0
+2,2,0,2,0,2
+2,3,0,2,0,2
+2,7,0,2,0,2
+3,0,0x57813200,2,1
+3,1,0x57813100,2,1
+3,2,0x57813300,2,1
+3,3,0x57813400,2,1
+3,7,0x57813000,2,1
+;
+1,2,4,2,4
+2,1,2,0,2,0
+2,5,2,0,2,0
+2,7,2,4,0,4
+2,8,2,0,2,0
+3,0,0x57813200,3,1
+3,1,0x57813400,3,1
+3,5,0x57813000,3,1
+3,7,0x57813100,3,1
+3,8,0x57813300,3,1
+
 ;---Type E1---
 ;NOTE: Will eventually be changed to be RHW-2 by default
 1,4,2,4,2