版本发布

Src/soft_seed_device.c

@@ -859,13 +859,13 @@ void  update_device_type_data(void)
                 Dev.Pump.warn = 0; //屏蔽报警
                 break;
 
-            // case FAC_HW_ESC:
-            //     Dev.Pump.rpm1 = EscMsg[1].motorRPM;
-            //     Dev.Pump.rpm2 = EscMsg[2].motorRPM;
-            //     Dev.Pump.rpm3 = 0;
-            //     Dev.Pump.rpm4 = 0;
-            //     Dev.Pump.warn = EscMsg[1].warn_flag;
-                // break;
+            case FAC_HW_ESC:
+                Dev.Pump.rpm1 = EscMsg[1].motorRPM;
+                Dev.Pump.rpm2 = EscMsg[2].motorRPM;
+                Dev.Pump.rpm3 = 0;
+                Dev.Pump.rpm4 = 0;
+                Dev.Pump.warn = EscMsg[1].warn_flag;
+                break;
             default:
                 break;
             }
@@ -934,8 +934,8 @@ void  update_device_type_data(void)
                 Dev.L_pump1.rpm =  Lpump1.rpm;
                 break;
             case FAC_HW_ESC:
-                // Dev.L_pump1.warn = EscMsg[1].warn_flag;
-                // Dev.L_pump1.rpm = EscMsg[1].motorRPM;
+                Dev.L_pump1.warn = EscMsg[1].warn_flag;
+                Dev.L_pump1.rpm = EscMsg[1].motorRPM;
                 break;
             default:
                 break;
@@ -952,8 +952,8 @@ void  update_device_type_data(void)
                 Dev.L_pump2.rpm =  Lpump2.rpm;
                 break;
             case FAC_HW_ESC:
-                // Dev.L_pump2.warn = EscMsg[2].warn_flag;
-                // Dev.L_pump2.rpm = EscMsg[2].motorRPM;
+                Dev.L_pump2.warn = EscMsg[2].warn_flag;
+                Dev.L_pump2.rpm = EscMsg[2].motorRPM;
                 break;
             default:
                 break;

Src/soft_water_device.c

@@ -322,8 +322,8 @@ void HW_CanSetESCInfomation( void )
 
             if ( setESCidInfo.setESCidNum > 0 && setESCidInfo.setESCidNum <= 4 )
             {
-                // EscMsg[setESCidInfo.setESCidNum].ResSetID = false;
-                // EscMsg[setESCidInfo.setESCidNum].ResSetIDModeExit = false;
+                EscMsg[setESCidInfo.setESCidNum].ResSetID = false;
+                EscMsg[setESCidInfo.setESCidNum].ResSetIDModeExit = false;
 
                 setESCidInfo.setESCidStep++;
             }
@@ -385,7 +385,7 @@ void HW_CanSetESCInfomation( void )
             //等待电调的油门信号失能判定时间300ms，每次配置一个电调
             if ( HAL_GetTick() - setESCidInfo.setEscIDDelayTime > 2000 )
             {
-                if (1/* EscMsg[setESCidInfo.setESCidNum].ResSetID == false*/ )
+                if ( EscMsg[setESCidInfo.setESCidNum].ResSetID == false )
                 {
                     send_can_buf[0] = setESCidInfo.setESCidNum;
                     send_can_buf[1] = setESCidInfo.setESCidNum;
@@ -411,7 +411,7 @@ void HW_CanSetESCInfomation( void )
         //nodeID配置完成/失败后退出配置模式，广播发送，全部回复
         else if ( setESCidInfo.setESCidStep == SETESCID_EXIT )
         {
-            if (1/* EscMsg[setESCidInfo.setESCidNum].ResSetIDModeExit == false */)
+            if ( EscMsg[setESCidInfo.setESCidNum].ResSetIDModeExit == false )
             {
                 //广播帧
                 canID  = ( ( HW_PRI_MEDIUM << HW_CANID_PRI_POS ) & HW_CANID_PRI_MASK ) |