Merge branch 'master' into test

.piopm

@@ -1 +1 @@
-{"type": "tool", "name": "tool-mik32-uploader", "version": "0.3.2", "spec": {"owner": "mikron", "id": 122, "name": "tool-mik32-uploader", "requirements": null, "uri": null}}
+{"type": "tool", "name": "tool-mik32-uploader", "version": "0.3.3", "spec": {"owner": "mikron", "id": 122, "name": "tool-mik32-uploader", "requirements": null, "uri": null}}

CHANGELOG.md

@@ -22,6 +22,13 @@
 
 ### Удалено
 
+## [v0.3.3] - 2025-03-17
+ 
+### Исправлено
+- Добавлен id для TCB блока МК, Добавление нестандартного CSR-регистра MCOUNTEN (@cryptozoy)
+- Ошибка записи eeprom при boot=1 (ram)
+- Выбор порта аргументом --openocd-port
+
 ## [v0.3.2] - 2024-12-28
  
 ### Добавлено

_version.py

@@ -1 +1 @@
-applicaton_version = 'v0.3.2'
+applicaton_version = 'v0.3.3'

mik32_upload.py

@@ -225,6 +225,11 @@ def upload_file(
     segments: List[Segment] = file.get_segments()
     pages: Pages = form_pages(segments, boot_mode)
 
+    try:
+        port = int(port)
+    except ValueError:
+        print("An integer argument --openocd-port was expected!")
+
     proc: Union[subprocess.Popen, None] = None
     if is_run_openocd:
         try:

openocd-scripts/target/mik32.cfg

@@ -54,14 +54,17 @@ proc init_targets {} {
 
   set _CHIPNAME riscv
   set _CPUTAPID 0xdeb11001
+  set _SYSTAPID 0xfffffffe
 
   jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID
 
-  jtag newtap $_CHIPNAME sys -irlen 4 -ircapture 0x05 -irmask 0x0F -enable
+  jtag newtap $_CHIPNAME sys -irlen 4 -ircapture 0x05 -irmask 0x0F -enable -expected-id $_SYSTAPID -ignore-bypass
     
   set _TARGETNAME $_CHIPNAME.cpu
 
   target create $_TARGETNAME riscv -endian little -chain-position $_TARGETNAME -coreid 0
+
+  riscv expose_csrs 2016=mcounten
 }
 
 poll_period 200

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tool-mik32-uploader",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "mik32-uploader",
   "keywords": [
     "tools",