Project

General

Profile

Revision 39

Added by Greg Tress over 16 years ago

cleaned up colonet gui code

View differences:

ColonetServerInterface.java
36 36
    Commands will be defined as necessary.
37 37
	*/
38 38
	
39
  public static 
40 39
	public static final String SEND_TO_ROBOT = "0";
41 40
	public static final String REQUEST_FROM_ROBOT = "1";
42 41
	public static final String RESPONSE_TO_CLIENT_REQUEST = "2";
......
56 55
	public static final String MOTOR2_SET = "25"; //0x19
57 56
	public static final String MOTORS_OFF = "26"; //0x1A
58 57
	public static final String MOVE = "27"; //0x1B
59
  public static final String MOVE_AVOID = "28"; //0x1C
58
	public static final String MOVE_AVOID = "28"; //0x1C
60 59
	
61 60
	//BUZZER
62 61
	public static final String BUZZER_INIT = "0"; //0x00
......
119 118
		return false;
120 119
	}
121 120
	
122
  public String getLine () {
123
    if (this.isReady())
124
      return reader.readLine();
125
    else
126
      return null;
127
  }
121
	public String getLine () {
122
		if (this.isReady()) {
123
			try {
124
				return reader.readLine();
125
			} catch (IOException e) {
126
				return null;
127
			}
128
		} else {
129
		  return null;
130
		}
131
	}
128 132
  
129 133
	/**
130 134
	 * Create socket connection to Colonet server.

Also available in: Unified diff