mirror of
https://github.com/soconnor0919/hristudio.git
synced 2026-03-23 19:27:51 -04:00
Fix branching logic and robot action timing
- Remove onCompleted() call after branch selection to prevent count increment - Add proper duration estimation for speech actions (word count + emotion overhead) - Add say_with_emotion and wave_goodbye to built-in actions - Add identifier field to admin.ts plugin creation
This commit is contained in:
@@ -438,8 +438,25 @@ export class WizardRosService extends EventEmitter {
|
||||
|
||||
this.publish(config.topic, config.messageType, msg);
|
||||
|
||||
// Wait for action completion (simple delay for now)
|
||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||
// Wait for action completion based on topic type
|
||||
if (config.topic === "/speech") {
|
||||
// Estimate speech duration based on text content
|
||||
const text =
|
||||
typeof msg === "object" && msg !== null && "data" in msg
|
||||
? String((msg as any).data || "")
|
||||
: JSON.stringify(msg);
|
||||
const wordCount = text.split(/\s+/).filter(Boolean).length;
|
||||
// Emotion markup adds overhead: ~200ms per word base + emotion animation time
|
||||
const emotionOverhead = 1500; // Animation prep time
|
||||
const duration = emotionOverhead + Math.max(1000, wordCount * 300);
|
||||
console.log(
|
||||
`[WizardROS] Speech action estimated duration: ${duration}ms (${wordCount} words)`,
|
||||
);
|
||||
await new Promise((resolve) => setTimeout(resolve, duration));
|
||||
} else {
|
||||
// Short delay for non-speech actions
|
||||
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -452,13 +469,25 @@ export class WizardRosService extends EventEmitter {
|
||||
): Promise<void> {
|
||||
switch (actionId) {
|
||||
case "say_text":
|
||||
case "say_with_emotion":
|
||||
const text = String(parameters.text || "Hello");
|
||||
this.publish("/speech", "std_msgs/String", { data: text });
|
||||
const wordCount = text.split(/\s+/).length;
|
||||
const duration = Math.max(800, wordCount * 250 + 500);
|
||||
const wordCount = text.split(/\s+/).filter(Boolean).length;
|
||||
const emotion = String(parameters.emotion || "neutral");
|
||||
const emotionOverhead = 1500;
|
||||
const duration = emotionOverhead + Math.max(1000, wordCount * 300);
|
||||
console.log(
|
||||
`[WizardROS] Speech action (${actionId}) estimated: ${duration}ms`,
|
||||
);
|
||||
await new Promise((resolve) => setTimeout(resolve, duration));
|
||||
break;
|
||||
|
||||
case "wave_goodbye":
|
||||
const waveText = String(parameters.text || "Goodbye");
|
||||
this.publish("/speech", "std_msgs/String", { data: waveText });
|
||||
await new Promise((resolve) => setTimeout(resolve, 3000));
|
||||
break;
|
||||
|
||||
case "walk_forward":
|
||||
this.publish("/cmd_vel", "geometry_msgs/Twist", {
|
||||
linear: { x: Number(parameters.speed) || 0.1, y: 0, z: 0 },
|
||||
|
||||
Reference in New Issue
Block a user