mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 06:47:52 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
51 lines
1.6 KiB
C++
51 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include "RedirectablePrint.h"
|
|
#include "StreamAPI.h"
|
|
/**
|
|
* Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
|
|
* (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
|
|
*/
|
|
class SerialConsole : public StreamAPI, public RedirectablePrint, private concurrency::OSThread
|
|
{
|
|
/**
|
|
* If true we are talking to a smart host and all messages (including log messages) must be framed as protobufs.
|
|
*/
|
|
bool usingProtobufs = false;
|
|
|
|
public:
|
|
SerialConsole();
|
|
|
|
/**
|
|
* we override this to notice when we've received a protobuf over the serial stream. Then we shunt off
|
|
* debug serial output.
|
|
*/
|
|
virtual bool handleToRadio(const uint8_t *buf, size_t len) override;
|
|
|
|
virtual size_t write(uint8_t c) override
|
|
{
|
|
if (c == '\n') // prefix any newlines with carriage return
|
|
RedirectablePrint::write('\r');
|
|
return RedirectablePrint::write(c);
|
|
}
|
|
|
|
virtual int32_t runOnce() override;
|
|
|
|
void flush();
|
|
void rxInt();
|
|
|
|
protected:
|
|
/// Check the current underlying physical link to see if the client is currently connected
|
|
virtual bool checkIsConnected() override;
|
|
|
|
virtual void onNowHasData(uint32_t fromRadioNum) override;
|
|
|
|
/// Possibly switch to protobufs if we see a valid protobuf message
|
|
virtual void log_to_serial(const char *logLevel, const char *format, va_list arg);
|
|
};
|
|
|
|
// A simple wrapper to allow non class aware code write to the console
|
|
void consolePrintf(const char *format, ...);
|
|
void consoleInit();
|
|
|
|
extern SerialConsole *console; |