/ - Diff - Colony - Robotics Club

Revision 38

Updating Colonet GUI to new style, plus minor fixes

+    		}
     		if (valid) {
     			this.showStatus("Matrix OK");
     			this.showStatus("Running");
     			// draw robots and find which one is seleced
     			double angle = 2.0 * Math.PI / numBots;
-...
     					if (!entries[row][col].equals("-") && entries[col][row].equals("-") && row != col) {
     						//TODO: Make a standard gray
     						drawConnection(row, col, BIGRADIUS-RADIUS, new Color(200,200,200));
+    					}
     					else if (!entries[row][col].equals("-") && ! entries[col][row].equals("-") && row != col) {
     					} else if (!entries[row][col].equals("-") && ! entries[col][row].equals("-") && row != col) {
     						drawConnection(row, col, BIGRADIUS-RADIUS, Color.BLACK);
+    					}
+    				}
-...
     			// draw the selection indicator
     			indicator.draw();
     			txtInfo.setText("Packet statistics: ???");
     		} else {// if matrix is not valid
     			this.showStatus("Error: Invalid matrix");
-...
     			//recalculate radius, if it will look cool, lolz
     			int newr = r;
     			if (steps < 100) newr = (int)( r + 200/(steps+1) );
     			if (steps < 100)
             newr = (int)( r + 200/(steps+1) );
     			//precompute values for dx and dy
     			int dx_inner = (int)(newr * Math.cos(theta));
-...
+    	*
     	*/
     	class DataListener extends Thread {
     		final int DATALISTENER_DELAY = 1000;
     		final int DATALISTENER_DELAY = 666;
     		BufferedReader reader;
     		public DataListener () {
-...
     		public void run () {
     			String line;
     			reader = csi.getBufferedReader();
     			while (true) {
     				try {
     					if (csi.isReady()) {
     						line = reader.readLine();
     						if (line != null) {
     							csi.msg("Incoming data: [" + line + "]");
     							//TODO: parse incoming data here
+    						}
+    					}
               if (csi == null) return;
               line = csi.getLine();
               if (line != null) {
                 csi.msg("Incoming data: [" + line + "]");
                 //TODO: parse incoming data here
+              }
     					Thread.sleep(DATALISTENER_DELAY);
     				} catch (InterruptedException e) {
     					return;

+    	 *
     	 * Colonet Definitions - common definitions and structs used in all colonet
     	 * applications
     	 */
     	/*  COMMAND PACKET STRUCTURE
       COMMAND PACKET STRUCTURE
 :  SEND_TO_ROBOT
 :  # of robot, or GLOBAL_DEST
 :  COLONET_COMMMAND
-...
 :  # 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.
     	*/
       public static
     	public static final String SEND_TO_ROBOT = "0";
     	public static final String REQUEST_FROM_ROBOT = "1";
     	public static final String RESPONSE_TO_CLIENT_REQUEST = "2";
-...
     	public static final String COLONET_COMMAND = "13"; //0x0D
     	public static final String COLONET_REQUEST = "14"; //0x0E
     	public static final String CORONET_RESPONSE = "15"; //0x0F
     	//Packet properties
     	public static final int PACKET_DATA_LEN = 7;
     	public static final int PACKET_SIZE = 16;
     	//Packet error codes
     	/** For timeouts. */						public static final String WL_ERRCODE_ROBOTDEATH = "123";
     	/** For pinging charging station. */		public static final String WL_ERRCODE_NEEDTOCHARGE = "250";
     	/** Charging station response to ping. */	public static final String WL_ERRCODE_CHARGESTATION = "251";
     	public static final String WL_ERR_DEAD_LOC = "5";
     	public static final String WL_ERROR_DEST = "255";
     	public static final String WL_ERROR_LOC = "4";
     	public static final String WL_DEFAULT_PAN = "3332";
     	//Use BATTERY to request battery level
     	public static final String BATTERY = "56"; //0x38
-...
     	public static final String MOTOR2_SET = "25"; //0x19
     	public static final String MOTORS_OFF = "26"; //0x1A
     	public static final String MOVE = "27"; //0x1B
         public static final String MOVE_AVOID = "28"; //0x1C
       public static final String MOVE_AVOID = "28"; //0x1C
     	//BUZZER
     	public static final String BUZZER_INIT = "0"; //0x00
-...
     	public static final String ORB_SET_NUM = "21"; //0x15
     	public static final String ORB_SEND = "22"; //0x16
     	/*
     	*	INSTANCE VARIBLES
     	*/
     	Socket socket;
     	OutputStreamWriter out;
-...
     		return false;
+    	}
       public String getLine () {
         if (this.isReady())
           return reader.readLine();
         else
           return null;
+      }
     	/**
     	 * Create socket connection to Colonet server.
     	 * If successful, start threads for loading the webcam image and listening for incoming data.
-...
     		//send packet
     		try {
     			Thread.sleep(200);
           log.append("Sending: " + packet);
     			out.write(packet);
     			out.flush();
     			log.append("Sending: " + packet);
     		} catch (IOException e) {
     			log.append("Could not send data.\n");
     		} catch (InterruptedException e) {
     			log.append("Thread InterruptedException in sendData\n");
+    		}
+        }
+    	}
     	/**

Also available in: Unified diff

Project

General

Profile

Colony

Revision 38