WebSVN - Projects - Path Comparison - /dongfang_FC_rewrite_tool/ Rev 1698 and /dongfang_FC_rewrite

Regard whitespace Rev 1698 → Rev 1697

 /dongfang_FC_rewrite_tool/src/dongfang/mkt/comm/FrameQueue.java
 ,7 → 17,7
         private final MKOutputStream output;
         // private List responseQueue;
         private ResponseFrame lastResponseFrame;
-        private volatile boolean doQueue = true;
+        private boolean doQueue = true;
         class Receiver extends Thread {
                 public void run() {
 ,9 → 47,7
                 super();
                 this.input = new MKInputStream (in);
                 this.output = new MKOutputStream(out);
-                Receiver r = new Receiver();
-                r.setDaemon(false);
-                r.start();
+                new Receiver().start();
         }
         public void sendRequest(RequestFrame f) throws IOException {

 /dongfang_FC_rewrite_tool/src/dongfang/mkt/comm/MKInputStream.java
 ,9 → 447,9
                         VersionResponseFrame f = new VersionResponseFrame(address);
                         f.setSWMajor(base64InputStream.readByte());
                         f.setSWMinor(base64InputStream.readByte());
-                        f.setSWPatch(base64InputStream.readByte());
                         f.setProtoMajor(base64InputStream.readByte());
                         f.setProtoMinor(base64InputStream.readByte());
+                        f.setSWPatch(base64InputStream.readByte());
                         f.setHardwareErrors(base64InputStream.readBytes(5));
                         result = f;
                         break;

 /dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/ExternalControlRequestFrame.java
 ,8 → 35,8
         int frameNum;                   // unsigned byte.
         int argument;                   // unsigned byte. Called "config" in MK code.
-        public ExternalControlRequestFrame() {
-                super(FC_ADDRESS);
+        ExternalControlRequestFrame(int address) {
+                super(address);
         }
         public int[] getDigital() {

 /dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/VersionResponseFrame.java
 ,8 → 89,6
         }
         public String toString() {
-                StringBuilder result = new StringBuilder();
-                result.append("SW=" + SWMajor + "." + SWMinor + "." + SWPatch + ", protocol=" + protoMajor + "." + protoMinor);
-                result.append();
+                return getClass().getSimpleName() + ": SWMajor=" + SWMajor + ", SWMinor=" + SWMinor + ", SWPatch=" + SWPatch + ", protocolMajor="+protoMajor + ", protocolMinor=" + protoMinor;
         }
 }