mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-09 06:32:06 +00:00
fix #1713
stop output to serial debug after config has been loaded (if serial is disabled), and only accept protobuf packets from that point on.
This commit is contained in:
parent
838271a14f
commit
f7331a2e41
@ -1,6 +1,7 @@
|
|||||||
#include "configuration.h"
|
#include "configuration.h"
|
||||||
#include "RedirectablePrint.h"
|
#include "RedirectablePrint.h"
|
||||||
#include "RTC.h"
|
#include "RTC.h"
|
||||||
|
#include "NodeDB.h"
|
||||||
#include "concurrency/OSThread.h"
|
#include "concurrency/OSThread.h"
|
||||||
// #include "wifi/WiFiServerAPI.h"
|
// #include "wifi/WiFiServerAPI.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -30,7 +31,9 @@ size_t RedirectablePrint::write(uint8_t c)
|
|||||||
// optionally send chars to TCP also
|
// optionally send chars to TCP also
|
||||||
//WiFiServerPort::debugOut(c);
|
//WiFiServerPort::debugOut(c);
|
||||||
|
|
||||||
dest->write(c);
|
if (!config.has_lora || config.device.serial_enabled)
|
||||||
|
dest->write(c);
|
||||||
|
|
||||||
return 1; // We always claim one was written, rather than trusting what the
|
return 1; // We always claim one was written, rather than trusting what the
|
||||||
// serial port said (which could be zero)
|
// serial port said (which could be zero)
|
||||||
}
|
}
|
||||||
|
@ -60,10 +60,15 @@ bool SerialConsole::checkIsConnected()
|
|||||||
*/
|
*/
|
||||||
bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)
|
bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)
|
||||||
{
|
{
|
||||||
// Turn off debug serial printing once the API is activated, because other threads could print and corrupt packets
|
// only talk to the API once the configuration has been loaded and we're sure the serial port is not disabled.
|
||||||
if (!config.device.debug_log_enabled)
|
if (config.has_lora && config.device.serial_enabled) {
|
||||||
setDestination(&noopPrint);
|
// Turn off debug serial printing once the API is activated, because other threads could print and corrupt packets
|
||||||
canWrite = true;
|
if (!config.device.debug_log_enabled)
|
||||||
|
setDestination(&noopPrint);
|
||||||
|
canWrite = true;
|
||||||
|
|
||||||
return StreamAPI::handleToRadio(buf, len);
|
return StreamAPI::handleToRadio(buf, len);
|
||||||
|
}else{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
@ -157,9 +157,7 @@ void setup()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUG_PORT
|
#ifdef DEBUG_PORT
|
||||||
if (!config.has_device || config.device.serial_enabled) {
|
|
||||||
consoleInit(); // Set serial baud rate and init our mesh console
|
consoleInit(); // Set serial baud rate and init our mesh console
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
serialSinceMsec = millis();
|
serialSinceMsec = millis();
|
||||||
|
Loading…
Reference in New Issue
Block a user