Merge pull request #85 from open-ephys-plugins/remove-heartbeat

Remove Heartbeat classes

Author: bparks13

Source/Devices/DeviceList.h

@@ -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"

Source/Devices/Heartbeat.cpp

@@ -50,8 +50,6 @@ namespace OnixSourcePlugin
 		PORT_CONTROL,
 		MEMORYMONITOR,
 		OUTPUTCLOCK,
-		HEARTBEAT,
-		PERSISTENTHEARTBEAT,
 		HARPSYNCINPUT,
 		ANALOGIO,
 		DIGITALIO,

Source/Devices/Heartbeat.h

@@ -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);
@@ -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)
 			{
@@ -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() });
 	}