From 03bd1e897a5972f8a17e1114afd90c96fd63d4b4 Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Tue, 5 Nov 2024 12:23:06 +0000
Subject: [PATCH 1/3] SET/RESET range

---
 EXRAIL2.cpp         | 13 +++++++------
 EXRAIL2MacroReset.h |  4 ++--
 EXRAILMacros.h      |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
index 0887c6a..992ca6f 100644
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -677,13 +677,14 @@ void RMFT2::loop2() {
     break;
 
   case OPCODE_SET:
-    killBlinkOnVpin(operand);
-    IODevice::write(operand,true);
-    break;
-    
   case OPCODE_RESET:
-    killBlinkOnVpin(operand);
-    IODevice::write(operand,false);
+    { 
+      auto count=getOperand(1);
+      for (int i=0;i<count;i++) {
+        killBlinkOnVpin(operand+i);
+        IODevice::write(operand+i,opcode==OPCODE_SET);
+      }
+    }
     break;
   
   case OPCODE_BLINK: 
diff --git a/EXRAIL2MacroReset.h b/EXRAIL2MacroReset.h
index 1f4afc8..8e305fc 100644
--- a/EXRAIL2MacroReset.h
+++ b/EXRAIL2MacroReset.h
@@ -309,7 +309,7 @@
 #define READ_LOCO 
 #define RED(signal_id) 
 #define RESERVE(blockid) 
-#define RESET(pin) 
+#define RESET(pin,count...) 
 #define RESUME 
 #define RETURN 
 #define REV(speed) 
@@ -335,7 +335,7 @@
 #define SERVO2(id,position,duration) 
 #define SERVO_SIGNAL(vpin,redpos,amberpos,greenpos)
 #define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) 
-#define SET(pin) 
+#define SET(pin,count...) 
 #define SET_TRACK(track,mode)
 #define SET_POWER(track,onoff)
 #define SETLOCO(loco) 
diff --git a/EXRAILMacros.h b/EXRAILMacros.h
index b7f6b0e..e94bb86 100644
--- a/EXRAILMacros.h
+++ b/EXRAILMacros.h
@@ -607,7 +607,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define READ_LOCO OPCODE_READ_LOCO1,0,0,OPCODE_READ_LOCO2,0,0,
 #define RED(signal_id) OPCODE_RED,V(signal_id),
 #define RESERVE(blockid) OPCODE_RESERVE,V(blockid),
-#define RESET(pin) OPCODE_RESET,V(pin),
+#define RESET(pin,count...) OPCODE_RESET,V(pin),OPCODE_PAD,V(#count[0] ? count+0: 1),
 #define RESUME OPCODE_RESUME,0,0,
 #define RETURN OPCODE_RETURN,0,0,
 #define REV(speed) OPCODE_REV,V(speed),
@@ -635,7 +635,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define SERVO2(id,position,ms) OPCODE_SERVO,V(id),OPCODE_PAD,V(position),OPCODE_PAD,V(PCA9685::Instant),OPCODE_PAD,V(ms/100L),
 #define SERVO_SIGNAL(vpin,redpos,amberpos,greenpos)
 #define SERVO_TURNOUT(id,pin,activeAngle,inactiveAngle,profile,description...) OPCODE_SERVOTURNOUT,V(id),OPCODE_PAD,V(pin),OPCODE_PAD,V(activeAngle),OPCODE_PAD,V(inactiveAngle),OPCODE_PAD,V(PCA9685::ProfileType::profile),
-#define SET(pin) OPCODE_SET,V(pin),
+#define SET(pin,count...) OPCODE_SET,V(pin),OPCODE_PAD,V(#count[0] ? count+0: 1),
 #define SET_TRACK(track,mode)  OPCODE_SET_TRACK,V(TRACK_MODE_##mode  <<8 | TRACK_NUMBER_##track),
 #define SET_POWER(track,onoff) OPCODE_SET_POWER,V(TRACK_POWER_##onoff),OPCODE_PAD, V(TRACK_NUMBER_##track),
 #define SETLOCO(loco) OPCODE_SETLOCO,V(loco),

From 8081bfdf1eab8d738e0fbaaa95098216c868da20 Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Wed, 6 Nov 2024 01:05:35 +0000
Subject: [PATCH 2/3] warnings cleared

---
 EXRAIL2.cpp      | 2 +-
 IO_EXSensorCAM.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
index 992ca6f..0ee6674 100644
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -680,7 +680,7 @@ void RMFT2::loop2() {
   case OPCODE_RESET:
     { 
       auto count=getOperand(1);
-      for (int i=0;i<count;i++) {
+      for (uint16_t i=0;i<count;i++) {
         killBlinkOnVpin(operand+i);
         IODevice::write(operand+i,opcode==OPCODE_SET);
       }
diff --git a/IO_EXSensorCAM.h b/IO_EXSensorCAM.h
index 1926f74..f91248d 100644
--- a/IO_EXSensorCAM.h
+++ b/IO_EXSensorCAM.h
@@ -121,6 +121,7 @@ void _begin() {
 // Configuration isn't done frequently so we can use blocking I2C calls here, and so buffers can
 // be allocated from the stack to reduce RAM allocation.
 bool _configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) override { 
+  (void)configType; (void)params; // unused
   if(_verPrint) DIAG(F("_configure() driver IO_EXSensorCAM v0.%d.%d vpin: %d "), driverVer/100,driverVer%100,vpin);
   _verPrint=false;           //only give driver versions once
   if (paramCount != 1) return false;

From 953b8054f573cbd4591482f5a4719a385a23e495 Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Wed, 6 Nov 2024 01:11:18 +0000
Subject: [PATCH 3/3] 5.2.89

---
 version.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/version.h b/version.h
index f900ae5..c089ab8 100644
--- a/version.h
+++ b/version.h
@@ -3,7 +3,8 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.88"
+#define VERSION "5.2.89"
+// 5.2.89 - EXRAIL SET(vpin[,npins]) RESET(vpin,[,npins]) pin range manipulation 
 // 5.2.88 - Fix bug where EX-Turntable objects return incorrect angle for home with <JP x>
 // 5.2.87 - CamParser and IO_EXSensorCam driver
 // 5.2.86 - IO_TCA8418 driver for keypad matrix input now fully functioning, including being able to use an interrupt pin