diff --git a/smocore/deviceManager/deviceAttachmentPipeSpecp.yy b/smocore/deviceManager/deviceAttachmentPipeSpecp.yy index c835b9e..9da1f27 100644 --- a/smocore/deviceManager/deviceAttachmentPipeSpecp.yy +++ b/smocore/deviceManager/deviceAttachmentPipeSpecp.yy @@ -88,7 +88,7 @@ interoceptor_spec: spec->sensorType = $1; smo::device::DeviceManager::interoceptorDeviceSpecs.push_back(spec); - smo::device::DeviceManager::senseDeviceSpecs.push_back(spec); + smo::device::DeviceManager::deviceAttachmentSpecs.push_back(spec); delete $3; } @@ -101,7 +101,7 @@ extrospector_spec: spec->sensorType = $1; smo::device::DeviceManager::extrospectorDeviceSpecs.push_back(spec); - smo::device::DeviceManager::senseDeviceSpecs.push_back(spec); + smo::device::DeviceManager::deviceAttachmentSpecs.push_back(spec); delete $3; } diff --git a/smocore/deviceManager/deviceManager.cpp b/smocore/deviceManager/deviceManager.cpp index 9bbff07..0f8996e 100644 --- a/smocore/deviceManager/deviceManager.cpp +++ b/smocore/deviceManager/deviceManager.cpp @@ -16,7 +16,7 @@ std::vector> std::vector> DeviceManager::extrospectorDeviceSpecs; std::vector> - DeviceManager::senseDeviceSpecs; + DeviceManager::deviceAttachmentSpecs; const std::string DeviceManager::stringifyDeviceSpecs(void) { diff --git a/smocore/include/deviceManager/deviceManager.h b/smocore/include/deviceManager/deviceManager.h index 0c07313..56e4599 100644 --- a/smocore/include/deviceManager/deviceManager.h +++ b/smocore/include/deviceManager/deviceManager.h @@ -24,6 +24,7 @@ public: std::string readDapSpecFile(const std::string& filename); void collateAllDapSpecs(void); void parseAllDapSpecs(void); + static const std::string stringifyDeviceSpecs(void); private: @@ -39,7 +40,7 @@ public: static std::vector> extrospectorDeviceSpecs; static std::vector> - senseDeviceSpecs; + deviceAttachmentSpecs; }; } // namespace device diff --git a/smocore/senseApis/senseApiManager.cpp b/smocore/senseApis/senseApiManager.cpp index bd9de5c..5737de6 100644 --- a/smocore/senseApis/senseApiManager.cpp +++ b/smocore/senseApis/senseApiManager.cpp @@ -275,14 +275,14 @@ void SenseApiManager::detachSenseDevice( void SenseApiManager::attachAllSenseDevicesFromSpecs(void) { - for (const auto& spec : device::DeviceManager::senseDeviceSpecs) { + for (const auto& spec : device::DeviceManager::deviceAttachmentSpecs) { attachSenseDevice(spec); } } void SenseApiManager::detachAllSenseDevices(void) { - for (const auto& spec : device::DeviceManager::senseDeviceSpecs) { + for (const auto& spec : device::DeviceManager::deviceAttachmentSpecs) { detachSenseDevice(spec); } }