rework the open_terminal(), set reset signal correctly

pull/24/head
z4yx 2019-04-11 16:56:06 +08:00
parent 039668df74
commit bfdca0d28e
1 changed files with 12 additions and 18 deletions

View File

@ -851,6 +851,16 @@ 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(reset):
control_signal = '0' if reset else '1'
control_signal_b = not reset
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='+control_signal, '--rts='+control_signal, '--filter=direct']
serial.tools.miniterm.main(default_port=_port, default_baudrate=115200, default_dtr=control_signal_b, default_rts=control_signal_b)
sys.exit(0)
if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument("-p", "--port", help="COM Port", default="DEFAULT")
@ -1025,18 +1035,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(False)
print(INFO_MSG,"Wait For 0.1 second for ISP to Boot", BASH_TIPS['DEFAULT'])
@ -1097,9 +1096,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(True)