diff --git a/lib/MyESP/MyESP.h b/lib/MyESP/MyESP.h index 097a767fc..9841db499 100644 --- a/lib/MyESP/MyESP.h +++ b/lib/MyESP/MyESP.h @@ -21,7 +21,7 @@ #include "EEPROM.h" extern "C" { - void custom_crash_callback(struct rst_info*, uint32_t, uint32_t); +void custom_crash_callback(struct rst_info *, uint32_t, uint32_t); } #if defined(ARDUINO_ARCH_ESP32) @@ -72,6 +72,14 @@ extern "C" { #define COLOR_MAGENTA "\x1B[0;35m" #define COLOR_CYAN "\x1B[0;36m" #define COLOR_WHITE "\x1B[0;37m" +#define COLOR_BRIGHT_BLACK "\x1B[0;90m" +#define COLOR_BRIGHT_RED "\x1B[0;91m" +#define COLOR_BRIGHT_GREEN "\x1B[0;92m" +#define COLOR_BRIGHT_YELLOW "\x1B[0;99m" +#define COLOR_BRIGHT_BLUE "\x1B[0;94m" +#define COLOR_BRIGHT_MAGENTA "\x1B[0;95m" +#define COLOR_BRIGHT_CYAN "\x1B[0;96m" +#define COLOR_BRIGHT_WHITE "\x1B[0;97m" #define COLOR_BOLD_ON "\x1B[1m" #define COLOR_BOLD_OFF "\x1B[22m" // fixed by Scott Arlott @@ -79,19 +87,19 @@ extern "C" { #define SPIFFS_MAXSIZE 500 // https://arduinojson.org/v5/assistant/ // CRASH -#define SAVE_CRASH_EEPROM_OFFSET 0x0100 // initial address for crash data -#define SAVE_CRASH_EEPROM_SIZE 0x0200 // size -#define SAVE_CRASH_CRASH_TIME 0x00 // 4 bytes -#define SAVE_CRASH_RESTART_REASON 0x04 // 1 byte -#define SAVE_CRASH_EXCEPTION_CAUSE 0x05 // 1 byte -#define SAVE_CRASH_EPC1 0x06 // 4 bytes -#define SAVE_CRASH_EPC2 0x0A // 4 bytes -#define SAVE_CRASH_EPC3 0x0E // 4 bytes -#define SAVE_CRASH_EXCVADDR 0x12 // 4 bytes -#define SAVE_CRASH_DEPC 0x16 // 4 bytes -#define SAVE_CRASH_STACK_START 0x1A // 4 bytes -#define SAVE_CRASH_STACK_END 0x1E // 4 bytes -#define SAVE_CRASH_STACK_TRACE 0x22 // variable +#define SAVE_CRASH_EEPROM_OFFSET 0x0100 // initial address for crash data +#define SAVE_CRASH_EEPROM_SIZE 0x0200 // size +#define SAVE_CRASH_CRASH_TIME 0x00 // 4 bytes +#define SAVE_CRASH_RESTART_REASON 0x04 // 1 byte +#define SAVE_CRASH_EXCEPTION_CAUSE 0x05 // 1 byte +#define SAVE_CRASH_EPC1 0x06 // 4 bytes +#define SAVE_CRASH_EPC2 0x0A // 4 bytes +#define SAVE_CRASH_EPC3 0x0E // 4 bytes +#define SAVE_CRASH_EXCVADDR 0x12 // 4 bytes +#define SAVE_CRASH_DEPC 0x16 // 4 bytes +#define SAVE_CRASH_STACK_START 0x1A // 4 bytes +#define SAVE_CRASH_STACK_END 0x1E // 4 bytes +#define SAVE_CRASH_STACK_TRACE 0x22 // variable typedef struct { char key[40]; diff --git a/lib/myESP/MyESP.cpp b/lib/myESP/MyESP.cpp index f4e00ddfa..c84e64b6a 100644 --- a/lib/myESP/MyESP.cpp +++ b/lib/myESP/MyESP.cpp @@ -34,7 +34,7 @@ MyESP::MyESP() { _helpProjectCmds = NULL; _helpProjectCmds_count = 0; - _use_serial = false; + _use_serial = true; _mqtt_host = NULL; _mqtt_password = NULL; _mqtt_username = NULL; diff --git a/lib/myESP/MyESP.h b/lib/myESP/MyESP.h index 7354a2886..1862896e4 100644 --- a/lib/myESP/MyESP.h +++ b/lib/myESP/MyESP.h @@ -226,7 +226,7 @@ class MyESP { char * _boottime; bool _suspendOutput; bool _use_serial; - void _printBuildTime(unsigned long rawTime); + void _printBuildTime(unsigned long unix); // load average (0..100) void _calculateLoad();