From e82058571f851e0dec910c0c4dd964da636a877d Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:35:51 +0200 Subject: [PATCH] Update console source info --- tasmota/include/tasmota.h | 4 ++-- tasmota/tasmota_support/support_tasmota.ino | 4 ++-- tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tasmota/include/tasmota.h b/tasmota/include/tasmota.h index 5b4913690..580afd812 100644 --- a/tasmota/include/tasmota.h +++ b/tasmota/include/tasmota.h @@ -450,10 +450,10 @@ enum DevGroupShareItem { DGR_SHARE_POWER = 1, DGR_SHARE_LIGHT_BRI = 2, DGR_SHARE enum CommandSource { SRC_IGNORE, SRC_MQTT, SRC_RESTART, SRC_BUTTON, SRC_SWITCH, SRC_BACKLOG, SRC_SERIAL, SRC_WEBGUI, SRC_WEBCOMMAND, SRC_WEBCONSOLE, SRC_PULSETIMER, SRC_TIMER, SRC_RULE, SRC_MAXPOWER, SRC_MAXENERGY, SRC_OVERTEMP, SRC_LIGHT, SRC_KNX, SRC_DISPLAY, SRC_WEMO, SRC_HUE, SRC_RETRY, SRC_REMOTE, SRC_SHUTTER, - SRC_THERMOSTAT, SRC_CHAT, SRC_TCL, SRC_BERRY, SRC_FILE, SRC_MAX }; + SRC_THERMOSTAT, SRC_CHAT, SRC_TCL, SRC_BERRY, SRC_FILE, SRC_SSERIAL, SRC_USBCONSOLE, SRC_MAX }; const char kCommandSource[] PROGMEM = "I|MQTT|Restart|Button|Switch|Backlog|Serial|WebGui|WebCommand|WebConsole|PulseTimer|" "Timer|Rule|MaxPower|MaxEnergy|Overtemp|Light|Knx|Display|Wemo|Hue|Retry|Remote|Shutter|" - "Thermostat|Chat|TCL|Berry|File"; + "Thermostat|Chat|TCL|Berry|File|SSerial|UsbConsole"; const uint8_t kDefaultRfCode[9] PROGMEM = { 0x21, 0x16, 0x01, 0x0E, 0x03, 0x48, 0x2E, 0x1A, 0x00 }; diff --git a/tasmota/tasmota_support/support_tasmota.ino b/tasmota/tasmota_support/support_tasmota.ino index be8801aa2..08d2f6f3d 100644 --- a/tasmota/tasmota_support/support_tasmota.ino +++ b/tasmota/tasmota_support/support_tasmota.ino @@ -1761,10 +1761,10 @@ void TasConsoleInput(void) { else if (console_in_byte == '\n') { TasmotaGlobal.seriallog_level = (Settings->seriallog_level < LOG_LEVEL_INFO) ? (uint8_t)LOG_LEVEL_INFO : Settings->seriallog_level; if (console_buffer_overrun) { - AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "Console buffer overrun")); + AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "USB buffer overrun")); } else { AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), console_buffer.c_str()); - ExecuteCommand(console_buffer.c_str(), SRC_SERIAL); + ExecuteCommand(console_buffer.c_str(), SRC_USBCONSOLE); } console_buffer = ""; console_buffer_overrun = false; diff --git a/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino b/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino index 5bc6bbc23..344d71575 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_08_serial_bridge.ino @@ -104,7 +104,7 @@ void SerialBridgeInput(void) { AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "SSerial buffer overrun")); } else { AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_COMMAND "%s"), serial_bridge_buffer); - ExecuteCommand(serial_bridge_buffer, SRC_SERIAL); + ExecuteCommand(serial_bridge_buffer, SRC_SSERIAL); } serial_bridge_in_byte_counter = 0; serial_bridge_overrun = false;