Project

General

Profile

Revision 708

Got rid of old boundary and charge station after disconnect

View differences:

trunk/code/projects/colonet/client/ColonetConstants.java
14 14
	public static final int BATTERY_WIDTH = 50;
15 15
	public static final int BATTERY_HEIGHT = 10;
16 16
	public static final int WEBCAM_DELAY = 100;
17
	public static final String WEBCAM_PATH = "http://roboclub9.frc.ri.cmu.edu/colonet.jpg";
17
	public static final String WEBCAM_PATH = "http://128.2.99.176/colonet.jpg";
18 18

  
19 19
  // Set the default look and feel - choose one
20 20
  public static final String LOOK_AND_FEEL = javax.swing.UIManager.getSystemLookAndFeelClassName();
trunk/code/projects/colonet/client/Colonet.java
405 405
		    btnConnect.setText("Connect");
406 406
	      lblConnectionStatus.setText("Status: Disconnected");
407 407
        setComponentsEnabled(false);
408
        boundary = null;
409
        station = null;
408 410
	    }
409 411
		};
410 412
		SwingUtilities.invokeLater(r);
trunk/code/projects/colonet/client/Makefile
16 16
CCFLAGS = -g -d $(DIR) -target 1.5
17 17
CCWARN = -Xlint:deprecation,unchecked,fallthrough,path,finally
18 18

  
19
COLONETFILES = BatteryIcon.java  Colonet.java  ColonetConstants.java \
20
               ColonetServerInterface.java  GraphicsPanel.java  RobotIcon.java \
21
               RobotList.java  TaskAddWindow.java  VectorController.java
22

  
19 23
# Java file compilation instructions
20 24

  
21 25
default: $(DIR) $(DIR)/Colonet.class $(DIR)/Colonet.jar
......
28 32
	cd $(DIR); jar cf Colonet.jar *.class; jarsigner -keystore ../colonetkey -storepass colonet Colonet.jar colonet
29 33
	@echo --- Done ---
30 34

  
31
$(DIR)/Colonet.class: Colonet.java ColonetServerInterface.java BatteryIcon.java RobotIcon.java VectorController.java
35
$(DIR)/Colonet.class: $(COLONETFILES)
32 36
	@echo --- Compiling ---
33 37
	$(CC) $(CCWARN) $(CCFLAGS) Colonet.java
34 38

  
......
44 48
	cp colonetstyle.css /var/www/colonet/colonetstyle.css
45 49

  
46 50
clean:
47
	$(RM) -rf $(DIR)
51
	$(RM) -r $(DIR)
48 52

  
49 53
run:
50 54
	appletviewer http://128.2.99.176/colonet

Also available in: Unified diff