Merge pull request #8 from ThadHouse/fixupcannames

ThadHouse · web-flow · commit 66879107f516 · 2025-06-14T17:51:14.000-07:00
Update to new CAN Bus names
diff --git a/allwpilib b/allwpilib
@@ -1 +1 @@
-Subproject commit 03d9e96877ad687ed82a0f1f33cf3947197b1ada
+Subproject commit 3355383fe9e7452e221dcd82fa1d80cf537c976f
diff --git a/powerdistribution/main.cpp b/powerdistribution/main.cpp
@@ -142,7 +142,7 @@ bool CanState::startUvLoop(unsigned bus, const nt::NetworkTableInstance& ntInst,
     }
 
     ifreq ifr;
-    std::snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "can%u", busId);
+    std::snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "can_s%u", busId);
 
     if (ioctl(socketHandle, SIOCGIFINDEX, &ifr) == -1) {
         return false;

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ bool CanState::startUvLoop(unsigned bus, const nt::NetworkTableInstance& ntInst,`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`ifreq ifr;`
`145`		`- std::snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "can%u", busId);`
	`145`	`+ std::snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "can_s%u", busId);`
`146`	`146`
`147`	`147`	`if (ioctl(socketHandle, SIOCGIFINDEX, &ifr) == -1) {`
`148`	`148`	`return false;`