Compare commits

..

No commits in common. "master" and "v1.10" have entirely different histories.

4 changed files with 6 additions and 14 deletions

View File

@ -1,6 +1,6 @@
name: Python package
on: [push, pull_request]
on: [push]
jobs:
test:

View File

@ -22,7 +22,7 @@ options:
-h, --help show this help message and exit
-e, --erase only erase flash memory
-a, --autoreset cycle power automatically by asserting DTR
-A {dtr,rts,dtr_inverted,rts_inverted}, --resetpin {dtr,rts,dtr_inverted,rts_inverted}
-A {dtr,rts}, --resetpin {dtr,rts}
pin to hold down when using --autoreset (default: DTR)
-r RESETCMD, --resetcmd RESETCMD
shell command for board power-cycling (instead of DTR

View File

@ -263,7 +263,7 @@ def cli():
exclusives.add_argument("-e", "--erase", help="only erase flash memory", action="store_true")
parser.add_argument("-a", "--autoreset", help="cycle power automatically by asserting DTR", action="store_true")
parser.add_argument("-A", "--resetpin", help="pin to hold down when using --autoreset (default: DTR)",
choices=["dtr", "rts", "dtr_inverted", "rts_inverted"], default="dtr")
choices=["dtr", "rts"], default="dtr")
parser.add_argument("-r", "--resetcmd", help="shell command for board power-cycling (instead of DTR assertion)", action="store")
parser.add_argument("-P", "--protocol", help="protocol version (default: auto)",
choices=["stc89", "stc89a", "stc12a", "stc12b", "stc12", "stc15a", "stc15", "stc8", "stc8d", "stc8g", "usb15", "auto"], default="auto")

View File

@ -265,30 +265,22 @@ class StcBaseProtocol(ABC):
def set_option(self, name, value):
self.options.set_option(name, value)
def reset_device(self, resetcmd=False, resetpin=False, invertreset=False):
def reset_device(self, resetcmd=False, resetpin=False):
if not resetcmd:
print("Cycling power: ", end="")
sys.stdout.flush()
if resetpin == "rts":
self.ser.setRTS(True)
elif resetpin == "dtr":
else:
self.ser.setDTR(True)
elif resetpin == "rts_inverted":
self.ser.setRTS(False)
else: # dtr_inverted
self.ser.setDTR(False)
time.sleep(0.25)
if resetpin == "rts":
self.ser.setRTS(False)
elif resetpin == "dtr":
else:
self.ser.setDTR(False)
elif resetpin == "rts_inverted":
self.ser.setRTS(True)
else: # dtr_inverted
self.ser.setDTR(True)
time.sleep(0.030)
print("done")