jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update debug for STM32

Browse Source
This commit is contained in:
fvanroie 2020-04-30 17:30:51 +02:00
parent 7e82697982
commit f9d14e7fba
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hasp_debug.cpp
View File

@ -15,7 +15,7 @@
#endif #endif
#include "hasp_hal.h" #include "hasp_hal.h"
#if HASP_USE_MQTT>0 #if HASP_USE_MQTT > 0
#include "hasp_mqtt.h" #include "hasp_mqtt.h"
#endif #endif
@ -73,7 +73,7 @@ Syslog * syslog;
// Serial Settings // Serial Settings
uint16_t debugSerialBaud = SERIAL_SPEED / 10; // Multiplied by 10 uint16_t debugSerialBaud = SERIAL_SPEED / 10; // Multiplied by 10
bool debugSerialStarted = false; bool debugSerialStarted = false;
bool debugAnsiCodes = true; bool debugAnsiCodes = true;
//#define TERM_COLOR_Black "\u001b[30m" //#define TERM_COLOR_Black "\u001b[30m"
#define TERM_COLOR_GRAY "\e[37m" #define TERM_COLOR_GRAY "\e[37m"
@ -94,7 +94,8 @@ String debugHaspHeader()
{ {
String header((char *)0); String header((char *)0);
header.reserve(256); header.reserve(256);
header = F(" _____ _____ _____ _____\r\n" if(debugAnsiCodes) header += TERM_COLOR_YELLOW;
header += F(" _____ _____ _____ _____\r\n"
" | | | _ | __| _ |\r\n" " | | | _ | __| _ |\r\n"
" | | |__ | __|\r\n" " | | |__ | __|\r\n"
" |__|__|__|__|_____|__|\r\n" " |__|__|__|__|_____|__|\r\n"
@ -216,21 +217,23 @@ static void debugPrintTimestamp(int level, Print * _logOutput)
time_t rawtime; time_t rawtime;
struct tm * timeinfo; struct tm * timeinfo;
//time(&rawtime); // time(&rawtime);
//timeinfo = localtime(&rawtime); // timeinfo = localtime(&rawtime);
// strftime(buffer, sizeof(buffer), "%b %d %H:%M:%S.", timeinfo); // strftime(buffer, sizeof(buffer), "%b %d %H:%M:%S.", timeinfo);
// Serial.println(buffer); // Serial.println(buffer);
debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput); debugSendAnsiCode(F(TERM_COLOR_CYAN), _logOutput);
/* if(timeinfo->tm_year >= 120) { /* if(timeinfo->tm_year >= 120) {
char buffer[64]; char buffer[64];
strftime(buffer, sizeof(buffer), "[%b %d %H:%M:%S.", timeinfo); // Literal String strftime(buffer, sizeof(buffer), "[%b %d %H:%M:%S.", timeinfo); // Literal String
_logOutput->print(buffer); _logOutput->print(buffer);
_logOutput->printf(PSTR("%03lu]"), millis() % 1000); _logOutput->printf(PSTR("%03lu]"), millis() % 1000);
} else */ { } else */
_logOutput->printf(PSTR("[%20.3f]"), (float)millis() / 1000); {
//_logOutput->printf(PSTR("[%20.3f]"), (float)millis() / 1000);
_logOutput->printf(PSTR("[%20d]"), millis() );
} }
} }
@ -328,15 +331,15 @@ void debugPreSetup(JsonObject settings)
uint32_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint32_t>() * 10; uint32_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint32_t>() * 10;
if(baudrate == 0) baudrate = SERIAL_SPEED; if(baudrate == 0) baudrate = SERIAL_SPEED;
if(baudrate >= 9600u) { /* the baudrates are stored divided by 10 */ if(baudrate >= 9600u) { /* the baudrates are stored divided by 10 */
#ifdef STM32_CORE_VERSION_MAJOR #ifdef STM32_CORE_VERSION_MAJOR
Serial.setRx(PA3); // User Serial2 // Serial.setRx(PA3); // User Serial2
Serial.setTx(PA2); // Serial.setTx(PA2);
#endif #endif
Serial.begin(baudrate); /* prepare for possible serial debug */ Serial.begin(baudrate); /* prepare for possible serial debug */
delay(10); delay(10);
Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true); Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true);
debugSerialStarted = true; debugSerialStarted = true;
Serial.println(); Serial.println();
Log.trace(("Serial started at %u baud"), baudrate); Log.trace(("Serial started at %u baud"), baudrate);