From 14724aeb2a63a6671eb7079d89ab63770c3e791f Mon Sep 17 00:00:00 2001 From: Asbelos Date: Sun, 24 Nov 2024 14:47:19 +0000 Subject: [PATCH 1/3] Nweopixel overlap check --- IO_NeoPixel.h | 2 +- version.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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..a11e8c4 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,8 @@ #include "StringFormatter.h" -#define VERSION "5.2.90" +#define VERSION "5.2.91" +// 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 From 016a20259a1567a1a88f76bb2471703b16a56068 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Thu, 19 Dec 2024 12:06:03 +0000 Subject: [PATCH 2/3] FADE fix and Track id diag. --- EXRAIL2.cpp | 2 +- EXRAILMacros.h | 2 +- version.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp index 0ee6674..ac1c453 100644 --- a/EXRAIL2.cpp +++ b/EXRAIL2.cpp @@ -1328,7 +1328,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 e94bb86..59accdb 100644 --- a/EXRAILMacros.h +++ b/EXRAILMacros.h @@ -516,7 +516,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/version.h b/version.h index a11e8c4..a325cb0 100644 --- a/version.h +++ b/version.h @@ -4,6 +4,7 @@ #include "StringFormatter.h" #define VERSION "5.2.91" +// 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 From 377f10e1c5c3536fb2c5c1f80f6299ba8660289b Mon Sep 17 00:00:00 2001 From: Asbelos Date: Thu, 19 Dec 2024 13:19:34 +0000 Subject: [PATCH 3/3] 5.2.92 --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index a325cb0..db69609 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,7 @@ #include "StringFormatter.h" -#define VERSION "5.2.91" +#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)