jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wifi and serial log

Browse Source
This commit is contained in:
fvanroie 2020-03-31 22:40:43 +02:00
parent 36b17ef784
commit 938873b5b3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hasp_config.cpp
View File

@ -117,6 +117,11 @@ void configGetConfig(JsonDocument & settings, bool setupdebug = false)
} }
} }
// File does not exist or error reading file
if(setupdebug) {
debugPreSetup(settings[F("debug")]);
}
configStartDebug(setupdebug, configFile); configStartDebug(setupdebug, configFile);
Log.error(F("CONF: Failed to load %s"), configFile.c_str()); Log.error(F("CONF: Failed to load %s"), configFile.c_str());
} }

10
src/hasp_debug.cpp
View File

@ -389,13 +389,15 @@ void debugPreSetup(JsonObject settings)
Log.setPrefix(debugPrintPrefix); // Uncomment to get timestamps as prefix Log.setPrefix(debugPrintPrefix); // Uncomment to get timestamps as prefix
Log.setSuffix(debugPrintSuffix); // Uncomment to get newline as suffix Log.setSuffix(debugPrintSuffix); // Uncomment to get newline as suffix
uint16_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint16_t>() | debugSerialBaud; uint32_t baudrate = settings[FPSTR(F_CONFIG_BAUD)].as<uint32_t>() * 10;
if(baudrate >= 960) { /* the baudrates are stored divided by 10 */ if(baudrate == 0) baudrate = 115200u;
Serial.begin(baudrate * 10); /* prepare for possible serial debug */ if(baudrate >= 9600u) { /* the baudrates are stored divided by 10 */
Serial.begin(baudrate); /* prepare for possible serial debug */
delay(10); delay(10);
debugSerialStarted = true; debugSerialStarted = true;
Serial.println();
Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true); Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true);
Log.trace(F("Serial started at %u baud"), baudrate * 10); Log.trace(F("Serial started at %u baud"), baudrate);
} }
} }

2
src/hasp_wifi.cpp
View File

@ -176,6 +176,8 @@ void wifiSetup(JsonObject settings)
bool wifiEvery5Seconds() bool wifiEvery5Seconds()
{ {
if(WiFi.getMode() == WIFI_AP) return true;
if(WiFi.status() == WL_CONNECTED) { if(WiFi.status() == WL_CONNECTED) {
return true; return true;
} else { } else {