Skip to content

Commit

Permalink
Merge branch 'main' into more-serialization
Browse files Browse the repository at this point in the history
  • Loading branch information
KangarooKoala committed Jul 17, 2024
2 parents e342773 + 15001af commit 0607cfd
Show file tree
Hide file tree
Showing 262 changed files with 6,890 additions and 990 deletions.
55 changes: 33 additions & 22 deletions .github/workflows/upstream-utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,50 +30,61 @@ jobs:
run: |
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
- name: Run update_eigen.py
- name: Run eigen.py
run: |
cd upstream_utils
./update_eigen.py
- name: Run update_fmt.py
./eigen.py clone
./eigen.py copy-upstream-to-thirdparty
- name: Run fmt.py
run: |
cd upstream_utils
./update_fmt.py
- name: Run update_gcem.py
./fmt.py clone
./fmt.py copy-upstream-to-thirdparty
- name: Run gcem.py
run: |
cd upstream_utils
./update_gcem.py
- name: Run update_json.py
./gcem.py clone
./gcem.py copy-upstream-to-thirdparty
- name: Run json.py
run: |
cd upstream_utils
./update_json.py
- name: Run update_libuv.py
./json.py clone
./json.py copy-upstream-to-thirdparty
- name: Run libuv.py
run: |
cd upstream_utils
./update_libuv.py
- name: Run update_llvm.py
./libuv.py clone
./libuv.py copy-upstream-to-thirdparty
- name: Run llvm.py
run: |
cd upstream_utils
./update_llvm.py
- name: Run update_mpack.py
./llvm.py clone
./llvm.py copy-upstream-to-thirdparty
- name: Run mpack.py
run: |
cd upstream_utils
./update_mpack.py
- name: Run update_stack_walker.py
./mpack.py clone
./mpack.py copy-upstream-to-thirdparty
- name: Run stack_walker.py
run: |
cd upstream_utils
./update_stack_walker.py
- name: Run update_memory.py
./stack_walker.py clone
./stack_walker.py copy-upstream-to-thirdparty
- name: Run memory.py
run: |
cd upstream_utils
./update_memory.py
- name: Run update_protobuf.py
./memory.py clone
./memory.py copy-upstream-to-thirdparty
- name: Run protobuf.py
run: |
cd upstream_utils
./update_protobuf.py
- name: Run update_sleipnir.py
./protobuf.py clone
./protobuf.py copy-upstream-to-thirdparty
- name: Run sleipnir.py
run: |
cd upstream_utils
./update_sleipnir.py
./sleipnir.py clone
./sleipnir.py copy-upstream-to-thirdparty
- name: Add untracked files to index so they count as changes
run: git add -A
- name: Check output
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
* private double angleToTote = 0;
* private double distanceToTote = 0;
*
* public Robot() {
* usbCamera = CameraServer.startAutomaticCapture(0);
* findTotePipeline = new MyFindTotePipeline();
* findToteThread = new VisionThread(usbCamera, findTotePipeline, this);
* }
*
* {@literal @}Override
* public void {@link edu.wpi.first.vision.VisionRunner.Listener#copyPipelineOutputs
* copyPipelineOutputs(MyFindTotePipeline pipeline)} {
Expand All @@ -43,13 +49,6 @@
* }
*
* {@literal @}Override
* public void robotInit() {
* usbCamera = CameraServer.startAutomaticCapture(0);
* findTotePipeline = new MyFindTotePipeline();
* findToteThread = new VisionThread(usbCamera, findTotePipeline, this);
* }
*
* {@literal @}Override
* public void autonomousInit() {
* findToteThread.start();
* }
Expand Down
3 changes: 1 addition & 2 deletions developerRobot/src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ public class Robot extends TimedRobot {
* This function is run when the robot is first started up and should be used for any
* initialization code.
*/
@Override
public void robotInit() {}
public Robot() {}

/** This function is run once each time the robot enters autonomous mode. */
@Override
Expand Down
3 changes: 2 additions & 1 deletion developerRobot/src/main/native/cpp/Robot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
#include <frc/TimedRobot.h>

class Robot : public frc::TimedRobot {
public:
/**
* This function is run when the robot is first started up and should be
* used for any initialization code.
*/
void RobotInit() override {}
Robot() {}

/**
* This function is run once each time the robot enters autonomous mode
Expand Down
2 changes: 2 additions & 0 deletions docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
evaluationDependsOn(':apriltag')
evaluationDependsOn(':cameraserver')
evaluationDependsOn(':cscore')
evaluationDependsOn(':epilogue-runtime')
evaluationDependsOn(':hal')
evaluationDependsOn(':ntcore')
evaluationDependsOn(':wpilibNewCommands')
Expand Down Expand Up @@ -239,6 +240,7 @@ task generateJavaDocs(type: Javadoc) {
source project(':apriltag').sourceSets.main.java
source project(':cameraserver').sourceSets.main.java
source project(':cscore').sourceSets.main.java
source project(':epilogue-runtime').sourceSets.main.java
source project(':hal').sourceSets.main.java
source project(':ntcore').sourceSets.main.java
source project(':wpilibNewCommands').sourceSets.main.java
Expand Down
19 changes: 19 additions & 0 deletions epilogue-processor/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
ext {
useJava = true
useCpp = false
baseId = 'epilogue-processor'
groupId = 'edu.wpi.first.epilogue'

devMain = ''
}

apply from: "${rootDir}/shared/java/javacommon.gradle"

dependencies {
implementation(project(':epilogue-runtime'))
api project(':wpilibNewCommands')

implementation 'com.google.auto.service:auto-service:1.1.1'
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
testImplementation 'com.google.testing.compile:compile-testing:+'
}
Loading

0 comments on commit 0607cfd

Please sign in to comment.