Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal] Fix USB serial port assignment in SerialHelper (#8689)

Browse Source
This commit is contained in:
Levi
2026-06-07 20:02:13 -05:00
committed by GitHub
parent 7ca35e5678
commit 859fb6c408
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hal/src/main/native/athena/cpp/SerialHelper.cpp
View File

@@ -138,10 +138,10 @@ void SerialHelper::SortHubPathVector() {
m_sortedHubPath = m_unsortedHubPath; m_sortedHubPath = m_unsortedHubPath;
std::sort(m_sortedHubPath.begin(), m_sortedHubPath.end(), std::sort(m_sortedHubPath.begin(), m_sortedHubPath.end(),
[](const wpi::SmallVectorImpl<char>& lhs, [](const wpi::SmallVectorImpl<char>& lhs,
const wpi::SmallVectorImpl<char>& rhs) -> int { const wpi::SmallVectorImpl<char>& rhs) -> bool {
std::string_view lhsRef(lhs.begin(), lhs.size()); std::string_view lhsRef(lhs.begin(), lhs.size());
std::string_view rhsRef(rhs.begin(), rhs.size()); std::string_view rhsRef(rhs.begin(), rhs.size());
return lhsRef.compare(rhsRef); return lhsRef < rhsRef;
}); });
} }
@@ -162,6 +162,11 @@ void SerialHelper::CoiteratedSort(
} }
void SerialHelper::QueryHubPaths(int32_t* status) { void SerialHelper::QueryHubPaths(int32_t* status) {
m_unsortedHubPath.clear();
m_visaResource.clear();
m_osResource.clear();
m_sortedHubPath.clear();
// VISA resource matching string // VISA resource matching string
const char* str = "?*"; const char* str = "?*";
// Items needed for VISA // Items needed for VISA
@@ -275,12 +280,14 @@ void SerialHelper::QueryHubPaths(int32_t* status) {
continue; continue;
} }
std::string_view hubPathComponent = pathSplitVec[hubIndex - 2];
std::string_view osPath =
wpi::split(wpi::split(osName, "(").second, ")").first;
// Add our devices to our list // Add our devices to our list
m_unsortedHubPath.emplace_back( m_unsortedHubPath.emplace_back(hubPathComponent);
std::string_view{pathSplitVec[hubIndex - 2]});
m_visaResource.emplace_back(desc); m_visaResource.emplace_back(desc);
m_osResource.emplace_back( m_osResource.emplace_back(osPath);
wpi::split(wpi::split(osName, "(").second, ")").first);
break; break;
} }
} }
@@ -303,14 +310,16 @@ int32_t SerialHelper::GetIndexForPort(HAL_SerialPort port, int32_t* status) {
// If port has not been assigned, find the one to assign // If port has not been assigned, find the one to assign
if (portString.empty()) { if (portString.empty()) {
// local copy to avoid modifying original
auto availableHubPaths = m_sortedHubPath;
for (size_t i = 0; i < 2; i++) { for (size_t i = 0; i < 2; i++) {
// Remove all used ports // Remove all used ports from the local copy
auto idx = std::find_if( auto idx = std::find_if(
m_sortedHubPath.begin(), m_sortedHubPath.end(), availableHubPaths.begin(), availableHubPaths.end(),
[&](const auto& s) { return wpi::equals(s, m_usbNames[i]); }); [&](const auto& s) { return wpi::equals(s, m_usbNames[i]); });
if (idx != m_sortedHubPath.end()) { if (idx != availableHubPaths.end()) {
// found availableHubPaths.erase(idx);
m_sortedHubPath.erase(idx);
} }
if (m_usbNames[i] == "") { if (m_usbNames[i] == "") {
indices.push_back(i); indices.push_back(i);
@@ -330,12 +339,12 @@ int32_t SerialHelper::GetIndexForPort(HAL_SerialPort port, int32_t* status) {
return -1; return -1;
} }
if (idx >= static_cast<int32_t>(m_sortedHubPath.size())) { if (idx >= static_cast<int32_t>(availableHubPaths.size())) {
*status = HAL_SERIAL_PORT_NOT_FOUND; *status = HAL_SERIAL_PORT_NOT_FOUND;
return -1; return -1;
} }
portString = m_sortedHubPath[idx].str(); portString = availableHubPaths[idx].str();
m_usbNames[port - 2] = portString; m_usbNames[port - 2] = portString;
} }