Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2020v6 image (#2078)

Browse Source
This commit is contained in:
Thad House
2019-11-13 21:35:52 -08:00
committed by Peter Johnson
parent 708009cd20
commit b7bc1ea745
16 changed files with 76 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hal/build.gradle
View File

@@ -185,3 +185,14 @@ nativeUtils.exportsConfigs {
}
}
}
model {
binaries {
all {
if (!(it instanceof NativeBinarySpec)) return
if (it.component.name != 'hal' && it.component.name != 'halBase') return
if (it.targetPlatform.name != nativeUtils.wpi.platforms.roborio) return
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared')
}
}
}

4
hal/src/generate/ResourceType.txt
View File

@@ -62,7 +62,7 @@ kResourceType_PCM = 60
kResourceType_PigeonIMU = 61
kResourceType_NidecBrushless = 62
kResourceType_CANifier = 63
kResourceType_CTRE_future0 = 64
kResourceType_TalonFX = 64
kResourceType_CTRE_future1 = 65
kResourceType_CTRE_future2 = 66
kResourceType_CTRE_future3 = 67
@@ -90,3 +90,5 @@ kResourceType_Odometry = 88
kResourceType_Units = 89
kResourceType_TrapezoidProfile = 90
kResourceType_DutyCycle = 91
kResourceType_AddressableLEDs = 92
kResourceType_FusionVenom = 93

8
hal/src/main/native/athena/DutyCycle.cpp
View File

