Skip to content

Commit 94559c7

Browse files
committed
Always include chip report header and rename Info -> Report
1 parent 65cb92f commit 94559c7

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Diff for: cores/esp32/Arduino.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ uint16_t makeWord(uint8_t h, uint8_t l);
200200
size_t getArduinoLoopTaskStackSize(void);
201201
#define SET_LOOP_TASK_STACK_SIZE(sz) size_t getArduinoLoopTaskStackSize() { return sz;}
202202

203-
bool shouldPrintChipDebugInfo(void);
204-
#define ENABLE_CHIP_DEBUG_INFO bool shouldPrintChipDebugInfo(void){return true;}
203+
bool shouldPrintChipDebugReport(void);
204+
#define ENABLE_CHIP_DEBUG_REPORT bool shouldPrintChipDebugReport(void){return true;}
205205

206206
// allows user to bypass esp_spiram_test()
207207
bool esp_psram_extram_test(void);

Diff for: cores/esp32/main.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#endif
1010
#endif
1111

12-
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
1312
#include "chip-debug-report.h"
14-
#endif
1513

1614
#ifndef ARDUINO_LOOP_STACK_SIZE
1715
#ifndef CONFIG_ARDUINO_LOOP_STACK_SIZE
@@ -41,7 +39,7 @@ __attribute__((weak)) size_t getArduinoLoopTaskStackSize(void) {
4139
return ARDUINO_LOOP_STACK_SIZE;
4240
}
4341

44-
__attribute__((weak)) bool shouldPrintChipDebugInfo(void) {
42+
__attribute__((weak)) bool shouldPrintChipDebugReport(void) {
4543
return false;
4644
}
4745

@@ -50,15 +48,15 @@ void loopTask(void *pvParameters)
5048
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
5149
printBeforeSetupInfo();
5250
#else
53-
if(shouldPrintChipDebugInfo()){
51+
if(shouldPrintChipDebugReport()){
5452
printBeforeSetupInfo();
5553
}
5654
#endif
5755
setup();
5856
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
5957
printAfterSetupInfo();
6058
#else
61-
if(shouldPrintChipDebugInfo()){
59+
if(shouldPrintChipDebugReport()){
6260
printAfterSetupInfo();
6361
}
6462
#endif

0 commit comments

Comments
 (0)