Skip to content

Commit c2c1858

Browse files
authored
Merge pull request #35 from ichiro-its/hotfix/fix-kinematic-get-key
[Hotfix] Fix Kinematic Get Key
2 parents 9bf82c1 + 13863fe commit c2c1858

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/aruku/walking/process/kinematic.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ void Kinematic::set_config(const nlohmann::json & kinematic_data)
356356
bool valid_section = true;
357357
valid_section &= jitsuyo::assign_val(ratio_section, "period_time", period_time);
358358
valid_section &= jitsuyo::assign_val(ratio_section, "dsp_ratio", dsp_ratio);
359-
valid_section &= jitsuyo::assign_val(ratio_section, "z_move", z_move);
360-
valid_section &= jitsuyo::assign_val(ratio_section, "y_swap_amplitude", y_swap_amplitude);
361-
valid_section &= jitsuyo::assign_val(ratio_section, "z_swap_amplitude", z_swap_amplitude);
359+
valid_section &= jitsuyo::assign_val(ratio_section, "foot_height", z_move);
360+
valid_section &= jitsuyo::assign_val(ratio_section, "swing_right_left", y_swap_amplitude);
361+
valid_section &= jitsuyo::assign_val(ratio_section, "swing_up_down", z_swap_amplitude);
362362
valid_section &= jitsuyo::assign_val(ratio_section, "arm_swing_gain", arm_swing_gain);
363363
valid_section &= jitsuyo::assign_val(ratio_section, "backward_hip_comp_ratio", backward_hip_comp_ratio);
364364
valid_section &= jitsuyo::assign_val(ratio_section, "forward_hip_comp_ratio", forward_hip_comp_ratio);
@@ -422,6 +422,10 @@ void Kinematic::set_config(const nlohmann::json & kinematic_data)
422422
valid_config = false;
423423
}
424424

425+
if (!valid_config) {
426+
throw std::runtime_error("Failed to load config file `kinematic.json`");
427+
}
428+
425429
update_times();
426430
update_move_amplitude();
427431

0 commit comments

Comments
 (0)