Revert "add a .clang-format file (#9154)" (#9172)

I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.

I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.

I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.

This reverts commit 0d11331d18.
This commit is contained in:
Jorropo
2026-01-04 12:15:53 +01:00
committed by GitHub
parent 0d11331d18
commit beb268ff25
771 changed files with 83399 additions and 77967 deletions

View File

@@ -20,19 +20,20 @@ MemGet memGet;
* Returns the amount of free heap memory in bytes.
* @return uint32_t The amount of free heap memory in bytes.
*/
uint32_t MemGet::getFreeHeap() {
uint32_t MemGet::getFreeHeap()
{
#ifdef ARCH_ESP32
return ESP.getFreeHeap();
return ESP.getFreeHeap();
#elif defined(ARCH_NRF52)
return dbgHeapFree();
return dbgHeapFree();
#elif defined(ARCH_RP2040)
return rp2040.getFreeHeap();
return rp2040.getFreeHeap();
#elif defined(ARCH_STM32WL)
struct mallinfo m = mallinfo();
return m.fordblks; // Total free space (bytes)
struct mallinfo m = mallinfo();
return m.fordblks; // Total free space (bytes)
#else
// this platform does not have heap management function implemented
return UINT32_MAX;
// this platform does not have heap management function implemented
return UINT32_MAX;
#endif
}
@@ -40,19 +41,20 @@ uint32_t MemGet::getFreeHeap() {
* Returns the size of the heap memory in bytes.
* @return uint32_t The size of the heap memory in bytes.
*/
uint32_t MemGet::getHeapSize() {
uint32_t MemGet::getHeapSize()
{
#ifdef ARCH_ESP32
return ESP.getHeapSize();
return ESP.getHeapSize();
#elif defined(ARCH_NRF52)
return dbgHeapTotal();
return dbgHeapTotal();
#elif defined(ARCH_RP2040)
return rp2040.getTotalHeap();
return rp2040.getTotalHeap();
#elif defined(ARCH_STM32WL)
struct mallinfo m = mallinfo();
return m.arena; // Non-mmapped space allocated (bytes)
struct mallinfo m = mallinfo();
return m.arena; // Non-mmapped space allocated (bytes)
#else
// this platform does not have heap management function implemented
return UINT32_MAX;
// this platform does not have heap management function implemented
return UINT32_MAX;
#endif
}
@@ -61,13 +63,14 @@ uint32_t MemGet::getHeapSize() {
*
* @return The amount of free psram memory in bytes.
*/
uint32_t MemGet::getFreePsram() {
uint32_t MemGet::getFreePsram()
{
#ifdef ARCH_ESP32
return ESP.getFreePsram();
return ESP.getFreePsram();
#elif defined(ARCH_PORTDUINO)
return 4194252;
return 4194252;
#else
return 0;
return 0;
#endif
}
@@ -76,23 +79,25 @@ uint32_t MemGet::getFreePsram() {
*
* @return uint32_t The size of the PSRAM memory.
*/
uint32_t MemGet::getPsramSize() {
uint32_t MemGet::getPsramSize()
{
#ifdef ARCH_ESP32
return ESP.getPsramSize();
return ESP.getPsramSize();
#elif defined(ARCH_PORTDUINO)
return 4194252;
return 4194252;
#else
return 0;
return 0;
#endif
}
void displayPercentHeapFree() {
uint32_t freeHeap = memGet.getFreeHeap();
uint32_t totalHeap = memGet.getHeapSize();
if (totalHeap == 0 || totalHeap == UINT32_MAX) {
LOG_INFO("Heap size unavailable");
return;
}
int percent = (int)((freeHeap * 100) / totalHeap);
LOG_INFO("Heap free: %d%% (%u/%u bytes)", percent, freeHeap, totalHeap);
void displayPercentHeapFree()
{
uint32_t freeHeap = memGet.getFreeHeap();
uint32_t totalHeap = memGet.getHeapSize();
if (totalHeap == 0 || totalHeap == UINT32_MAX) {
LOG_INFO("Heap size unavailable");
return;
}
int percent = (int)((freeHeap * 100) / totalHeap);
LOG_INFO("Heap free: %d%% (%u/%u bytes)", percent, freeHeap, totalHeap);
}