Skip to content

Commit 6c190fd

Browse files
ThadHouseThadHouse
committed
Fix tests
1 parent 367735c commit 6c190fd

File tree

4 files changed

+28
-37
lines changed

4 files changed

+28
-37
lines changed

‎src/datalog/Natives/DataLogNative.cs

+23-23
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,55 @@ public struct OpaqueDataLog { }
1111

1212
public static partial class DataLogNative
1313
{
14-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_CreateWriter")]
14+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_CreateWriter")]
1515
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
1616
public static unsafe partial OpaqueDataLog* Create(WpiString dir, WpiString filename);
1717

18-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_CreateBackgroundWriter")]
18+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_CreateBackgroundWriter")]
1919
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
2020
public static unsafe partial OpaqueDataLog* CreateBg(WpiString dir, WpiString filename, double period, WpiString extraHeader);
2121

22-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_CreateBackgroundWriter_Func")]
22+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_CreateBackgroundWriter_Func")]
2323
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
2424
public static unsafe partial OpaqueDataLog* CreateBgFunc(delegate* unmanaged[Cdecl]<void*, byte*, nuint, void> write, void* ptr, double period, WpiString extraHeader);
2525

26-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Release")]
26+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Release")]
2727
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
2828
public static unsafe partial void Release(OpaqueDataLog* datalog);
2929

30-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_SetFilename")]
30+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_SetFilename")]
3131
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
3232
public static unsafe partial void SetFilename(OpaqueDataLog* datalog, WpiString filename);
3333

34-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Flush")]
34+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Flush")]
3535
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
3636
public static unsafe partial void Flush(OpaqueDataLog* datalog);
3737

38-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Pause")]
38+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Pause")]
3939
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
4040
public static unsafe partial void Pause(OpaqueDataLog* datalog);
4141

42-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Resume")]
42+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Resume")]
4343
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
4444
public static unsafe partial void Resume(OpaqueDataLog* datalog);
4545

46-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Stop")]
46+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Stop")]
4747
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
4848
public static unsafe partial void Stop(OpaqueDataLog* datalog);
4949

50-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Start")]
50+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Start")]
5151
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
5252
public static unsafe partial DataLogEntryHandle Start(OpaqueDataLog* datalog, WpiString name, WpiString type, WpiString metadata, ulong timestamp);
5353

54-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_Finish")]
54+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_Finish")]
5555
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
5656
public static unsafe partial void Finish(OpaqueDataLog* datalog, DataLogEntryHandle entry, ulong timestamp);
5757

58-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_SetMetadata")]
58+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_SetMetadata")]
5959
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
6060
public static unsafe partial void SetMetadata(OpaqueDataLog* datalog, DataLogEntryHandle entry, WpiString metadata, ulong timestamp);
6161

62-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendRaw")]
62+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendRaw")]
6363
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
6464
internal static unsafe partial void AppendRaw(OpaqueDataLog* datalog, DataLogEntryHandle entry, ReadOnlySpan<byte> raw, nuint len, ulong timestamp);
6565

@@ -68,27 +68,27 @@ public static unsafe void AppendRaw(OpaqueDataLog* datalog, DataLogEntryHandle e
6868
AppendRaw(datalog, entry, raw, (nuint)raw.Length, timestamp);
6969
}
7070

71-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendBoolean")]
71+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendBoolean")]
7272
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
7373
public static unsafe partial void AppendBoolean(OpaqueDataLog* datalog, DataLogEntryHandle entry, [MarshalAs(UnmanagedType.I4)] bool value, ulong timestamp);
7474

75-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendInteger")]
75+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendInteger")]
7676
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
7777
public static unsafe partial void AppendInteger(OpaqueDataLog* datalog, DataLogEntryHandle entry, long value, ulong timestamp);
7878

79-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendFloat")]
79+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendFloat")]
8080
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
8181
public static unsafe partial void AppendFloat(OpaqueDataLog* datalog, DataLogEntryHandle entry, float value, ulong timestamp);
8282

83-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendDouble")]
83+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendDouble")]
8484
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
8585
public static unsafe partial void AppendDouble(OpaqueDataLog* datalog, DataLogEntryHandle entry, double value, ulong timestamp);
8686

87-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendString")]
87+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendString")]
8888
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
8989
public static unsafe partial void AppendString(OpaqueDataLog* datalog, DataLogEntryHandle entry, WpiString value, ulong timestamp);
9090

91-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendBooleanArray")]
91+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendBooleanArray")]
9292
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
9393
internal static unsafe partial void AppendBooleanArray(OpaqueDataLog* datalog, DataLogEntryHandle entry, [MarshalUsing(typeof(BoolToIntMarshaller), ElementIndirectionDepth = 1)] ReadOnlySpan<bool> value, nuint len, ulong timestamp);
9494

@@ -97,7 +97,7 @@ public static unsafe void AppendBooleanArray(OpaqueDataLog* datalog, DataLogEntr
9797
AppendBooleanArray(datalog, entry, value, timestamp);
9898
}
9999

100-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendIntegerArray")]
100+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendIntegerArray")]
101101
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
102102
internal static unsafe partial void AppendIntegerArray(OpaqueDataLog* datalog, DataLogEntryHandle entry, ReadOnlySpan<long> value, nuint len, ulong timestamp);
103103

@@ -106,7 +106,7 @@ public static unsafe void AppendIntegerArray(OpaqueDataLog* datalog, DataLogEntr
106106
AppendIntegerArray(datalog, entry, value, timestamp);
107107
}
108108

109-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendFloatArray")]
109+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendFloatArray")]
110110
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
111111
internal static unsafe partial void AppendFloatArray(OpaqueDataLog* datalog, DataLogEntryHandle entry, ReadOnlySpan<float> value, nuint len, ulong timestamp);
112112

@@ -115,7 +115,7 @@ public static unsafe void AppendFloatArray(OpaqueDataLog* datalog, DataLogEntryH
115115
AppendFloatArray(datalog, entry, value, timestamp);
116116
}
117117

118-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendDoubleArray")]
118+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendDoubleArray")]
119119
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
120120
internal static unsafe partial void AppendDoubleArray(OpaqueDataLog* datalog, DataLogEntryHandle entry, ReadOnlySpan<double> value, nuint len, ulong timestamp);
121121

@@ -125,7 +125,7 @@ public static unsafe void AppendDoubleArray(OpaqueDataLog* datalog, DataLogEntry
125125
}
126126

127127

128-
[LibraryImport("wpiutil", EntryPoint = "WPI_DataLog_AppendStringArray")]
128+
[LibraryImport("datalog", EntryPoint = "WPI_DataLog_AppendStringArray")]
129129
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
130130
internal static unsafe partial void AppendStringArray(OpaqueDataLog* datalog, DataLogEntryHandle entry, [MarshalUsing(typeof(WpiStringMarshaller), ElementIndirectionDepth = 1)] ReadOnlySpan<string> value, nuint len, ulong timestamp);
131131

‎src/ntcore/Natives/NtCore.ClientServer.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,9 @@ public static partial class NtCore
3030
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
3131
public static partial void StopServer(NtInst inst);
3232

33-
[LibraryImport("ntcore", EntryPoint = "NT_StartClient3")]
33+
[LibraryImport("ntcore", EntryPoint = "NT_StartClient")]
3434
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
35-
public static partial void StartClient3(NtInst inst, WpiString identity);
36-
37-
[LibraryImport("ntcore", EntryPoint = "NT_StartClient4")]
38-
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
39-
public static partial void StartClient4(NtInst inst, WpiString identity);
35+
public static partial void StartClient(NtInst inst, WpiString identity);
4036

4137
[LibraryImport("ntcore", EntryPoint = "NT_StopClient")]
4238
[UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]

‎src/ntcore/NetworkTableInstance.cs

+2-7
Original file line numberDiff line numberDiff line change
@@ -493,14 +493,9 @@ public void StopServer()
493493
NtCore.StopServer(Handle);
494494
}
495495

496-
public void StartClient3(string identity)
496+
public void StartClient(string identity)
497497
{
498-
NtCore.StartClient3(Handle, identity);
499-
}
500-
501-
public void StartClient4(string identity)
502-
{
503-
NtCore.StartClient4(Handle, identity);
498+
NtCore.StartClient(Handle, identity);
504499
}
505500

506501
public void SetServer(string serverName, int port = 0)

‎test/ntcore.test/LoggerTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public void AddMessageTest()
1111
List<NetworkTableEvent> msgs = [];
1212
instance.AddLogger((int)NtLogLevel.Info, 100, msgs.Add);
1313

14-
instance.StartClient4("client");
14+
instance.StartClient("client");
1515
instance.SetServer("127.0.0.1", 10000);
1616

1717
// Wait for client to report it's started, then wait another 0.1 sec

0 commit comments

Comments
 (0)