联调

dubin

6 天以前 ffc3b1151655f258fb1db0b24c3434bd294b0598

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -126,13 +126,13 @@
        crnProtocol.setWalkPos((short)0);
        crnProtocol.setLoaded((short)0);
        crnProtocol.setAlarm((short)0);
        crnProtocol.setxSpeed((short)0);
        crnProtocol.setySpeed((short)0);
        crnProtocol.setzSpeed((short)0);
        crnProtocol.setxDistance((short)0);
        crnProtocol.setyDistance((short)0);
        crnProtocol.setxDuration((short)0);
        crnProtocol.setyDuration((short)0);
        crnProtocol.setxSpeed((float)0);
        crnProtocol.setySpeed((float)0);
        crnProtocol.setzSpeed((float)0);
        crnProtocol.setxDistance((float)0);
        crnProtocol.setyDistance((float)0);
        crnProtocol.setxDuration((float)0);
        crnProtocol.setyDuration((float)0);
    }

    @Override
@@ -183,13 +183,13 @@
                crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
                crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
                crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
                crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
                crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
                crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
                crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
                crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
//                crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
//                crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
//                crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
//                crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
//                crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
//                crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
//                crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));

                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));