From ca66d05f2d3f4090e4b355be229d34260ac8b030 Mon Sep 17 00:00:00 2001 From: ranchuan Date: Fri, 27 Oct 2023 18:50:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9updata=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.txt | 2 ++ coder/coder_test.py | 8 ++++---- coder/prottcp.py | 16 +++++++++++++--- updata/updata.py | 45 +++++++++++++++++++++++---------------------- 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index 7b68bc9..577806c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -90,4 +90,6 @@ 检测后赋码如果返回200也保存赋码结果 添加电机下降按钮 每次赋码结果采用不同的颜色 +2023.10.27 + 修改updata工具按钮描述 diff --git a/coder/coder_test.py b/coder/coder_test.py index ce647ef..634ece1 100644 --- a/coder/coder_test.py +++ b/coder/coder_test.py @@ -130,12 +130,12 @@ def main(): print("串口号为:{d1} ,运行次数为:{d2}".format(d1=com,d2=count)) # 检测赋码仪系统测试 - # p.open(com,115200) - # p.ecode_test(count) + p.open(com,115200) + p.ecode_test(count) # 赋码仪设备串口测试 - p.open(com,115200) - p.coder_test(count) + # p.open(com,115200) + # p.coder_test(count) # 赋码仪设备网口测试 # p.open("utcp",0) diff --git a/coder/prottcp.py b/coder/prottcp.py index 93405ed..5b8ef04 100644 --- a/coder/prottcp.py +++ b/coder/prottcp.py @@ -480,8 +480,8 @@ if __name__ == "__main__": # u.send_file(0xed,"../Objects/checker_gen1_app_20230602.bin") # 设置电阻 矫正值 - u.cmd=0x41 - data=bytearray([1,0,0x00,2,0,0x00,3,0,0x00,4,0,0x00,5,0,0x00,6,0,0x00,7,0,0x00,8,0,0x00,9,0,0x00,10,0,0x00,11,0,0x00,12,0,0x00,13,0,0x00,14,0,0x00,15,0,0x00,16,0,0x00,17,0,0x00,18,0,0x00,19,0,0x00,20,0,0x00]) + # u.cmd=0x41 + # data=bytearray([1,0,0x00,2,0,0x00,3,0,0x00,4,0,0x00,5,0,0x00,6,0,0x00,7,0,0x00,8,0,0x00,9,0,0x00,10,0,0x00,11,0,0x00,12,0,0x00,13,0,0x00,14,0,0x00,15,0,0x00,16,0,0x00,17,0,0x00,18,0,0x00,19,0,0x00,20,0,0x00]) # 测量电阻 # u.cmd=0x42 # data=bytearray([0]) @@ -494,7 +494,7 @@ if __name__ == "__main__": # data=bytearray([0x02]) # 上升 # data=bytearray([0x03]) # 下降 - print(u.encode(data).hex(' ')) + # print(u.encode(data).hex(' ')) # with open("file/EX_Coder_Test_2023-07-6.json","rb") as f: # json_obj=json.loads(f.read()) # d=scheme_to_byte(json_obj) @@ -510,6 +510,16 @@ if __name__ == "__main__": # p=u.encode(f.read()) # print(p.hex(' ')) + u.init("utcp:9527") + u.send(0x42,bytearray([0])) + d=u.ser.read(500) + d=u.decode(d) + print(d.hex(' ')) + def slave_res(d:bytearray): + for i in range(len(d)//3): + print("slave:{addr},{res}".format(addr=d[3*i],res=(d[3*i+1])|(d[3*i+2]<<8))) + slave_res(d[1:]) + # 开始检测 # 59 6d 03 00 30 00 00 60 0f diff --git a/updata/updata.py b/updata/updata.py index 9dc25ca..81f21e7 100644 --- a/updata/updata.py +++ b/updata/updata.py @@ -110,7 +110,7 @@ class updata_dlg(QObject): QObject.__init__(self) self.app = QApplication(sys.argv) self.widget = QWidget() - self.widget.resize(820, 410) + self.widget.resize(870, 410) self.widget.setWindowTitle("批检仪程序升级") self.widget.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint) self.addrs="" @@ -189,9 +189,9 @@ class updata_dlg(QObject): def hand_but_init(self): self.hand_but = QPushButton(self.widget) self.hand_but.setObjectName(u"hand_but") - self.hand_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.hand_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.hand_but.setText("手动添加IP") + self.hand_but.setText("手动添加IP到列表") self.hand_but.clicked.connect(self.hand_but_clicked) self.hand_but.setToolTip("请先在[手动添加IP地址]输入框中输入要添加的地址,然后点击此按钮添加到设备列表中。") # self.hand_but.setToolTipDuration(1) @@ -200,9 +200,9 @@ class updata_dlg(QObject): def save_but_init(self): self.save_but = QPushButton(self.widget) self.save_but.setObjectName(u"save_but") - self.save_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.save_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.save_but.setText("发送文件") + self.save_but.setText("发送文件到主板") self.save_but.clicked.connect(self.save_but_clicked) self.save_but.setToolTip("请先选中要升级的主板和文件,然后点击此按钮发送到设备中。") # self.save_but.setToolTipDuration(1) @@ -211,7 +211,7 @@ class updata_dlg(QObject): def dhcp_but_init(self): self.dhcp_but = QPushButton(self.widget) self.dhcp_but.setObjectName(u"dhcp_but") - self.dhcp_but.setGeometry(QRect(700, 60, 93, 28)) + self.dhcp_but.setGeometry(QRect(750, 60, 93, 28)) self.dhcp_but.setText("打开DHCP") self.dhcp_but.clicked.connect(self.dhcp_but_clicked) self.dhcp_but.setToolTip("如果没有搜索到从机,则打开DHCP服务器。") @@ -220,7 +220,7 @@ class updata_dlg(QObject): def console_but_init(self): self.console_but = QPushButton(self.widget) self.console_but.setObjectName(u"console_but") - self.console_but.setGeometry(QRect(700, 100, 93, 28)) + self.console_but.setGeometry(QRect(750, 100, 93, 28)) self.console_but.setText("串口控制台") self.console_but.clicked.connect(self.console_but_clicked) self.console_but.setToolTip("通过设备的串口控制台升级程序,这种方式需要使用到U盘。") @@ -229,7 +229,7 @@ class updata_dlg(QObject): def settime_but_init(self): self.settime_but = QPushButton(self.widget) self.settime_but.setObjectName(u"settime_but") - self.settime_but.setGeometry(QRect(700, 140, 93, 28)) + self.settime_but.setGeometry(QRect(750, 140, 93, 28)) self.settime_but.setText("同步时间") self.settime_but.clicked.connect(self.settime_but_clicked) self.settime_but.setToolTip("同步主板时间。") @@ -238,8 +238,8 @@ class updata_dlg(QObject): def restart_but_init(self): self.restart_but = QPushButton(self.widget) self.restart_but.setObjectName(u"restart_but") - self.restart_but.setGeometry(QRect(700, 180, 93, 28)) - self.restart_but.setText("重启软件") + self.restart_but.setGeometry(QRect(700, 180, 150, 28)) + self.restart_but.setText("重启主板软件") self.restart_but.clicked.connect(self.restart_but_clicked) self.restart_but.setToolTip("如果已知设备ip地址,但刷新不出,可尝试重启设备软件。") @@ -247,18 +247,18 @@ class updata_dlg(QObject): def cmd_but_init(self): self.cmd_but = QPushButton(self.widget) self.cmd_but.setObjectName(u"save_but") - self.cmd_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.cmd_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.cmd_but.setText("升级MCU") + self.cmd_but.setText("升级小板程序") self.cmd_but.clicked.connect(self.cmd_but_clicked) - self.cmd_but.setToolTip("请先将要升级的MCU程序发送到主板中,然后点击此按钮开始升级MCU程序。") + self.cmd_but.setToolTip("请先将要升级的小板程序发送到主板中,然后点击此按钮开始升级小板程序。") # self.cmd_but.setToolTipDuration(1) # 初始化刷新按钮 def refresh_but_init(self): self.refresh_but = QPushButton(self.widget) self.refresh_but.setObjectName(u"save_but") - self.refresh_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.refresh_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step self.refresh_but.setText("刷新IP地址") self.refresh_but.clicked.connect(self.refresh_but_clicked) @@ -269,20 +269,21 @@ class updata_dlg(QObject): def sstate_but_init(self): self.sstate_but = QPushButton(self.widget) self.sstate_but.setObjectName(u"sstate_but") - self.sstate_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.sstate_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.sstate_but.setText("MCU在线状态") + self.sstate_but.setText("小板在线状态") self.sstate_but.clicked.connect(self.sstate_but_clicked) self.sstate_but.setToolTip("点击此按钮查看小板在线情况,显示在线小板的地址。") + self.sstate_but.setEnabled(False) # self.sstate_but.setToolTipDuration(1) # 初始化添加文件按钮 def addfile_but_init(self): self.addfile_but = QPushButton(self.widget) self.addfile_but.setObjectName(u"addfile_but") - self.addfile_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.addfile_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.addfile_but.setText("添加文件") + self.addfile_but.setText("添加外部文件到列表") self.addfile_but.clicked.connect(self.addfile_but_clicked) self.addfile_but.setToolTip("如果文件列表中不存在要升级的文件,点击此按钮从外部添加。") # self.addfile_but.setToolTipDuration(1) @@ -291,9 +292,9 @@ class updata_dlg(QObject): def scheme_but_init(self): self.scheme_but = QPushButton(self.widget) self.scheme_but.setObjectName(u"scheme_but") - self.scheme_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.scheme_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.scheme_but.setText("升级方案") + self.scheme_but.setText("升级方案到小板") self.scheme_but.clicked.connect(self.scheme_but_clicked) self.scheme_but.setToolTip("请先将要升级的方案文件发送到主板中,然后点击此按钮开始升级方案到MCU。") # self.addfile_but.setToolTipDuration(1) @@ -302,9 +303,9 @@ class updata_dlg(QObject): def download_but_init(self): self.download_but = QPushButton(self.widget) self.download_but.setObjectName(u"download_but") - self.download_but.setGeometry(QRect(590, self.but_y, 93, 28)) + self.download_but.setGeometry(QRect(590, self.but_y, 150, 28)) self.but_y+=self.but_y_step - self.download_but.setText("下载文件") + self.download_but.setText("从服务器下载文件") self.download_but.clicked.connect(self.download_but_clicked) # ip前缀