Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class HeightMapParameters extends StoredPropertySet implements HeightMapP
public static final BooleanStoredPropertyKey flyingPointsFilter = keys.addBooleanKey("Flying points filter");
public static final BooleanStoredPropertyKey enableChunkedMap = keys.addBooleanKey("Enable chunked map");
public static final BooleanStoredPropertyKey logHeightMap = keys.addBooleanKey("Log height map");
public static final DoubleStoredPropertyKey minDepthToAccept = keys.addDoubleKey("Min Depth To Accept");
public static final DoubleStoredPropertyKey minHeightRegistration = keys.addDoubleKey("Min height registration");
public static final DoubleStoredPropertyKey maxHeightRegistration = keys.addDoubleKey("Max height registration");
public static final DoubleStoredPropertyKey kalmanFilterPredictionNoise = keys.addDoubleKey("Kalman filter prediction noise");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ default void setLogHeightMap(boolean logHeightMap)
set(HeightMapParameters.logHeightMap, logHeightMap);
}

default void setMinDepthToAccept(double minDepthToAccept)
{
set(HeightMapParameters.minDepthToAccept, minDepthToAccept);
}

default void setMinHeightRegistration(double minHeightRegistration)
{
set(HeightMapParameters.minHeightRegistration, minHeightRegistration);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ default boolean getLogHeightMap()
return get(logHeightMap);
}

default double getMinDepthToAccept()
{
return get(minDepthToAccept);
}

default double getMinHeightRegistration()
{
return get(minHeightRegistration);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ public float[] populateParameterArray(HeightMapParameters parameters, CameraIntr
(float) parameters.getVariancePerMeter(),
(float) parameters.getVariancePerTranslationSpeed(),
(float) parameters.getVariancePerRotationSpeed(),
(float) groundHeightGuess};
(float) groundHeightGuess,
(float) parameters.getMinDepthToAccept()};
}

public HeightMapData getHeightMapData()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ extern "C"
#define VARIANCE_PER_TRANSLATION_SPEED 16
#define VARIANCE_PER_ROTATION_SPEED 17
#define GROUND_HEIGHT 18
#define MIN_DEPTH_TO_ACCEPT 19

__device__ float3 back_project_perspective(int2 pos, float Z, const float *params)
{
Expand Down Expand Up @@ -69,7 +70,7 @@ __global__ void heightMapUpdateDataKernel(const unsigned short* __restrict__ dep
float depth = rowPtr[xIndex] * 0.001f; // Scale to meters

// Early exit for invalid depth
if (depth < 0.52f)
if (depth < params[MIN_DEPTH_TO_ACCEPT])
return;

// Back-project and transform
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"Flying points filter": false,
"Enable chunked map": false,
"Log height map": false,
"Min Depth To Accept": {
"value": 0.88,
"lowerBound": 0.0,
"upperBound": 2.0
},
"Min height registration": {
"value": -1.5,
"lowerBound": -10.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public class AlexanderSensorInformation implements HumanoidRobotSensorInformatio
private static final RigidBodyTransform D457_TO_CHEST_TRANSFORM = new RigidBodyTransform();
static
{
D457_TO_CHEST_TRANSFORM.getTranslation().set(0.081, 0.09, 0.087);
EuclidCoreMissingTools.setYawPitchRollDegrees(D457_TO_CHEST_TRANSFORM.getRotation(), 0.0, 28.0, 0.0);
D457_TO_CHEST_TRANSFORM.getTranslation().set(0.081, 0.04, 0.087);
EuclidCoreMissingTools.setYawPitchRollDegrees(D457_TO_CHEST_TRANSFORM.getRotation(), -0.8, 44.0, -1.0);
}

protected final SideDependentList<String> feetForceSensorNames = new SideDependentList<String>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public double getDefaultSwingStepDownHeight()
@Override
public double getMinHeightDifferenceForStepUpOrDown()
{
return 0.1;
return 0.05;
}

@Override
Expand Down
Loading