Skip to content

Commit 058da74

Browse files
Revert "Added an option to log a full resolution heartbeat for the depth image (#1120)"
This reverts commit 2cdb895.
1 parent 2cdb895 commit 058da74

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

ihmc-communication/src/main/java/us/ihmc/communication/PerceptionAPI.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ public final class PerceptionAPI
118118
.withTypeName(ImageMessage.class)
119119
.withSuffix("depth_filtered");
120120

121-
public static final ROS2Topic<Empty> REQUEST_FULL_RESOLUTION_HEARTBEAT = PERCEPTION_MODULE.withSuffix("request_realsense_full_resolution")
122-
.withType(Empty.class);
123-
public static final ROS2Topic<ImageMessage> D455_DEPTH_IMAGE_FULL_RESOLUTION = BEST_EFFORT.withModule("d455")
124-
.withTypeName(ImageMessage.class)
125-
.withSuffix("depth_full_resolution");
126-
public static final ROS2Topic<ImageMessage> D455_COLOR_IMAGE_FULL_RESOLUTION = BEST_EFFORT.withModule("d455")
127-
.withTypeName(ImageMessage.class)
128-
.withSuffix("color_full_resolution");
129-
130121
/*
131122
* RealSense image topics (official ROS 2 Image and CameraInfo types)
132123
*/

ihmc-high-level-behaviors/src/libgdx/java/us/ihmc/rdx/ui/graphics/ros2/pointCloud/RDXROS2ColoredPointCloudVisualizer.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
import com.badlogic.gdx.graphics.g3d.Renderable;
44
import com.badlogic.gdx.utils.Array;
55
import com.badlogic.gdx.utils.Pool;
6-
import imgui.ImGui;
7-
import imgui.type.ImBoolean;
86
import perception_msgs.msg.dds.ImageMessage;
9-
import us.ihmc.communication.PerceptionAPI;
10-
import us.ihmc.communication.ros2.ROS2Heartbeat;
117
import us.ihmc.perception.RawImage;
128
import us.ihmc.perception.imageMessage.ImageMessageDecoder;
139
import us.ihmc.rdx.sceneManager.RDXSceneLevel;
@@ -40,9 +36,6 @@ public class RDXROS2ColoredPointCloudVisualizer extends RDXROS2MultiTopicVisuali
4036
private final ImageMessageDecoder colorMessageDecoder = new ImageMessageDecoder();
4137

4238
private final RDXRawImagePointCloudVisualizer visualizer;
43-
private ROS2Heartbeat fullResolutionHeartbeat;
44-
private final ImBoolean requestFullResolution = new ImBoolean(false);
45-
4639

4740
public RDXROS2ColoredPointCloudVisualizer(String title, ROS2Node ros2Node, ROS2Topic<ImageMessage> depthTopic, ROS2Topic<ImageMessage> colorTopic)
4841
{
@@ -91,9 +84,6 @@ public List<ROS2Topic<?>> getTopics()
9184
@Override
9285
public void renderImGuiWidgets()
9386
{
94-
if (ImGui.checkbox(labels.get("Full Resolution Hearbeat"), requestFullResolution) && fullResolutionHeartbeat != null)
95-
fullResolutionHeartbeat.setAlive(requestFullResolution.get());
96-
9787
depthMessageSizeReadout.renderImGuiWidgets();
9888
colorMessageSizeReadout.renderImGuiWidgets();
9989

@@ -120,12 +110,6 @@ public void destroy()
120110
colorMessageDecoder.destroy();
121111
}
122112

123-
public void setupFullResolutionRequestHeartbeat(ROS2Node ros2Node)
124-
{
125-
fullResolutionHeartbeat = new ROS2Heartbeat(ros2Node, PerceptionAPI.REQUEST_FULL_RESOLUTION_HEARTBEAT);
126-
fullResolutionHeartbeat.setAlive(requestFullResolution.get());
127-
}
128-
129113
private void subscribe()
130114
{
131115
depthSubscription = ros2Node.createSubscription2(depthTopic, this::onDepthMessageReceived);

ihmc-high-level-behaviors/src/main/java/us/ihmc/perception/ROS2ImageSensors.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public class ROS2ImageSensors
2626
private ImageSensor zedSensor;
2727
private ROS2DemandGraphNode zedPublishDemandNode;
2828
private ImageSensorPublishThread zedPublishThread;
29-
private ROS2DemandGraphNode ros2DemandGraphNode;
30-
private ImageSensorPublishThread imageSensorPublishThread;
3129

3230
public ROS2ImageSensors(ROS2Node ros2Node)
3331
{
@@ -50,18 +48,6 @@ public void addRealsenseSensor(ImageSensor realsenseSensor, ReferenceFrame senso
5048
setupCallbackForDemandNode(realsensePublishThread, realsensePublishDemandNode);
5149
}
5250

53-
// Must be called after the realsense has been added, no safety checks
54-
public void addFullResolutionRealSensePublisher(ImageSensor realsenseSensor)
55-
{
56-
ros2DemandGraphNode = new ROS2DemandGraphNode(ros2Node, PerceptionAPI.REQUEST_FULL_RESOLUTION_HEARTBEAT);
57-
realsenseDemandNode.addDependents(ros2DemandGraphNode);
58-
59-
imageSensorPublishThread = new ImageSensorPublishThread(ros2Node, realsenseSensor);
60-
realsensePublishThread.addTopic(PerceptionAPI.D455_DEPTH_IMAGE_FULL_RESOLUTION, RealSenseImageSensor.DEPTH_IMAGE_KEY);
61-
realsensePublishThread.addTopic(PerceptionAPI.D455_COLOR_IMAGE_FULL_RESOLUTION, RealSenseImageSensor.COLOR_IMAGE_KEY);
62-
setupCallbackForDemandNode(imageSensorPublishThread, ros2DemandGraphNode);
63-
}
64-
6551
public void addZEDSensor(ImageSensor zedSensor, ReferenceFrame sensorFrame)
6652
{
6753
this.zedSensor = zedSensor;

0 commit comments

Comments
 (0)