Skip to content

Commit

Permalink
Match the SlimeVR Server PR changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
kitlith committed Aug 17, 2022
1 parent 25f0417 commit a6cb451
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions bindings/actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@
"/actions/main/in/right_knee": "Right Knee",
"/actions/main/in/waist": "Waist",
"/actions/main/in/foot_left": "Left Foot",
"/actions/main/in/foot_right": "Right Foot"
"/actions/main/in/foot_right": "Right Foot",
"/actions/main/in/request_calibration": "Reset",
"/actions/main/in/fast_reset": "Fast Reset"
}
]
}
}
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -877,8 +877,8 @@ int main(int argc, char* argv[]) {
}

// TODO: rename these actions as appropriate, perhaps log them?
trackers.HandleDigitalActionBool(calibration_action, { "calibrate" });
trackers.HandleDigitalActionBool(fast_reset_action, { "fast reset" });
trackers.HandleDigitalActionBool(calibration_action, { "reset" });
trackers.HandleDigitalActionBool(fast_reset_action, { "fast_reset" });

trackers.Tick(just_connected);

Expand All @@ -900,4 +900,4 @@ int main(int argc, char* argv[]) {
fmt::print("Exiting cleanly!\n");

return 0;
}
}

0 comments on commit a6cb451

Please sign in to comment.