From 88521b551e67bc0aa23265defcd7703a6f8d9304 Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 20 Oct 2022 14:39:48 +0300 Subject: MTX-4685 MTCDT3 R.6.2.0: hw-version shall be used to detect serial capabilities GP-1779 --- src/Device/Device.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index effd4b6..c6e1186 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -175,6 +175,12 @@ void Device::getSystemTreeJson(const char *dir_name) { deviceInfoList[toCamelCase(d_name)] = fileData; } else if (strcmp(d_name, "hw-version") == 0) { deviceInfoList["hardwareVersion"] = fileData; + if (regex_match(fileData, mtcdt3Filters)) { + capabilityList["rs232"] = true; + capabilityList["rs422"] = true; + capabilityList["rs485"] = true; + capabilityList["serial"] = true; + } } else if (strcmp(d_name, "mac-eth") == 0) { deviceInfoList["macAddress"] = fileData; } else if (strcmp(d_name, "has-radio") == 0 && @@ -186,12 +192,6 @@ void Device::getSystemTreeJson(const char *dir_name) { deviceInfoList["oemString2"] = fileData; }; if (strcmp(d_name, "product-id") == 0) { - if (regex_match(fileData, mtcdt3Filters)) { - capabilityList["rs232"] = true; - capabilityList["rs422"] = true; - capabilityList["rs485"] = true; - capabilityList["serial"] = true; - } if (regex_match(fileData, mtrFilters)) { capabilityList["rs232"] = true; capabilityList["serial"] = true; -- cgit v1.2.3 From 49ee47ad3caae204fd19c31eb94b55bc72fce5e8 Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 20 Oct 2022 16:14:46 +0300 Subject: MTX-4685 MTCDT3 R.6.2.0: hw-version shall be used to detect serial capabilities GP-1779 --- include/Device/Device.h | 2 +- src/Device/Device.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Device/Device.h b/include/Device/Device.h index 5f2bf12..7a20f04 100644 --- a/include/Device/Device.h +++ b/include/Device/Device.h @@ -28,7 +28,7 @@ class Device { static const std::regex serialModeFilter; static const std::regex storeFilters; static const std::regex showFilters; - static const std::regex mtcdt3Filters; + static const std::regex mtcdt3HwVersionFilters; static const std::regex mtrFilters; const unsigned int accessoryCardsListSize = 7; diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index c6e1186..6ef807e 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -22,7 +22,7 @@ const std::vector Device::apIdentifiers = { const std::regex Device::apFilters("(modalias)|(power)(.*)|(subsystem)|(uevent)"); const std::regex Device::serialModeFilter("(.*)(serial-mode)"); -const std::regex Device::mtcdt3Filters("(MTCDT3AC)(.*)"); +const std::regex Device::mtcdt3HwVersionFilters("(MTCDT3AC)(.*)"); const std::regex Device::mtrFilters("(MTR-)(.*)"); const std::regex Device::storeFilters( "(.*)(mac-)(.*)|(.*)(-id)|(uuid)|(.*)(/eui)|(.*)(/" @@ -175,7 +175,7 @@ void Device::getSystemTreeJson(const char *dir_name) { deviceInfoList[toCamelCase(d_name)] = fileData; } else if (strcmp(d_name, "hw-version") == 0) { deviceInfoList["hardwareVersion"] = fileData; - if (regex_match(fileData, mtcdt3Filters)) { + if (regex_match(fileData, mtcdt3HwVersionFilters)) { capabilityList["rs232"] = true; capabilityList["rs422"] = true; capabilityList["rs485"] = true; -- cgit v1.2.3