Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1562 → Rev 1561

/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/OSDLogger.java
File deleted
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/MKDebugLogger.java
43,17 → 43,11
public void start(String logId) {}
 
public void log(DebugResponseFrame f, long timestamp) {
if (f == null) {
System.out.println("Oops, null response frame.");
return;
}
int l = f.getDigital()==null ? 0 : f.getDigital().length;
for (int i = 0; i < l; i++) {
for (int i = 0; i < f.getDigital().length; i++) {
System.out.println("Digital " + i + ":\t" + f.getDigital()[i]);
}
 
l = f.getAnalog()==null ? 0 : f.getAnalog().length;
for (int i = 0; i < l; i++) {
for (int i = 0; i < f.getAnalog().length; i++) {
String label = labels[i] == null ? ("Analog " + i) : labels[i];
System.out.println(label + ":\t" + f.getAnalog()[i]);
}
153,7 → 147,7
}
 
int tries = 0;
while (!missing.isEmpty() && tries < 300) {
while (!missing.isEmpty() && tries < 100) {
int i = missing.get(0);
tries++;
AnalogDebugLabelRequestFrame f2 = //ff.createAnalogDebugLabelRequestFrame(Frame.FC_ADDRESS, i);
160,10 → 154,9
new AnalogDebugLabelRequestFrame(Frame.FC_ADDRESS, i);
try {
q.sendRequest(f2);
AnalogDebugLabelResponseFrame rf = (AnalogDebugLabelResponseFrame) q.getResponseFor(f2, 5000);
AnalogDebugLabelResponseFrame rf = (AnalogDebugLabelResponseFrame) q.getResponseFor(f2, 1000);
if (rf != null) {
logger.setLabel(i, rf.getLabelAsString());
missing.remove(0);
} else {
String unknown = "analog " + i;
logger.setLabel(i, unknown);
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/UniversalConfigurator.java
70,7 → 70,7
UniversalReadParamSetRequestFrame frame = new UniversalReadParamSetRequestFrame();
frame.setConfigurationSetNumber(parameterSetNumber);
q.sendRequest(frame);
UniversalReadParamSetResponseFrame r = (UniversalReadParamSetResponseFrame) q.getResponseFor(frame, 5000);
UniversalReadParamSetResponseFrame r = (UniversalReadParamSetResponseFrame) q.getResponseFor(frame, 3000);
if (r == null) {
System.err.println("ERROR. Timeout waiting for response.");
} else {
244,7 → 244,7
if ("w".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
if ("r".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
 
String portIdentifier = null;
String portIdentifier = "COM10";
if ("r".equals(args[0])) {
readConfiguration(portIdentifier, Integer.parseInt(args[1]));