add open_terminal() to replace duplicated code
parent
1f0db55f19
commit
6e313e9a2a
28
kflash.py
28
kflash.py
|
@ -833,6 +833,14 @@ class MAIXLoader:
|
|||
speed = str(int((n + 1) * 4096 / 1024.0 / time_delta)) + 'kiB/s'
|
||||
printProgressBar(n+1, total_chunk, prefix = 'Programming BIN:', suffix = speed, length = columns - 35)
|
||||
|
||||
def open_terminal():
|
||||
import serial.tools.miniterm
|
||||
# For using the terminal with MaixPy the 'filter' option must be set to 'direct'
|
||||
# because some control characters are emited
|
||||
sys.argv = ['kflash.py', _port, '115200', '--dtr=0', '--rts=0', '--filter=direct']
|
||||
serial.tools.miniterm.main(default_port=_port, default_baudrate=115200, default_dtr=False, default_rts=False)
|
||||
sys.exit(0)
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-p", "--port", help="COM Port", default="DEFAULT")
|
||||
|
@ -1001,18 +1009,7 @@ if __name__ == '__main__':
|
|||
|
||||
if args.sram:
|
||||
if(args.terminal == True):
|
||||
import serial.tools.miniterm
|
||||
_miniterm = serial.tools.miniterm.Miniterm(loader._port)
|
||||
_miniterm.set_rx_encoding('UTF-8')
|
||||
_miniterm.set_tx_encoding('UTF-8')
|
||||
_miniterm.start()
|
||||
try:
|
||||
_miniterm.join(True)
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
_miniterm.join()
|
||||
_miniterm.close()
|
||||
sys.exit(0)
|
||||
open_terminal()
|
||||
|
||||
print(INFO_MSG,"Wait For 0.1 second for ISP to Boot", BASH_TIPS['DEFAULT'])
|
||||
|
||||
|
@ -1073,9 +1070,4 @@ if __name__ == '__main__':
|
|||
loader._port.close()
|
||||
|
||||
if(args.terminal == True):
|
||||
import serial.tools.miniterm
|
||||
# For using the terminal with MaixPy the 'filter' option must be set to 'direct'
|
||||
# because some control characters are emited
|
||||
sys.argv = ['kflash.py', _port, '115200', '--dtr=0', '--rts=0', '--filter=direct']
|
||||
serial.tools.miniterm.main(default_port=_port, default_baudrate=115200, default_dtr=False, default_rts=False)
|
||||
sys.exit(0)
|
||||
open_terminal()
|
||||
|
|
Loading…
Reference in New Issue