Skip to content

Commit 3dc6ff7

Browse files
authored
Reintroduce HSL Network (HULKs#2179)
* goodbye spl * missspelling 1 * missspelling 2 * cycler in mujoco_hardware_interface * bringing game_controller_state back * game_controller_hpp * fmt * fix some minor requests * fmt * rebase fix
1 parent a10c01d commit 3dc6ff7

116 files changed

Lines changed: 829 additions & 722 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 481 additions & 475 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ members = [
2121
"crates/framework",
2222
"crates/geometry",
2323
"crates/hardware",
24+
"crates/hsl_network",
25+
"crates/hsl_network_messages",
2426
"crates/hula_types",
2527
"crates/hulk_booster",
2628
"crates/hulk_imagine",
@@ -44,8 +46,6 @@ members = [
4446
"crates/ros2",
4547
"crates/simulation_message",
4648
"crates/source_analyzer",
47-
"crates/spl_network",
48-
"crates/spl_network_messages",
4949
"crates/step_planning",
5050
"crates/step_planning_solver",
5151
"crates/types",
@@ -144,6 +144,8 @@ gilrs = "0.11.0"
144144
glob = "0.3.2"
145145
hardware = { path = "crates/hardware" }
146146
home = "=0.5.9"
147+
hsl_network = { path = "crates/hsl_network" }
148+
hsl_network_messages = { path = "crates/hsl_network_messages" }
147149
hula_types = { path = "crates/hula_types" }
148150
hulk_manifest = { path = "crates/hulk_manifest" }
149151
hulk_mujoco = { path = "crates/hulk_mujoco" }
@@ -229,8 +231,6 @@ simba = "0.9.0"
229231
simulation_message = { path = "crates/simulation_message" }
230232
smallvec = "1.14.0"
231233
source_analyzer = { path = "crates/source_analyzer" }
232-
spl_network = { path = "crates/spl_network" }
233-
spl_network_messages = { path = "crates/spl_network_messages" }
234234
splines = { version = "=4.2.0", features = ["serde"] }
235235
step_planning = { path = "crates/step_planning" }
236236
step_planning_solver = { path = "crates/step_planning_solver" }

crates/argument_parsers/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ homepage.workspace = true
77

88
[dependencies]
99
color-eyre = { workspace = true }
10+
hsl_network_messages = { workspace = true }
1011
regex = { workspace = true }
1112
robot = { workspace = true }
12-
spl_network_messages = { workspace = true }

crates/argument_parsers/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use color_eyre::{
1010
};
1111
use regex::Regex;
1212

13+
use hsl_network_messages::PlayerNumber;
1314
use robot::{Network, SystemctlAction};
14-
use spl_network_messages::PlayerNumber;
1515

1616
pub const SYSTEMCTL_ACTION_POSSIBLE_VALUES: &[&str] =
1717
&["disable", "enable", "restart", "start", "status", "stop"];

crates/bevyhavior_simulator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ fern = { workspace = true }
2424
framework = { workspace = true }
2525
geometry = { workspace = true }
2626
hardware = { workspace = true }
27+
hsl_network = { workspace = true }
28+
hsl_network_messages = { workspace = true }
2729
hula_types = { workspace = true }
2830
indicatif = { workspace = true }
2931
ittapi = { workspace = true }
@@ -41,8 +43,6 @@ repository = { workspace = true }
4143
scenario = { workspace = true }
4244
serde = { workspace = true }
4345
serde_json = { workspace = true }
44-
spl_network = { workspace = true }
45-
spl_network_messages = { workspace = true }
4646
step_planning = { workspace = true }
4747
tokio = { workspace = true }
4848
tokio-util = { workspace = true }

crates/bevyhavior_simulator/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ fn main() -> Result<()> {
4646
execution_time_warning_threshold: None,
4747
},
4848
CyclerManifest {
49-
name: "SplNetwork",
49+
name: "HslNetwork",
5050
kind: CyclerKind::Perception,
5151
instances: vec![""],
52-
setup_nodes: vec!["spl_network::message_receiver"],
53-
nodes: vec!["spl_network::message_filter"],
52+
setup_nodes: vec!["hsl_network::message_receiver"],
53+
nodes: vec!["hsl_network::message_filter"],
5454
execution_time_warning_threshold: None,
5555
},
5656
CyclerManifest {

crates/bevyhavior_simulator/src/autoref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use bevy::{
1212
time::{Time, Timer, TimerMode},
1313
};
1414
use coordinate_systems::{Field, Ground};
15+
use hsl_network_messages::{GameState, Penalty, SubState, Team};
1516
use linear_algebra::{point, vector, Isometry2};
16-
use spl_network_messages::{GameState, Penalty, SubState, Team};
1717
use step_planning::traits::Length;
1818
use types::{
1919
ball_position::SimulatorBallState,

crates/bevyhavior_simulator/src/bin/ball_search.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use bevy::prelude::*;
22

3+
use hsl_network_messages::{GameState, PlayerNumber, SubState, Team};
34
use linear_algebra::point;
45
use scenario::scenario;
5-
use spl_network_messages::{GameState, PlayerNumber, SubState, Team};
66

77
use bevyhavior_simulator::{
88
ball::BallResource,

crates/bevyhavior_simulator/src/bin/defender_positioning.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use bevy::prelude::*;
22

3+
use hsl_network_messages::{GameState, PlayerNumber};
34
use linear_algebra::{point, vector};
45
use scenario::scenario;
5-
use spl_network_messages::{GameState, PlayerNumber};
66

77
use bevyhavior_simulator::{
88
ball::BallResource,

crates/bevyhavior_simulator/src/bin/demonstration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use bevy::prelude::*;
22

3+
use hsl_network_messages::{GameState, PlayerNumber, SubState, Team};
34
use linear_algebra::{vector, Isometry2};
45
use scenario::scenario;
5-
use spl_network_messages::{GameState, PlayerNumber, SubState, Team};
66

77
use bevyhavior_simulator::{
88
ball::BallResource,

0 commit comments

Comments
 (0)