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); |