From f4aa572df2352c6c260b820a4ff35a59292b42f3 Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Fri, 18 Nov 2022 20:19:53 +0100 Subject: [PATCH] Remove RAM thief --- GITHUB_SHA.h | 2 +- RingStream.cpp | 11 ++++++----- version.h | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index 19880b6..12884d8 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "devel-202211152314Z" +#define GITHUB_SHA "devel-202211181919Z" diff --git a/RingStream.cpp b/RingStream.cpp index 9db6230..7f10728 100644 --- a/RingStream.cpp +++ b/RingStream.cpp @@ -189,11 +189,12 @@ bool RingStream::commit() { _mark++; if (_mark==_len) _mark=0; _buffer[_mark]=lowByte(_count); - { char s[_count+2]; - strncpy(s, (const char*)&(_buffer[_mark+1]), _count); - s[_count]=0; - //DIAG(F("RS commit count=%d core %d \"%s\""), _count, xPortGetCoreID(), s); - } + // Enable this for debugging only, it requires A LOT of RAM + //{ char s[_count+2]; + // strncpy(s, (const char*)&(_buffer[_mark+1]), _count); + // s[_count]=0; + // DIAG(F("RS commit count=%d core %d \"%s\""), _count, xPortGetCoreID(), s); + //} _ringClient = NO_CLIENT; return true; // commit worked } diff --git a/version.h b/version.h index f272e1d..0244840 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,9 @@ #include "StringFormatter.h" -#define VERSION "4.2.5" +#define VERSION "4.2.6" +// 4.2.6 FIX: Remove RAM thief +// FIX: ADC port 8-15 fix // 4.2.5 Make GETFLASHW code more universal // FIX: Withrottle roster index // Ethernet start improvement and link detection