Skip to content

Remove Heartbeat classes #85

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

Merged
merged 1 commit into from
Jul 1, 2025
Merged

Remove Heartbeat classes #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Source/Devices/DeviceList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include "Neuropixels2e.h"
#include "MemoryMonitor.h"
#include "OutputClock.h"
#include "Heartbeat.h"
#include "PersistentHeartbeat.h"
#include "HarpSyncInput.h"
#include "AnalogIO.h"
#include "DigitalIO.h"
Expand Down
79 changes: 0 additions & 79 deletions Source/Devices/Heartbeat.cpp
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions Source/Devices/Heartbeat.h
View file
Open in desktop

This file was deleted.

98 changes: 0 additions & 98 deletions Source/Devices/PersistentHeartbeat.cpp
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions Source/Devices/PersistentHeartbeat.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Source/OnixDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ namespace OnixSourcePlugin
PORT_CONTROL,
MEMORYMONITOR,
OUTPUTCLOCK,
HEARTBEAT,
PERSISTENTHEARTBEAT,
HARPSYNCINPUT,
ANALOGIO,
DIGITALIO,
Expand Down
16 changes: 2 additions & 14 deletions Source/OnixSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ bool OnixSource::configureDevice(OnixDeviceVector& sources,
LOGD("Difference in names found for device at address ", deviceIdx, ". Found ", deviceName, " on ", hubName, ", but was expecting ", device->getName(), " on ", device->getHubName());
}
}
else if (device->getDeviceType() == OnixDeviceType::HEARTBEAT ||
device->getDeviceType() == OnixDeviceType::PERSISTENTHEARTBEAT ||
device->getDeviceType() == OnixDeviceType::MEMORYMONITOR)
else if (device->getDeviceType() == OnixDeviceType::MEMORYMONITOR)
{// NB: These are devices with no equivalent settings tab that still need to be created and added to the vector of devices
LOGD("Creating new device ", deviceName, " on ", hubName);
device = std::make_shared<Device>(deviceName, hubName, deviceIdx, ctx);
Expand Down Expand Up @@ -296,13 +294,6 @@ bool OnixSource::initializeDevices(device_map_t deviceTable, bool updateStreamIn
hubNames.insert({ hubIndex, BREAKOUT_BOARD_NAME });
auto canvas = editor->getCanvas();

devicesFound = configureDevice<PersistentHeartbeat>(sources, canvas, "Heartbeat", BREAKOUT_BOARD_NAME, PersistentHeartbeat::getDeviceType(), hubIndex, context);
if (!devicesFound)
{
sources.clear();
return false;
}

devicesFound = configureDevice<OutputClock>(sources, canvas, "Output Clock", BREAKOUT_BOARD_NAME, OutputClock::getDeviceType(), hubIndex + 5, context);
if (!devicesFound)
{
Expand Down Expand Up @@ -601,10 +592,7 @@ std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devic

for (const auto& device : devices)
{
if (filterDevices &&
(device->getDeviceType() == OnixDeviceType::HEARTBEAT ||
device->getDeviceType() == OnixDeviceType::PERSISTENTHEARTBEAT ||
device->getDeviceType() == OnixDeviceType::MEMORYMONITOR)) continue;
if (filterDevices && (device->getDeviceType() == OnixDeviceType::MEMORYMONITOR)) continue;

deviceMap.insert({ device->getDeviceIdx(), device->getDeviceType() });
}
Expand Down