Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Remove NT3 support (#7625)

Browse Source 
- Remove StartClient3
- Rename StartClient4 to StartClient
- Remove port3 parameter from StartServer
- Remove 3-suffix constants
- Remove 4 suffix from constants

Also remove Shuffleboard build from CI.
This commit is contained in:
Peter Johnson
2025-01-02 23:05:13 -08:00
committed by GitHub
parent da90ffd24a
commit 1240ee1bf4
58 changed files with 149 additions and 4116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableInstance.java generated
View File

@@ -49,11 +49,8 @@ public final class NetworkTableInstance implements AutoCloseable {
/** Running in server mode. */
kServer(0x01),
/** Running in NT3 client mode. */
kClient3(0x02),
/** Running in NT4 client mode. */
kClient4(0x04),
/** Running in client mode. */
kClient(0x04),
/** Currently starting up (either client or server). */
kStarting(0x08),
@@ -77,11 +74,8 @@ public final class NetworkTableInstance implements AutoCloseable {
}
}
/** The default port that network tables operates on for NT3. */
public static final int kDefaultPort3 = 1735;
/** The default port that network tables operates on for NT4. */
public static final int kDefaultPort4 = 5810;
/** The default port that network tables operates on. */
public static final int kDefaultPort = 5810;
/**
* Construct from native handle.
@@ -1177,7 +1171,7 @@ public final class NetworkTableInstance implements AutoCloseable {
* @param listenAddress the address to listen on, or empty to listen on any address
*/
public void startServer(String persistFilename, String listenAddress) {
startServer(persistFilename, listenAddress, kDefaultPort3, kDefaultPort4);
startServer(persistFilename, listenAddress, kDefaultPort);
}
/**
@@ -1185,22 +1179,10 @@ public final class NetworkTableInstance implements AutoCloseable {
*
* @param persistFilename the name of the persist file to use
* @param listenAddress the address to listen on, or empty to listen on any address
* @param port3 port to communicate over (NT3)
* @param port port to communicate over
*/
public void startServer(String persistFilename, String listenAddress, int port3) {
startServer(persistFilename, listenAddress, port3, kDefaultPort4);
}
/**
* Starts a server using the specified filename, listening address, and port.
*
* @param persistFilename the name of the persist file to use
* @param listenAddress the address to listen on, or empty to listen on any address
* @param port3 port to communicate over (NT3)
* @param port4 port to communicate over (NT4)
*/
public void startServer(String persistFilename, String listenAddress, int port3, int port4) {
NetworkTablesJNI.startServer(m_handle, persistFilename, listenAddress, port3, port4);
public void startServer(String persistFilename, String listenAddress, int port) {
NetworkTablesJNI.startServer(m_handle, persistFilename, listenAddress, port);
}
/** Stops the server if it is running. */
@@ -1209,21 +1191,12 @@ public final class NetworkTableInstance implements AutoCloseable {
}
/**
* Starts a NT3 client. Use SetServer or SetServerTeam to set the server name and port.
* Starts a client. Use SetServer or SetServerTeam to set the server name and port.
*
* @param identity network identity to advertise (cannot be empty string)
*/
public void startClient3(String identity) {
NetworkTablesJNI.startClient3(m_handle, identity);
}
/**
* Starts a NT4 client. Use SetServer or SetServerTeam to set the server name and port.
*
* @param identity network identity to advertise (cannot be empty string)
*/
public void startClient4(String identity) {
NetworkTablesJNI.startClient4(m_handle, identity);
public void startClient(String identity) {
NetworkTablesJNI.startClient(m_handle, identity);
}
/** Stops the client if it is running. */

17
ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java generated
View File

@@ -1404,11 +1404,10 @@ public final class NetworkTablesJNI {
* @param inst NT instance handle.
* @param persistFilename the name of the persist file to use
* @param listenAddress the address to listen on, or empty to listen on any address
* @param port3 port to communicate over (NT3)
* @param port4 port to communicate over (NT4)
* @param port port to communicate over
*/
public static native void startServer(
int inst, String persistFilename, String listenAddress, int port3, int port4);
int inst, String persistFilename, String listenAddress, int port);
/**
* Stops the server if it is running.
@@ -1418,20 +1417,12 @@ public final class NetworkTablesJNI {
public static native void stopServer(int inst);
/**
* Starts a NT3 client. Use SetServer or SetServerTeam to set the server name and port.
* Starts a client. Use SetServer or SetServerTeam to set the server name and port.
*
* @param inst NT instance handle.
* @param identity network identity to advertise (cannot be empty string)
*/
public static native void startClient3(int inst, String identity);
/**
* Starts a NT4 client. Use SetServer or SetServerTeam to set the server name and port.
*
* @param inst NT instance handle.
* @param identity network identity to advertise (cannot be empty string)
*/
public static native void startClient4(int inst, String identity);
public static native void startClient(int inst, String identity);
/**
* Stops the client if it is running.