Browse Source

Merge branch 'fix' of dk/kraken into master

dk 1 year ago
parent
commit
8d8a6e8959
2 changed files with 6 additions and 6 deletions
  1. 2 2
      backend/free_grasp.psyexp
  2. 4 4
      backend/free_grasp.py

+ 2 - 2
backend/free_grasp.psyexp

@@ -23,7 +23,7 @@
     <Param val="True" valType="bool" updates="None" name="Save wide csv file"/>
     <Param val="True" valType="bool" updates="None" name="Save wide csv file"/>
     <Param val="1" valType="num" updates="None" name="Screen"/>
     <Param val="1" valType="num" updates="None" name="Screen"/>
     <Param val="True" valType="bool" updates="None" name="Show info dlg"/>
     <Param val="True" valType="bool" updates="None" name="Show info dlg"/>
-    <Param val="False" valType="bool" updates="None" name="Show mouse"/>
+    <Param val="True" valType="bool" updates="None" name="Show mouse"/>
     <Param val="height" valType="str" updates="None" name="Units"/>
     <Param val="height" valType="str" updates="None" name="Units"/>
     <Param val="" valType="str" updates="None" name="Use version"/>
     <Param val="" valType="str" updates="None" name="Use version"/>
     <Param val="[1920, 1080]" valType="list" updates="None" name="Window size (pixels)"/>
     <Param val="[1920, 1080]" valType="list" updates="None" name="Window size (pixels)"/>
@@ -269,7 +269,7 @@
         <Param val="parameter_inputs" valType="code" updates="None" name="name"/>
         <Param val="parameter_inputs" valType="code" updates="None" name="name"/>
       </CodeComponent>
       </CodeComponent>
       <CodeComponent name="device" plugin="None">
       <CodeComponent name="device" plugin="None">
-        <Param val="# connect neo&amp;#10;receiver = NeuracleDataClient(n_channel=len(config_info['channel_labels']), &amp;#10;                               samplerate=config_info['sample_rate'],&amp;#10;                               host=config_info['host'],&amp;#10;                               port=config_info['port'].&amp;#10;                               buffer_len=config_info['buffer_length'])&amp;#10;&amp;#10;# connect to trigger box&amp;#10;trigger = TriggerNeuracle()&amp;#10;&amp;#10;# connect to mechanical hand&amp;#10;hand_device = FuboPneumaticFingerClient({'port': args.com})&amp;#10;" valType="extendedCode" updates="constant" name="Before Experiment"/>
+        <Param val="# connect neo&amp;#10;receiver = NeuracleDataClient(n_channel=len(config_info['channel_labels']), &amp;#10;                               samplerate=config_info['sample_rate'],&amp;#10;                               host=config_info['host'],&amp;#10;                               port=config_info['port'],&amp;#10;                               buffer_len=config_info['buffer_length'])&amp;#10;&amp;#10;# connect to trigger box&amp;#10;trigger = TriggerNeuracle()&amp;#10;&amp;#10;# connect to mechanical hand&amp;#10;hand_device = FuboPneumaticFingerClient({'port': args.com})&amp;#10;" valType="extendedCode" updates="constant" name="Before Experiment"/>
         <Param val="receiver = new NeuracleDataClient({&quot;n_channel&quot;: config_info[&quot;channel_labels&quot;].length, &quot;samplerate&quot;: config_info[&quot;sample_rate&quot;], &quot;host&quot;: config_info[&quot;host&quot;], &quot;port&quot;: config_info[&quot;port&quot;]});&amp;#10;trigger = new TriggerNeuracle();&amp;#10;hand_device = new FuboPneumaticFingerClient({&quot;port&quot;: args.com});&amp;#10;controller = new Controller(0.0, args.model_path, {&quot;state_change_threshold&quot;: 0.8});&amp;#10;" valType="extendedCode" updates="constant" name="Before JS Experiment"/>
         <Param val="receiver = new NeuracleDataClient({&quot;n_channel&quot;: config_info[&quot;channel_labels&quot;].length, &quot;samplerate&quot;: config_info[&quot;sample_rate&quot;], &quot;host&quot;: config_info[&quot;host&quot;], &quot;port&quot;: config_info[&quot;port&quot;]});&amp;#10;trigger = new TriggerNeuracle();&amp;#10;hand_device = new FuboPneumaticFingerClient({&quot;port&quot;: args.com});&amp;#10;controller = new Controller(0.0, args.model_path, {&quot;state_change_threshold&quot;: 0.8});&amp;#10;" valType="extendedCode" updates="constant" name="Before JS Experiment"/>
         <Param val="" valType="extendedCode" updates="constant" name="Begin Experiment"/>
         <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 Experiment"/>

+ 4 - 4
backend/free_grasp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 """
 """
 This experiment was created using PsychoPy3 Experiment Builder (v2023.2.3),
 This experiment was created using PsychoPy3 Experiment Builder (v2023.2.3),
-    on Tue Nov 21 18:13:33 2023
+    on 十一月 22, 2023, at 11:18
 If you publish work using this script the most relevant publication is:
 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) 
     Peirce J, Gray JR, Simpson S, MacAskill M, Höchenberger R, Sogo H, Kastman E, Lindeløv JK. (2019) 
@@ -93,7 +93,7 @@ controller = Controller(0., args.model_path,
 receiver = NeuracleDataClient(n_channel=len(config_info['channel_labels']), 
 receiver = NeuracleDataClient(n_channel=len(config_info['channel_labels']), 
                                samplerate=config_info['sample_rate'],
                                samplerate=config_info['sample_rate'],
                                host=config_info['host'],
                                host=config_info['host'],
-                               port=config_info['port'].
+                               port=config_info['port'],
                                buffer_len=config_info['buffer_length'])
                                buffer_len=config_info['buffer_length'])
 
 
 # connect to trigger box
 # connect to trigger box
@@ -176,7 +176,7 @@ def setupData(expInfo, dataDir=None):
     thisExp = data.ExperimentHandler(
     thisExp = data.ExperimentHandler(
         name=expName, version='',
         name=expName, version='',
         extraInfo=expInfo, runtimeInfo=None,
         extraInfo=expInfo, runtimeInfo=None,
-        originPath='/Users/dingkunliu/Projects/MI-BCI-Proj/kraken/backend/free_grasp.py',
+        originPath='C:\\Users\\asena\\Desktop\\kraken\\backend\\free_grasp.py',
         savePickle=True, saveWideText=True,
         savePickle=True, saveWideText=True,
         dataFileName=dataDir + os.sep + filename, sortColumns='time'
         dataFileName=dataDir + os.sep + filename, sortColumns='time'
     )
     )
@@ -244,7 +244,7 @@ def setupWindow(expInfo=None, win=None):
         win.backgroundImage = ''
         win.backgroundImage = ''
         win.backgroundFit = 'none'
         win.backgroundFit = 'none'
         win.units = 'height'
         win.units = 'height'
-    win.mouseVisible = False
+    win.mouseVisible = True
     win.hideMessage()
     win.hideMessage()
     return win
     return win