Safe crash #1825
Open
Safe crash #1825
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oleflb
requested changes
May 9, 2025
Comment on lines
+146
to
+150
| if (position.right_knee_pitch <= 90.0_f32.to_radians() | ||
| || position.left_knee_pitch <= 90.0_f32.to_radians()) | ||
| && (position.left_hip_pitch >= -40.0_f32.to_radians() | ||
| || position.right_hip_pitch >= -40.0_f32.to_radians()) | ||
| && inertial_measurement_unit.accelerometer.z < -8.0 |
There was a problem hiding this comment.
can you extract this to a variable with a name like is_... to properly name what you want to check here
Comment on lines
+112
to
158
| sit_down_interpolator.advance_by( | ||
| loop_duration, | ||
| &ConditionInput { | ||
| filtered_angular_velocity: Vector3::zeros(), | ||
| ground_contact: true, | ||
| fall_state: FallState::Upright, | ||
| }, | ||
| ); | ||
|
|
||
| let sit_down_joints_command = MotorCommands { | ||
| positions: sit_down_interpolator.value(), | ||
| stiffnesses: Joints::fill(0.8), | ||
| }; | ||
|
|
||
| send_sit_down( | ||
| &mut writer, | ||
| sit_down_joints_command.positions, | ||
| sit_down_joints_command.stiffnesses, | ||
| ) | ||
| .wrap_err("failed to send sit down command to LoLA")?; | ||
|
|
||
| if sit_down_interpolator.is_finished() { | ||
| operation_state = OperationState::GuestsInControl; | ||
| sit_down_interpolator.reset(); | ||
| } | ||
| } else if !connections | ||
| .values() | ||
| .any(|connection| connection.is_sending_control_frames) | ||
| { | ||
| let battery = self.shared_state.lock().unwrap().battery; | ||
| send_idle(&mut writer, battery).wrap_err( | ||
| let shared_state = self.shared_state.lock().unwrap(); | ||
| if let (Some(position), Some(inertial_measurement_unit)) = ( | ||
| shared_state.position, | ||
| shared_state.inertial_measurement_unit, | ||
| ) { | ||
| if (position.right_knee_pitch <= 90.0_f32.to_radians() | ||
| || position.left_knee_pitch <= 90.0_f32.to_radians()) | ||
| && (position.left_hip_pitch >= -40.0_f32.to_radians() | ||
| || position.right_hip_pitch >= -40.0_f32.to_radians()) | ||
| && inertial_measurement_unit.accelerometer.z < -8.0 | ||
| { | ||
| operation_state = OperationState::SittingDown; | ||
| } | ||
| } | ||
| send_idle(&mut writer, shared_state.battery).wrap_err( | ||
| "a shadowy flight into the dangerous world of a man who does not exist", | ||
| )?; | ||
| } |
There was a problem hiding this comment.
I think the function is getting really long, can you split it up into smaller sub-tasks?
Comment on lines
+1
to
+22
| #[derive(Deserialize, Serialize)] | ||
| pub struct SitDown {} | ||
|
|
||
| pub fn sit_down() -> bool { | ||
| interpolator: MotionFile::from_path(paths.motions.join("sit_down.json"))?.try_into()?, | ||
|
|
||
|
|
||
| let last_cycle_duration = context.cycle_time.last_cycle_duration; | ||
|
|
||
| self.interpolator | ||
| .advance_by(last_cycle_duration, context.condition_input); | ||
|
|
||
| context.motion_safe_exits[MotionType::SitDown] = self.interpolator.is_finished(); | ||
|
|
||
| Ok(MainOutputs { | ||
| sit_down_joints_command: MotorCommands { | ||
| positions: self.interpolator.value(), | ||
| stiffnesses: Joints::fill(0.8), | ||
| } | ||
| .into(), | ||
| }) | ||
| } |
There was a problem hiding this comment.
What is this? Added accidentally?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why? What?
Describe here why you created this PR and what it does
Fixes #
ToDo / Known Issues
If this is a WIP describe which problems are to be fixed.
Ideas for Next Iterations (Not This PR)
If there are some improvements that could be done in a next iteration, describe them here.
How to Test
Describe how to test your changes. (For the reviewer)