Skip to content

Commit 6f50db2

Browse files
authored
Regenerated TF2 msgs (#191)
* Regenerated TF2 msgs * Remove debugs * PR feedback: Revert metafiles
1 parent 35a7251 commit 6f50db2

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

com.unity.robotics.ros-tcp-connector/Runtime/Messages/Tf2/msg/TF2ErrorMsg.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace RosMessageTypes.Tf2
1111
public class TF2ErrorMsg : Message
1212
{
1313
public const string k_RosMessageName = "tf2_msgs/TF2Error";
14+
public override string RosMessageName => k_RosMessageName;
1415

1516
public const byte NO_ERROR = 0;
1617
public const byte LOOKUP_ERROR = 1;

com.unity.robotics.ros-tcp-connector/Runtime/Messages/Tf2/msg/TFMessageMsg.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace RosMessageTypes.Tf2
1111
public class TFMessageMsg : Message
1212
{
1313
public const string k_RosMessageName = "tf2_msgs/TFMessage";
14+
public override string RosMessageName => k_RosMessageName;
1415

1516
public Geometry.TransformStampedMsg[] transforms;
1617

com.unity.robotics.ros-tcp-connector/Runtime/TcpConnector/ROSConnection.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,13 @@ public RosTopicState GetOrCreateTopic(string topic, string rosMessageName)
183183
public void Subscribe<T>(string topic, Action<T> callback) where T : Message
184184
{
185185
string rosMessageName = MessageRegistry.GetRosMessageName<T>();
186-
AddSubscriberInternal(topic, rosMessageName, (Message msg) => { callback((T)msg); });
186+
AddSubscriberInternal(topic, rosMessageName, (Message msg) =>
187+
{
188+
if (msg.RosMessageName != rosMessageName)
189+
Debug.LogError($"Subscriber to '{topic}' expected '{rosMessageName}' but received '{msg.RosMessageName}'!?");
190+
else
191+
callback((T)msg);
192+
});
187193
}
188194

189195
public void Unsubscribe(string topic)

0 commit comments

Comments
 (0)