Merge branch 'master' of https://gitee.com/Dozingfiretruck/MCUProg

Author: PeakRacing

.github/workflows/linux.yml

@@ -12,17 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.11
+    - name: Set up Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "3.13"
         # cache: "pip"
     - name: Install dependencies
       run: |
         sudo apt update -y
         sudo apt upgrade -y
         sudo apt install ccache
         sudo apt install clang
+        sudo apt install libusb-dev
         python -m pip install --upgrade pip
         pip install pyside6
         pip install pyocd

.github/workflows/macos.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
     - name: Check out repository
       uses: actions/checkout@v4
-    - name: Set up Python 3.11
+    - name: Set up Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/windows.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.11
+    - name: Set up Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: "3.11"
+        python-version: "3.13"
         # cache: 'pip'
     - name: Set up MSVC
       uses: ilammy/msvc-dev-cmd@v1

MCUProg.py

@@ -12,10 +12,10 @@
 
 # The output directory and other options
 # nuitka-project: --output-dir=build
-# nuitka-project: --disable-console
 # nuitka-project: --include-data-dir=./icons=./icons
 # nuitka-project: --include-data-dir=./resources=./resources
 # nuitka-project-if: {OS} in ("Windows"):
+#    nuitka-project: --windows-console-mode=disable
 #    nuitka-project: --windows-icon-from-ico=./icons/tool_icon.ico
 # nuitka-project-if: {OS} in ("Linux", "FreeBSD"):
 #    nuitka-project: --linux-icon=./icons/tool_icon.ico
@@ -48,7 +48,7 @@
 
 from pyocd.target.pack.cmsis_pack import CmsisPack
 
-version = "0.0.9"
+version = "0.1.0"
 author = "打盹的消防车"
 
 try:
@@ -521,36 +521,12 @@ def __init__(self, parent = None) :
         self.gridLayout_info.addWidget(self.logs_label, 5, 0, 1, 1)
         self.gridLayout_info.addWidget(self.logs, 5, 1, 1, 7)
 
-        # 信号与槽
-        self.pack_selection_button.clicked.connect(self.click_choose_pack)
-        self.usb_comboBox.pop_up.connect(self.usb_selection)
-        self.usb_connect_button.clicked.connect(self.usb_connect_button_click)
-        self.targets_comboBox.pop_up.connect(self.target_selection)
-        self.file_selection_button.clicked.connect(self.file_selection_button_click)
-        self.flash_button.clicked.connect(self.flash_button_click)
-
         self.setCentralWidget(self.centralwidget)
-
         self.retranslateUi()
 
         QMetaObject.connectSlotsByName(self)
 
-        self.worker = Worker()
-        self.worker_thread = QThread()
-        self.worker.moveToThread(self.worker_thread)
-        self.programmer.connect(self.worker.programmer)
-        self.mem_read.connect(self.worker.mem_read)
-
-        self.worker.programmer_finish.connect(self.programmer_finished)
-        self.worker.mem_read_finish.connect(self.mem_read_finished)
-
-        self.worker.mem_text_show.connect(lambda text: self.mem_textBrowser.insertPlainText(text))
-
-        self.worker_thread.start()
-
-        self.usb_selection()
-        self.target_selection()
-        self.mem_show()
+        self.init_extra()
 
     def retranslateUi(self):
         self.pack_label.setText(QCoreApplication.translate("MCUProg", u"pack文件", None))
@@ -574,7 +550,30 @@ def retranslateUi(self):
         self.chip_rom_label.setText(QCoreApplication.translate("MCUProg", u"ROM:", None))
         self.chip_other_label.setText(QCoreApplication.translate("MCUProg", u"OTHER:", None))
         self.logs_label.setText(QCoreApplication.translate("MCUProg", u"日志:", None))
-    
+
+    def init_extra(self):
+        self.worker = Worker()
+        self.worker_thread = QThread()
+        self.worker.moveToThread(self.worker_thread)
+        self.programmer.connect(self.worker.programmer)
+        self.mem_read.connect(self.worker.mem_read)
+        self.worker.programmer_finish.connect(self.programmer_finished)
+        self.worker.mem_read_finish.connect(self.mem_read_finished)
+        self.worker.mem_text_show.connect(lambda text: self.mem_textBrowser.insertPlainText(text))
+        self.worker_thread.start()
+
+        # 信号与槽
+        self.pack_selection_button.clicked.connect(self.click_choose_pack)
+        self.usb_comboBox.pop_up.connect(self.usb_selection)
+        self.usb_connect_button.clicked.connect(self.usb_connect_button_click)
+        self.targets_comboBox.pop_up.connect(self.target_selection)
+        self.file_selection_button.clicked.connect(self.file_selection_button_click)
+        self.flash_button.clicked.connect(self.flash_button_click)
+
+        self.usb_selection()
+        self.target_selection()
+        self.mem_show()
+
     def usb_selection(self):
         self.usb_probe()
 
@@ -612,7 +611,7 @@ def usb_connect_button_click(self):
                         self.Probe = Probe
                         break
                 # print(self.usb_comboBox.currentText())
-                print(Probe,Probe.unique_id)
+                # print(Probe,Probe.unique_id)
                 # print(self.targets_comboBox.currentText())
                 # print(self.frequency[self.speed_comboBox.currentText()])
                 if self.Probe:
