Merge remote-tracking branch 'wpilibsuite/main' into requestversions

ThadHouse · ThadHouse · commit d97aeac57c3a · 2025-01-11T22:05:53.000-08:00
diff --git a/allwpilib b/allwpilib
@@ -1 +1 @@
-Subproject commit 6ba7189373714e5fdc84c95308e5a0d6caa3e4f4
+Subproject commit 03d9e96877ad687ed82a0f1f33cf3947197b1ada
diff --git a/kitcan/main.cpp b/kitcan/main.cpp
@@ -310,7 +310,7 @@ int main() {
 
     auto ntInst = nt::NetworkTableInstance::Create();
     ntInst.SetServer({"localhost"}, 6810);
-    ntInst.StartClient4("PowerDistributionDaemon");
+    ntInst.StartClient("KitCanDaemon");
 
     nt::IntegerSubscriber requestSubscriber =
         ntInst.GetIntegerTopic("/Netcomm/Reporting/RequestVersions")
diff --git a/radio/main.cpp b/radio/main.cpp
@@ -42,7 +42,7 @@ int main() {
 
     auto ntInst = nt::NetworkTableInstance::Create();
     ntInst.SetServer({"localhost"}, 6810);
-    ntInst.StartClient4("RadioDaemon");
+    ntInst.StartClient("RadioDaemon");
 
     DataStorage instData;
 
