Skip to content

Commit

Permalink
Rename output port accessors (which had previously called themselves …
Browse files Browse the repository at this point in the history
…input ports)
  • Loading branch information
sammy-tri committed Apr 9, 2018
1 parent be01cd6 commit f350df0
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ int DoMain() {
builder.Connect(iiwa_command_sub->get_output_port(),
iiwa_command_receiver->get_input_port(0));

builder.Connect(iiwa_command_receiver->get_output_port(0),
builder.Connect(iiwa_command_receiver->get_commanded_state_output_port(),
model->get_input_port_iiwa_state_command());

builder.Connect(iiwa_zero_acceleration_source->get_output_port(),
Expand Down
2 changes: 1 addition & 1 deletion examples/kuka_iiwa_arm/dev/pick_and_place/lcm_plant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ LcmPlant::LcmPlant(
// Export iiwa command input port.
input_port_iiwa_command_.push_back(
builder.ExportInput(iiwa_command_receiver->get_input_port(0)));
builder.Connect(iiwa_command_receiver->get_output_port(0),
builder.Connect(iiwa_command_receiver->get_commanded_state_output_port(),
iiwa_and_wsg_plant_->get_input_port_iiwa_state_command(i));

// lcmt_iiwa_command does not include a reference acceleration, so use a
Expand Down
4 changes: 2 additions & 2 deletions examples/kuka_iiwa_arm/iiwa_lcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ class IiwaCommandReceiver : public systems::LeafSystem<double> {
void set_initial_position(systems::Context<double>* context,
const Eigen::Ref<const VectorX<double>> x) const;

const systems::OutputPort<double>& get_commanded_state_input_port()
const systems::OutputPort<double>& get_commanded_state_output_port()
const {
return this->get_output_port(0);
}

const systems::OutputPort<double>& get_commanded_torque_input_port()
const systems::OutputPort<double>& get_commanded_torque_output_port()
const {
return this->get_output_port(1);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/kuka_iiwa_arm/iiwa_wsg_simulation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ int DoMain() {

builder.Connect(iiwa_command_sub->get_output_port(),
iiwa_command_receiver->get_input_port(0));
builder.Connect(iiwa_command_receiver->get_output_port(0),
builder.Connect(iiwa_command_receiver->get_commanded_state_output_port(),
model->get_input_port_iiwa_state_command());
builder.Connect(iiwa_zero_acceleration_source->get_output_port(),
model->get_input_port_iiwa_acceleration_command());
Expand Down
2 changes: 1 addition & 1 deletion examples/kuka_iiwa_arm/kuka_simulation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ int DoMain() {

base_builder->Connect(command_sub->get_output_port(),
command_receiver->get_input_port(0));
base_builder->Connect(command_receiver->get_output_port(0),
base_builder->Connect(command_receiver->get_commanded_state_output_port(),
controller->get_input_port_desired_state());
base_builder->Connect(plant->get_output_port(0),
status_sender->get_state_input_port());
Expand Down

0 comments on commit f350df0

Please sign in to comment.