|
|
@ -35,15 +35,11 @@ public class DiDevice { |
|
|
|
private DiTaskManager taskManager; |
|
|
|
// runtime variables |
|
|
|
private DiDeviceRuntimeVariableManager runtimeVariables; |
|
|
|
// message index |
|
|
|
private short messageIndex = 0; |
|
|
|
// testcase manager |
|
|
|
private DiTestcaseManager testcaseManager; |
|
|
|
|
|
|
|
@PostConstruct |
|
|
|
public void init() { |
|
|
|
this.messageIndex = 0; |
|
|
|
|
|
|
|
this.loadDeviceYml(); |
|
|
|
this.setupConnection(); |
|
|
|
this.io = new DiDeviceIOManager(this); |
|
|
@ -227,10 +223,9 @@ public class DiDevice { |
|
|
|
int moduleId = mid; |
|
|
|
|
|
|
|
DiCommandRequest request = new DiCommandRequest(); |
|
|
|
request.id = this.messageIndex; |
|
|
|
request.parameter = ByteBuffer.allocate(length); |
|
|
|
request.parameter.order(ByteOrder.LITTLE_ENDIAN); |
|
|
|
request.parameter.putShort(this.messageIndex); |
|
|
|
request.parameter.putShort(request.id); // packet index |
|
|
|
request.parameter.putShort((short)mainCmdId); // main cmd id |
|
|
|
request.parameter.put((byte)subCmdId); // sub cmd id |
|
|
|
request.parameter.put((byte)0); // directive type |
|
|
@ -241,11 +236,6 @@ public class DiDevice { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.messageIndex ++; |
|
|
|
if ( this.messageIndex > 30000 ) { |
|
|
|
this.messageIndex = 0; |
|
|
|
} |
|
|
|
|
|
|
|
return request; |
|
|
|
} |
|
|
|
|
|
|
|