Skip to content

Commit 77612c8

Browse files
ThadHouseThadHouse
committed
Final fixes needed for minimal 2018 install
1 parent 41d3483 commit 77612c8

15 files changed

+87
-15
lines changed

‎HAL/Delegates/HALDriverStation.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static void Ping()
9797
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void HAL_ObserveUserProgramTestDelegate();
9898
[NativeDelegate] public static HAL_ObserveUserProgramTestDelegate HAL_ObserveUserProgramTest;
9999

100-
100+
/*
101101
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
102102
private delegate int NativeHALSetErrorDataDelegate(byte[] errors, int errorsLength, int waitMs);
103103
[NativeDelegate("HAL_SetErrorData")]
@@ -109,6 +109,7 @@ public static int HAL_SetErrorData(string errors, int waitMs)
109109
byte[] errorB = HAL.CreateUTF8String(errors, out len);
110110
return NativeHALSetErrorData(errorB, len, waitMs);
111111
}
112+
*/
112113
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
113114
private delegate int NativeHALSendErrorDelegate(int isError, int errorCode, int isLVCode,
114115
byte[] details, byte[] location, byte[] callStack, int printMsg);

‎HAL/Delegates/HALSPI.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static void Ping()
5050

5151
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void HAL_SetSPIHandleDelegate(int port, int handle);
5252
[NativeDelegate] public static HAL_SetSPIHandleDelegate HAL_SetSPIHandle;
53-
53+
/*
5454
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void HAL_InitSPIAccumulatorDelegate(int port, int period, int cmd, int xfer_size, int valid_mask, int valid_value, int data_shift, int data_size, [MarshalAs(UnmanagedType.Bool)]bool is_signed, [MarshalAs(UnmanagedType.Bool)]bool big_endian, ref int status);
5555
[NativeDelegate] public static HAL_InitSPIAccumulatorDelegate HAL_InitSPIAccumulator;
5656
@@ -80,6 +80,7 @@ public static void Ping()
8080
8181
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void HAL_GetSPIAccumulatorOutputDelegate(int port, ref long value, ref long count, ref int status);
8282
[NativeDelegate] public static HAL_GetSPIAccumulatorOutputDelegate HAL_GetSPIAccumulatorOutput;
83+
*/
8384
}
8485
}
8586

