1

zhang

昨天 424c956abe6441e032b9e1e113b2f82a435fdc9b

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java

@@ -5,8 +5,8 @@
import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.constant.PlcConstant;
import com.zy.acs.conveyor.core.constant.SafeSignalField;
import com.zy.acs.conveyor.core.constant.TaskField;
import com.zy.acs.conveyor.core.enums.SafeSignalField;
import com.zy.acs.conveyor.core.enums.TaskField;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
@@ -66,18 +66,18 @@
        SafeSignal safeSignal = staProtocol.getSafeSignal();

        int baseOffset = 0;
        short[] array = new short[6];
        array[0] = (short) 1;
        array[1] = (short) 0;
        array[2] = (short) 0;
        array[5] = (short) 0;
        boolean[] array = new boolean[6];
        array[0] = true;
        array[1] = false;
        array[2] = false;
        array[5] = false;
        if (safeSignal.getFlag()) {
            array[3] = (short) 0;
            array[3] = false;
            array[4] = safeSignal.getValue();
            baseOffset = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getOffset() + safeSignal.getIndex() * SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getByteLength();
        } else {
            array[3] = safeSignal.getValue();
            array[4] = (short) 0;
            array[4] = false;
            baseOffset = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getOffset() + 2 + safeSignal.getIndex() * SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getByteLength();
        }
        String flagAddr = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION