Compare commits

...

10 Commits
v1.7 ... master

Author SHA1 Message Date
Grigori Goronzy
fdf5fdd605
ci: trigger on pull request
Trigger actions on pull requests, which is needed for PRs from third party branches.
2023-11-11 11:26:05 +01:00
hkzlab
a660184520
Add options to invert pin reset logic (#97)
This PR adds 'dtr_inverted' and 'rts_inverted' as options for '-A' that
invert the pin logic for autoreset.
2023-11-11 11:23:29 +01:00
area-8051
6e8e73669e
Merge pull request #91 from grigorig/version_fix
Fixed version for new release
2023-09-01 20:10:07 +02:00
Vincent DEFERT
b32bbf99c8 Fixed version for new release 2023-09-01 20:07:23 +02:00
area-8051
cdc365a5f0
Merge pull request #89 from grigorig/doc_update
Updated list of tested models
2023-08-30 17:37:57 +02:00
Vincent DEFERT
521339066c Updated list of tested models 2023-08-30 17:36:00 +02:00
area-8051
48a36b90c9
Merge pull request #88 from grigorig/proto_fix
Fixed protocol autodetection to support STC8H1KxxT
2023-08-30 17:27:05 +02:00
Vincent DEFERT
1c37582952 Fixed protocol autodetection to support STC8H1KxxT 2023-08-30 17:24:28 +02:00
area-8051
6a598002e6
Merge pull request #86 from grigorig/area-8051-patch-1
Updated version to prepare next release
2023-06-02 12:18:53 +02:00
area-8051
fcf4dff166
Updated version to prepare next release 2023-06-02 12:16:56 +02:00
6 changed files with 20 additions and 11 deletions

View File

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

View File

@ -44,6 +44,7 @@ STC8 series
* STC8G1K17-20/16PIN (BSL version: 7.3.12U)
* STC8G2K64S4 (BSL version: 7.3.11U)
* STC8H1K08 (BSL version: 7.3.12U)
* STC8H1K17T (BSL version: 7.4.5U)
* STC8H3K64S2 (BSL version: 7.4.1U)
* STC8H3K64S4 (BSL version: 7.4.1U)
* STC8H4K64TL (BSL version: 7.4.3U)

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}, --resetpin {dtr,rts}
-A {dtr,rts,dtr_inverted,rts_inverted}, --resetpin {dtr,rts,dtr_inverted,rts_inverted}
pin to hold down when using --autoreset (default: DTR)
-r RESETCMD, --resetcmd RESETCMD
shell command for board power-cycling (instead of DTR

View File

@ -1 +1 @@
__version__ = "1.6"
__version__ = "1.10"

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"], default="dtr")
choices=["dtr", "rts", "dtr_inverted", "rts_inverted"], 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,22 +265,30 @@ class StcBaseProtocol(ABC):
def set_option(self, name, value):
self.options.set_option(name, value)
def reset_device(self, resetcmd=False, resetpin=False):
def reset_device(self, resetcmd=False, resetpin=False, invertreset=False):
if not resetcmd:
print("Cycling power: ", end="")
sys.stdout.flush()
if resetpin == "rts":
self.ser.setRTS(True)
else:
elif resetpin == "dtr":
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)
else:
elif resetpin == "dtr":
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")
@ -390,11 +398,11 @@ class StcAutoProtocol(StcBaseProtocol):
("stc12", r"(STC|IAP)(10|11|12)\D"),
("stc15a", r"(STC|IAP)15[FL][012]0\d(E|EA|)$"),
("stc15", r"(STC|IAP|IRC)15\D"),
("stc8d", r"STC8H(3|4|8)K"),
("stc8d", r"STC32"),
("stc8d", r"STC8A8K\d\dD4"),
("stc8g", r"STC8H"),
("stc8g", r"STC8H1K\d\d$"),
("stc8g", r"STC8G"),
("stc8d", r"STC8H"),
("stc8d", r"STC32"),
("stc8d", r"STC8A8K\d\dD\d"),
("stc8", r"STC8\D")]
for protocol_name, pattern in protocol_database: