tinyocd 1.0.0__tar.gz → 1.1.0__tar.gz

{tinyocd-1.0.0/tinyocd.egg-info → tinyocd-1.1.0}/PKG-INFO

@@ -1,31 +1,9 @@
 Metadata-Version: 2.4
 Name: tinyocd
-Version: 1.0.0
+Version: 1.1.0
 Summary: Programming Tool for STM32, PY32 and SAMD Microcontrollers via CMSIS-DAP, ST-Link or J-Link
 Author-email: Stefan Wagner <wagiminator@web.de>
 Maintainer-email: Stefan Wagner <wagiminator@web.de>
-License: MIT License
-        
-        Copyright (c) 2026 Stefan Wagner
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
 Project-URL: Homepage, https://wagiminator.github.io/
 Project-URL: Repository, https://github.com/wagiminator/MCU-Flash-Tools
 Project-URL: Issues, https://github.com/wagiminator/MCU-Flash-Tools/issues
@@ -38,12 +16,10 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: pyusb
 Requires-Dist: libusb-package; platform_system == "Windows"
 Provides-Extra: hid
 Requires-Dist: hidapi; extra == "hid"
-Dynamic: license-file
 
 # Programming Tool for STM32, PY32 and SAMD Microcontrollers via CMSIS-DAP, ST-Link or J-Link
 ## Description
@@ -106,6 +82,8 @@ Example:
 tinyocd -f firmware.bin
 ```
 
+Without action arguments, tinyocd shows the programmer, the chip, whether it is read protected and its option byte registers (user row on SAMD). Then the firmware is started.
+
 Notes:
 - The BIN file is written to the start of the flash memory (0x08000000 for STM32/PY32, 0x00000000 for SAMD).
 - If the chip cannot be halted (e.g. SWD pins disabled by the firmware), tinyOCD connects under reset. For this, NRST must be connected to the programmer.

{tinyocd-1.0.0 → tinyocd-1.1.0}/README.md

@@ -59,6 +59,8 @@ Example:
 tinyocd -f firmware.bin
 ```
 
+Without action arguments, tinyocd shows the programmer, the chip, whether it is read protected and its option byte registers (user row on SAMD). Then the firmware is started.
+
 Notes:
 - The BIN file is written to the start of the flash memory (0x08000000 for STM32/PY32, 0x00000000 for SAMD).
 - If the chip cannot be halted (e.g. SWD pins disabled by the firmware), tinyOCD connects under reset. For this, NRST must be connected to the programmer.

