Browse Source

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
modified: backend/free_grasp.psyexp
modified: backend/free_grasp.py

dk 1 year ago
parent
commit
9900e9024f
2 changed files with 4 additions and 2 deletions
  1. 1 1
      backend/free_grasp.psyexp
  2. 3 1
      backend/free_grasp.py

+ 1 - 1
backend/free_grasp.psyexp

@@ -95,7 +95,7 @@
         <Param val="" valType="extendedCode" updates="constant" name="Begin Experiment"/>
         <Param val="" valType="extendedCode" updates="constant" name="Begin JS Experiment"/>
         <Param val="" valType="extendedCode" updates="constant" name="Begin JS Routine"/>
-        <Param val="# state changed&amp;#10;feedback_bar1.progress = force&amp;#10;if decision != -1:&amp;#10;    feedback_time = 5&amp;#10;    if not decision:&amp;#10;        hand_device.extend()&amp;#10;    else:&amp;#10;        hand_device.start(model=fingermodel_ids_inverse[decision])&amp;#10;else:&amp;#10;    feedback_time = 0&amp;#10;    " valType="extendedCode" updates="constant" name="Begin Routine"/>
+        <Param val="# state changed&amp;#10;feedback_bar1.progress = force&amp;#10;if decision != -1:&amp;#10;    feedback_time = 5&amp;#10;    if not decision:&amp;#10;        trigger.send_trigger(0)&amp;#10;        hand_device.extend()&amp;#10;    else:&amp;#10;        trigger.send_trigger(decision)&amp;#10;        hand_device.start(model=fingermodel_ids_inverse[decision])&amp;#10;else:&amp;#10;    feedback_time = 0&amp;#10;    " valType="extendedCode" updates="constant" name="Begin Routine"/>
         <Param val="Py" valType="str" updates="None" name="Code Type"/>
         <Param val="" valType="extendedCode" updates="constant" name="Each Frame"/>
         <Param val="" valType="extendedCode" updates="constant" name="Each JS Frame"/>

+ 3 - 1
backend/free_grasp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """
 This experiment was created using PsychoPy3 Experiment Builder (v2023.2.3),
-    on 十一月 22, 2023, at 11:18
+    on Wed Nov 22 18:42:41 2023
 If you publish work using this script the most relevant publication is:
 
     Peirce J, Gray JR, Simpson S, MacAskill M, Höchenberger R, Sogo H, Kastman E, Lindeløv JK. (2019) 
@@ -683,8 +683,10 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
         if decision != -1:
             feedback_time = 5
             if not decision:
+                trigger.send_trigger(0)
                 hand_device.extend()
             else:
+                trigger.send_trigger(decision)
                 hand_device.start(model=fingermodel_ids_inverse[decision])
         else:
             feedback_time = 0