Added the STC8H2K08U series to models.py

Trigger actions on pull requests, which is needed for PRs from third party branches.

.github/workflows/python.yml

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

doc/MODELS.md

@@ -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)

doc/USAGE.md

@@ -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

stcgal/__init__.py

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

stcgal/frontend.py

@@ -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")

stcgal/models.py

@@ -39,7 +39,7 @@ class MCUModelDatabase:
     MCUModel(name='STC32F12K59', magic=0xf875, total=60416, code=60416, eeprom=0, iap=True, calibrate=True, mcs251=True),
     MCUModel(name='STC32G12K128-Beta', magic=0xf7e1, total=131072, code=131072, eeprom=0, iap=True, calibrate=True, mcs251=True),
     MCUModel(name='STC32G12K128', magic=0xf7e3, total=131072, code=131072, eeprom=0, iap=True, calibrate=True, mcs251=True),
-    MCUModel(name='STC-USB Link1', magic=0xf7ee, total=131072, code=131072, eeprom=0, iap=True, calibrate=True, mcs251=True),
+    MCUModel(name='STC-USB Link1D', magic=0xf7ee, total=131072, code=131072, eeprom=0, iap=True, calibrate=True, mcs251=True),
     MCUModel(name='STC-USB Writer1', magic=0xf7ef, total=131072, code=131072, eeprom=0, iap=True, calibrate=True, mcs251=True),
     MCUModel(name='STC32G8K64-Beta', magic=0xf850, total=65536, code=65536, eeprom=0, iap=True, calibrate=True, mcs251=True),
     MCUModel(name='STC32G8K16', magic=0xf851, total=65536, code=16384, eeprom=49152, iap=False, calibrate=True, mcs251=True),
@@ -52,6 +52,14 @@ class MCUModelDatabase:
     MCUModel(name='STC8H8K48U', magic=0xf785, total=65536, code=49152, eeprom=16384, iap=False, calibrate=True, mcs251=False),
     MCUModel(name='STC8H8K60U', magic=0xf783, total=65536, code=61440, eeprom=4096, iap=False, calibrate=True, mcs251=False),
     MCUModel(name='STC8H8K64U', magic=0xf784, total=65536, code=65024, eeprom=512, iap=True, calibrate=True, mcs251=False),
+    MCUModel(name='STC USB-2UART', magic=0xf78f, total=65536, code=65024, eeprom=512, iap=True, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K02U', magic=0xf891, total=12288, code=2048, eeprom=10240, iap=False, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K04U', magic=0xf892, total=12288, code=4096, eeprom=8192, iap=False, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K06U', magic=0xf893, total=12288, code=6144, eeprom=6144, iap=False, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K08U', magic=0xf894, total=12288, code=8192, eeprom=4096, iap=False, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K10U', magic=0xf895, total=12288, code=10240, eeprom=2048, iap=False, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K12U', magic=0xf896, total=12288, code=12288, eeprom=0, iap=True, calibrate=True, mcs251=False),
+    MCUModel(name='STC8H2K17U', magic=0xf897, total=17408, code=17408, eeprom=0, iap=True, calibrate=True, mcs251=False),
     MCUModel(name='STC8H4K16TLCD', magic=0xf811, total=65536, code=16384, eeprom=49152, iap=False, calibrate=True, mcs251=False),
     MCUModel(name='STC8H4K32TLCD', magic=0xf812, total=65536, code=32768, eeprom=32768, iap=False, calibrate=True, mcs251=False),
     MCUModel(name='STC8H4K48TLCD', magic=0xf815, total=65536, code=49152, eeprom=16384, iap=False, calibrate=True, mcs251=False),

stcgal/protocols.py

@@ -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: