Merge pull request #139 from lnccbrown/fix-remove-offset-triggers

fix: remove offset triggers
lnccbrown · Nov 17, 2020 · 433aed1 · 433aed1
2 parents 670e7a4 + 6a6d96c
commit 433aed1
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 80 deletions.
diff --git a/.github/workflows/build_at_home.yaml b/.github/workflows/build_at_home.yaml
@@ -3,8 +3,8 @@ name: Build at home version (Windows)
 on:
   pull_request:
     paths:
-      - 'src/**'
-      - '.github/workflows/main.yml'
+      - "src/**"
+      - ".github/workflows/main.yml"
 
 jobs:
   build:
@@ -13,34 +13,34 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    # Set up js package
-    - uses: actions/checkout@v1
-    - name: Use Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
-    - name: Set package version and name
-      uses: brown-ccv/gh-actions/get-package-info@master
-      id: package_info
+      # Set up js package
+      - uses: actions/checkout@v1
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Set package version and name
+        uses: brown-ccv/gh-actions/get-package-info@main
+        id: package_info
 
-    # install, test, build package
-    - name: npm install
-      run: npm install
-    - name: npm build:win:home
-      run: npm run build
-    - name: npm test
-      run: npm test
-      env:
-        CI: true
-        REACT_APP_AT_HOME: true
+      # install, test, build package
+      - name: npm install
+        run: npm install
+      - name: npm build:win:home
+        run: npm run build
+      - name: npm test
+        run: npm test
+        env:
+          CI: true
+          REACT_APP_AT_HOME: true
 
-    # Build electron app package installers
-    - name: package electron - windows
-      run: npm run package:windows
+      # Build electron app package installers
+      - name: package electron - windows
+        run: npm run package:windows
 
-    # Upload installers to github action
-    - name: upload win-installer-home
-      uses: actions/upload-artifact@master
-      with:
-        name: win-installer-home
-        path: dist/installers/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-setup.exe
+      # Upload installers to github action
+      - name: upload win-installer-home
+        uses: actions/upload-artifact@master
+        with:
+          name: win-installer-home
+          path: dist/installers/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-setup.exe
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           node-version: 12.x
       - name: Set package version and name
-        uses: brown-ccv/gh-actions/get-package-info@master
+        uses: brown-ccv/gh-actions/get-package-info@main
         id: package_info
 
       # install, test, build package

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           node-version: 12.x
       - name: Set package version and name
-        uses: brown-ccv/gh-actions/get-package-info@master
+        uses: brown-ccv/gh-actions/get-package-info@main
         id: package_info
 
       # install, test, build package

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "email": "[email protected]",
     "url": "https://lnccbrown.com"
   },
-  "version": "1.3.0-beta",
+  "version": "1.3.1",
   "license": "MIT",
   "private": true,
   "main": "public/electron.js",

