EXRAIL2MacroReset.h

@@ -84,7 +84,6 @@
 #undef IFTTPOSITION
 #undef IFRE
 #undef INVERT_DIRECTION 
-#undef JMRI_SENSOR
 #undef JOIN 
 #undef KILLALL
 #undef LATCH 
@@ -238,7 +237,6 @@
 #define IFTTPOSITION(turntable_id,position)
 #define IFRE(sensor_id,value)
 #define INVERT_DIRECTION 
-#define JMRI_SENSOR(vpin,count...)
 #define JOIN 
 #define KILLALL
 #define LATCH(sensor_id)

EXRAILMacros.h

@@ -149,8 +149,6 @@ static_assert(!hasdup(compileTimeSequenceList[0],1),"Duplicate SEQUENCE/ROUTE/AU
 #define HAL(haltype,params...)  haltype::create(params);
 #undef HAL_IGNORE_DEFAULTS
 #define HAL_IGNORE_DEFAULTS ignore_defaults=true;
-#undef JMRI_SENSOR
-#define JMRI_SENSOR(vpin,count...) Sensor::createMultiple(vpin,##count);
 bool exrailHalSetup() {
    bool ignore_defaults=false;
    #include "myAutomation.h"
@@ -489,7 +487,6 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #endif
 #define IFRE(sensor_id,value) OPCODE_IFRE,V(sensor_id),OPCODE_PAD,V(value),
 #define INVERT_DIRECTION OPCODE_INVERT_DIRECTION,0,0,
-#define JMRI_SENSOR(vpin,count...)
 #define JOIN OPCODE_JOIN,0,0,
 #define KILLALL OPCODE_KILLALL,0,0,
 #define LATCH(sensor_id) OPCODE_LATCH,V(sensor_id),

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-stm32EC 202402072340Z"
+#define GITHUB_SHA "devel-stm32EC 202402041604Z"

Sensors.cpp

@@ -230,13 +230,6 @@ Sensor *Sensor::create(int snum, VPIN pin, int pullUp){
   return tt;
 }
 
-// Creet multiple eponymous sensors based on vpin alone. 
-void Sensor::createMultiple(VPIN firstPin, byte count) {
-  for (byte i=0;i<count;i++) {
-    create(firstPin+i,firstPin+i,1); 
-  }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Object method to directly change the input state, for sensors such as LCN which are updated
 //  by means other than by polling an input.

Sensors.h

@@ -76,7 +76,6 @@ public:
   static void store();
 #endif
   static Sensor *create(int id, VPIN vpin, int pullUp);
-  static void createMultiple(VPIN firstPin, byte count=1);
   static Sensor* get(int id);  
   static bool remove(int id);  
   static void checkAll();

version.h

@@ -3,14 +3,12 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.3.5"
-// 5.3.5  - Exrail JMRI_SENSORS(vpin [,count]) creates <S> types.
+#define VERSION "5.3.4"
 // 5.3.4  - Bugfix: WiThrottle sendIntro after initial N message as well
 // 5.3.3  - Fix Ethernet cable disconnected message, wait for DHCP
 // 5.3.2  - MDNS Generic library integration for Ethernet
 // 5.3.1  - Variable frequency for DC mode
 // 5.2.40 - Bugfix: WiThrottle sendIntro after initial N message as well
-// 5.2.31 - included in stm32EC as 5.3.5  
 // 5.2.29 - Added IO_I2CDFPlayer.h to support DFPLayer over I2C connected to NXP SC16IS750/SC16IS752 (currently only single UART for SC16IS752)
 //        - Added enhanced IO_I2CDFPLayer enum commands to EXRAIL2.h
 //        - Added PLAYSOUND alias of ANOUT to EXRAILMacros.h