[TeamTalk 47]: [584] TeamTalk: 1) removed robot messages from skeleton

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070509/58c7ef47/attachment.html
-------------- next part --------------
Modified: TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm
===================================================================
--- TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm	2007-05-02 19:25:45 UTC (rev 583)
+++ TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm	2007-05-09 20:26:45 UTC (rev 584)
@@ -137,31 +137,31 @@
 LOG_IN: :inframe
 LOG_OUT: :outframe
 
-PROGRAM: robot_message
+;;PROGRAM: robot_message
 
 ;;RULE: :goal | --> PenDecoder.speak
 ;;IN: :robot_name :speaktext
 ;;OUT:
 
-RULE: :type = "location" --> PenDecoder.set_bot
-IN: :robot_name :x :y :r
-OUT: 
+;;RULE: :type = "location" --> PenDecoder.set_bot
+;;IN: :robot_name :x :y :r
+;;OUT: 
 
-RULE: :type = "goal" --> PenDecoder.set_goal
-IN: :robot_name :relative :x :y
-OUT:
+;;RULE: :type = "goal" --> PenDecoder.set_goal
+;;IN: :robot_name :relative :x :y
+;;OUT:
 
-RULE: :type = "halt" --> PenDecoder.set_halt
-IN: :robot_name
-OUT:
+;;RULE: :type = "halt" --> PenDecoder.set_halt
+;;IN: :robot_name
+;;OUT:
 
-RULE: :type = "follow" --> PenDecoder.set_follow
-IN: :robot_name :followee
-OUT:
+;;RULE: :type = "follow" --> PenDecoder.set_follow
+;;IN: :robot_name :followee
+;;OUT:
 
-RULE: :type = "cover" --> PenDecoder.set_cover
-IN: :robot_name :x :y
-OUT:
+;;RULE: :type = "cover" --> PenDecoder.set_cover
+;;IN: :robot_name :x :y
+;;OUT:
 
 PROGRAM: restart_decoder
 

Modified: TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm
===================================================================
--- TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm	2007-05-02 19:25:45 UTC (rev 583)
+++ TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-template.pgm	2007-05-09 20:26:45 UTC (rev 584)
@@ -260,7 +260,7 @@
 IN: :name :voice
 OUT:
 
-PROGRAM: map_message
-RULE: --> PenDecoder.map_update
-IN: :type :x_size :y_size :resolution :encoded_map
-OUT:
+;;PROGRAM: map_message
+;;RULE: --> PenDecoder.map_update
+;;IN: :type :x_size :y_size :resolution :encoded_map
+;;OUT:

Modified: TeamTalk/Resources/Grammar/TeamTalkTask-template.gra
===================================================================
--- TeamTalk/Resources/Grammar/TeamTalkTask-template.gra	2007-05-02 19:25:45 UTC (rev 583)
+++ TeamTalk/Resources/Grammar/TeamTalkTask-template.gra	2007-05-09 20:26:45 UTC (rev 584)
@@ -153,14 +153,10 @@
 	([MoveToGoal])
 ;
 
-[CLYDEJOINBASHFUL]
-	(*clyde join bashful)
+[Join]
+	(*[RobotName] join [RobotName])
 ;
 
-[BASHFULJOINCLYDE]
-	(*bashful join clyde)
-;
-
 #[MoveVectorCardinal]
 #	(*[RobotName] MOVE *[CardinalDirection] [AbsoluteDistance])
 #	(*[RobotName] MOVE [CardinalDirection])