Merge branch 'contrib/github_pr_8100' into 'master'

monitor: Print buffer when reading an escape character

Closes IDFGH-6443

See merge request espressif/esp-idf!16584
This commit is contained in:
Roland Dobai 2022-01-03 18:52:14 +00:00
commit 93cb847424
2 changed files with 4 additions and 14 deletions

View File

@ -3065,7 +3065,6 @@ tools/find_build_apps/cmake.py
tools/find_build_apps/common.py
tools/gdb_panic_server.py
tools/gen_esp_err_to_name.py
tools/idf_monitor_base/ansi_color_converter.py
tools/idf_monitor_base/argument_parser.py
tools/idf_monitor_base/chip_specific_config.py
tools/idf_monitor_base/console_reader.py

View File

@ -1,16 +1,5 @@
# Copyright 2015-2021 Espressif Systems (Shanghai) CO LTD
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
import ctypes
import os
@ -94,7 +83,9 @@ class ANSIColorConverter(object):
for b in data:
b = bytes([b])
length = len(self.matched)
if b == b'\033': # ESC
self._output_write(self.matched)
self.matched = b
elif (length == 1 and b == b'[') or (1 < length < 7):
self.matched += b