diff --git a/src/trials/choice.js b/src/trials/choice.js
@@ -19,7 +19,6 @@ const choice = (duration, blockSettings, opts) => {
     `</div>`;
 
   const startCode = eventCodes.choiceStart;
-  const endCode = eventCodes.choiceEnd;
 
   duration = blockSettings.is_practice ? 5000000 : duration; // make practice choices have no timeout
   let probability = blockSettings.is_practice ? opts : opts.prob;
@@ -195,8 +194,7 @@ const choice = (duration, blockSettings, opts) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/costBenefits.js b/src/trials/costBenefits.js
@@ -20,7 +20,6 @@ const costBenefits = (duration, blockSettings, opts, trialDetails) => {
     `</div>`;
 
   const startCode = eventCodes.costBenefitsStart;
-  const endCode = eventCodes.costBenefitsEnd;
 
   let probability = blockSettings.is_practice ? opts : opts.prob;
   let value = blockSettings.is_practice ? blockSettings.value : opts.value;
@@ -131,8 +130,7 @@ const costBenefits = (duration, blockSettings, opts, trialDetails) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/cumulativeReward.js b/src/trials/cumulativeReward.js
@@ -12,7 +12,6 @@ const cumulativeReward = (
   trialDetails
 ) => {
   const startCode = eventCodes.cumulativeRewardsStart;
-  const endCode = eventCodes.cumulativeRewardsEnd;
 
   return {
     type: "call_function",
@@ -55,8 +54,7 @@ const cumulativeReward = (
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/fixation.js b/src/trials/fixation.js
@@ -8,7 +8,6 @@ const fixation = (duration) => {
   let stimulus = fixationHTML + photodiodeGhostBox();
 
   const startCode = eventCodes.fixationStart;
-  const endCode = eventCodes.fixationEnd;
 
   return {
     type: "html_keyboard_response",
@@ -21,8 +20,7 @@ const fixation = (duration) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/frameSpike.js b/src/trials/frameSpike.js
@@ -20,7 +20,6 @@ const frameSpike = (duration, blockSettings, opts, trialDetails) => {
     `</div>`;
 
   const startCode = eventCodes.frameSpikeStart;
-  const endCode = eventCodes.frameSpikeEnd;
 
   let probability = blockSettings.is_practice ? opts : opts.prob;
   let effort = blockSettings.is_practice ? blockSettings.effort : opts.effort;
@@ -111,8 +110,7 @@ const frameSpike = (duration, blockSettings, opts, trialDetails) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/pressBalloon.js b/src/trials/pressBalloon.js
@@ -26,7 +26,6 @@ const pressBalloon = (duration, blockSettings, opts) => {
   let is_practice = blockSettings.is_practice;
 
   const startCode = eventCodes.pressBalloonStart;
-  const endCode = eventCodes.pressBalloonEnd;
 
   let probability = blockSettings.is_practice ? opts : opts.prob;
   let value = blockSettings.is_practice ? blockSettings.value : opts.value;
@@ -395,8 +394,7 @@ const pressBalloon = (duration, blockSettings, opts) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/rewardFeedback.js b/src/trials/rewardFeedback.js
@@ -6,7 +6,6 @@ import { addData } from "../lib/taskUtils";
 
 const rewardFeedback = (duration, blockSettings, opts, trialDetails) => {
   const startCode = eventCodes.rewardFeedbackStart;
-  const endCode = eventCodes.rewardFeedbackEnd;
 
   return {
     type: "call_function",
@@ -43,8 +42,7 @@ const rewardFeedback = (duration, blockSettings, opts, trialDetails) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/rewardProbability.js b/src/trials/rewardProbability.js
@@ -19,7 +19,6 @@ const rewardProbability = (duration, blockSettings, opts, trialDetails) => {
     `</div>`;
 
   const startCode = eventCodes.rewardProbabilityStart;
-  const endCode = eventCodes.rewardProbabilityEnd;
 
   let probability = blockSettings.is_practice ? opts : opts.prob;
 
@@ -59,8 +58,7 @@ const rewardProbability = (duration, blockSettings, opts, trialDetails) => {
       pdSpotEncode(startCode);
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.encode = [startCode, endCode];
+      data.code = startCode;
     },
   };
 };

diff --git a/src/trials/showPayment.js b/src/trials/showPayment.js
@@ -73,8 +73,7 @@ const showPayment = (duration, blockSettings) => {
           ) + photodiodeGhostBox();
       },
       on_finish: (data) => {
-        pdSpotEncode(endCode);
-        data.code = [startCode, endCode];
+        data.code = startCode;
         data.total_earnings = total_earnings;
         data.subtrial_type = "show_payment";
       },

diff --git a/src/trials/trialEnd.js b/src/trials/trialEnd.js
@@ -1,9 +1,9 @@
-import { eventCodes, IS_ELECTRON, AT_HOME } from "../config/main";
-import { photodiodeGhostBox, pdSpotEncode } from "../lib/markup/photodiode";
+import { IS_ELECTRON, AT_HOME } from "../config/main";
+import { photodiodeGhostBox } from "../lib/markup/photodiode";
 import { removeCursor } from "../lib/utils";
 
 const trialEnd = (duration) => {
-  const endCode = eventCodes.trialFinishEnd;
+  // const endCode = eventCodes.trialFinishEnd;
   return {
     type: "html_keyboard_response",
     stimulus: "",
@@ -16,8 +16,8 @@ const trialEnd = (duration) => {
       if (IS_ELECTRON && !AT_HOME) trial.stimulus += photodiodeGhostBox();
     },
     on_finish: (data) => {
-      pdSpotEncode(endCode);
-      data.code = endCode;
+      // pdSpotEncode(endCode);
+      // data.code = endCode;
     },
   };
 };