Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1562 → Rev 1563

/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/MKDebugLogger.java
13,14 → 13,15
import java.util.LinkedList;
import java.util.List;
 
import dongfang.mkt.comm.FrameQueue;
import dongfang.mkt.comm.MKConnection;
import dongfang.mkt.comm.serial.RXTXSerialPort;
import dongfang.mkt.comm.tcp.MKTCPConnection;
import dongfang.mkt.frames.AnalogDebugLabelRequestFrame;
import dongfang.mkt.frames.AnalogDebugLabelResponseFrame;
import dongfang.mkt.frames.DebugRequestFrame;
import dongfang.mkt.frames.DebugResponseFrame;
import dongfang.mkt.frames.Frame;
import dongfang.mkt.io.MKCommPort;
import dongfang.mkt.io.RXTXSerialPort;
import dongfang.mkt.serial.FrameQueue;
 
public class MKDebugLogger {
private static final PrintStream STDERR = System.out;
201,8 → 202,8
public static void main(String[] args) throws IOException {
MKDebugLogger test = new MKDebugLogger();
 
MKCommPort port = new RXTXSerialPort();
port.init(null);
MKConnection port = new MKTCPConnection(); //RXTXSerialPort();
port.init("8080");
 
FrameQueue q = new FrameQueue(port);
String encoding = "iso-8859-1";
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/OSDLogger.java
12,13 → 12,13
import java.util.Date;
import java.util.List;
 
import dongfang.mkt.comm.FrameQueue;
import dongfang.mkt.comm.MKConnection;
import dongfang.mkt.comm.serial.RXTXSerialPort;
import dongfang.mkt.frames.OSDDataRequestFrame;
import dongfang.mkt.frames.OSDDataResponseFrame;
import dongfang.mkt.frames.OSDDataResponseFrame.GPSDistanceAndBearing;
import dongfang.mkt.frames.OSDDataResponseFrame.GPSPosition;
import dongfang.mkt.io.MKCommPort;
import dongfang.mkt.io.RXTXSerialPort;
import dongfang.mkt.serial.FrameQueue;
 
public class OSDLogger {
private static final PrintStream STDERR = System.out;
163,10 → 163,10
public static void main(String[] args) throws IOException {
OSDLogger test = new OSDLogger();
 
MKCommPort port = new RXTXSerialPort();
port.init(null);
MKConnection _port = new RXTXSerialPort();
_port.init(null);
 
FrameQueue q = new FrameQueue(port);
FrameQueue q = new FrameQueue(_port);
String encoding = "iso-8859-1";
 
OutputStream fout = new FileOutputStream("osd.xml");
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/UniversalConfigurator.java
18,19 → 18,20
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
 
import dongfang.mkt.comm.FrameQueue;
import dongfang.mkt.comm.MKConnection;
import dongfang.mkt.comm.serial.RXTXSerialPort;
import dongfang.mkt.comm.tcp.MKTCPConnection;
import dongfang.mkt.configuration.ConfigSet;
import dongfang.mkt.frames.UniversalReadParamSetRequestFrame;
import dongfang.mkt.frames.UniversalReadParamSetResponseFrame;
import dongfang.mkt.frames.UniversalWriteParamSetRequestFrame;
import dongfang.mkt.frames.UniversalWriteParamSetResponseFrame;
import dongfang.mkt.io.MKCommPort;
import dongfang.mkt.io.RXTXSerialPort;
import dongfang.mkt.serial.FrameQueue;
 
public class UniversalConfigurator {
private static void configure(String portIdentifier, UniversalWriteParamSetRequestFrame frame,
int parameterSetNumber) throws IOException {
MKCommPort port = new RXTXSerialPort();
MKConnection port = new RXTXSerialPort();
port.init(portIdentifier);
FrameQueue q = new FrameQueue(port);
 
62,7 → 63,7
}
 
private static ConfigSet readConfiguration(String portIdentifier, int parameterSetNumber) throws IOException {
MKCommPort port = new RXTXSerialPort();
MKConnection port = new MKTCPConnection(); //new RXTXSerialPort();//
port.init(portIdentifier);
FrameQueue q = new FrameQueue(port);
ConfigSet cs = null;
244,7 → 245,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 = "8080";
if ("r".equals(args[0])) {
readConfiguration(portIdentifier, Integer.parseInt(args[1]));