sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Add Keysight branding where applicable

Browse Source 
Because there is now more than one "product name" per device
type, we have a concept of a "generic product name" which
singularly maps onto a device type.

This change comes with a few small breaking changes within
the C++ API:

DeviceType::GetDeviceTypeString has been renamed to
DeviceType::GetGenericProductName to denote that
the returned value is not device specific and
device->getProductName() is preferable.

The member function DeviceType::toString has been renamed
to DeviceType::getGenericProductName for the same reason.

The DeviceType std::ostream& operator<< has been removed
to avoid accidental use of the generic product name.
This commit is contained in:
Paul Hollinsky
2021-04-12 19:01:43 -04:00
parent d79f735df8
commit e29d63b08c
12 changed files with 186 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/icsneoc/icsneoc.cpp
+2 -2
View File
@@ -272,7 +272,7 @@ bool icsneo_getProductName(const neodevice_t* device, char* str, size_t* maxLeng
if(!icsneo_isValidNeoDevice(device))
return false;
std::string output = device->device->getType().toString();
std::string output = device->device->getProductName();
if(str == nullptr) {
*maxLength = output.length();
@@ -295,7 +295,7 @@ bool icsneo_getProductNameForType(devicetype_t type, char* str, size_t* maxLengt
return false;
}
std::string output = DeviceType(type).toString();
std::string output = DeviceType(type).getGenericProductName();
if(str == nullptr) {
*maxLength = output.length();