Skip to content

Commit 91871e6

Browse files
PotatoPeeler3000ihmc-rosie-windows
andauthored
Feature/height map noise hacking (#1119)
* Add option to parameters to tune the minimum acceptable depth values * Tuned value * Update transform and parameter for swing --------- Co-authored-by: ihmc-rosie-windows <rosie@ihmc.org>
1 parent ba94d85 commit 91871e6

File tree

8 files changed

+23
-5
lines changed

8 files changed

+23
-5
lines changed

ihmc-perception/src/main/generated-java/us/ihmc/perception/gpuMapping/HeightMapParameters.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class HeightMapParameters extends StoredPropertySet implements HeightMapP
2222
public static final BooleanStoredPropertyKey flyingPointsFilter = keys.addBooleanKey("Flying points filter");
2323
public static final BooleanStoredPropertyKey enableChunkedMap = keys.addBooleanKey("Enable chunked map");
2424
public static final BooleanStoredPropertyKey logHeightMap = keys.addBooleanKey("Log height map");
25+
public static final DoubleStoredPropertyKey minDepthToAccept = keys.addDoubleKey("Min Depth To Accept");
2526
public static final DoubleStoredPropertyKey minHeightRegistration = keys.addDoubleKey("Min height registration");
2627
public static final DoubleStoredPropertyKey maxHeightRegistration = keys.addDoubleKey("Max height registration");
2728
public static final DoubleStoredPropertyKey kalmanFilterPredictionNoise = keys.addDoubleKey("Kalman filter prediction noise");

ihmc-perception/src/main/generated-java/us/ihmc/perception/gpuMapping/HeightMapParametersBasics.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ default void setLogHeightMap(boolean logHeightMap)
2828
set(HeightMapParameters.logHeightMap, logHeightMap);
2929
}
3030

31+
default void setMinDepthToAccept(double minDepthToAccept)
32+
{
33+
set(HeightMapParameters.minDepthToAccept, minDepthToAccept);
34+
}
35+
3136
default void setMinHeightRegistration(double minHeightRegistration)
3237
{
3338
set(HeightMapParameters.minHeightRegistration, minHeightRegistration);

ihmc-perception/src/main/generated-java/us/ihmc/perception/gpuMapping/HeightMapParametersReadOnly.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ default boolean getLogHeightMap()
3030
return get(logHeightMap);
3131
}
3232

33+
default double getMinDepthToAccept()
34+
{
35+
return get(minDepthToAccept);
36+
}
37+
3338
default double getMinHeightRegistration()
3439
{
3540
return get(minHeightRegistration);

ihmc-perception/src/main/java/us/ihmc/perception/gpuMapping/HeightMapExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,8 @@ public float[] populateParameterArray(HeightMapParameters parameters, CameraIntr
418418
(float) parameters.getVariancePerMeter(),
419419
(float) parameters.getVariancePerTranslationSpeed(),
420420
(float) parameters.getVariancePerRotationSpeed(),
421-
(float) groundHeightGuess};
421+
(float) groundHeightGuess,
422+
(float) parameters.getMinDepthToAccept()};
422423
}
423424

424425
public HeightMapData getHeightMapData()

ihmc-perception/src/main/resources/us/ihmc/perception/gpuMapping/HeightMapExtractor.cu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extern "C"
2121
#define VARIANCE_PER_TRANSLATION_SPEED 16
2222
#define VARIANCE_PER_ROTATION_SPEED 17
2323
#define GROUND_HEIGHT 18
24+
#define MIN_DEPTH_TO_ACCEPT 19
2425

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

7172
// Early exit for invalid depth
72-
if (depth < 0.52f)
73+
if (depth < params[MIN_DEPTH_TO_ACCEPT])
7374
return;
7475

7576
// Back-project and transform

ihmc-perception/src/main/resources/us/ihmc/perception/gpuMapping/HeightMapParameters.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"Flying points filter": false,
55
"Enable chunked map": false,
66
"Log height map": false,
7+
"Min Depth To Accept": {
8+
"value": 0.88,
9+
"lowerBound": 0.0,
10+
"upperBound": 2.0
11+
},
712
"Min height registration": {
813
"value": -1.5,
914
"lowerBound": -10.0,

open-alexander/src/main/java/us/ihmc/openAlexander/AlexanderSensorInformation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class AlexanderSensorInformation implements HumanoidRobotSensorInformatio
3939
private static final RigidBodyTransform D457_TO_CHEST_TRANSFORM = new RigidBodyTransform();
4040
static
4141
{
42-
D457_TO_CHEST_TRANSFORM.getTranslation().set(0.081, 0.09, 0.087);
43-
EuclidCoreMissingTools.setYawPitchRollDegrees(D457_TO_CHEST_TRANSFORM.getRotation(), 0.0, 28.0, 0.0);
42+
D457_TO_CHEST_TRANSFORM.getTranslation().set(0.081, 0.04, 0.087);
43+
EuclidCoreMissingTools.setYawPitchRollDegrees(D457_TO_CHEST_TRANSFORM.getRotation(), -0.8, 44.0, -1.0);
4444
}
4545

4646
protected final SideDependentList<String> feetForceSensorNames = new SideDependentList<String>();

open-alexander/src/main/java/us/ihmc/openAlexander/parameters/controller/AlexanderSwingTrajectoryParameters.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public double getDefaultSwingStepDownHeight()
102102
@Override
103103
public double getMinHeightDifferenceForStepUpOrDown()
104104
{
105-
return 0.1;
105+
return 0.05;
106106
}
107107

108108
@Override

0 commit comments

Comments
 (0)