Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1543 → Rev 1545

/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/AnalogDebugLabelRequestFrame.java
7,7 → 7,7
public class AnalogDebugLabelRequestFrame extends RequestFrame {
int channel;
AnalogDebugLabelRequestFrame(int address, int channel) {
public AnalogDebugLabelRequestFrame(int address, int channel) {
super(address);
this.channel = channel;
}
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/DebugRequestFrame.java
7,7 → 7,7
public class DebugRequestFrame extends RequestFrame {
private int autoSendInterval;
 
DebugRequestFrame(int address) {
public DebugRequestFrame(int address) {
super(address);
}
 
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/MKDebugLogger.java
18,15 → 18,13
import dongfang.mkt.frames.DebugRequestFrame;
import dongfang.mkt.frames.DebugResponseFrame;
import dongfang.mkt.frames.Frame;
import dongfang.mkt.frames.FrameFactory;
import dongfang.mkt.io.MKCommPort;
import dongfang.mkt.io.RXTXSerialPort;
import dongfang.mkt.serial.FrameQueue;
import dongfang.mkt.version.MKVersion;
 
public class MKDebugLogger {
private static final PrintStream STDERR = System.out;
private static final FrameFactory ff = MKVersion.getFrameFactory(null);
// private static final FrameFactory ff = MKVersion.getFrameFactory(null);
 
interface DebugLogger {
void setLabel(int index, String label);
152,8 → 150,8
while (!missing.isEmpty() && tries < 100) {
int i = missing.get(0);
tries++;
AnalogDebugLabelRequestFrame f2 = ff
.createAnalogDebugLabelRequestFrame(Frame.FC_ADDRESS, i);
AnalogDebugLabelRequestFrame f2 = //ff.createAnalogDebugLabelRequestFrame(Frame.FC_ADDRESS, i);
new AnalogDebugLabelRequestFrame(Frame.FC_ADDRESS, i);
try {
q.sendRequest(f2);
AnalogDebugLabelResponseFrame rf = (AnalogDebugLabelResponseFrame) q.getResponseFor(f2, 1000);
168,7 → 166,8
}
}
 
DebugRequestFrame f = ff.createDebugRequestFrame(Frame.FC_ADDRESS);
DebugRequestFrame f = // ff.createDebugRequestFrame(Frame.FC_ADDRESS);
new DebugRequestFrame(Frame.FC_ADDRESS);
f.setAutoSendInterval(interval);
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
q.sendRequest(f);
/dongfang_FC_rewrite_tool/src/dongfang/mkt/version/MKVersion.java
1,7 → 1,6
package dongfang.mkt.version;
 
import dongfang.mkt.frames.FrameFactory;
import dongfang.mkt.frames.FrameFactory_V0_74;
 
public class MKVersion {