Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add SystemServer DS support #7466

Merged
merged 42 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4100334
Initial SystemCore empty HAL
ThadHouse Nov 30, 2024
2e45ab1
Fix styleguide
ThadHouse Nov 30, 2024
786ad68
More formatting
ThadHouse Nov 30, 2024
7add24f
Formatting fixes
github-actions[bot] Nov 30, 2024
ce46a9f
Update opencv
ThadHouse Nov 30, 2024
6141c9f
Fix a few more things
ThadHouse Nov 30, 2024
fb68a16
More formattings
ThadHouse Nov 30, 2024
e097f13
Fix bazel
ThadHouse Nov 30, 2024
b400860
comma
ThadHouse Nov 30, 2024
b60e0a1
Revert athena back
ThadHouse Nov 30, 2024
d3cdbf4
SC build again
ThadHouse Nov 30, 2024
bb78182
Formatting
ThadHouse Nov 30, 2024
b3e1cbc
Switch to 2027 repository
ThadHouse Nov 30, 2024
908e363
Remove athena build
ThadHouse Nov 30, 2024
075f6e5
Merge remote-tracking branch 'wpilibsuite/2027' into systemcore
ThadHouse Nov 30, 2024
83527f4
Start adding systemserver
ThadHouse Nov 30, 2024
b0b65b4
Protos
ThadHouse Nov 30, 2024
b640385
More DS work
ThadHouse Nov 30, 2024
8b05624
Merge remote-tracking branch 'wpilibsuite/2027' into scds
ThadHouse Nov 30, 2024
4a9a434
Add pregenerate check for hal
ThadHouse Nov 30, 2024
0b0d010
Remove extra
ThadHouse Nov 30, 2024
3b0e172
Styleguide
ThadHouse Nov 30, 2024
d2637ba
Formatting fixes
github-actions[bot] Nov 30, 2024
9e8f91e
Fix merge
ThadHouse Nov 30, 2024
cd1747e
Missing mrc headers
ThadHouse Nov 30, 2024
4758293
Fix bazel
ThadHouse Nov 30, 2024
cdcbdd0
1 more fix
ThadHouse Nov 30, 2024
8d2a035
Formatting fixes
github-actions[bot] Nov 30, 2024
57499e8
More build fixes
ThadHouse Nov 30, 2024
844856d
Another build round
ThadHouse Nov 30, 2024
ab9e916
System service DS
ThadHouse Nov 30, 2024
8c52e51
Fix developerRobot java
ThadHouse Nov 30, 2024
54a629d
Fix herbs
ThadHouse Nov 30, 2024
ca13582
Oh lint, you fickle mistress
ThadHouse Nov 30, 2024
2c80624
Fix ldconfig
ThadHouse Nov 30, 2024
af8b455
Fix publishing without only
ThadHouse Nov 30, 2024
ee0d036
Merge branch 'scds' into systemserviceds
ThadHouse Nov 30, 2024
5fc54e9
Full DS
ThadHouse Dec 1, 2024
240d8b9
Merge
ThadHouse Dec 1, 2024
b51edaf
tidy
ThadHouse Dec 1, 2024
d2e454b
Formatting fixes
github-actions[bot] Dec 1, 2024
ff6fd53
Update using event
ThadHouse Dec 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions developerRobot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ deploy {
all {
postdeploy << { ctx ->
ctx.execute("sync")
ctx.execute("ldconfig")
ctx.execute("sudo ldconfig /home/systemcore/frc/third-party/lib")
}
}

Expand All @@ -104,7 +104,7 @@ deploy {
postdeploy << { ctx ->
ctx.execute("echo '/home/systemcore/developerRobotCppStatic' > /home/systemcore/robotCommand")
ctx.execute("chmod +x /home/systemcore/robotCommand; chown systemcore /home/systemcore/robotCommand")
ctx.execute("setcap cap_sys_nice+eip \"/home/systemcore/developerRobotCppStatic\"")
ctx.execute("sudo setcap cap_sys_nice+eip \"/home/systemcore/developerRobotCppStatic\"")
ctx.execute('chmod +x developerRobotCppStatic')
}
}
Expand All @@ -130,7 +130,6 @@ deploy {

tasks.register('deployJava') {
try {
dependsOn tasks.named('deployjresystemcore')
dependsOn tasks.named('deploydeveloperRobotJavasystemcore')
dependsOn tasks.named('deploydeveloperRobotCppJavasystemcore') // Deploying shared C++ is how to get the Java shared libraries.
} catch (ignored) {
Expand Down
1 change: 1 addition & 0 deletions hal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ext {
srcDir 'src/main/native/include'
srcDir generatedHeaders
srcDir 'src/mrc/include'
srcDir 'src/generated/main/native/cpp/mrc/protobuf'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion hal/src/main/native/cpp/proto/ControlDataProto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ bool wpi::Protobuf<mrc::ControlData>::Pack(OutputStream& Stream,
std::optional<mrc::Joystick> wpi::Protobuf<mrc::Joystick>::Unpack(
InputStream& Stream) {
wpi::UnpackCallback<float, MRC_MAX_NUM_AXES> AxesCb;
wpi::UnpackCallback<uint16_t, MRC_MAX_NUM_POVS> PovsCb;
wpi::UnpackCallback<int16_t, MRC_MAX_NUM_POVS> PovsCb;

mrc_proto_ProtobufJoystickData Msg{
.ButtonCount = 0,
Expand Down
Loading
Loading