mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
HAND FIXES: Fixup remaining rename issues
This commit is contained in:
committed by
Peter Johnson
parent
bf9da2cdea
commit
d3da30d53a
@@ -2,8 +2,8 @@ load("@rules_java//java:defs.bzl", "java_binary")
|
|||||||
|
|
||||||
java_binary(
|
java_binary(
|
||||||
name = "multiCameraServer-java",
|
name = "multiCameraServer-java",
|
||||||
srcs = ["src/main/java/edu/wpi/Main.java"],
|
srcs = ["src/main/java/org/wpilib/Main.java"],
|
||||||
main_class = "edu.wpi.Main",
|
main_class = "org.wpilib.Main",
|
||||||
deps = [
|
deps = [
|
||||||
"//cameraserver:cameraserver-java",
|
"//cameraserver:cameraserver-java",
|
||||||
"//cscore:cscore-java",
|
"//cscore:cscore-java",
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ ext {
|
|||||||
apply from: "${rootDir}/shared/opencv.gradle"
|
apply from: "${rootDir}/shared/opencv.gradle"
|
||||||
|
|
||||||
application {
|
application {
|
||||||
mainClass = 'edu.wpi.Main'
|
mainClass = 'org.wpilib.Main'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.gradleup.shadow'
|
apply plugin: 'com.gradleup.shadow'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// Open Source Software; you can modify and/or share it under the terms of
|
// Open Source Software; you can modify and/or share it under the terms of
|
||||||
// the WPILib BSD license file in the root directory of this project.
|
// the WPILib BSD license file in the root directory of this project.
|
||||||
|
|
||||||
package edu.wpi;
|
package org.wpilib;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
@@ -1 +1 @@
|
|||||||
edu.wpi.first.epilogue.processor.AnnotationProcessor
|
org.wpilib.epilogue.processor.AnnotationProcessor
|
||||||
|
|||||||
@@ -211,8 +211,8 @@ cc_binary(
|
|||||||
|
|
||||||
java_binary(
|
java_binary(
|
||||||
name = "DevMain-Java",
|
name = "DevMain-Java",
|
||||||
srcs = ["src/dev/java/edu/wpi/first/ntcore/DevMain.java"],
|
srcs = ["src/dev/java/org/wpilib/networktables/DevMain.java"],
|
||||||
main_class = "edu.wpi.first.ntcore.DevMain",
|
main_class = "org.wpilib.networktables.DevMain",
|
||||||
deps = [
|
deps = [
|
||||||
"ntcore-java",
|
"ntcore-java",
|
||||||
"//wpiutil:wpiutil-java",
|
"//wpiutil:wpiutil-java",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ ext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
nativeName = 'ntcore'
|
nativeName = 'ntcore'
|
||||||
devMain = 'edu.wpi.first.ntcore.DevMain'
|
devMain = 'org.wpilib.networktables.DevMain'
|
||||||
generatedSources = "$projectDir/src/generated/main/native/cpp"
|
generatedSources = "$projectDir/src/generated/main/native/cpp"
|
||||||
generatedHeaders = "$projectDir/src/generated/main/native/include"
|
generatedHeaders = "$projectDir/src/generated/main/native/include"
|
||||||
jniSplitSetup = {
|
jniSplitSetup = {
|
||||||
|
|||||||
@@ -2,9 +2,8 @@
|
|||||||
// Open Source Software; you can modify and/or share it under the terms of
|
// Open Source Software; you can modify and/or share it under the terms of
|
||||||
// the WPILib BSD license file in the root directory of this project.
|
// the WPILib BSD license file in the root directory of this project.
|
||||||
|
|
||||||
package edu.wpi.first.ntcore;
|
package org.wpilib.networktables;
|
||||||
|
|
||||||
import org.wpilib.networktables.NetworkTablesJNI;
|
|
||||||
import org.wpilib.util.runtime.CombinedRuntimeLoader;
|
import org.wpilib.util.runtime.CombinedRuntimeLoader;
|
||||||
|
|
||||||
public final class DevMain {
|
public final class DevMain {
|
||||||
@@ -63,8 +63,9 @@ package org.wpilib.opmode;
|
|||||||
*
|
*
|
||||||
* <p>If the robot periodic functions and the controller periodic functions have a lot of scheduling
|
* <p>If the robot periodic functions and the controller periodic functions have a lot of scheduling
|
||||||
* jitter that cause them to occasionally overlap with later timeslices, consider giving the main
|
* jitter that cause them to occasionally overlap with later timeslices, consider giving the main
|
||||||
* robot thread a real-time priority using {@link Threads#setCurrentThreadPriority(boolean,int)}. An
|
* robot thread a real-time priority using {@link
|
||||||
* RT priority of 15 is a reasonable choice.
|
* org.wpilib.system.Threads#setCurrentThreadPriority(boolean,int)}. An RT priority of 15 is a
|
||||||
|
* reasonable choice.
|
||||||
*
|
*
|
||||||
* <p>If you do enable RT though, <i>make sure your periodic functions do not block</i>. If they do,
|
* <p>If you do enable RT though, <i>make sure your periodic functions do not block</i>. If they do,
|
||||||
* the operating system will lock up, and you'll have to boot the roboRIO into safe mode and delete
|
* the operating system will lock up, and you'll have to boot the roboRIO into safe mode and delete
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
// Copyright (c) FIRST and other WPILib contributors.
|
|
||||||
// Open Source Software; you can modify and/or share it under the terms of
|
|
||||||
// the WPILib BSD license file in the root directory of this project.
|
|
||||||
|
|
||||||
package org.wpilib.math.util;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
import static org.junit.jupiter.params.provider.Arguments.arguments;
|
|
||||||
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
import org.junit.jupiter.params.ParameterizedTest;
|
|
||||||
import org.junit.jupiter.params.provider.Arguments;
|
|
||||||
import org.junit.jupiter.params.provider.MethodSource;
|
|
||||||
import org.wpilib.util.Color;
|
|
||||||
|
|
||||||
class ColorTest {
|
|
||||||
private static final double kEpsilon = 1e-3;
|
|
||||||
|
|
||||||
void assertColorMatches(double red, double green, double blue, Color color) {
|
|
||||||
assertAll(
|
|
||||||
() -> assertEquals(red, color.red, kEpsilon),
|
|
||||||
() -> assertEquals(green, color.green, kEpsilon),
|
|
||||||
() -> assertEquals(blue, color.blue, kEpsilon));
|
|
||||||
}
|
|
||||||
|
|
||||||
@ParameterizedTest
|
|
||||||
@MethodSource("staticColorProvider")
|
|
||||||
void staticColorTest(double red, double green, double blue, Color color) {
|
|
||||||
assertColorMatches(red, green, blue, color);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ParameterizedTest
|
|
||||||
@MethodSource("staticColorProvider")
|
|
||||||
void colorEqualsTest(double red, double green, double blue, Color color) {
|
|
||||||
assertEquals(color, new Color(red, green, blue));
|
|
||||||
}
|
|
||||||
|
|
||||||
static Stream<Arguments> staticColorProvider() {
|
|
||||||
return Stream.of(
|
|
||||||
arguments(0.0823529412, 0.376470589, 0.7411764706, Color.kDenim),
|
|
||||||
arguments(0.0, 0.4, 0.7019607844, Color.kFirstBlue),
|
|
||||||
arguments(0.9294117648, 0.1098039216, 0.1411764706, Color.kFirstRed));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user