Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1696 → Rev 1695

/dongfang_FC_rewrite_tool/src/dongfang/mkt/RequestFrameVisitor.java
13,8 → 13,6
import dongfang.mkt.frames.LoopbackTestRequestFrame;
import dongfang.mkt.frames.MotorTestRequestFrame;
import dongfang.mkt.frames.OSDDataRequestFrame;
import dongfang.mkt.frames.ProfilerLabelRequestFrame;
import dongfang.mkt.frames.ProfilerRequestFrame;
import dongfang.mkt.frames.ReadExternalControlRequestFrame;
import dongfang.mkt.frames.ReadIMUConfigurationRequestFrame;
import dongfang.mkt.frames.ReadMotorMixerRequestFrame;
32,9 → 30,7
public interface RequestFrameVisitor {
// void visit(RequestFrame f) throws IOException;
void visit(AnalogDebugLabelRequestFrame f) throws IOException;
void visit(ProfilerLabelRequestFrame f) throws IOException;
void visit(DebugRequestFrame f) throws IOException;
void visit(ProfilerRequestFrame f) throws IOException;
void visit(LoopbackTestRequestFrame f) throws IOException;
void visit(MotorTestRequestFrame f) throws IOException;
void visit(VersionRequestFrame f) throws IOException;
/dongfang_FC_rewrite_tool/src/dongfang/mkt/comm/MKInputStream.java
9,6 → 9,7
import dongfang.mkt.frames.AllDisplaysResponseFrame;
import dongfang.mkt.frames.AnalogDebugLabelResponseFrame;
import dongfang.mkt.frames.AttitudeDataResponseFrame;
import dongfang.mkt.frames.ChangeParameterSetResponseFrame;
import dongfang.mkt.frames.CompassHeadingResponseFrame;
import dongfang.mkt.frames.ConfirmFrame;
import dongfang.mkt.frames.DCMMatrixResponseFrame;
15,8 → 16,6
import dongfang.mkt.frames.DebugResponseFrame;
import dongfang.mkt.frames.MotorTestResponseFrame;
import dongfang.mkt.frames.OSDDataResponseFrame;
import dongfang.mkt.frames.ProfilerLabelResponseFrame;
import dongfang.mkt.frames.ProfilerResponseFrame;
import dongfang.mkt.frames.ReadExternalControlResponseFrame;
import dongfang.mkt.frames.ReadIMUConfigurationResponseFrame;
import dongfang.mkt.frames.ReadMotorMixerResponseFrame;
226,7 → 225,6
result = f;
break;
}
/*
case 'F': {
ChangeParameterSetResponseFrame f = new ChangeParameterSetResponseFrame(address);
f.setParameterSetNumber(base64InputStream.readByte());
233,15 → 231,6
result = f;
break;
}
*/
case 'F': {
ProfilerLabelResponseFrame f = new ProfilerLabelResponseFrame(address);
f.setChannel(base64InputStream.readByte());
f.setLabel(base64InputStream.readChars(16));
result = f;
break;
}
 
case 'G': {
ReadExternalControlResponseFrame f = new ReadExternalControlResponseFrame(address);
f.setDigital(base64InputStream.readBytes(2));
435,14 → 424,6
break;
}
*/
case 'U': {
ProfilerResponseFrame f = new ProfilerResponseFrame(address);
f.setTotalHits(base64InputStream.readSignedDWord());
for (int i=0; i<16; i++)
f.setActivity(i, base64InputStream.readWord());
result = f;
break;
}
case 'V': {
VersionResponseFrame f = new VersionResponseFrame(address);
f.setSWMajor(base64InputStream.readByte());
/dongfang_FC_rewrite_tool/src/dongfang/mkt/comm/MKOutputStream.java
15,8 → 15,6
import dongfang.mkt.frames.LoopbackTestRequestFrame;
import dongfang.mkt.frames.MotorTestRequestFrame;
import dongfang.mkt.frames.OSDDataRequestFrame;
import dongfang.mkt.frames.ProfilerLabelRequestFrame;
import dongfang.mkt.frames.ProfilerRequestFrame;
import dongfang.mkt.frames.ReadExternalControlRequestFrame;
import dongfang.mkt.frames.ReadIMUConfigurationRequestFrame;
import dongfang.mkt.frames.ReadMotorMixerRequestFrame;
135,11 → 133,6
base64OutputStream.writeByte(f.getChannel());
}
 
public void visit(ProfilerLabelRequestFrame f) throws IOException {
writeByte('f');
base64OutputStream.writeByte(f.getChannel());
}
 
public void visit(AttitudeDataRequestFrame f) throws IOException {
writeByte('c');
base64OutputStream.writeByte(f.getAutoSendInterval());
150,11 → 143,6
base64OutputStream.writeByte(f.getAutoSendInterval());
}
 
public void visit(ProfilerRequestFrame f) throws IOException {
writeByte('u');
base64OutputStream.writeByte(f.getAutoSendInterval());
}
 
public void visit(DCMMatrixRequestFrame f) throws IOException {
writeByte('e');
}
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/ProfilerRequestFrame.java
File deleted
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/ProfilerLabelRequestFrame.java
File deleted
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/ProfilerResponseFrame.java
File deleted
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/ProfilerLabelResponseFrame.java
File deleted
/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/RequestFrameVisitor.java
0,0 → 1,27
package dongfang.mkt.frames;
 
import java.io.IOException;
 
/*
public interface RequestFrameVisitor {
// void visit(RequestFrame f) throws IOException;
void visit(AnalogDebugLabelRequestFrame f) throws IOException;
void visit(DebugRequestFrame f) throws IOException;
void visit(LoopbackTestRequestFrame f) throws IOException;
void visit(MotorTestRequestFrame f) throws IOException;
void visit(VersionRequestFrame f) throws IOException;
void visit(AttitudeDataRequestFrame f) throws IOException;
void visit(SingleDisplayRequestFrame f) throws IOException;
void visit(AllDisplaysRequestFrame f) throws IOException;
void visit(ReadVariablesRequestFrame f) throws IOException;
void visit(ExternalControlRequestFrame f) throws IOException;
void visit(ResetRequestFrame f) throws IOException;
void visit(ChangeParameterSetRequestFrame f) throws IOException;
void visit(ReadParamSetRequestFrame f) throws IOException;
void visit(WriteParamSetRequestFrame f) throws IOException;
void visit(SetCompassHeadingRequestFrame f) throws IOException;
void visit(ReadExternalControlRequestFrame f) throws IOException;
void visit(OSDDataRequestFrame f) throws IOException;
void visit(CompassHeadingRequestFrame f) throws IOException;
}
*/
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/MKProfiler.java
File deleted