Merge branch 'devel' into devel_chris

DCC-EX · Apr 4, 2024 · 94083b9 · 94083b9
2 parents 72ef199 + 02bf50b
commit 94083b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
@@ -294,7 +294,7 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   // The resets will be zero not only now but as well repeats packets into the future
   clearResets(repeats+1);
   {
-    int ret;
+    int ret = 0;
     do {
       if(isMainTrack) {
 	if (rmtMainChannel != NULL)

diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202403182018Z"
+#define GITHUB_SHA "devel-202404012205Z"
diff --git a/version.h b/version.h
@@ -3,7 +3,8 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.41"
+#define VERSION "5.2.42"
+// 5.2.42 - ESP32 Bugfix: Uninitialized stack variable
 // 5.2.41 - Update rotary encoder default address to 0x67
 // 5.2.40 - Allow no shield
 // 5.2.39 - Functions for DC frequency: Use func up to F31