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.

Sign up for GitHub

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

Rename enableDevice #18

Merged
merged 2 commits into from
Mar 10, 2025
Merged

Rename enableDevice #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05b29e6
Rename `enableDevice` to `configureDevice`
bparks13 Feb 4, 2025
4440f12
Merge branch 'main' into issue-13
bparks13 Mar 4, 2025
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
2 changes: 1 addition & 1 deletion Source/Devices/Bno055.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Bno055::~Bno055()
{
}

int Bno055::enableDevice()
int Bno055::configureDevice()
{
oni_write_reg(ctx, deviceIdx, (uint32_t)Bno055Registers::ENABLE, (uint32_t)1);

Expand Down
2 changes: 1 addition & 1 deletion Source/Devices/Bno055.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Bno055 : public OnixDevice
/** Destructor */
~Bno055();

int enableDevice() override;
int configureDevice() override;

/** Update the settings of the device */
int updateSettings() override;
Expand Down
2 changes: 1 addition & 1 deletion Source/Devices/Neuropixels2e.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ int Neuropixels2e::getNumProbes() const
return m_numProbes;
}

int Neuropixels2e::enableDevice()
int Neuropixels2e::configureDevice()
{
configureSerDes();
setProbeSupply(true);
Expand Down
2 changes: 1 addition & 1 deletion Source/Devices/Neuropixels2e.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Neuropixels2e :
/** Destructor */
~Neuropixels2e();

int enableDevice() override;
int configureDevice() override;

/** Update the settings of the device */
int updateSettings() override;
Expand Down
2 changes: 1 addition & 1 deletion Source/Devices/Neuropixels_1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ NeuropixelsReference Neuropixels_1::getReference(int index)
return NeuropixelsReference::External;
}

int Neuropixels_1::enableDevice()
int Neuropixels_1::configureDevice()
{
// Get Probe SN
uint32_t eepromOffset = 0;
Expand Down
2 changes: 1 addition & 1 deletion Source/Devices/Neuropixels_1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class Neuropixels_1 : public OnixDevice,
~Neuropixels_1();

/** Enables the device so that it is ready to stream with default settings */
int enableDevice() override;
int configureDevice() override;

/** Update the settings of the device */
int updateSettings() override;
Expand Down
2 changes: 1 addition & 1 deletion Source/OnixDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class OnixDevice

void setEnabled(bool newState) { enabled = newState; }

virtual int enableDevice() = 0;
virtual int configureDevice() = 0;

virtual int updateSettings() = 0;

Expand Down
6 changes: 3 additions & 3 deletions Source/OnixSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
{
auto np1 = std::make_unique<Neuropixels_1>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), this, devices[dev_idx].idx, ctx);

int res = np1->enableDevice();
int res = np1->configureDevice();

if (res != 0)
{
Expand Down Expand Up @@ -178,7 +178,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
{
auto bno = std::make_unique<Bno055>("BNO-" + String::charToString(probeLetters[bnoIdx]), devices[dev_idx].idx, ctx);

int result = bno->enableDevice();
int result = bno->configureDevice();

if (result != 0)
{
Expand Down Expand Up @@ -206,7 +206,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
if (hsid == 8) //Npix2.0e headstage, constant needs to be added to onix.h
{
auto np2 = std::make_unique<Neuropixels2e>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), devices[dev_idx].idx, ctx);
int res = np2->enableDevice();
int res = np2->configureDevice();
if (res != 0)
{
if (res == -1)
Expand Down