Merge branch 'bugfix/alt_exit_idf_monitor_v3.1' into 'release/v3.1'

idf_monitor: Exit with CTRL+X in menu (v3.1)

See merge request espressif/esp-idf!6293

tools/idf_monitor.py

@@ -58,6 +58,7 @@ CTRL_R = '\x12'
 CTRL_T = '\x14'
 CTRL_Y = '\x19'
 CTRL_P = '\x10'
+CTRL_X = '\x18'
 CTRL_RBRACKET = '\x1d'  # Ctrl+]
 
 # ANSI terminal codes (if changed, regular expressions in LineMatcher need to be udpated)
@@ -449,6 +450,9 @@ class Monitor(object):
             self.serial.setRTS(False)  # EN=HIGH, chip out of reset
             time.sleep(0.45) # timeouts taken from esptool.py, includes esp32r0 workaround. defaults: 0.05
             self.serial.setDTR(False)  # IO0=HIGH, done
+        elif c in [CTRL_X, 'x', 'X']:  # Exiting from within the menu
+            self.console_reader.stop()
+            self.serial_reader.stop()
         else:
             red_print('--- unknown menu character {} --'.format(key_description(c)))
 
@@ -467,6 +471,7 @@ class Monitor(object):
 ---    {appmake:7} Build & flash app only
 ---    {output:7} Toggle output display
 ---    {pause:7} Reset target into bootloader to pause app via RTS line
+---    {menuexit:7} Exit program
 """.format(version=__version__,
            exit=key_description(self.exit_key),
            menu=key_description(self.menu_key),
@@ -474,7 +479,8 @@ class Monitor(object):
            makecmd=key_description(CTRL_F),
            appmake=key_description(CTRL_A),
            output=key_description(CTRL_Y),
-           pause=key_description(CTRL_P) )
+           pause=key_description(CTRL_P),
+           menuexit=key_description(CTRL_X) + ' (or X)')
 
     def __enter__(self):
         """ Use 'with self' to temporarily disable monitoring behaviour """