Moved some code from a project I was working on to PsyForge because I…

… put it in the wrong place
BruskaTech · Jan 31, 2025 · 77e6094 · 77e6094
1 parent e21c5ab
commit 77e6094
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/Runtime/Scripts/Experiment/MathDistractor.cs b/Runtime/Scripts/Experiment/MathDistractor.cs
@@ -49,11 +49,6 @@ public async Task RunInitialTimings() {
         }
 
         public async Task Run(bool isPractice, int trialNum, bool setProblemTimings = false) {
-            if (isPractice) {
-                await ExpHelpers.PressAnyKey("instructions math distractor", LangStrings.IntroSlidesMathDistractorTitle(), 
-                    LangStrings.IntroSlidesMathDistractor().Aggregate((a, b) => a + b));
-            }
-
             ExpHelpers.SetExperimentStatus(HostPcStatusMsg.DISTRACT(trialNum));
             var trueDistractorDurationMs = isPractice ? practiceDistractorDurationMs : distractorDurationMs;
 

diff --git a/Runtime/Scripts/Experiment/VerbalFreeRecall.cs b/Runtime/Scripts/Experiment/VerbalFreeRecall.cs
@@ -30,10 +30,8 @@ public VerbalFreeRecall(int practiceVerbalFreeRecallDurationMs, int verbalFreeRe
             this.verbalFreeRecallDurationMs = verbalFreeRecallDurationMs;
         }
 
-        public async Task Run(bool isPractice, uint trialNum) {
-            if (isPractice) {
-                await ExpHelpers.PressAnyKey("instructions verbal free recall", LangStrings.IntroSlidesVerbalFreeRecallTitle(), LangStrings.PracticeVerbalFreeRecall());
-            }
+        public async Task Run(bool isPractice, uint trialNum, LangString verbalRecallDisplay = null) {
+            verbalRecallDisplay ??= LangStrings.VerbalRecallDisplay();
 
             // Setup
             var realVerbalFreeRecallDurationMs = isPractice ?
@@ -45,7 +43,7 @@ public async Task Run(bool isPractice, uint trialNum) {
 
             // Play start beep
             manager.lowBeep.Play();
-            textDisplayer.Display("verbal recall display", text: LangStrings.VerbalRecallDisplay());
+            textDisplayer.Display("verbal recall display", text: verbalRecallDisplay);
 
             while (manager.lowBeep.isPlaying) { await Awaitable.NextFrameAsync(); }
             await manager.Delay(100); // This is needed so you don't hear the end of the beep in the recording

diff --git a/Runtime/Scripts/ExternalDevices/HostPcMsg.cs b/Runtime/Scripts/ExternalDevices/HostPcMsg.cs
@@ -51,6 +51,12 @@ protected HostPcStatusMsg(string name, Dictionary<string, object> dict = null)
 
         public static HostPcStatusMsg PAUSE(bool pauseStart) { return new HostPcStatusMsg("PAUSE", new() { {"pause start", pauseStart} }); }
         public static HostPcStatusMsg WAITING() { return new HostPcStatusMsg("WAITING"); }
+        public static HostPcStatusMsg DISTRACT(int trailNum) { return new HostPcStatusMsg("DISTRACT", new() {{"trial", trailNum}}); }
+        public static HostPcStatusMsg MATH(bool correct, string problem, string answer, int responseTimeMs) { return new HostPcStatusMsg("MATH",
+            new() { { "correct", correct }, { "problem", problem }, { "answer", answer }, { "responseTimeMs", responseTimeMs } }
+        ); }
+        public static HostPcStatusMsg ENCODING(uint trailNum) { return new HostPcStatusMsg("ENCODING", new() {{"trial", trailNum}}); }
+        public static HostPcStatusMsg RECALL(float duration, uint trailNum) { return new HostPcStatusMsg("RECALL", new() {{"duration", duration}, {"trial", trailNum}}); }
     }
 
     // Host PC Closed Loop Message

diff --git a/Runtime/Scripts/Utilities/MyLangStrings.cs b/Runtime/Scripts/Utilities/MyLangStrings.cs
@@ -92,6 +92,10 @@ public static partial class LangStrings {
             { Language.English, "*****" },
             { Language.German, "*****" },
         }); }
+        public static LangString MathDistractorPreTrial() { return new( new() {
+            { Language.English, "Press any key to start the math task." },
+            { Language.German, "Drücken Sie eine beliebige Taste, um die Mathematikaufgabe zu starten." },
+        }); }
         public static LangString ElememConnection() { return new( new() {
             { Language.English, "Waiting for Elemem connection..." },
             { Language.German, "Warte auf Elemem-Verbindung..." },