patch for thinkpulse #4
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commented max_markers utils.py
added screen_num parameter
New resting-state eyes open/eyes-closed experiment
… Psychopy version to 2025.1.1; Switched to sounddevice library for macOS ARM, and added `cffi` for sound support. (NeuroTechX#301) Updated Psychopy version to 2025.1.1 and added cffi dependency in conda environments to fix MacOS ARM sound issues. Removed Psychopy PTB audio preferences and updated sound configuration for compatibility with macOS ARM and sounddevice backend. Use forked version of psychopy-soundevice until patches are merged into official repo.
modified kf packet info following discussion w devs
Fixed typecheck errors
* Add Windows-specific numpy fix for PsychXR DLL issues * Add numpy to environment yml to fix PsychXR DLL issues
pellet
force-pushed
the
claude/merge-openbci-conflicts-01PjYMTt2hwHqrPvkzPf1g7C
branch
2 times, most recently
from
0887e86 to
c46a529
Compare
pellet
force-pushed
the
claude/merge-openbci-conflicts-01PjYMTt2hwHqrPvkzPf1g7C
branch
2 times, most recently
from
5818fbb to
5f1d49a
Compare
pellet
changed the base branch from
dev/openbci_cyton_thinkpulse
to
feature/support_for_openbci_cyton_thinkpulse_electrodes
…odes Resolved conflicts in eegnb/devices/eeg.py by combining both parameters: - Kept config parameter (for OpenBCI board configuration) - Added make_logfile parameter from master (for kernelflow support)
pellet
force-pushed
the
claude/merge-openbci-conflicts-01PjYMTt2hwHqrPvkzPf1g7C
branch
from
5f1d49a to
804c716
Compare
pellet
merged commit b050d2d
into
feature/support_for_openbci_cyton_thinkpulse_electrodes
pellet
deleted the
claude/merge-openbci-conflicts-01PjYMTt2hwHqrPvkzPf1g7C
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.