{tinyocd-1.0.0 → tinyocd-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "tinyocd"
-version      = "1.0.0"
+version      = "1.1.0"
 description  = "Programming Tool for STM32, PY32 and SAMD Microcontrollers via CMSIS-DAP, ST-Link or J-Link"
 keywords     = ["SWD", "ARM", "Cortex-M", "STM32", "PY32", "PUYA", "SAMD", "ATSAMD21", "CMSIS-DAP", "DAPLink", "ST-Link", "J-Link", "microcontroller"]
 dependencies = ["pyusb", "libusb-package; platform_system == 'Windows'"]

{tinyocd-1.0.0 → tinyocd-1.1.0}/tinyocd/tinyocd.py

@@ -2,7 +2,7 @@
 # ===================================================================================
 # Project:   tinyOCD - Programming Tool for STM32, PY32 and SAMD Microcontrollers
 #                      via CMSIS-DAP (DAPLink), ST-Link or J-Link
-# Version:   v1.0
+# Version:   v1.1
 # Year:      2026
 # Author:    Stefan Wagner
 # Github:    https://github.com/wagiminator
@@ -70,6 +70,8 @@
 #   -R, --pinreset            make NRST pin a reset pin
 #   -f FLASH, --flash FLASH   write BIN file to flash and verify
 #   -t, --list                list supported chips
+#   Without action arguments, the programmer, the chip and its option bytes
+#   (user row on SAMD) are shown.
 #
 # - Example:
 #   python3 tinyocd.py -f firmware.bin
@@ -113,10 +115,8 @@ def _main():
         print_supported_chips()
         sys.exit(0)
 
-    # Check arguments
-    if not any( (args.unlock, args.lock, args.erase, args.bootpin, args.pingpio, args.pinreset, args.flash) ):
-        print('No arguments - no action!')
-        sys.exit(0)
+    # Check arguments (without action arguments the chip info is shown)
+    showinfo = not any( (args.unlock, args.lock, args.erase, args.bootpin, args.pingpio, args.pinreset, args.flash) )
     if args.pingpio and args.pinreset:
         sys.stderr.write('ERROR: -G and -R cannot be used together!\n')
         sys.exit(1)
@@ -160,6 +160,17 @@ def _main():
         if ocd.locked:
             print('Chip is read protected (locked).')
 
+        # Show option bytes (no action arguments)
+        if showinfo:
+            if not ocd.locked:
+                print('Read protection: off')
+            options = ocd.option_bytes()
+            if options and all(value is None for name, value in options):
+                print('INFO: Option bytes cannot be read.')
+            else:
+                for name, value in options:
+                    print('%-16s %s' % (name + ':', 'not readable' if value is None else '0x%08x' % value))
+
         # Check option support before doing anything
         if args.bootpin and not ocd.chip.has_bootpin:
             raise Exception('BOOT0 pin configuration is not supported on this chip')
@@ -1467,6 +1478,12 @@ class Target:
         self.chip.driver.nrst(gpio)
         self.reconnect_after_reset()
 
+    # Option byte registers (user row on SAMD) as list of (name, value or None)
+    def option_bytes(self):
+        if self.chip.driver is None:
+            return []
+        return self.chip.driver.options()
+
 
 # ===================================================================================
 # Flash Driver Base Class
@@ -1475,6 +1492,7 @@ class Target:
 class FlashDriver:
     unit = 4
     iwdg_freeze = None
+    option_regs = ()                                                # (name, offset) of option registers
 
     def __init__(self, target):
         self.t = target
@@ -1503,6 +1521,9 @@ class FlashDriver:
     def nrst(self, gpio):
         raise Exception('NRST pin configuration is not supported on this chip')
 
+    def options(self):
+        return [(name, self.t.try_read32(self.base + offset)) for name, offset in self.option_regs]
+
     def r(self, reg):
         return self.t.read32(self.base + reg)
 
@@ -1523,6 +1544,7 @@ class FlashDriver:
 
 class STM32F1Flash(FlashDriver):
     unit = 2
+    option_regs = (('FLASH_OBR', 0x1C), ('FLASH_WRPR', 0x20))
 
     def __init__(self, target, part, devid, size):
         super().__init__(target)
@@ -1628,6 +1650,7 @@ class STM32F1Flash(FlashDriver):
 
 class STM32F4Flash(FlashDriver):
     unit = 2
+    option_regs = (('FLASH_OPTCR', 0x14),)
 
     def __init__(self, target, part, devid, size):
         super().__init__(target)
@@ -1703,6 +1726,8 @@ class STM32F4Flash(FlashDriver):
 # ===================================================================================
 
 class STM32L0Flash(FlashDriver):
+    option_regs = (('FLASH_OPTR', 0x1C),)
+
     def __init__(self, target, part, devid, size):
         super().__init__(target)
         self.l1 = (part == 0xC23)
@@ -1794,6 +1819,7 @@ class STM32L4Flash(FlashDriver):
         self.busy = (1 << 16) | (1 << 18) | ((1 << 17) if devid == 0x467 else 0)
         self.KEYR, self.OPTKEYR, self.SR, self.CR, self.OPTR = \
             (0x08, 0x10, 0x20, 0x28, 0x40) if self.l5 else (0x08, 0x0C, 0x10, 0x14, 0x20)
+        self.option_regs = (('FLASH_OPTR', self.OPTR),)
         if opts.get('tz') and (self.r(self.OPTR) & (1 << 31)):
             raise Exception('TrustZone is enabled on this chip, not supported')
         fz = opts.get('fz')
@@ -1881,6 +1907,8 @@ class STM32L4Flash(FlashDriver):
 # ===================================================================================
 
 class STM32H7Flash(FlashDriver):
+    option_regs = (('FLASH_OPTSR_CUR', 0x1C),)
+
     def __init__(self, target, part, devid, size):
         super().__init__(target)
         self.base = 0x52002000
@@ -1967,6 +1995,7 @@ class STM32H7Flash(FlashDriver):
 
 class STM32H5Flash(FlashDriver):
     unit = 16
+    option_regs = (('FLASH_OPTSR_CUR', 0x50),)
     iwdg_freeze = (0x44024008, 1 << 12)
 
     def __init__(self, target, part, devid, size):
@@ -2017,6 +2046,7 @@ PY32_VARIANTS = {
 
 class PY32Flash(FlashDriver):
     unit = 128
+    option_regs = (('FLASH_OPTR', 0x20),)
 
     def __init__(self, target, variant):
         super().__init__(target)
@@ -2162,6 +2192,9 @@ class SAMDFlash(FlashDriver):
             if flags & 0x02:
                 raise Exception('NVM controller error (STATUS 0x%04x)' % (self.r(0x18) & 0xFFFF))
 
+    def options(self):
+        return [('USER ROW word %d' % i, self.t.try_read32(0x00804000 + 4 * i)) for i in range(3 if self.d5x else 2)]
+
     def _bootprot(self):
         user = self.t.read32(0x00804000)
         if self.d5x:

{tinyocd-1.0.0 → tinyocd-1.1.0/tinyocd.egg-info}/PKG-INFO

@@ -1,31 +1,9 @@
 Metadata-Version: 2.4
 Name: tinyocd
-Version: 1.0.0
+Version: 1.1.0
 Summary: Programming Tool for STM32, PY32 and SAMD Microcontrollers via CMSIS-DAP, ST-Link or J-Link
 Author-email: Stefan Wagner <wagiminator@web.de>
 Maintainer-email: Stefan Wagner <wagiminator@web.de>
-License: MIT License
-        
-        Copyright (c) 2026 Stefan Wagner
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
 Project-URL: Homepage, https://wagiminator.github.io/
 Project-URL: Repository, https://github.com/wagiminator/MCU-Flash-Tools
 Project-URL: Issues, https://github.com/wagiminator/MCU-Flash-Tools/issues
@@ -38,12 +16,10 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: pyusb
 Requires-Dist: libusb-package; platform_system == "Windows"
 Provides-Extra: hid
 Requires-Dist: hidapi; extra == "hid"
-Dynamic: license-file
 
 # Programming Tool for STM32, PY32 and SAMD Microcontrollers via CMSIS-DAP, ST-Link or J-Link
 ## Description
@@ -106,6 +82,8 @@ Example:
 tinyocd -f firmware.bin
 ```
 
+Without action arguments, tinyocd shows the programmer, the chip, whether it is read protected and its option byte registers (user row on SAMD). Then the firmware is started.
+
 Notes:
 - The BIN file is written to the start of the flash memory (0x08000000 for STM32/PY32, 0x00000000 for SAMD).
 - If the chip cannot be halted (e.g. SWD pins disabled by the firmware), tinyOCD connects under reset. For this, NRST must be connected to the programmer.

{tinyocd-1.0.0 → tinyocd-1.1.0}/tinyocd.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE
 README.md
 pyproject.toml
 tinyocd/tinyocd.py

tinyocd-1.0.0/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Stefan Wagner
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.