...
 
Commits (2)
......@@ -51,7 +51,7 @@ class SensorMonitor(object):
sensor = self.sensors.getSensor(sid)
name = sensor['name']
status = sensor['status']
rospy.loginfo("Sensor %s (%s) timed out waiting for '%s' after '%ss' with status '%s'.", sid, name, desired_status, (time.time() - self.times[sid]), status)
rospy.loginfo("[SEMON] Sensor %s (%s) timed out waiting for '%s' after '%ss' with status '%s'.", sid, name, desired_status, (time.time() - self.times[sid]), status)
def check_log(self, sid, desired_status):
sensor = self.sensors.getSensor(sid)
......@@ -59,7 +59,7 @@ class SensorMonitor(object):
status = sensor['status']
if status == desired_status:
rospy.loginfo("Sensor %s (%s) reached '%s' after '%ss'.", sid, name, desired_status, (time.time() - self.times[sid]))
rospy.loginfo("[SEMON] Sensor %s (%s) reached '%s' after '%ss'.", sid, name, desired_status, (time.time() - self.times[sid]))
return True
else:
return False
......@@ -84,11 +84,11 @@ class TopicMonitor(object):
def abort(self):
self.aborted = True
rospy.loginfo("Timed out waiting for '%s' on topic '%s' after '%ss' with data '%s'.", self.target, self.topic, (time.time() - self.time), self.data)
rospy.loginfo("[TOMON] Timed out waiting for '%s' on topic '%s' after '%ss' with data '%s'.", self.target, self.topic, (time.time() - self.time), self.data)
def check_log(self):
if self.data == self.target:
rospy.loginfo("Received '%s' on topic '%s' after '%ss'.", self.data, self.topic, (time.time() - self.time))
rospy.loginfo("[TOMON] Received '%s' on topic '%s' after '%ss'.", self.data, self.topic, (time.time() - self.time))
return True
else:
return False
......@@ -143,6 +143,9 @@ class ExperimentControl(object):
def say_item(self, item, wait=2):
#utterance = get_parameter("/script_server/utterances/" + item)
utterance = self.sound_path + "/" + item + ".ogg"
rospy.loginfo("<<say>> '%s' (%s)", item, utterance)
#self.sound.say(utterance)
self.sound.playWave(self.sound_path + "/" + item + ".ogg")
time.sleep(wait)
......