@@ -83,7 +83,9 @@ int32_t HAL_GetDutyCycleFrequency(HAL_DutyCycleHandle dutyCycleHandle,
return 0;
}
return dutyCycle->dutyCycle->readFrequency(status);
// TODO Handle Overflow
unsigned char overflow = 0;
return dutyCycle->dutyCycle->readFrequency(&overflow, status);
}
double HAL_GetDutyCycleOutput(HAL_DutyCycleHandle dutyCycleHandle,
@@ -100,7 +102,9 @@ int32_t HAL_GetDutyCycleOutputRaw(HAL_DutyCycleHandle dutyCycleHandle,
return 0;
}
return dutyCycle->dutyCycle->readOutput(status);
// TODO Handle Overflow
unsigned char overflow = 0;
return dutyCycle->dutyCycle->readOutput(&overflow, status);
}
int32_t HAL_GetDutyCycleOutputScaleFactor(HAL_DutyCycleHandle dutyCycleHandle,

14
myRobot/build.gradle
View File

@@ -17,14 +17,6 @@ ext {
skipDev = true
}
ext {
chipObjectComponents = ['myRobotCpp', 'myRobotCppStatic']
netCommComponents = ['myRobotCpp', 'myRobotCppStatic']
useNiJava = true
}
apply from: "${rootDir}/shared/nilibraries.gradle"
apply from: "${rootDir}/shared/opencv.gradle"
mainClassName = 'Main'
@@ -79,6 +71,9 @@ model {
project(':hal').addHalJniDependency(binary)
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
myRobotCppStatic(NativeExecutableSpec) {
@@ -105,6 +100,9 @@ model {
project(':hal').addHalDependency(binary, 'static')
lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'static'
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}

2
shared/config.gradle
View File

@@ -8,7 +8,7 @@ nativeUtils {
wpi {
configureDependencies {
wpiVersion = "-1"
niLibVersion = "2020.5.1"
niLibVersion = "2020.6.1"
opencvVersion = "3.4.7-2"
googleTestVersion = "1.9.0-3-437e100"
imguiVersion = "1.72b-2"

18
shared/jni/setupBuild.gradle
View File

@@ -32,18 +32,6 @@ staticGtestConfigs["${nativeName}Test"] = []
apply from: "${rootDir}/shared/googletest.gradle"
if (project.hasProperty('niLibraries')) {
ext {
chipObjectComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}JNI".toString(), "${nativeName}JNIShared".toString(), "${nativeName}Test".toString()]
netCommComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}JNI".toString(), "${nativeName}JNIShared".toString(), "${nativeName}Test".toString()]
useNiJava = true
}
apply from: "${rootDir}/shared/nilibraries.gradle"
}
model {
components {
"${nativeName}Base"(NativeLibrarySpec) {
@@ -211,6 +199,9 @@ model {
if (!project.hasProperty('noWpiutil')) {
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
}
if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}
@@ -243,6 +234,9 @@ model {
lib library: nativeName, linkage: 'shared'
if (!project.hasProperty('noWpiutil')) {
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}

10
shared/nilibraries.gradle
View File

@@ -1,10 +0,0 @@
model {
binaries {
all {
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared')
}
}
}
}

11
shared/plugins/setupBuild.gradle
View File

@@ -2,14 +2,6 @@ apply plugin: 'cpp'
apply plugin: 'edu.wpi.first.NativeUtils'
apply plugin: ExtraTasks
ext {
chipObjectComponents = ["$pluginName".toString(), "${pluginName}Dev".toString(), "${pluginName}Test".toString()]
netCommComponents = ["$pluginName".toString(), "${pluginName}Dev".toString(), "${pluginName}Test".toString()]
useNiJava = false
}
apply from: "${rootDir}/shared/nilibraries.gradle"
if (!project.hasProperty('onlylinuxathena')) {
ext.skiplinuxathena = true
apply from: "${rootDir}/shared/config.gradle"
@@ -64,6 +56,9 @@ if (!project.hasProperty('onlylinuxathena')) {
lib project: ':ntcore', library: 'ntcore', linkage: 'shared'
}
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
} else {
it.buildable = false
}

3
simulation/halsim_ds_socket/build.gradle
View File

@@ -48,6 +48,9 @@ model {
project(':hal').addHalDependency(it, 'shared')
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib library: pluginName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}

16
simulation/lowfi_simulation/build.gradle
View File

@@ -30,16 +30,6 @@ if (!project.hasProperty('onlylinuxathena')) {
project(':').libraryBuild.dependsOn build
ext {
chipObjectComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}Test".toString()]
netCommComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}Test".toString()]
useNiJava = false
}
apply from: "${rootDir}/shared/nilibraries.gradle"
nativeUtils.exportsConfigs {
lowfi_sim {
x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure',
@@ -125,6 +115,9 @@ if (!project.hasProperty('onlylinuxathena')) {
project(':hal').addHalDependency(it, 'shared')
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib library: nativeName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}
@@ -137,6 +130,9 @@ if (!project.hasProperty('onlylinuxathena')) {
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'
lib library: nativeName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}

5
wpilibNewCommands/build.gradle
View File

@@ -40,8 +40,6 @@ nativeUtils.exportsConfigs {
}
}
apply from: "${rootDir}/shared/nilibraries.gradle"
apply plugin: DisableBuildingGTest
model {
@@ -65,6 +63,9 @@ model {
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
lib project: ':cscore', library: 'cscore', linkage: 'shared'
}
if ((it instanceof NativeExecutableBinarySpec || it instanceof GoogleTestTestSuiteBinarySpec) && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
tasks {

5
wpilibOldCommands/build.gradle
View File

@@ -38,8 +38,6 @@ nativeUtils.exportsConfigs {
}
}
apply from: "${rootDir}/shared/nilibraries.gradle"
apply plugin: DisableBuildingGTest
model {
@@ -63,6 +61,9 @@ model {
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
lib project: ':cscore', library: 'cscore', linkage: 'shared'
}
if ((it instanceof NativeExecutableBinarySpec || it instanceof GoogleTestTestSuiteBinarySpec) && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
tasks {

16
wpilibc/build.gradle
View File

@@ -60,16 +60,6 @@ staticGtestConfigs["${nativeName}Test"] = []
apply from: "${rootDir}/shared/googletest.gradle"
ext {
chipObjectComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}Test".toString()]
netCommComponents = ["$nativeName".toString(), "${nativeName}Dev".toString(), "${nativeName}Base".toString(),
"${nativeName}Test".toString()]
useNiJava = false
}
apply from: "${rootDir}/shared/nilibraries.gradle"
apply plugin: DisableBuildingGTest
nativeUtils.exportsConfigs {
@@ -164,6 +154,9 @@ model {
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}
@@ -211,6 +204,9 @@ model {
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
nativeUtils.useRequiredLibrary(it, 'opencv_shared')
lib library: nativeName, linkage: 'shared'
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
tasks {

21
wpilibcExamples/build.gradle
View File

@@ -44,21 +44,6 @@ ext {
apply from: "${rootDir}/shared/opencv.gradle"
ext {
chipObjectComponents = ['commands']
netCommComponents = ['commands']
examplesMap.each { key, value ->
chipObjectComponents << key.toString()
netCommComponents << key.toString()
}
templatesMap.each { key, value ->
chipObjectComponents << key.toString()
netCommComponents << key.toString()
}
}
apply from: "${rootDir}/shared/nilibraries.gradle"
model {
components {
commands(NativeLibrarySpec) {
@@ -107,6 +92,9 @@ model {
lib project: ':simulation:halsim_print', library: 'halsim_print', linkage: 'shared'
lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared'
}
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
sources {
cpp {
@@ -158,6 +146,9 @@ model {
lib project: ':simulation:halsim_print', library: 'halsim_print', linkage: 'shared'
lib project: ':simulation:halsim_ds_nt', library: 'halsim_ds_nt', linkage: 'shared'
}
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
sources {
cpp {

11
wpilibcIntegrationTests/build.gradle
View File

@@ -19,14 +19,6 @@ apply from: "${rootDir}/shared/opencv.gradle"
apply from: "${rootDir}/shared/googletest.gradle"
ext {
chipObjectComponents = ['wpilibcIntegrationTests']
netCommComponents = ['wpilibcIntegrationTests']
useNiJava = false
}
apply from: "${rootDir}/shared/nilibraries.gradle"
model {
components {
wpilibcIntegrationTests(NativeExecutableSpec) {
@@ -62,6 +54,9 @@ model {
project(':hal').addHalJniDependency(binary)
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(binary, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
} else {
binary.sources {
simCpp(CppSourceSet) {

25
wpilibj/build.gradle
View File

@@ -89,14 +89,6 @@ ext {
useCpp = true
}
ext {
chipObjectComponents = ['wpilibjDev']
netCommComponents = ['wpilibjDev']
useNiJava = true
}
apply from: "${rootDir}/shared/nilibraries.gradle"
apply from: "${rootDir}/shared/opencv.gradle"
model {
@@ -108,13 +100,6 @@ model {
source {
srcDirs 'src/dev/native/cpp'
include '**/*.cpp'
lib project: ':ntcore', library: 'ntcore', linkage: 'shared'
lib project: ':cscore', library: 'cscore', linkage: 'shared'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared'
lib project: ':cscore', library: 'cscoreJNIShared', linkage: 'shared'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
}
exportedHeaders {
srcDirs 'src/dev/native/include'
@@ -122,8 +107,18 @@ model {
}
}
binaries.all {
lib project: ':ntcore', library: 'ntcore', linkage: 'shared'
lib project: ':cscore', library: 'cscore', linkage: 'shared'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':ntcore', library: 'ntcoreJNIShared', linkage: 'shared'
lib project: ':cscore', library: 'cscoreJNIShared', linkage: 'shared'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
project(':hal').addHalDependency(it, 'shared')
project(':hal').addHalJniDependency(it)
if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
nativeUtils.useRequiredLibrary(it, 'netcomm_shared', 'chipobject_shared', 'ni_runtime_shared')
}
}
}
}