From ce744c8fd742a9351a07e8ebff8ff65a645b743b Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 27 Jun 2024 10:56:12 +0800
Subject: [PATCH] update

---
 a8000_protocol               |  2 +-
 src/tab/module_opera_tab.cpp | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/a8000_protocol b/a8000_protocol
index 5ed4730..a53eb99 160000
--- a/a8000_protocol
+++ b/a8000_protocol
@@ -1 +1 @@
-Subproject commit 5ed47307b153a256e90fc5031b58ff65102a7f03
+Subproject commit a53eb99bce9e1793fe16cb7f7c2de1d7d3422e8f
diff --git a/src/tab/module_opera_tab.cpp b/src/tab/module_opera_tab.cpp
index 89d1ba5..63c09cd 100644
--- a/src/tab/module_opera_tab.cpp
+++ b/src/tab/module_opera_tab.cpp
@@ -17,17 +17,12 @@ extern Ui::MainWindow *main_ui;
 
 extern int getDeviceId();
 
-
 static const char *module_type2_str(int id) {
   switch (id) {
-    case kuniversal_module:
-      return "通用模块";
     case khbot_module:
       return "hbot模块";
-    case kmotor_module:
-      return "电机控制";
     case ktemperature_ctrl_module:
-      return "水冷温度控制";
+      return "温度控制";
     case kfan_ctrl_module:
       return "风扇控制";
     case kcode_scaner:
@@ -36,17 +31,18 @@ static const char *module_type2_str(int id) {
       return "移液体枪控制";
     case ka8000_optical_module:
       return "a8000光学模组";
-    case klaster_scaner_module:
-      return "a8000光学模组";
-      //
     case ktmc_step_motor:
       return "步进电机";
     case kmini_servo_motor_module:
       return "舵机";
     case kboard:
-      return "板子扩展";
+      return "板子";
+    case ka8000_idcard_reader:
+      return "id卡读卡器";
+    case ka8000_plate_code_scaner:
+      return "反应板条扫码器";
     default:
-      return "未知模块";
+      return "Unkown";
   }
 }
 
@@ -77,7 +73,7 @@ void ModuleOperaTab::construct(QWidget *parent) {
           if (i % 10 == 0) {
             ZQUI::ins()->ishow("");
           }
-          ZQUI::ins()->ishow("module :%d isOnline type:%10s v(%d)", i, module_type2_str(moduleType), moduleVersion);
+          ZQUI::ins()->ishow("module :%d isOnline type:%10s(%d) v(%d)", i, module_type2_str(moduleType), moduleType, moduleVersion);
         } catch (const zexception &e) {
           if (e.ecode() != ke_overtime) {
             ZQUI::ins()->ishow("%s", e.what());