diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp index 94e43f6..43d228f 100644 --- a/EXRAIL2.cpp +++ b/EXRAIL2.cpp @@ -1343,7 +1343,7 @@ void RMFT2::clockEvent(int16_t clocktime, bool change) { void RMFT2::powerEvent(int16_t track, bool overload) { // Hunt for an ONOVERLOAD for this item if (Diag::CMD) - DIAG(F("powerEvent : %c"), track); + DIAG(F("powerEvent : %c"), track + 'A'); if (overload) { onOverloadLookup->handleEvent(F("POWER"),track); } diff --git a/EXRAILMacros.h b/EXRAILMacros.h index 47b0174..b2f93b0 100644 --- a/EXRAILMacros.h +++ b/EXRAILMacros.h @@ -521,7 +521,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup]; #ifndef IO_NO_HAL #define EXTT_TURNTABLE(id,vpin,home,description...) OPCODE_EXTTTURNTABLE,V(id),OPCODE_PAD,V(vpin),OPCODE_PAD,V(home), #endif -#define FADE(pin,value,ms) OPCODE_SERVO,V(pin),OPCODE_PAD,V(value),OPCODE_PAD,V(PCA9685::ProfileType::UseDuration|PCA9685::NoPowerOff),OPCODE_PAD,V(ms/100L), +#define FADE(pin,value,ms) OPCODE_SERVO,V(pin),OPCODE_PAD,V(value),OPCODE_PAD,V((int16_t)PCA9685::ProfileType::UseDuration|(int16_t)PCA9685::ProfileType::NoPowerOff),OPCODE_PAD,V(ms/100L), #define FOFF(func) OPCODE_FOFF,V(func), #define FOLLOW(route) OPCODE_FOLLOW,V(route), #define FON(func) OPCODE_FON,V(func), diff --git a/IO_NeoPixel.h b/IO_NeoPixel.h index 03d3254..acd44ea 100644 --- a/IO_NeoPixel.h +++ b/IO_NeoPixel.h @@ -129,7 +129,7 @@ class NeoPixel : public IODevice { public: static void create(VPIN vpin, int nPins, uint16_t mode=(NEO_GRB | NEO_KHZ800), I2CAddress i2cAddress=0x60) { - if (checkNoOverlap(vpin, nPins, mode, i2cAddress)) new NeoPixel(vpin, nPins, mode, i2cAddress); + if (checkNoOverlap(vpin, nPins, i2cAddress)) new NeoPixel(vpin, nPins, mode, i2cAddress); } private: diff --git a/version.h b/version.h index 10549ba..db69609 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,9 @@ #include "StringFormatter.h" -#define VERSION "5.2.90" +#define VERSION "5.2.92" +// 5.2.92 - Bugfix: FADE power off fix, EXRAIL power diagnostic fix. +// 5.2.91 - Bugfix: Neopixel I2C overlap check // 5.2.90 - Bugfix: EXRAIL EXTT_TURNTABLE() now has description as optional in line with ocumentation (also fixed DCC_TURNTABLE) // 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