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

HAND FIXES: Fixup remaining rename issues

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 19:58:22 -05:00
committed by Peter Johnson
parent bf9da2cdea
commit d3da30d53a
9 changed files with 12 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cameraserver/multiCameraServer/BUILD.bazel
View File

@@ -2,8 +2,8 @@ load("@rules_java//java:defs.bzl", "java_binary")
java_binary(
name = "multiCameraServer-java",
srcs = ["src/main/java/edu/wpi/Main.java"],
main_class = "edu.wpi.Main",
srcs = ["src/main/java/org/wpilib/Main.java"],
main_class = "org.wpilib.Main",
deps = [
"//cameraserver:cameraserver-java",
"//cscore:cscore-java",

2
cameraserver/multiCameraServer/build.gradle
View File

@@ -19,7 +19,7 @@ ext {
apply from: "${rootDir}/shared/opencv.gradle"
application {
mainClass = 'edu.wpi.Main'
mainClass = 'org.wpilib.Main'
}
apply plugin: 'com.gradleup.shadow'

2
cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java → cameraserver/multiCameraServer/src/main/java/org/wpilib/Main.java
View File

@@ -2,7 +2,7 @@
// 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 edu.wpi;
package org.wpilib;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

2
epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
View File

@@ -1 +1 @@
edu.wpi.first.epilogue.processor.AnnotationProcessor
org.wpilib.epilogue.processor.AnnotationProcessor

4
ntcore/BUILD.bazel
View File

@@ -211,8 +211,8 @@ cc_binary(
java_binary(
name = "DevMain-Java",
srcs = ["src/dev/java/edu/wpi/first/ntcore/DevMain.java"],
main_class = "edu.wpi.first.ntcore.DevMain",
srcs = ["src/dev/java/org/wpilib/networktables/DevMain.java"],
main_class = "org.wpilib.networktables.DevMain",
deps = [
"ntcore-java",
"//wpiutil:wpiutil-java",

2
ntcore/build.gradle
View File

@@ -10,7 +10,7 @@ ext {
}
nativeName = 'ntcore'
devMain = 'edu.wpi.first.ntcore.DevMain'
devMain = 'org.wpilib.networktables.DevMain'
generatedSources = "$projectDir/src/generated/main/native/cpp"
generatedHeaders = "$projectDir/src/generated/main/native/include"
jniSplitSetup = {

3
ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java → ntcore/src/dev/java/org/wpilib/networktables/DevMain.java
View File

@@ -2,9 +2,8 @@
// 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 edu.wpi.first.ntcore;
package org.wpilib.networktables;
import org.wpilib.networktables.NetworkTablesJNI;
import org.wpilib.util.runtime.CombinedRuntimeLoader;
public final class DevMain {

5
wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java
View File

@@ -63,8 +63,9 @@ package org.wpilib.opmode;
*
* <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
* robot thread a real-time priority using {@link Threads#setCurrentThreadPriority(boolean,int)}. An
* RT priority of 15 is a reasonable choice.
* robot thread a real-time priority using {@link
* 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,
* the operating system will lock up, and you'll have to boot the roboRIO into safe mode and delete

45
wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java
View File

@@ -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));
}
}