1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 21:21:24 +01:00

Merge branch 'devel' into devel_chris

This commit is contained in:
Asbelos 2024-04-04 09:08:26 +01:00
commit 94083b9ab8
3 changed files with 4 additions and 3 deletions

View File

@ -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 // The resets will be zero not only now but as well repeats packets into the future
clearResets(repeats+1); clearResets(repeats+1);
{ {
int ret; int ret = 0;
do { do {
if(isMainTrack) { if(isMainTrack) {
if (rmtMainChannel != NULL) if (rmtMainChannel != NULL)

View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202403182018Z" #define GITHUB_SHA "devel-202404012205Z"

View File

@ -3,7 +3,8 @@
#include "StringFormatter.h" #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.41 - Update rotary encoder default address to 0x67
// 5.2.40 - Allow no shield // 5.2.40 - Allow no shield
// 5.2.39 - Functions for DC frequency: Use func up to F31 // 5.2.39 - Functions for DC frequency: Use func up to F31