‎HAL/Delegates/LibraryLoaderHolder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static LibraryLoaderHolder()
8585
resourceRoot + "x86.mockhal.dll");
8686
s_nativeLoader.AddLibraryLocation(OsType.Windows64,
8787
resourceRoot + "amd64.mockhal.dll");
88-
s_nativeLoader.AddLibraryLocation(OsType.roboRIO, "libHALAthena.so");
88+
s_nativeLoader.AddLibraryLocation(OsType.roboRIO, "libwpiHal.so");
8989
/*
9090
NativeLoader.AddLibraryLocation(OsType.Linux32,
9191
resourceRoot + "x86.libcscore.so");

‎LoadTester/LoadTester.csproj

+17
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,38 @@
105105
<None Include="wpinative\libntcore.so" />
106106
<None Include="wpinative\libOpenCvSharpExtern.so" />
107107
<None Include="wpinative\libopencv_calib3d.so.3.1" />
108+
<None Include="wpinative\libopencv_calib3d.so.3.2" />
108109
<None Include="wpinative\libopencv_core.so.3.1" />
110+
<None Include="wpinative\libopencv_core.so.3.2" />
109111
<None Include="wpinative\libopencv_features2d.so.3.1" />
112+
<None Include="wpinative\libopencv_features2d.so.3.2" />
110113
<None Include="wpinative\libopencv_flann.so.3.1" />
114+
<None Include="wpinative\libopencv_flann.so.3.2" />
111115
<None Include="wpinative\libopencv_highgui.so.3.1" />
116+
<None Include="wpinative\libopencv_highgui.so.3.2" />
112117
<None Include="wpinative\libopencv_imgcodecs.so.3.1" />
118+
<None Include="wpinative\libopencv_imgcodecs.so.3.2" />
113119
<None Include="wpinative\libopencv_imgproc.so.3.1" />
120+
<None Include="wpinative\libopencv_imgproc.so.3.2" />
114121
<None Include="wpinative\libopencv_ml.so.3.1" />
122+
<None Include="wpinative\libopencv_ml.so.3.2" />
115123
<None Include="wpinative\libopencv_objdetect.so.3.1" />
124+
<None Include="wpinative\libopencv_objdetect.so.3.2" />
116125
<None Include="wpinative\libopencv_photo.so.3.1" />
126+
<None Include="wpinative\libopencv_photo.so.3.2" />
117127
<None Include="wpinative\libopencv_shape.so.3.1" />
128+
<None Include="wpinative\libopencv_shape.so.3.2" />
118129
<None Include="wpinative\libopencv_stitching.so.3.1" />
130+
<None Include="wpinative\libopencv_stitching.so.3.2" />
119131
<None Include="wpinative\libopencv_superres.so.3.1" />
132+
<None Include="wpinative\libopencv_superres.so.3.2" />
120133
<None Include="wpinative\libopencv_video.so.3.1" />
134+
<None Include="wpinative\libopencv_video.so.3.2" />
121135
<None Include="wpinative\libopencv_videoio.so.3.1" />
136+
<None Include="wpinative\libopencv_videoio.so.3.2" />
122137
<None Include="wpinative\libopencv_videostab.so.3.1" />
138+
<None Include="wpinative\libopencv_videostab.so.3.2" />
139+
<None Include="wpinative\libwpiHal.so" />
123140
<None Include="wpinative\libwpiutil.so" />
124141
</ItemGroup>
125142
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎LoadTester/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
55
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net461" />
66
<package id="FRC.OpenCvSharp.DesktopLibraries" version="1.0.3" targetFramework="net461" />
7-
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net461" />
7+
<package id="FRC.WPILibNativeLibraries" version="2018.1.0" targetFramework="net461" />
88
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net461" />
99
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
1010
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />

‎WPILib.IntegrationTests/WPILib.IntegrationTests.csproj

+17
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,38 @@
163163
<None Include="wpinative\libntcore.so" />
164164
<None Include="wpinative\libOpenCvSharpExtern.so" />
165165
<None Include="wpinative\libopencv_calib3d.so.3.1" />
166+
<None Include="wpinative\libopencv_calib3d.so.3.2" />
166167
<None Include="wpinative\libopencv_core.so.3.1" />
168+
<None Include="wpinative\libopencv_core.so.3.2" />
167169
<None Include="wpinative\libopencv_features2d.so.3.1" />
170+
<None Include="wpinative\libopencv_features2d.so.3.2" />
168171
<None Include="wpinative\libopencv_flann.so.3.1" />
172+
<None Include="wpinative\libopencv_flann.so.3.2" />
169173
<None Include="wpinative\libopencv_highgui.so.3.1" />
174+
<None Include="wpinative\libopencv_highgui.so.3.2" />
170175
<None Include="wpinative\libopencv_imgcodecs.so.3.1" />
176+
<None Include="wpinative\libopencv_imgcodecs.so.3.2" />
171177
<None Include="wpinative\libopencv_imgproc.so.3.1" />
178+
<None Include="wpinative\libopencv_imgproc.so.3.2" />
172179
<None Include="wpinative\libopencv_ml.so.3.1" />
180+
<None Include="wpinative\libopencv_ml.so.3.2" />
173181
<None Include="wpinative\libopencv_objdetect.so.3.1" />
182+
<None Include="wpinative\libopencv_objdetect.so.3.2" />
174183
<None Include="wpinative\libopencv_photo.so.3.1" />
184+
<None Include="wpinative\libopencv_photo.so.3.2" />
175185
<None Include="wpinative\libopencv_shape.so.3.1" />
186+
<None Include="wpinative\libopencv_shape.so.3.2" />
176187
<None Include="wpinative\libopencv_stitching.so.3.1" />
188+
<None Include="wpinative\libopencv_stitching.so.3.2" />
177189
<None Include="wpinative\libopencv_superres.so.3.1" />
190+
<None Include="wpinative\libopencv_superres.so.3.2" />
178191
<None Include="wpinative\libopencv_video.so.3.1" />
192+
<None Include="wpinative\libopencv_video.so.3.2" />
179193
<None Include="wpinative\libopencv_videoio.so.3.1" />
194+
<None Include="wpinative\libopencv_videoio.so.3.2" />
180195
<None Include="wpinative\libopencv_videostab.so.3.1" />
196+
<None Include="wpinative\libopencv_videostab.so.3.2" />
197+
<None Include="wpinative\libwpiHal.so" />
181198
<None Include="wpinative\libwpiutil.so" />
182199
</ItemGroup>
183200
<Choose>

‎WPILib.IntegrationTests/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
55
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net451" />
66
<package id="FRC.OpenCvSharp.DesktopLibraries" version="1.0.3" targetFramework="net451" />
7-
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net451" />
7+
<package id="FRC.WPILibNativeLibraries" version="2018.1.0" targetFramework="net461" />
88
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net451" />
99
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
1010
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />

‎WPILib.Tests/TestNotifier.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,19 @@ public void TestSingle()
3232
public void TestSingleWithObject()
3333
{
3434
int count = 0;
35-
object obj = null;
36-
Action<object> mockDelegate = o =>
35+
Action mockDelegate = () =>
3736
{
3837
count++;
39-
obj = o;
4038
};
4139

42-
using (Notifier nt = new Notifier(mockDelegate, this))
40+
using (Notifier nt = new Notifier(mockDelegate))
4341
{
4442
nt.StartSingle(0.25);
4543

4644
Thread.Sleep(500);
4745
}
4846

4947
Assert.AreEqual(1, count);
50-
Assert.AreEqual(this, obj);
5148
}
5249
/*
5350
[Test]

‎WPILib.Tests/WPILib.Tests.csproj

+17
Original file line numberDiff line numberDiff line change
@@ -209,21 +209,38 @@
209209
<None Include="wpinative\libntcore.so" />
210210
<None Include="wpinative\libOpenCvSharpExtern.so" />
211211
<None Include="wpinative\libopencv_calib3d.so.3.1" />
212+
<None Include="wpinative\libopencv_calib3d.so.3.2" />
212213
<None Include="wpinative\libopencv_core.so.3.1" />
214+
<None Include="wpinative\libopencv_core.so.3.2" />
213215
<None Include="wpinative\libopencv_features2d.so.3.1" />
216+
<None Include="wpinative\libopencv_features2d.so.3.2" />
214217
<None Include="wpinative\libopencv_flann.so.3.1" />
218+
<None Include="wpinative\libopencv_flann.so.3.2" />
215219
<None Include="wpinative\libopencv_highgui.so.3.1" />
220+
<None Include="wpinative\libopencv_highgui.so.3.2" />
216221
<None Include="wpinative\libopencv_imgcodecs.so.3.1" />
222+
<None Include="wpinative\libopencv_imgcodecs.so.3.2" />
217223
<None Include="wpinative\libopencv_imgproc.so.3.1" />
224+
<None Include="wpinative\libopencv_imgproc.so.3.2" />
218225
<None Include="wpinative\libopencv_ml.so.3.1" />
226+
<None Include="wpinative\libopencv_ml.so.3.2" />
219227
<None Include="wpinative\libopencv_objdetect.so.3.1" />
228+
<None Include="wpinative\libopencv_objdetect.so.3.2" />
220229
<None Include="wpinative\libopencv_photo.so.3.1" />
230+
<None Include="wpinative\libopencv_photo.so.3.2" />
221231
<None Include="wpinative\libopencv_shape.so.3.1" />
232+
<None Include="wpinative\libopencv_shape.so.3.2" />
222233
<None Include="wpinative\libopencv_stitching.so.3.1" />
234+
<None Include="wpinative\libopencv_stitching.so.3.2" />
223235
<None Include="wpinative\libopencv_superres.so.3.1" />
236+
<None Include="wpinative\libopencv_superres.so.3.2" />
224237
<None Include="wpinative\libopencv_video.so.3.1" />
238+
<None Include="wpinative\libopencv_video.so.3.2" />
225239
<None Include="wpinative\libopencv_videoio.so.3.1" />
240+
<None Include="wpinative\libopencv_videoio.so.3.2" />
226241
<None Include="wpinative\libopencv_videostab.so.3.1" />
242+
<None Include="wpinative\libopencv_videostab.so.3.2" />
243+
<None Include="wpinative\libwpiHal.so" />
227244
<None Include="wpinative\libwpiutil.so" />
228245
</ItemGroup>
229246
<ItemGroup>

‎WPILib.Tests/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
55
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net451" />
66
<package id="FRC.OpenCvSharp.DesktopLibraries" version="1.0.3" targetFramework="net451" />
7-
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net451" />
7+
<package id="FRC.WPILibNativeLibraries" version="2018.1.0" targetFramework="net461" />
88
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net451" />
99
<package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net451" />
1010
<package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net451" />

‎WPILib/ADXRS450_Gyro.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System;
1+
/*
2+
using System;
23
using HAL.Base;
34
using WPILib.Interfaces;
45
using WPILib.LiveWindow;
@@ -179,3 +180,4 @@ public override double GetRate()
179180
}
180181
}
181182
}
183+
*/

