dubin
3 天以前 e2aa3f9c79ae688a56ea3bb5bc96ba1600f215de
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -182,7 +182,7 @@
//            crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
            if(slave.getId()==3){
//            if(slave.getId()==3){
//                crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 28));
//                crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 30));
//                crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 32));
@@ -190,6 +190,15 @@
//                crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 36));
//                crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
//                crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 40));
//                crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
//                crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
//                crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
//                crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
//                crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
//                crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
//                crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
//            }else{
                crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
                crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
                crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
@@ -198,16 +207,7 @@
                crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
                crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
            }else{
                crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
                crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
                crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
                crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
                crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
                crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
                crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
            }
//            }