From f5014f5595207a08d2b865aede791930a73c0717 Mon Sep 17 00:00:00 2001 From: pmantoine Date: Thu, 3 Oct 2024 09:28:55 +0800 Subject: [PATCH] Further STM32 TrackManager fix --- TrackManager.cpp | 8 ++++---- version.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TrackManager.cpp b/TrackManager.cpp index c6a30ad..6b37cef 100644 --- a/TrackManager.cpp +++ b/TrackManager.cpp @@ -160,8 +160,8 @@ void TrackManager::setDCCSignal( bool on) { HAVE_PORTD(PORTD=shadowPORTD); HAVE_PORTE(PORTE=shadowPORTE); HAVE_PORTF(PORTF=shadowPORTF); - HAVE_PORTG(shadowPORTG=PORTG); - HAVE_PORTH(shadowPORTH=PORTH); + HAVE_PORTG(PORTG=shadowPORTG); + HAVE_PORTH(PORTH=shadowPORTH); } // setPROGSignal(), called from interrupt context @@ -182,8 +182,8 @@ void TrackManager::setPROGSignal( bool on) { HAVE_PORTD(PORTD=shadowPORTD); HAVE_PORTE(PORTE=shadowPORTE); HAVE_PORTF(PORTF=shadowPORTF); - HAVE_PORTG(shadowPORTG=PORTG); - HAVE_PORTH(shadowPORTH=PORTH); + HAVE_PORTG(PORTG=shadowPORTG); + HAVE_PORTH(PORTH=shadowPORTH); } // setDCSignal(), called from normal context diff --git a/version.h b/version.h index a955a86..749227b 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,8 @@ #include "StringFormatter.h" -#define VERSION "5.2.83" +#define VERSION "5.2.84" +// 5.2.84 - Fix TrackManager setDCCSignal and setPROGSignal for STM32 shadowing of PORTG/PORTH - this time it really is correct! // 5.2.83 - Various STM32 related fixes for serial ports, I2C pullups now turned off, and shadowing of PORTG/PORTH for TrackManager now correct // 5.2.82 - TrackManager and EXRAIL: Introduce more consistent names for <= ...> and SET_TRACK // 5.2.81 - STM32 Ethernet boards support, also now have specific EX8874 motor driver definition