Skip to content

Commit 779ae24

Browse files
authored
Merge pull request letscontrolit#3946 from TD-er/bugfix/RAMtracker
[RAM tracker] fix potential multiple calls to std::move on the same string
2 parents acb2c9e + e6d0d8b commit 779ae24

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/src/Globals/RamTracker.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,23 @@ void checkRAM(const __FlashStringHelper * descr ) {
5151
void checkRAM(String&& descr ) {
5252
if (Settings.EnableRAMTracking())
5353
myRamTracker.registerRamState(descr);
54-
55-
uint32_t freeRAM = FreeMem();
54+
55+
const uint32_t freeStack = getFreeStackWatermark();
56+
if (freeStack <= lowestFreeStack) {
57+
lowestFreeStack = freeStack;
58+
lowestFreeStackfunction = descr;
59+
}
60+
61+
#ifdef ESP32
62+
const uint32_t freeRAM = ESP.getMinFreeHeap();
63+
#else
64+
const uint32_t freeRAM = FreeMem();
65+
#endif
5666
if (freeRAM <= lowestRAM)
5767
{
5868
lowestRAM = freeRAM;
5969
lowestRAMfunction = std::move(descr);
6070
}
61-
uint32_t freeStack = getFreeStackWatermark();
62-
if (freeStack <= lowestFreeStack) {
63-
lowestFreeStack = freeStack;
64-
lowestFreeStackfunction = std::move(descr);
65-
}
6671
}
6772

6873

0 commit comments

Comments
 (0)