From 1d203b46b4676ee91910d8c7b95762604e71a42e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 10 Oct 2016 20:08:54 +0300 Subject: [PATCH] Change default exit combination for Device Monitor from ``Ctrl+]`` to ``Ctrl+C`` --- HISTORY.rst | 1 + docs/userguide/cmd_device.rst | 11 +++++------ platformio/commands/device.py | 8 ++++---- platformio/commands/remote.py | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index bed15668..051c85b7 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -9,6 +9,7 @@ PlatformIO 3.0 * Improved detecting of ARM mbed media disk for uploading * Improved Project Generator for CLion IDE when source folder contains nested items +* Changed default exit combination for Device Monitor from ``Ctrl+]`` to ``Ctrl+C`` * Fixed issue with ``PATH`` auto-configuring for upload tools * Fixed ``99-platformio-udev.rules`` checker for Linux OS diff --git a/docs/userguide/cmd_device.rst b/docs/userguide/cmd_device.rst index 91d2fcd2..2ee8e45f 100644 --- a/docs/userguide/cmd_device.rst +++ b/docs/userguide/cmd_device.rst @@ -105,7 +105,7 @@ escapes. To control *monitor* please use these "hot keys": -* ``Ctrl+]`` Quit +* ``Ctrl+C`` Quit * ``Ctrl+T`` Menu * ``Ctrl+T followed by Ctrl+H`` Help @@ -191,10 +191,10 @@ Do not apply any encodings/transformations --exit-char ASCII code of special character that is used to exit the application, -default ``29`` (DEC). +default ``3`` (DEC, ``Ctrl+C``). -For example, to use ``Ctrl+Q`` run -``platformio device monitor --exit-char 17``. +For example, to use ``Ctrl+]`` run +``platformio device monitor --exit-char 29``. .. option:: --menu-char @@ -285,9 +285,8 @@ Examples --- /dev/cu.obd2ecu-SPPDev n/a Enter port name:/dev/cu.SLAB_USBtoUART --- Miniterm on /dev/cu.SLAB_USBtoUART: 9600,8,N,1 --- - --- Quit: Ctrl+] | Menu: Ctrl+T | Help: Ctrl+T followed by Ctrl+H --- + --- Quit: Ctrl+C | Menu: Ctrl+T | Help: Ctrl+T followed by Ctrl+H --- Hello PlatformIO! - --- pySerial (2.7) - miniterm - help --- --- Ctrl+] Exit program --- Ctrl+T Menu escape key, followed by: diff --git a/platformio/commands/device.py b/platformio/commands/device.py index e423f273..28d6e9e8 100644 --- a/platformio/commands/device.py +++ b/platformio/commands/device.py @@ -99,9 +99,9 @@ if int(PYSERIAL_VERSION[0]) == 3: @click.option( "--exit-char", type=int, - default=29, + default=3, help="ASCII code of special character that is used to exit " - "the application, default=29 (DEC)") + "the application, default=3 (Ctrl+C)") @click.option( "--menu-char", type=int, @@ -197,9 +197,9 @@ else: @click.option( "--exit-char", type=int, - default=29, + default=3, help="ASCII code of special character that is used to exit " - "the application, default=29 (DEC)") + "the application, default=3 (Ctrl+C)") @click.option( "--menu-char", type=int, diff --git a/platformio/commands/remote.py b/platformio/commands/remote.py index a92ff0b2..55169e0e 100644 --- a/platformio/commands/remote.py +++ b/platformio/commands/remote.py @@ -138,9 +138,9 @@ if int(PYSERIAL_VERSION[0]) == 3: @click.option( "--exit-char", type=int, - default=29, + default=3, help="ASCII code of special character that is used to exit " - "the application, default=29 (DEC)") + "the application, default=3 (Ctrl+C)") @click.option( "--menu-char", type=int, @@ -210,9 +210,9 @@ else: @click.option( "--exit-char", type=int, - default=29, + default=3, help="ASCII code of special character that is used to exit " - "the application, default=29 (DEC)") + "the application, default=3 (Ctrl+C)") @click.option( "--menu-char", type=int,