Merge pull request #527 from brown-ccv/feat-v3.4.2

Feat v3.4.2

package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
     "@jspsych/plugin-audio-keyboard-response": "^1.1.3",
+    "@jspsych/plugin-call-function": "^1.1.0",
     "@jspsych/plugin-fullscreen": "^1.2.0",
     "@jspsych/plugin-html-button-response": "^1.1.1",
     "@jspsych/plugin-html-keyboard-response": "^1.1.1",

src/experiment/honeycomb.js

@@ -53,8 +53,8 @@ export function buildHoneycombTimeline(jsPsych) {
 
   const timeline = [
     startProcedure,
-    countdownTrial,
     preloadTrial,
+    countdownTrial,
     instructionsTrial,
     honeycombProcedure,
     debriefTrial,

src/experiment/procedures/startProcedure.js

@@ -6,6 +6,7 @@ import { holdUpMarkerTrial } from "../trials/holdUpMarker";
 import { nameTrial } from "../trials/name";
 import { initPhotodiodeTrial } from "../trials/initPhotodiode";
 import { introductionTrial } from "../trials/introduction";
+import { buildCallFunctionTrial } from "../trials/callFunction";
 
 /**
  * Builds the block of trials needed to start and setup the experiment
@@ -24,6 +25,11 @@ export function buildStartProcedure(jsPsych) {
   // Conditionally add the photodiode setup trials
   if (config.USE_PHOTODIODE) {
     procedure.push(holdUpMarkerTrial);
+    procedure.push(
+      buildCallFunctionTrial(() => {
+        window.electronAPI.checkSerialPort();
+      })
+    );
     procedure.push(initPhotodiodeTrial);
   }
 

src/experiment/trials/callFunction.js

@@ -0,0 +1,14 @@
+import callFunction from "@jspsych/plugin-call-function";
+
+/**
+ * Trial to execute the callback function passed in
+ *
+ * @param {function} func callback function to execute
+ * @returns JS object as a trial
+ */
+export function buildCallFunctionTrial(func) {
+  return {
+    type: callFunction,
+    func: func,
+  };
+}

src/experiment/trials/holdUpMarker.js

@@ -1,32 +1,14 @@
 import htmlButtonResponse from "@jspsych/plugin-html-button-response";
-
-import { config, LANGUAGE } from "../../config/main";
-import { eventCodes } from "../../config/trigger";
-import { pdSpotEncode, photodiodeGhostBox } from "../../lib/markup/photodiode";
-import { div, h1, p } from "../../lib/markup/tags";
+import { LANGUAGE } from "../../config/main";
+import { h1 } from "../../lib/markup/tags";
+import { photodiodeGhostBox } from "../../lib/markup/photodiode";
 
 // TODO @brown-ccv #330: Custom extension for EEG - this is initializeTriggerBox
 // TODO @brown-ccv #330: Need to ping the serial part - this isn't doing anything yet
-// TODO @brown-ccv: Prevent user from pressing continue until pdSpotEncode finishes (need to use jsPsych.pluginAPI.setTimeout)
 export const holdUpMarkerTrial = {
   type: htmlButtonResponse,
-  stimulus: function () {
-    const eventMarkerMarkup = h1(LANGUAGE.trials.eventMarker.connected, {
-      style: "color: green;",
-    });
-    return div(eventMarkerMarkup);
-  },
-  prompt: function () {
-    let holdUpMarkerPrompt = p(LANGUAGE.trials.holdUpMarker);
-
-    // Conditionally add the photodiodeGhostBox
-    if (config.USE_PHOTODIODE) holdUpMarkerPrompt += photodiodeGhostBox;
-
-    return holdUpMarkerPrompt;
-  },
+  stimulus:
+    h1(LANGUAGE.trials.holdUpMarker) +
+    photodiodeGhostBox,
   choices: [LANGUAGE.prompts.continue.button],
-  on_load: function () {
-    // Conditionally flash the photodiode when the trial first loads
-    if (config.USE_PHOTODIODE) pdSpotEncode(eventCodes.test_connect);
-  },
 };