Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow setting/disabling Emergency Stop during setup/via Serial commands #269

Merged
merged 33 commits into from
Oct 3, 2024

Conversation

hhvrc
Copy link
Member

@hhvrc hhvrc commented Aug 23, 2024

Allows enabling/disabling EStop without needing to change the compile-time constant.

Default pin is still obtained via OPENSHOCK_ESTOP_PIN

Using a pin of 0 (GPIO_INVALID in Common.h) in either the Captive Portal or via Serial will disable the EStop manager.

Remaining tasks:

  • Captive Portal formatting seems to be affected, need to fix.
  • Need to further test updating to this from old firmwares (so far, works correctly)

Original PR: #228 by @nullstalgia

Title: Allow setting/disabling Emergency Stop during setup/via Serial commands

Date: April 19th 2024
Co-Authored-By: nullstalgia <[email protected]>
@hhvrc hhvrc marked this pull request as ready for review October 1, 2024 16:29
@hhvrc hhvrc requested a review from nullstalgia October 1, 2024 16:30
@hhvrc hhvrc self-assigned this Oct 1, 2024
Copy link
Contributor

github-actions bot commented Oct 3, 2024

Cpp-Linter Report ⚠️

Some files did not pass the configured checks!

clang-format reports: 5 file(s) not formatted
  • include/serialization/_fbs/HubConfig_generated.h
  • include/serialization/_fbs/HubToLocalMessage_generated.h
  • include/serialization/_fbs/LocalToHubMessage_generated.h
  • src/CompatibilityChecks.cpp
  • src/config/EStopConfig.cpp

Have any feedback or feature suggestions? Share it here.

@hhvrc hhvrc merged commit df27b6a into develop Oct 3, 2024
37 checks passed
@hhvrc hhvrc deleted the feature/estop-config branch October 3, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants