diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index cc7ad3056..0f36782f9 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -6278,39 +6278,6 @@ void CMMCore::setPressurePumpDevice(const char* deviceLabel) throw (CMMError) } } -/** - * Sets the current pump device. - * @param pump the shutter device label - */ -void CMMCore::setPressurePumpDevice(const char* deviceLabel) throw (CMMError) -{ - if (!deviceLabel || strlen(deviceLabel) > 0) // Allow empty label - CheckDeviceLabel(deviceLabel); - - // Nothing to do if this is the current shutter device: - if (getPressurePumpDevice().compare(deviceLabel) == 0) - return; - - if (strlen(deviceLabel) > 0) - { - currentPressurePump_ = - deviceManager_->GetDeviceOfType(deviceLabel); - - LOG_INFO(coreLogger_) << "Default shutter set to " << deviceLabel; - } - else - { - currentPressurePump_.reset(); - LOG_INFO(coreLogger_) << "Default pump unset"; - } - properties_->Refresh(); // TODO: more efficient - std::string newPumpLabel = getPressurePumpDevice(); - { - MMThreadGuard scg(stateCacheLock_); - stateCache_.addSetting(PropertySetting(MM::g_Keyword_CoreDevice, MM::g_Keyword_CorePressurePump, newPumpLabel.c_str())); - } -} - /** * Stops the pressure pump */