/ - Diff - Colony - Robotics Club

Revision 539

Added by Eugene Marinelli about 16 years ago

spaces to tabs in colonet client

     				if (csi != null) {
     					csi.sendAbsoluteMove(r.id, r.destx, r.desty);
+    				}
+    				}
     				return;
+    			}
-...
     				try {
     					//request more data
     					if (csi != null && csi.isReady()) {
     												csi.sendPositionRequest();
     						csi.sendPositionRequest();
     						csi.sendXBeeIDRequest();
     						if (cmbRobotNum.getSelectedIndex() > 0) {
     								String sel = (String) cmbRobotNum.getSelectedItem();
     								int num = Integer.parseInt(sel);
     							String sel = (String) cmbRobotNum.getSelectedItem();
     							int num = Integer.parseInt(sel);
     							csi.sendBatteryRequest(num);
+    						}
+    					}

     /*
     *	ColonetServerInterface.java
     *	Gregory Tress
     * ColonetServerInterface.java
     * Gregory Tress
     */
     import java.net.*;
-...
+    {
     /*	Old packet structure:
         COMMAND PACKET STRUCTURE
 :  SEND_TO_ROBOT
 :  # of robot, or GLOBAL_DEST
 :  COLONET_COMMMAND
 :  message code (i.e. ORB_SET)
 :  any data, as many that fit in the packet
     		COMMAND PACKET STRUCTURE
 :	SEND_TO_ROBOT
 :	# of robot, or GLOBAL_DEST
 :	COLONET_COMMMAND
 :	message code (i.e. ORB_SET)
 :	any data, as many that fit in the packet
     	REQUEST PACKET STRUCTURE
 :  REQUEST_FROM_SERVER
 :  # of robot
 :  COLONET_REQUEST
 :  ???
 :	REQUEST_FROM_SERVER
 :	# of robot
 :	COLONET_REQUEST
 :	???
 /12/07 New server interface structure
         Client will no longer send full robot packets to the server.
         Commands will be defined as necessary.
 /12/07 New server interface structure
     		Client will no longer send full robot packets to the server.
     		Commands will be defined as necessary.
     	*/
     	//General Colonet Interface
-...
     	public static final String ORB_SET_NUM = "21"; //0x15
     	public static final String ORB_SEND = "22"; //0x16
     	Colonet colonet;  //save reference to the entire applet locally
     	Colonet colonet;	//save reference to the entire applet locally
     	Socket socket;
     	OutputStreamWriter out;
     	BufferedReader reader;
-...
     	JTextArea log, txtMatrix;
     	/*
     	*	FUNCTION IMPLEMENTATIONS
     	* FUNCTION IMPLEMENTATIONS
     	*/
     	/**
-...
     	* reference must be provided to ensure that data is routed correctly.
+    	*
     	* @param colonet The Colonet object to save locally. This reference cannot be changed once the
     	*   ColonetSreverInterface has been contsructed.
     	*		ColonetSreverInterface has been contsructed.
     	* @throws NullPointerException if colonet is null
+    	*
     	*/
-...
     			return;
     		} catch (IOException e) {
     			log.append("IO Exception.\n");
     			err("Could not create socket to " + strHost + ".\n" + e);
     			err("Failed to connect to " + strHost + ".\n" + e);
     			return;
     		} catch (java.security.AccessControlException e) {
     			log.append("Access Control Exception.\n");
-...
+    	}
     	public void disconnect () {
     	    try {
     	        reader.close();
     	        out.close();
     	    } catch (IOException e) {
+    	    }
     			try {
     					reader.close();
     					out.close();
     			} catch (IOException e) {
+    			}
+    	}
     	/*
-...
+    		}
     		//send packet
     		try {
     			Thread.sleep(50);  //pause to be safe
     			Thread.sleep(50);	 //pause to be safe
     			out.write(s);
     			out.flush();
     			//log.append("Sent: " + s + "\n");
-...
     		if (robotNumber != null)
     			packet += " " + robotNumber;
     		packet += " " + ColonetServerInterface.COLONET_COMMAND;
     		packet += " " + s;  //add  the command code here
     		packet += " " + s;	//add	 the command code here
     		packet += "\n";
     		sendString(packet);
     		//txtMatrix.append("S:" + packet);
-...
     		String packet = "";
     		packet += ColonetServerInterface.REQUEST_FROM_SERVER;
     		packet += " " + robotNumber;
     		packet += " " + s;  //add  the command code here
     		packet += " " + s;	//add	 the command code here
     		packet += "\n";
     		sendString(packet);
+    	}
-...
     		packet += ColonetServerInterface.SEND_TO_ROBOT;
     		packet += " " + robotNum;
     		packet += " " + ColonetServerInterface.COLONET_REQUEST;
     		packet += " " + ColonetServerInterface.BATTERY;  //add  the command code here
     		packet += " " + ColonetServerInterface.BATTERY;	 //add	the command code here
     		packet += "\n";
     		sendString(packet);
+    	}
-...
     	* Order a robot to move to an absolute coordinate point.
     	*/
     	public void sendAbsoluteMove (int id, int x, int y) {
     	    sendData(MOVE_TO_ABSOLUTE_POSITION + " " + x + " " + y, "" + id);
     			sendData(MOVE_TO_ABSOLUTE_POSITION + " " + x + " " + y, "" + id);
+    	}
     	/*
     	*	Queue management
     	* Queue management
     	*/
     	private void sendQueueInstruction (String inst) {
     		String packet = "";
-...
     	/*
     	*	DataListener thread.
     	* DataListener thread.
+    	*
     	*/
     	class DataListener extends Thread {
-...
     			while (true) {
     				try {
     					line = reader.readLine();
     					if (line == null)
     					    throw new IOException();
     					if (line == null) {
     						throw new IOException();
+    					}
     					parseData(line);
     					Thread.sleep(DATALISTENER_DELAY);
     				} catch (InterruptedException e) {
     					return;
     				} catch (IOException e) {
     			        disconnect();
     				    colonet.disconnect();
     				    return;
     					disconnect();
     					colonet.disconnect();
     					return;
+    				}
+    			}
+    		}

Also available in: Unified diff

Project

General

Profile

Colony

Revision 539