From 7a18cd43db571165e24419e530b39b58f26d15b3 Mon Sep 17 00:00:00 2001
From: HSZ_HeSongZhen <210202959@qq.com>
Date: Fri, 9 May 2025 14:19:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E5=88=86=E9=85=8D=20M?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/iflytop/gd/hardware/type/MId.java     | 103 +++++++++++----------
 src/main/resources/application-dev.yml             |   2 +-
 2 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/iflytop/gd/hardware/type/MId.java b/src/main/java/com/iflytop/gd/hardware/type/MId.java
index b578bde..f2bcc8d 100644
--- a/src/main/java/com/iflytop/gd/hardware/type/MId.java
+++ b/src/main/java/com/iflytop/gd/hardware/type/MId.java
@@ -1,63 +1,66 @@
 package com.iflytop.gd.hardware.type;
 
+/**
+ * MID 现版本 取值范围 0-255
+ */
 public enum MId {
     NotSet(0, "未设置"),
-    IO1Board(10, "台面 IO 板模块"),
-    PWMLight(11, "PWM 灯"),
-    TriColorLight(12, "三色灯"),
+    IO1Board(5, "台面 IO 板模块"),
+    PWMLight(6, "PWM 灯"),
+    TriColorLight(7, "三色灯"),
     HBotClawS(13, "夹爪舵机"),//
     DualRobotAxis1S(14, "双轴机械臂1舵机"),
     DualRobotAxis2S(15, "双轴机械臂2舵机"),
     IO1_IO(16, "台面 IO 板模块"),
     IO1_ADC(17, "台面 ADC 板模块"),
 
-    IO2Board(30, "台下 IO 板模块"),
-
-    DoorBoard(80, "门电机板模块"),//
-    DoorM(81, "门电机"),
-
-    ShakeModBoard(90, "摇匀模组板"),    //
-    ShakeM(91, "加液位摇匀电机"), //
-
-    CapStorageBoard(100, "拍子存放板模块"),     //
-    CapStorageM(101, "拍子存放电机"),          //
-
-    HBotXBoard(130, "X轴板模块"),//
-    HBotXM(131, "X轴电机"),
-    HBotYBoard(140, "Y轴板模块"),//
-    HBotYM(141, "Y轴电机"),
-    HBotZBoard(150, "Z轴板模块"),//
-    HBotZM(151, "Z轴电机"),
-
-    Heater1Board(160, "加热1板模块"),//
-    Heater1M(161, "加热1电机"),
-    Heater2Board(170, "加热2板模块"),//
-    Heater2M(171, "加热2电机"),
-    Heater3Board(180, "加热3板模块"),//
-    Heater3M(181, "加热3电机"),
-    Heater4Board(190, "加热4板模块"),//
-    Heater4M(191, "加热4电机"),
-    Heater5Board(200, "加热5板模块"),//
-    Heater5M(201, "加热5电机"),
-    Heater6Board(210, "加热6板模块"),//
-    Heater6M(211, "加热6电机"),
-
-    AcidPump1Board(220, "加酸泵1板模块"),//
-    AcidPump1M(221, "加酸泵1电机"),
-    AcidPump2Board(230, "加酸泵2板模块"),//
-    AcidPump2M(231, "加酸泵2电机"),
-    AcidPump3Board(240, "加酸泵3板模块"),//
-    AcidPump3M(241, "加酸泵3电机"),
-    AcidPump4Board(250, "加酸泵4板模块"),//
-    AcidPump4M(251, "加酸泵4电机"),
-    AcidPump5Board(260, "泵5板模块"),//
-    AcidPump5M(261, "泵5电机"),
-    AcidPump6Board(270, "泵6板模块"),//
-    AcidPump6M(271, "泵6电机"),
-    AcidPump7Board(280, "泵7板模块"),//
-    AcidPump7M(281, "泵7电机"),
-    AcidPump8Board(290, "泵8板模块"),//
-    AcidPump8M(291, "泵8电机"),
+    IO2Board(25, "台下 IO 板模块"),
+
+    DoorBoard(40, "门电机板模块"),//
+    DoorM(41, "门电机"),
+
+    ShakeModBoard(45, "摇匀模组板"),    //
+    ShakeM(46, "加液位摇匀电机"), //
+
+    CapStorageBoard(50, "拍子存放板模块"),     //
+    CapStorageM(51, "拍子存放电机"),          //
+
+    HBotXBoard(65, "X轴板模块"),//
+    HBotXM(66, "X轴电机"),
+    HBotYBoard(70, "Y轴板模块"),//
+    HBotYM(71, "Y轴电机"),
+    HBotZBoard(75, "Z轴板模块"),//
+    HBotZM(76, "Z轴电机"),
+
+    Heater1Board(80, "加热1板模块"),//
+    Heater1M(81, "加热1电机"),
+    Heater2Board(85, "加热2板模块"),//
+    Heater2M(86, "加热2电机"),
+    Heater3Board(90, "加热3板模块"),//
+    Heater3M(91, "加热3电机"),
+    Heater4Board(95, "加热4板模块"),//
+    Heater4M(96, "加热4电机"),
+    Heater5Board(100, "加热5板模块"),//
+    Heater5M(101, "加热5电机"),
+    Heater6Board(105, "加热6板模块"),//
+    Heater6M(106, "加热6电机"),
+
+    AcidPump1Board(110, "加酸泵1板模块"),//
+    AcidPump1M(111, "加酸泵1电机"),
+    AcidPump2Board(115, "加酸泵2板模块"),//
+    AcidPump2M(116, "加酸泵2电机"),
+    AcidPump3Board(120, "加酸泵3板模块"),//
+    AcidPump3M(121, "加酸泵3电机"),
+    AcidPump4Board(125, "加酸泵4板模块"),//
+    AcidPump4M(126, "加酸泵4电机"),
+    AcidPump5Board(130, "加酸泵5板模块"),//
+    AcidPump5M(131, "加酸泵5电机"),
+    AcidPump6Board(135, "加酸泵6板模块"),//
+    AcidPump6M(136, "加酸泵6电机"),
+    AcidPump7Board(140, "加酸泵7板模块"),//
+    AcidPump7M(141, "加酸泵7电机"),
+    AcidPump8Board(145, "加酸泵8板模块"),//
+    AcidPump8M(146, "加酸泵8电机"),
     ;
 
     final public String description;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e0a2e5d..014034c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -36,6 +36,6 @@ command_bus:
 device.enableCanBus: true
 
 iflytophald:
-  ip: 192.168.8.168
+  ip: 192.168.1.140
   cmdch.port: 19004
   datach.port: 19005
\ No newline at end of file