From c780b968564eae454d2001d51b0988f2245b0e02 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Fri, 9 Feb 2024 11:54:53 +0000 Subject: [PATCH] Exrail CONFIGURE_SERVO --- EXRAIL2MacroReset.h | 4 +++- EXRAILMacros.h | 3 +++ version.h | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/EXRAIL2MacroReset.h b/EXRAIL2MacroReset.h index f52b636..309c325 100644 --- a/EXRAIL2MacroReset.h +++ b/EXRAIL2MacroReset.h @@ -42,6 +42,7 @@ #undef CLEAR_STASH #undef CLEAR_ALL_STASH #undef CLOSE +#undef CONFIGURE_SERVO #undef DCC_SIGNAL #undef DCC_TURNTABLE #undef DEACTIVATE @@ -194,7 +195,8 @@ #define CALL(route) #define CLEAR_STASH(id) #define CLEAR_ALL_STASH(id) -#define CLOSE(id) +#define CLOSE(id) +#define CONFIGURE_SERVO(vpin,pos1,pos2,profile) #define DCC_SIGNAL(id,add,subaddr) #define DCC_TURNTABLE(id,home,description) #define DEACTIVATE(addr,subaddr) diff --git a/EXRAILMacros.h b/EXRAILMacros.h index 5873e38..3b579a3 100644 --- a/EXRAILMacros.h +++ b/EXRAILMacros.h @@ -151,6 +151,8 @@ static_assert(!hasdup(compileTimeSequenceList[0],1),"Duplicate SEQUENCE/ROUTE/AU #define HAL_IGNORE_DEFAULTS ignore_defaults=true; #undef JMRI_SENSOR #define JMRI_SENSOR(vpin,count...) Sensor::createMultiple(vpin,##count); +#undef CONFIGURE_SERVO +#define CONFIGURE_SERVO(vpin,pos1,pos2,profile) IODevice::configureServo(vpin,pos1,pos2,PCA9685::profile); bool exrailHalSetup() { bool ignore_defaults=false; #include "myAutomation.h" @@ -441,6 +443,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup]; #define CLEAR_STASH(id) OPCODE_CLEAR_STASH,V(id), #define CLEAR_ALL_STASH OPCODE_CLEAR_ALL_STASH,V(0), #define CLOSE(id) OPCODE_CLOSE,V(id), +#define CONFIGURE_SERVO(vpin,pos1,pos2,profile) #ifndef IO_NO_HAL #define DCC_TURNTABLE(id,home,description...) OPCODE_DCCTURNTABLE,V(id),OPCODE_PAD,V(home), #endif diff --git a/version.h b/version.h index c24efed..84eeedf 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,8 @@ #include "StringFormatter.h" -#define VERSION "5.2.32" +#define VERSION "5.2.33" +// 5.2.33 - Exrail CONFIGURE_SERVO(vpin,pos1,pos2,profile) // 5.2.32 - Railcom Cutout (Initial trial Mega2560 only) // 5.2.31 - Exrail JMRI_SENSOR(vpin [,count]) creates types. // 5.2.30 - Bugfix: WiThrottle sendIntro after initial N message as well