Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eegnb/experiments/Experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,15 @@ def show_instructions(self):

def _user_input(self, input_type):
if input_type == 'start':
key_input = 'spacebar'
key_input = ['space']
vr_inputs = [
('RightTouch', 'A', True),
('LeftTouch', 'X', True),
('Xbox', 'A', None)
]

elif input_type == 'cancel':
key_input = 'escape'
key_input = ['escape']
vr_inputs = [
('RightTouch', 'B', False),
('LeftTouch', 'Y', False),
Expand Down
2 changes: 1 addition & 1 deletion eegnb/experiments/auditory_oddball/aMMN.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def show_instructions(duration):
text = visual.TextStim(win=mywin, text=instruction_text, color=[-1, -1, -1])
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True
mywin.close()
2 changes: 1 addition & 1 deletion eegnb/experiments/auditory_oddball/auditory_erp_arrayin.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def show_instructions(duration):
text = visual.TextStim(win=mywin, text=instruction_text, color=[-1, -1, -1])
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True
mywin.close()
Expand Down
2 changes: 1 addition & 1 deletion eegnb/experiments/auditory_ssaep/ssaep.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def show_instructions(duration):
text = visual.TextStim(win=mywin, text=instruction_text, color=[-1, -1, -1])
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True
mywin.close()
Expand Down
2 changes: 1 addition & 1 deletion eegnb/experiments/auditory_ssaep/ssaep_onefreq.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def show_instructions(duration):
color=[-1, -1, -1])
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True
mywin.close()
Expand Down
10 changes: 5 additions & 5 deletions eegnb/experiments/visual_codeprose/codeprose.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def fixate(window: visual.Window, text: Optional[str] = None):
visual.GratingStim(win=window, size=0.2, sf=0).draw()

window.flip()
event.waitKeys(keyList="space", maxWait=5)
event.waitKeys(keyList=["space"], maxWait=5)


def goodbye(window):
Expand All @@ -187,7 +187,7 @@ def goodbye(window):
)
text.draw()
window.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])


def practice(window):
Expand All @@ -198,7 +198,7 @@ def practice(window):
text.draw()
window.flip()

event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])


def instructions(window):
Expand All @@ -211,7 +211,7 @@ def instructions(window):
text.draw()
window.flip()

event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

text = visual.TextStim(
win=window,
Expand All @@ -221,4 +221,4 @@ def instructions(window):
text.draw()
window.flip()

event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])
22 changes: 11 additions & 11 deletions eegnb/experiments/visual_cueing/cueing.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def present(duration, subject=0, session=0, **kwargs):
)
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True

Expand Down Expand Up @@ -403,7 +403,7 @@ def practice():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True

Expand All @@ -429,7 +429,7 @@ def instructions():
)
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -445,7 +445,7 @@ def instructions():
fixation.draw()
text.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -457,7 +457,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -471,7 +471,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -485,7 +485,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -503,7 +503,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -521,7 +521,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -539,7 +539,7 @@ def instructions():
text.draw()
fixation.draw()
mywin.flip()
event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

# Instructions
text = visual.TextStim(
Expand All @@ -555,7 +555,7 @@ def instructions():
sys.stdout.write("\a")
sys.stdout.flush()

event.waitKeys(keyList="space")
event.waitKeys(keyList=["space"])

mywin.mouseVisible = True

Expand Down
Loading