@@ -706,8 +705,9 @@ def mem_read_finished(self):
         self.mem_toolButton.setEnabled(True)
 
     def flash_button_click(self):
-        self.flash_button.setEnabled(False)
-        self.programmer.emit(self)
+        if self.file_path != '':
+            self.flash_button.setEnabled(False)
+            self.programmer.emit(self)
 
     def usb_probe(self):
         self.allProbes = ConnectHelper.get_all_connected_probes(False, None, False)

README.md

@@ -1,9 +1,13 @@
 **English** | [中文](./README_zh.md) 
 
-![github license](https://img.shields.io/github/license/Dozingfiretruck/MCUProg)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/windows.yml/badge.svg?branch=master)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/linux.yml/badge.svg?branch=master)
-
 # MCUProg
 
+![github license](https://img.shields.io/github/license/Dozingfiretruck/MCUProg)[![Latest Release](https://img.shields.io/github/v/release/Dozingfiretruck/MCUProg?label=Release&logo=github)](https://github.com/Dozingfiretruck/nes/releases/latest)![windows](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/windows.yml/badge.svg?branch=master)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/linux.yml/badge.svg?branch=master)
+
+github: [MCUProg](https://github.com/Dozingfiretruck/MCUProg) (recommend)
+
+gitee: [MCUProg:](https://gitee.com/Dozingfiretruck/MCUProg) (updates may not be timely due to synchronization issues)
+
 ## Introduction
 
 MCUProg is a MUC programming host computer software based on pyocd+PySide6 (this software is only used to learn pyocd and PySide6 practice projects, if it can help you, it is a great honor, you can also modify it at will)
@@ -12,8 +16,8 @@ MCUProg is a MUC programming host computer software based on pyocd+PySide6 (this
 
 ## Software Architecture
 
-pyocd: 0.36.0
-PySide6: 6.7.0
+pyocd: 0.37.0
+PySide6: 6.9.1
 
 ## Support platform 
 
@@ -41,6 +45,8 @@ PySide6: 6.7.0
 
 Linux to install the driver,The driver is in the [udev](./udev/) directory of the repository,Instructions for [pyocd Linux driver installation](./udev/README.md)
 
+and need install libusb : `apt install libusb-dev`
+
 ## Precautions
 
 If the programming fails, please check the following points
@@ -51,6 +57,14 @@ If the programming fails, please check the following points
 4. Whether there is an interruption to the download, such as unplugging the USB operation
 5. In other cases, please try to restart the software, if it cannot be solved, please give feedback in time
 
+## Download link
+
+github: https://github.com/Dozingfiretruck/MCUProg/releases
+
+gitee: https://gitee.com/Dozingfiretruck/MCUProg/releases
+
+
+
 ## Software Presentation
 
 ![MCUProg](./doc/MCUProg.png)

README_zh.md

@@ -1,9 +1,13 @@
 [**English**](./README.md)  | **中文**
 
-![github license](https://img.shields.io/github/license/Dozingfiretruck/MCUProg)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/windows.yml/badge.svg?branch=master)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/linux.yml/badge.svg?branch=master)
-
 # MCUProg
 
+![github license](https://img.shields.io/github/license/Dozingfiretruck/MCUProg)[![Latest Release](https://img.shields.io/github/v/release/Dozingfiretruck/MCUProg?label=Release&logo=github)](https://github.com/Dozingfiretruck/nes/releases/latest)![windows](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/windows.yml/badge.svg?branch=master)![linux](https://github.com/Dozingfiretruck/MCUProg/actions/workflows/linux.yml/badge.svg?branch=master)
+
+github: [MCUProg](https://github.com/Dozingfiretruck/MCUProg) (推荐)
+
+gitee: [MCUProg:](https://gitee.com/Dozingfiretruck/MCUProg) (由于同步问题可能导致更新不及时)
+
 ## 介绍
 
 MCUProg是一款基于pyocd+PySide6的MUC烧录上位机软件(此软件只是用来学习pyocd和PySide6的练手项目,如果能帮到你那无比荣幸,你也可以任意修改)
@@ -12,8 +16,8 @@ MCUProg是一款基于pyocd+PySide6的MUC烧录上位机软件(此软件只是
 
 ## 软件架构
 
-pyocd: 0.36.0
-PySide6: 6.7.0
+pyocd: 0.37.0
+PySide6: 6.9.1
 
 ## 支持平台
 
@@ -35,6 +39,8 @@ PySide6: 6.7.0
 
 linux下要安装驱动, 驱动在仓库[udev](./udev/)目录下，使用说明参考[pyocd linux驱动安装](./udev/README.md)
 
+并需要安装libusb : `apt install libusb-dev`
+
 ## 注意事项
 
 如烧录失败请检查一下几点
@@ -45,6 +51,12 @@ linux下要安装驱动, 驱动在仓库[udev](./udev/)目录下，使用说明
 4. 是否有中断下载比如拔出usb操作
 5. 其他情况请尝试重启软件，如无法解决请及时反馈
 
+## 下载地址
+
+github: https://github.com/Dozingfiretruck/MCUProg/releases
+
+gitee: https://gitee.com/Dozingfiretruck/MCUProg/releases
+
 ## 软件展示
 
 ![MCUProg](./doc/MCUProg.png)