‎WPILib/Notifier.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ public void StartPeriodic(double period)
111111

112112
public void Stop()
113113
{
114-
HAL_CancelNotifierAlarm(Interlocked.Add(ref m_notifier, 0));
114+
int status = 0;
115+
HAL_CancelNotifierAlarm(Interlocked.Add(ref m_notifier, 0), ref status);
116+
115117
}
116118
}
117119
}

‎WPILib/SPI.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public int Transaction(byte[] dataToSend, byte[] dataReceived, int size)
199199
Array.Copy(receivedBuffer, dataReceived, Math.Min(receivedBuffer.Length, dataReceived.Length));
200200
return retVal;
201201
}
202-
202+
/*
203203
/// <summary>
204204
/// Initialize the accumulator.
205205
/// </summary>
@@ -329,5 +329,6 @@ public void GetAccumulatorOutput(ref long value, ref long count)
329329
HAL_GetSPIAccumulatorOutput((byte)m_port, ref value, ref count, ref status);
330330
CheckStatus(status);
331331
}
332+
*/
332333
}
333334
}

‎WPILib/WPILib.csproj

+17
Original file line numberDiff line numberDiff line change
@@ -218,21 +218,38 @@
218218
<None Include="wpinative\libntcore.so" />
219219
<None Include="wpinative\libOpenCvSharpExtern.so" />
220220
<None Include="wpinative\libopencv_calib3d.so.3.1" />
221+
<None Include="wpinative\libopencv_calib3d.so.3.2" />
221222
<None Include="wpinative\libopencv_core.so.3.1" />
223+
<None Include="wpinative\libopencv_core.so.3.2" />
222224
<None Include="wpinative\libopencv_features2d.so.3.1" />
225+
<None Include="wpinative\libopencv_features2d.so.3.2" />
223226
<None Include="wpinative\libopencv_flann.so.3.1" />
227+
<None Include="wpinative\libopencv_flann.so.3.2" />
224228
<None Include="wpinative\libopencv_highgui.so.3.1" />
229+
<None Include="wpinative\libopencv_highgui.so.3.2" />
225230
<None Include="wpinative\libopencv_imgcodecs.so.3.1" />
231+
<None Include="wpinative\libopencv_imgcodecs.so.3.2" />
226232
<None Include="wpinative\libopencv_imgproc.so.3.1" />
233+
<None Include="wpinative\libopencv_imgproc.so.3.2" />
227234
<None Include="wpinative\libopencv_ml.so.3.1" />
235+
<None Include="wpinative\libopencv_ml.so.3.2" />
228236
<None Include="wpinative\libopencv_objdetect.so.3.1" />
237+
<None Include="wpinative\libopencv_objdetect.so.3.2" />
229238
<None Include="wpinative\libopencv_photo.so.3.1" />
239+
<None Include="wpinative\libopencv_photo.so.3.2" />
230240
<None Include="wpinative\libopencv_shape.so.3.1" />
241+
<None Include="wpinative\libopencv_shape.so.3.2" />
231242
<None Include="wpinative\libopencv_stitching.so.3.1" />
243+
<None Include="wpinative\libopencv_stitching.so.3.2" />
232244
<None Include="wpinative\libopencv_superres.so.3.1" />
245+
<None Include="wpinative\libopencv_superres.so.3.2" />
233246
<None Include="wpinative\libopencv_video.so.3.1" />
247+
<None Include="wpinative\libopencv_video.so.3.2" />
234248
<None Include="wpinative\libopencv_videoio.so.3.1" />
249+
<None Include="wpinative\libopencv_videoio.so.3.2" />
235250
<None Include="wpinative\libopencv_videostab.so.3.1" />
251+
<None Include="wpinative\libopencv_videostab.so.3.2" />
252+
<None Include="wpinative\libwpiHal.so" />
236253
<None Include="wpinative\libwpiutil.so" />
237254
</ItemGroup>
238255
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎WPILib/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="FRC.CameraServer" version="1.0.2" targetFramework="net451" />
44
<package id="FRC.NetworkTables" version="3.1.8" targetFramework="net461" />
55
<package id="FRC.OpenCvSharp" version="1.0.3" targetFramework="net451" />
6-
<package id="FRC.WPILibNativeLibraries" version="2017.1.0" targetFramework="net451" />
6+
<package id="FRC.WPILibNativeLibraries" version="2018.1.0" targetFramework="net461" />
77
<package id="NativeLibraryUtilities" version="1.0.3" targetFramework="net451" />
88
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
99
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />

0 commit comments

Comments
 (0)