Skip to content

Commit

Permalink
Upgrade to ihmc-pub-sub 0.9.0 and increase size of sequence after it …
Browse files Browse the repository at this point in the history
…started crashing.
  • Loading branch information
calvertdw committed Sep 18, 2018
1 parent d7e6868 commit 170d41d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ihmc-ros2-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ihmc {
}

mainDependencies {
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.8.3"
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.9.0"
compile group: "us.ihmc", name: "IHMCRealtime", version: "1.1.8"
compile group: "us.ihmc", name: "ihmc-commons", version: "0.20.0"
}
Expand Down
2 changes: 1 addition & 1 deletion ros2-common-interfaces/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ihmc {
mainDependencies {
compile group: "us.ihmc", name: "euclid-core", version: "0.4.13"
compile group: "us.ihmc", name: "euclid", version: "0.7.5"
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.8.3"
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.9.0"
}

generatorDependencies {
Expand Down
4 changes: 2 additions & 2 deletions ros2-msg-to-pubsub-generator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ dependencies {
}

mainDependencies {
compile group: "us.ihmc", name: "ihmc-pub-sub-generator", version: "0.8.3"
compile group: "us.ihmc", name: "ihmc-pub-sub-generator", version: "0.9.0"
compile group: "us.ihmc", name: "ros2-msg-to-idl-generator", version: version
}

testDependencies {
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.8.3"
compile group: "us.ihmc", name: "ihmc-pub-sub", version: "0.9.0"
compile group: "us.ihmc", name: "ihmc-ci-core-api", version: "0.18.0"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module ros_msgs
@TypeCode(type="ros_msgs::msg::dds_::BigNumSequence_")
struct BigNumSequence
{
sequence<ros_msgs::msg::dds::Num, 100> large_sequence;
sequence<ros_msgs::msg::dds::Num, 10000> large_sequence;
};
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class BigNumSequence extends Packet<BigNumSequence> implements Settable<B

public BigNumSequence()
{
large_sequence_ = new us.ihmc.idl.IDLSequence.Object<ros_msgs.msg.dds.Num> (100, new ros_msgs.msg.dds.NumPubSubType());
large_sequence_ = new us.ihmc.idl.IDLSequence.Object<ros_msgs.msg.dds.Num> (10000, new ros_msgs.msg.dds.NumPubSubType());

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static int getMaxCdrSerializedSize(int current_alignment)
{
int initial_alignment = current_alignment;

current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);for(int i0 = 0; i0 < 100; ++i0)
current_alignment += 4 + us.ihmc.idl.CDR.alignment(current_alignment, 4);for(int i0 = 0; i0 < 10000; ++i0)
{
current_alignment += ros_msgs.msg.dds.NumPubSubType.getMaxCdrSerializedSize(current_alignment);}
return current_alignment - initial_alignment;
Expand All @@ -65,7 +65,7 @@ public final static int getCdrSerializedSize(ros_msgs.msg.dds.BigNumSequence dat

public static void write(ros_msgs.msg.dds.BigNumSequence data, us.ihmc.idl.CDR cdr)
{
if(data.getLargeSequence().size() <= 100)
if(data.getLargeSequence().size() <= 10000)
cdr.write_type_e(data.getLargeSequence());else
throw new RuntimeException("large_sequence field exceeds the maximum length");

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Num[<=100] large_sequence
Num[<=10000] large_sequence

0 comments on commit 170d41d

Please sign in to comment.