mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small refactor adding define USE_SERIAL_BRIDGE_TEE

This commit is contained in:
Theo Arends 2022-06-06 18:08:02 +02:00
parent 44ce19f26f
commit 8a425c40c9
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino
View File

@ -25,6 +25,8 @@
#define XDRV_08 8 #define XDRV_08 8
#define HARDWARE_FALLBACK 2 #define HARDWARE_FALLBACK 2
#define USE_SERIAL_BRIDGE_TEE
#ifdef ESP8266 #ifdef ESP8266
const uint16_t SERIAL_BRIDGE_BUFFER_SIZE = 130; const uint16_t SERIAL_BRIDGE_BUFFER_SIZE = 130;
#else #else
@ -63,6 +65,7 @@ void SetSSerialConfig(uint32_t serial_config) {
} }
void SerialBridgeLog(const char *mxtime, const char *log_data, const char *log_data_payload, const char *log_data_retained) { void SerialBridgeLog(const char *mxtime, const char *log_data, const char *log_data_payload, const char *log_data_retained) {
#ifdef USE_SERIAL_BRIDGE_TEE
if (Settings->sbflag1.serbridge_console && serial_bridge_buffer) { if (Settings->sbflag1.serbridge_console && serial_bridge_buffer) {
char empty[2] = { 0 }; char empty[2] = { 0 };
if (!log_data) { log_data = empty; } if (!log_data) { log_data = empty; }
@ -70,6 +73,7 @@ void SerialBridgeLog(const char *mxtime, const char *log_data, const char *log_d
if (!log_data_retained) { log_data_retained = empty; } if (!log_data_retained) { log_data_retained = empty; }
SerialBridgeSerial->printf("%s%s%s%s\r\n", mxtime, log_data, log_data_payload, log_data_retained); SerialBridgeSerial->printf("%s%s%s%s\r\n", mxtime, log_data, log_data_payload, log_data_retained);
} }
#endif // USE_SERIAL_BRIDGE_TEE
} }
/********************************************************************************************/ /********************************************************************************************/
@ -79,6 +83,7 @@ void SerialBridgeInput(void) {
yield(); yield();
uint8_t serial_in_byte = SerialBridgeSerial->read(); uint8_t serial_in_byte = SerialBridgeSerial->read();
#ifdef USE_SERIAL_BRIDGE_TEE
if (Settings->sbflag1.serbridge_console) { if (Settings->sbflag1.serbridge_console) {
static bool serial_bridge_overrun = false; static bool serial_bridge_overrun = false;
@ -104,6 +109,7 @@ void SerialBridgeInput(void) {
return; return;
} }
} else { } else {
#endif // USE_SERIAL_BRIDGE_TEE
serial_bridge_raw = (254 == Settings->serial_delimiter); serial_bridge_raw = (254 == Settings->serial_delimiter);
if ((serial_in_byte > 127) && !serial_bridge_raw) { // Discard binary data above 127 if no raw reception allowed if ((serial_in_byte > 127) && !serial_bridge_raw) { // Discard binary data above 127 if no raw reception allowed
serial_bridge_in_byte_counter = 0; serial_bridge_in_byte_counter = 0;
@ -128,32 +134,38 @@ void SerialBridgeInput(void) {
} }
} }
serial_bridge_polling_window = millis(); // Wait for more data serial_bridge_polling_window = millis(); // Wait for more data
#ifdef USE_SERIAL_BRIDGE_TEE
} }
#endif // USE_SERIAL_BRIDGE_TEE
} }
if (!Settings->sbflag1.serbridge_console) { #ifdef USE_SERIAL_BRIDGE_TEE
if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) { if (Settings->sbflag1.serbridge_console) {
serial_bridge_buffer[serial_bridge_in_byte_counter] = 0; // Serial data completed return;
bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{')); }
#endif // USE_SERIAL_BRIDGE_TEE
Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":")); if (serial_bridge_in_byte_counter && (millis() > (serial_bridge_polling_window + SERIAL_POLLING))) {
if (assume_json) { serial_bridge_buffer[serial_bridge_in_byte_counter] = 0; // Serial data completed
ResponseAppend_P(serial_bridge_buffer); bool assume_json = (!serial_bridge_raw && (serial_bridge_buffer[0] == '{'));
Response_P(PSTR("{\"" D_JSON_SSERIALRECEIVED "\":"));
if (assume_json) {
ResponseAppend_P(serial_bridge_buffer);
} else {
ResponseAppend_P(PSTR("\""));
if (serial_bridge_raw) {
char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
ResponseAppend_P(ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)));
} else { } else {
ResponseAppend_P(PSTR("\"")); ResponseAppend_P(EscapeJSONString(serial_bridge_buffer).c_str());
if (serial_bridge_raw) {
char hex_char[(serial_bridge_in_byte_counter * 2) + 2];
ResponseAppend_P(ToHex_P((unsigned char*)serial_bridge_buffer, serial_bridge_in_byte_counter, hex_char, sizeof(hex_char)));
} else {
ResponseAppend_P(EscapeJSONString(serial_bridge_buffer).c_str());
}
ResponseAppend_P(PSTR("\""));
} }
ResponseJsonEnd(); ResponseAppend_P(PSTR("\""));
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
serial_bridge_in_byte_counter = 0;
} }
ResponseJsonEnd();
MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_TELE, PSTR(D_JSON_SSERIALRECEIVED));
serial_bridge_in_byte_counter = 0;
} }
} }
@ -221,12 +233,14 @@ void CmndSSerialSend(void) {
ResponseCmndDone(); ResponseCmndDone();
} }
} }
#ifdef USE_SERIAL_BRIDGE_TEE
if (9 == XdrvMailbox.index) { if (9 == XdrvMailbox.index) {
if (XdrvMailbox.payload >= 0) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
Settings->sbflag1.serbridge_console = XdrvMailbox.payload &1; Settings->sbflag1.serbridge_console = XdrvMailbox.payload &1;
} }
ResponseCmndStateText(Settings->sbflag1.serbridge_console); ResponseCmndStateText(Settings->sbflag1.serbridge_console);
} }
#endif // USE_SERIAL_BRIDGE_TEE
} }
void CmndSBaudrate(void) { void CmndSBaudrate(void) {