From 7f488de06ebe4defb9f116dd5bb1800f910a1cbc Mon Sep 17 00:00:00 2001
From: Ash-4 <mcc9345@hotmail.com>
Date: Tue, 11 Feb 2025 01:09:11 -0600
Subject: [PATCH] Nucleo-F4 Timer sync F439 build flag

---
 DCCEXParser.cpp | 26 +++++++++++---------------
 platformio.ini  | 20 ++++++++++----------
 version.h       |  3 ++-
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp
index 1202506..4bb7fc3 100644
--- a/DCCEXParser.cpp
+++ b/DCCEXParser.cpp
@@ -632,21 +632,17 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	  }
 	  //TrackManager::streamTrackState(NULL,t);
 
-    TrackManager::setTrackPowerF439ZI(0);
-    TrackManager::setTrackPowerF439ZI(1);
-    TrackManager::setTrackPowerF439ZI(2);
-    TrackManager::setTrackPowerF439ZI(3);
-    TrackManager::setTrackPowerF439ZI(4);
-    TrackManager::setTrackPowerF439ZI(5);
-    TrackManager::setTrackPowerF439ZI(6);
-    TrackManager::setTrackPowerF439ZI(7);
-    TrackManager::setTrackPowerF439ZI(0);  // repeated in case the <F29..31 was
-    TrackManager::setTrackPowerF439ZI(1);  // set on a later track than power
-    TrackManager::setTrackPowerF439ZI(2);  // Note: this retains power but prevents
-    TrackManager::setTrackPowerF439ZI(3);  //       speed doubling.
-    TrackManager::setTrackPowerF439ZI(4);
-    TrackManager::setTrackPowerF439ZI(5);
-    TrackManager::setTrackPowerF439ZI(6);
+      // reinitialize DC mode timer settings following powerON
+      #ifdef ARDUINO_ARCH_STM32
+        for (uint8_t i = 0; i < 8; i++)  {
+          TrackManager::setTrackPowerF439ZI(i);
+        }
+          // repeated in case the <F29..31 was set on a later track than power
+          // Note:  this retains power but prevents speed doubling
+        for (uint8_t i = 0; i < 7; i++)  {
+            TrackManager::setTrackPowerF439ZI(i);
+        }
+      #endif
 
 	  return;
 	}
diff --git a/platformio.ini b/platformio.ini
index 9797748..0e4e6c5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -194,7 +194,7 @@ monitor_speed = 115200
 monitor_echo = yes
 
 [env:Nucleo-F411RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 board = nucleo_f411re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -203,7 +203,7 @@ monitor_speed = 115200
 monitor_echo = yes
 
 [env:Nucleo-F446RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 board = nucleo_f446re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -215,7 +215,7 @@ monitor_echo = yes
 ; tested as yet
 ;
 [env:Nucleo-F401RE]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 board = nucleo_f401re
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -228,7 +228,7 @@ monitor_echo = yes
 ; installed before you can let PlatformIO see this
 ;
 ; [env:Nucleo-F413ZH]
-; platform = ststm32 @ 17.6.0
+; platform = ststm32 @ 19.0.0
 ; board = nucleo_f413zh
 ; framework = arduino
 ; lib_deps = ${env.lib_deps}
@@ -240,7 +240,7 @@ monitor_echo = yes
 ; installed before you can let PlatformIO see this
 ;
 [env:Nucleo-F446ZE]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 board = nucleo_f446ze
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -252,7 +252,7 @@ monitor_echo = yes
 ; installed before you can let PlatformIO see this
 ;
 ; [env:Nucleo-F412ZG]
-; platform = ststm32 @ 17.6.0
+; platform = ststm32 @ 19.0.0
 ; board = nucleo_f412zg
 ; framework = arduino
 ; lib_deps = ${env.lib_deps}
@@ -264,7 +264,7 @@ monitor_echo = yes
 ; Experimental - Ethernet work still in progress
 ;
 [env:Nucleo-F429ZI]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 board = nucleo_f429zi
 framework = arduino
 lib_deps = ${env.lib_deps}
@@ -276,7 +276,7 @@ lib_ignore = WiFi101
 			WiFiEspAT
 			WiFiMulti_Generic
 			WiFiNINA_Generic
-build_flags = -std=c++17 -Os -g2 -Wunused-variable
+build_flags = -std=c++17 -Os -g2 -Wunused-variable -DCUSTOM_PERIPHERAL_PINS
 monitor_speed = 115200
 monitor_echo = yes
 upload_protocol = stlink
@@ -284,7 +284,7 @@ upload_protocol = stlink
 ; Experimental - Ethernet work still in progress
 ;
 [env:Nucleo-F439ZI]
-platform = ststm32 @ 17.6.0
+platform = ststm32 @ 19.0.0
 ; board = nucleo_f439zi
 ; Temporarily treat it as an F429ZI (they are code compatible) until
 ; the PR to PlatformIO to update the F439ZI JSON file is available
@@ -300,7 +300,7 @@ lib_ignore = WiFi101
 			WiFiEspAT
 			WiFiMulti_Generic
 			WiFiNINA_Generic
-build_flags = -std=c++17 -Os -g2 -Wunused-variable
+build_flags = -std=c++17 -Os -g2 -Wunused-variable -DCUSTOM_PERIPHERAL_PINS
 monitor_speed = 115200
 monitor_echo = yes
 upload_protocol = stlink
diff --git a/version.h b/version.h
index 8a58a90..ea56678 100644
--- a/version.h
+++ b/version.h
@@ -3,9 +3,10 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.5.12 F439"
+#define VERSION "5.5.13 F439"
 //        - Nucleo-F4 DC mode timer sync
 //        - <JL display startRow>  Track power status
+// 5.5.13 - Update STM32duino core to v19.0.0. for updated PeripheralPins.c in preparation for F429/439ZI Ethernet support
 // 5.5.12 - Websocket support (wifi only) 
 // 5.5.11 - (5.4.2) accessory command reverse
 // 5.5.10 - CamParser fix