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

Extract clench from orgasm_control_updateArousal #87

Merged

Conversation

B4ben-69
Copy link
Contributor

@B4ben-69 B4ben-69 commented Apr 1, 2024

Extract clench from orgasm_control_updateArousal and make it a simple function returning clench time and publishing EVT_ORGASM_START event at orgasm threshold

Take it if you think it's going in the direction you want. I know very well the clench detector and wanted to help in separating it from you updateArousal function.

It's simplified and now generates an orgasm event in your new event handler no matter what mode it's running in. Even in Manual.

…function returning clench time and publishing EVT_ORGASM_START event at orgasm threshold
Copy link
Contributor

@MauAbata MauAbata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is excellent! Perfect!

this cleans up a huge block of code from the update_arousal call, I am all for this.

I just recently pushed a change that fixed the camelCase names from the old C++ API, so if you can just make sure that's pulled in here, this is good.

Once I fully decide how I want to extract these modes into plugins, this function can be copied to its final home, but for now even just keeping it in its own function within orgasm_control.c is a huge help to me, thanks for this.

Also, publishing the event is excellent, people have asked for arousal detection to continue during manual mode.

@B4ben-69
Copy link
Contributor Author

B4ben-69 commented Apr 2, 2024

The branch is in sync with your main

@B4ben-69
Copy link
Contributor Author

B4ben-69 commented Apr 2, 2024

Btw, i'm sure you know.but the new event handler broke acces to the mercury-1000

@MauAbata MauAbata merged commit 0d9f171 into MausTec:main Apr 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants