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

Feature/impedance control #533

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
updated messages that after merge got compromised
  • Loading branch information
LuigiPenco93 committed Jan 3, 2025
commit 087b26d6a9a5e70f7ca946d25a3c8ab1e6adaff9
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ public class BehaviorTreeStateMessagePubSubType implements us.ihmc.pubsub.TopicD
@Override
public final java.lang.String getDefinitionChecksum()
{
return "f7740c251c76e2ea67a69ab51e9ebc307964c3f623e3d34ad8c1de280e423793";
return "2321167ccecaa347227355e5a37c3d1a8098dfcc0f1cc5a37ccd193660f3a03d";
}

@Override
@@ -52,7 +52,7 @@ public static int getMaxCdrSerializedSize(int current_alignment)
{
int initial_alignment = current_alignment;

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);
current_alignment += 8 + us.ihmc.idl.CDR.alignment(current_alignment, 8);

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);

@@ -132,7 +132,7 @@ public final static int getCdrSerializedSize(behavior_msgs.msg.dds.BehaviorTreeS
{
int initial_alignment = current_alignment;

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);
current_alignment += 8 + us.ihmc.idl.CDR.alignment(current_alignment, 8);


current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);
@@ -249,7 +249,7 @@ public final static int getCdrSerializedSize(behavior_msgs.msg.dds.BehaviorTreeS

public static void write(behavior_msgs.msg.dds.BehaviorTreeStateMessage data, us.ihmc.idl.CDR cdr)
{
cdr.write_type_4(data.getSequenceId());
cdr.write_type_12(data.getSequenceId());

cdr.write_type_4(data.getNextId());

@@ -342,7 +342,7 @@ public static void write(behavior_msgs.msg.dds.BehaviorTreeStateMessage data, us

public static void read(behavior_msgs.msg.dds.BehaviorTreeStateMessage data, us.ihmc.idl.CDR cdr)
{
data.setSequenceId(cdr.read_type_4());
data.setSequenceId(cdr.read_type_12());

data.setNextId(cdr.read_type_4());

@@ -374,7 +374,7 @@ public static void read(behavior_msgs.msg.dds.BehaviorTreeStateMessage data, us.
@Override
public final void serialize(behavior_msgs.msg.dds.BehaviorTreeStateMessage data, us.ihmc.idl.InterchangeSerializer ser)
{
ser.write_type_4("sequence_id", data.getSequenceId());
ser.write_type_12("sequence_id", data.getSequenceId());
ser.write_type_4("next_id", data.getNextId());
ser.write_type_a("confirmable_request", new ihmc_common_msgs.msg.dds.ConfirmableRequestMessagePubSubType(), data.getConfirmableRequest());

@@ -404,7 +404,7 @@ public final void serialize(behavior_msgs.msg.dds.BehaviorTreeStateMessage data,
@Override
public final void deserialize(us.ihmc.idl.InterchangeSerializer ser, behavior_msgs.msg.dds.BehaviorTreeStateMessage data)
{
data.setSequenceId(ser.read_type_4("sequence_id"));
data.setSequenceId(ser.read_type_12("sequence_id"));
data.setNextId(ser.read_type_4("next_id"));
ser.read_type_a("confirmable_request", new ihmc_common_msgs.msg.dds.ConfirmableRequestMessagePubSubType(), data.getConfirmableRequest());

Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ public class HandPoseActionStateMessagePubSubType implements us.ihmc.pubsub.Topi
@Override
public final java.lang.String getDefinitionChecksum()
{
return "c9226ac6e7b9539729b6a502090fdc8b9e2ca036bb92087f2e6dd65ae8562d49";
return "a198df3ee51dbcfa50646e2b205acf444101f69b0eb59d785ae38d25ba17f3ad";
}

@Override
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ public class HandHybridJointspaceTaskspaceTrajectoryMessagePubSubType implements
@Override
public final java.lang.String getDefinitionChecksum()
{
return "116a91d7d75006460a92258a598788b7ef72db1c6c9edd05f3928d6cac1acfea";
return "2705f7c3e4da3dd1d34f26ebf7cbd675ca31340846960635793577338ad00486";
}

@Override
@@ -52,7 +52,7 @@ public static int getMaxCdrSerializedSize(int current_alignment)
{
int initial_alignment = current_alignment;

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);
current_alignment += 8 + us.ihmc.idl.CDR.alignment(current_alignment, 8);

current_alignment += 1 + us.ihmc.idl.CDR.alignment(current_alignment, 1);

@@ -81,7 +81,7 @@ public final static int getCdrSerializedSize(controller_msgs.msg.dds.HandHybridJ
{
int initial_alignment = current_alignment;

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);
current_alignment += 8 + us.ihmc.idl.CDR.alignment(current_alignment, 8);


current_alignment += 1 + us.ihmc.idl.CDR.alignment(current_alignment, 1);
@@ -107,7 +107,7 @@ public final static int getCdrSerializedSize(controller_msgs.msg.dds.HandHybridJ

public static void write(controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTrajectoryMessage data, us.ihmc.idl.CDR cdr)
{
cdr.write_type_4(data.getSequenceId());
cdr.write_type_12(data.getSequenceId());

cdr.write_type_7(data.getForceExecution());

@@ -123,7 +123,7 @@ public static void write(controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTr

public static void read(controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTrajectoryMessage data, us.ihmc.idl.CDR cdr)
{
data.setSequenceId(cdr.read_type_4());
data.setSequenceId(cdr.read_type_12());

data.setForceExecution(cdr.read_type_7());

@@ -141,7 +141,7 @@ public static void read(controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTra
@Override
public final void serialize(controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTrajectoryMessage data, us.ihmc.idl.InterchangeSerializer ser)
{
ser.write_type_4("sequence_id", data.getSequenceId());
ser.write_type_12("sequence_id", data.getSequenceId());
ser.write_type_7("force_execution", data.getForceExecution());
ser.write_type_7("impedance_enabled", data.getImpedanceEnabled());
ser.write_type_9("robot_side", data.getRobotSide());
@@ -158,7 +158,7 @@ public final void serialize(controller_msgs.msg.dds.HandHybridJointspaceTaskspac
@Override
public final void deserialize(us.ihmc.idl.InterchangeSerializer ser, controller_msgs.msg.dds.HandHybridJointspaceTaskspaceTrajectoryMessage data)
{
data.setSequenceId(ser.read_type_4("sequence_id"));
data.setSequenceId(ser.read_type_12("sequence_id"));
data.setForceExecution(ser.read_type_7("force_execution"));
data.setImpedanceEnabled(ser.read_type_7("impedance_enabled"));
data.setRobotSide(ser.read_type_9("robot_side"));
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ public class SE3PIDGainsTrajectoryMessagePubSubType implements us.ihmc.pubsub.To
@Override
public final java.lang.String getDefinitionChecksum()
{
return "18a9ffcf2c5a4f7ec8db4ffbd3db4c8888f187e6b1ecb820365201b8a108ec90";
return "ef5185be8bbbef2d5c6eec4139f2b6a121b519f930299ffb7e01476c45b7428c";
}

@Override