Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS Silicon support + minor doc updates #271

Merged
merged 14 commits into from
Sep 5, 2024
Merged

Conversation

oreHGA
Copy link
Collaborator

@oreHGA oreHGA commented Aug 2, 2024

Mainly contains @pellet changes to get MacOS build working & some doc updates on running experiments.

--
During our call yesterday, I mistakenly merged #269 into develop. I've rebased the master branch into this and included a doc update on running experiments.

(the commit history is a little weird but we'll squash merge into one)

Parvfect and others added 14 commits August 2, 2024 12:32
…iments to subclasses (#184)

* First commit

* Second commit

* Modifications

* Lol

* Lol

* Incorporated N170 and p300, looking good for a PR

* ssvep update

* Implementing subclasses instead of loose functions

* fix: fixed import (brainflow updated API)

* Playing around still

* Fixing import errors

* Adding abstractmethod decorators

* Still working on the import error

* Guess what's finally working

* Comments and naming ticks

* More comments

* Live coding demonstration

* ssvep adapted

* Adapting Auditory Oddball

* changing save_fn to self.save_fun

* This maybe the last big change

* utils file changed, changes work through cli

Co-authored-by: Erik Bjäreholt <[email protected]>
* started pipelines function

* almost working simple function equivalents of nb scripts

* fix: fixed import (brainflow updated API)

* sqc fixes for unicorn (#176)

* Ignore pushes

* Trying to create a cli

* Stepping through the problem

* First commit

* Fixing pause in signal quality check

* Fixing Signal quality check problem

* fix the technical debt

* Save path done for automated saving pdf

* I feel amazing

* Almost through

* Update eegnb/cli/__main__.py

Co-authored-by: Erik Bjäreholt <[email protected]>

* Trying to create cli but it's being really painful

* Extra word cli error

* Changed example handling

* Pain

* Adding whole datapath

* Finally fixed cli

* hmm

* Looking good

* added hyperlink

* Having some issues with detecting css and image deltetion

* Just the css now

* Fixed the css linking problem though it's a weird soln

* Automated running, still fnames problem

* Hahahah embedded images in html

* Improving code

* Okay now

* Look at that

* Almost there just the two figures now

* Now

* Added attrdict to do with cli error

Co-authored-by: John Griffiths <[email protected]>
Co-authored-by: Erik Bjäreholt <[email protected]>
Co-authored-by: John Griffiths <[email protected]>
This commit introduces multiple changes that ensure compatibility with macOS Apple Silicon. The 'keyboard' dependency was removed because of segmentation faults, and it was replaced with 'pynput'. The versions of 'pylsl', 'pyobjc', and 'psychopy' were specified to prevent dependency resolution loop and solve issues on Apple Silicon. The 'conda' installation step was added to the GitHub Actions workflow to facilitate installation of these dependencies. Some experiment and analytical scripts were also updated accordingly for compatibility.
@oreHGA oreHGA merged commit ab1a444 into master Sep 5, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants