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

Add optional (on by default) shocker Keep-Alive! #125

Merged
merged 16 commits into from
Nov 28, 2023
Merged

Conversation

nullstalgia
Copy link
Member

Also some minor RFTransmitter tweaks alongside it, but this should work well!

It's on by default, but users can disable it with

-DOPENSHOCK_SHOCKER_KEEPALIVE_INTERVAL_MS=0

I think a Frontend toggle like we have for the Captive Portal would be better, but still!

@nullstalgia
Copy link
Member Author

Added toggling the keep-alive task via Serial! But I added a utility function to parse the "bool" the user types in. Not sure if this is best in another file somewhere. Seems fine for now though.

@hhvrc hhvrc merged commit c207665 into develop Nov 28, 2023
29 checks passed
@hhvrc hhvrc deleted the shocker-keepalive branch November 28, 2023 07:15
nullstalgia added a commit that referenced this pull request Dec 1, 2023
commit b68fe89
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 11:04:12 2023 +0100

    Implement sending shocker commands via serial (#144)

commit 2f775bf
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:49:11 2023 +0100

    Fix weird logging of received command list

commit 624774a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:43:28 2023 +0100

    Show warning when no LED implementation is defined (#143)

commit 635b9f5
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:34:05 2023 +0100

    Remove misleading comment

commit 200ee2a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:31:11 2023 +0100

    Implement serial command for reading and writing raw config (#142)

    * Implement getter and setter command to import/export raw config

    * Simplify function signatures

    * Return after config print

    * Fix base64 issues

commit 55813c5
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:15:11 2023 +0100

    RFTransmitter cleanup (#138)

    * Remove magic numbers in RFTransmitter

    * Move intensity limiters into sequence encoders

commit 841ebb8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:13:13 2023 +0100

    Feature/config improvements (#140)

    * Some cleanup and make mainconfig static

    * More config improvements

    * Add more comments

commit 85353e4
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 15:51:06 2023 +0100

    Feature/improve network config (#139)

    * Remove BSSID from config

    * Increase credentials id limit to 255

commit 202924e
Author: nullstalgia <[email protected]>
Date:   Wed Nov 29 03:43:12 2023 -0800

    Fix clearing E-Stop re-enabling keep-alive when disabled in config (#132)

    Keep-Alive consistency

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit 49cedab
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:34:36 2023 +0100

    Remove code accidentally embedded in serial print strings (#136)

commit 973d4e1
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:33:20 2023 +0100

    Fix CommandHandler semaphore initialization (#135)

commit 05db2b8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:19:32 2023 +0100

    Rework config (#134)

commit 3c56492
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 10:36:50 2023 +0100

    Cleanup & beautify strings and logging

    * Clean up SerialInputHandler print statements

    * Raw string literals go BRRR

commit f4dbc8c
Author: HentaiHeavenVR <[email protected]>
Date:   Tue Nov 28 08:30:42 2023 +0100

    Reduce concurrent Github jobs (#131)

commit 129ad0b
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:18:42 2023 -0800

    Use WiFi.begin() for faster connect if we recognize the cached SSID (#128)

    * Use WiFi.begin() for faster connect if we recognize the cached SSID

    * Clean up SSID cache check

    ---------

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit c207665
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:15:38 2023 -0800

    Add optional (on by default) shocker Keep-Alive (#125)

    * Add optional (on by default) shocker Keep-Alive!

    * Move Keep-Alive manager into it's own task

    * Allow Idle Task to alongside Keep-Alive Task, plus iterator logic fix

    * Revert RFTransmitter Changes

    * CommandHandler Keep-Alive

    * Keep-Alive working in Command Handler

    Co-Authored-By: hhvrc <[email protected]>

    * Switch to using a queue kill message to avoid panic when deleting a mid-listening queue

    * Gateway Keep-Alive wording :)

    * Some cleanup

    * Mini CommandHandler cleanup

    * Add keep-alive toggling to Serial commands

    * Fix USB Serial on OpenShock Core

    * Revert keep-alive duration used during testing

    ---------

    Co-authored-by: hhvrc <[email protected]>

commit 4119946
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Nov 27 23:17:50 2023 +0000

    build(deps): Bump actions/checkout from 3 to 4

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 1f621b8
Author: HentaiHeavenVR <[email protected]>
Date:   Mon Nov 27 16:02:08 2023 +0100

    Create codeql.yml (#129)
hhvrc added a commit that referenced this pull request Dec 6, 2023
* WiFi Scanning QOL: Hide duplicate SSIDs and restart stuck scans

* Add missing Time.h inclusion

* Improve post-setup WiFi connection speed with WiFi.begin()

* Clear ESP's saved WiFi credentials if LittleFS credentials are blank

* Cleanup

* Squashed commit of the following:

commit b68fe89
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 11:04:12 2023 +0100

    Implement sending shocker commands via serial (#144)

commit 2f775bf
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:49:11 2023 +0100

    Fix weird logging of received command list

commit 624774a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:43:28 2023 +0100

    Show warning when no LED implementation is defined (#143)

commit 635b9f5
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:34:05 2023 +0100

    Remove misleading comment

commit 200ee2a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:31:11 2023 +0100

    Implement serial command for reading and writing raw config (#142)

    * Implement getter and setter command to import/export raw config

    * Simplify function signatures

    * Return after config print

    * Fix base64 issues

commit 55813c5
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:15:11 2023 +0100

    RFTransmitter cleanup (#138)

    * Remove magic numbers in RFTransmitter

    * Move intensity limiters into sequence encoders

commit 841ebb8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:13:13 2023 +0100

    Feature/config improvements (#140)

    * Some cleanup and make mainconfig static

    * More config improvements

    * Add more comments

commit 85353e4
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 15:51:06 2023 +0100

    Feature/improve network config (#139)

    * Remove BSSID from config

    * Increase credentials id limit to 255

commit 202924e
Author: nullstalgia <[email protected]>
Date:   Wed Nov 29 03:43:12 2023 -0800

    Fix clearing E-Stop re-enabling keep-alive when disabled in config (#132)

    Keep-Alive consistency

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit 49cedab
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:34:36 2023 +0100

    Remove code accidentally embedded in serial print strings (#136)

commit 973d4e1
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:33:20 2023 +0100

    Fix CommandHandler semaphore initialization (#135)

commit 05db2b8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:19:32 2023 +0100

    Rework config (#134)

commit 3c56492
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 10:36:50 2023 +0100

    Cleanup & beautify strings and logging

    * Clean up SerialInputHandler print statements

    * Raw string literals go BRRR

commit f4dbc8c
Author: HentaiHeavenVR <[email protected]>
Date:   Tue Nov 28 08:30:42 2023 +0100

    Reduce concurrent Github jobs (#131)

commit 129ad0b
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:18:42 2023 -0800

    Use WiFi.begin() for faster connect if we recognize the cached SSID (#128)

    * Use WiFi.begin() for faster connect if we recognize the cached SSID

    * Clean up SSID cache check

    ---------

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit c207665
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:15:38 2023 -0800

    Add optional (on by default) shocker Keep-Alive (#125)

    * Add optional (on by default) shocker Keep-Alive!

    * Move Keep-Alive manager into it's own task

    * Allow Idle Task to alongside Keep-Alive Task, plus iterator logic fix

    * Revert RFTransmitter Changes

    * CommandHandler Keep-Alive

    * Keep-Alive working in Command Handler

    Co-Authored-By: hhvrc <[email protected]>

    * Switch to using a queue kill message to avoid panic when deleting a mid-listening queue

    * Gateway Keep-Alive wording :)

    * Some cleanup

    * Mini CommandHandler cleanup

    * Add keep-alive toggling to Serial commands

    * Fix USB Serial on OpenShock Core

    * Revert keep-alive duration used during testing

    ---------

    Co-authored-by: hhvrc <[email protected]>

commit 4119946
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Nov 27 23:17:50 2023 +0000

    build(deps): Bump actions/checkout from 3 to 4

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 1f621b8
Author: HentaiHeavenVR <[email protected]>
Date:   Mon Nov 27 16:02:08 2023 +0100

    Create codeql.yml (#129)

* Condense grouping networks by SSID, and sort by signal strength!

* Revert old WifiManager changes

* Removed unused declarations and includes

* Make network grouping global and have more context

* Fix text and connect button for WiFiDetails

* Restore sorting network groups by RSSI of strongest network.

* Cleaner sort statement

* Move group sorting into WiFiList

---------

Co-authored-by: hhvrc <[email protected]>
LucHeart pushed a commit that referenced this pull request Jan 22, 2024
* Add optional (on by default) shocker Keep-Alive!

* Move Keep-Alive manager into it's own task

* Allow Idle Task to alongside Keep-Alive Task, plus iterator logic fix

* Revert RFTransmitter Changes

* CommandHandler Keep-Alive

* Keep-Alive working in Command Handler

Co-Authored-By: hhvrc <[email protected]>

* Switch to using a queue kill message to avoid panic when deleting a mid-listening queue

* Gateway Keep-Alive wording :)

* Some cleanup

* Mini CommandHandler cleanup

* Add keep-alive toggling to Serial commands

* Fix USB Serial on OpenShock Core

* Revert keep-alive duration used during testing

---------

Co-authored-by: hhvrc <[email protected]>
LucHeart pushed a commit that referenced this pull request Jan 22, 2024
* WiFi Scanning QOL: Hide duplicate SSIDs and restart stuck scans

* Add missing Time.h inclusion

* Improve post-setup WiFi connection speed with WiFi.begin()

* Clear ESP's saved WiFi credentials if LittleFS credentials are blank

* Cleanup

* Squashed commit of the following:

commit b68fe89
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 11:04:12 2023 +0100

    Implement sending shocker commands via serial (#144)

commit 2f775bf
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:49:11 2023 +0100

    Fix weird logging of received command list

commit 624774a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:43:28 2023 +0100

    Show warning when no LED implementation is defined (#143)

commit 635b9f5
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:34:05 2023 +0100

    Remove misleading comment

commit 200ee2a
Author: HentaiHeavenVR <[email protected]>
Date:   Fri Dec 1 09:31:11 2023 +0100

    Implement serial command for reading and writing raw config (#142)

    * Implement getter and setter command to import/export raw config

    * Simplify function signatures

    * Return after config print

    * Fix base64 issues

commit 55813c5
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:15:11 2023 +0100

    RFTransmitter cleanup (#138)

    * Remove magic numbers in RFTransmitter

    * Move intensity limiters into sequence encoders

commit 841ebb8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 16:13:13 2023 +0100

    Feature/config improvements (#140)

    * Some cleanup and make mainconfig static

    * More config improvements

    * Add more comments

commit 85353e4
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 15:51:06 2023 +0100

    Feature/improve network config (#139)

    * Remove BSSID from config

    * Increase credentials id limit to 255

commit 202924e
Author: nullstalgia <[email protected]>
Date:   Wed Nov 29 03:43:12 2023 -0800

    Fix clearing E-Stop re-enabling keep-alive when disabled in config (#132)

    Keep-Alive consistency

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit 49cedab
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:34:36 2023 +0100

    Remove code accidentally embedded in serial print strings (#136)

commit 973d4e1
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:33:20 2023 +0100

    Fix CommandHandler semaphore initialization (#135)

commit 05db2b8
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 12:19:32 2023 +0100

    Rework config (#134)

commit 3c56492
Author: HentaiHeavenVR <[email protected]>
Date:   Wed Nov 29 10:36:50 2023 +0100

    Cleanup & beautify strings and logging

    * Clean up SerialInputHandler print statements

    * Raw string literals go BRRR

commit f4dbc8c
Author: HentaiHeavenVR <[email protected]>
Date:   Tue Nov 28 08:30:42 2023 +0100

    Reduce concurrent Github jobs (#131)

commit 129ad0b
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:18:42 2023 -0800

    Use WiFi.begin() for faster connect if we recognize the cached SSID (#128)

    * Use WiFi.begin() for faster connect if we recognize the cached SSID

    * Clean up SSID cache check

    ---------

    Co-authored-by: HentaiHeavenVR <[email protected]>

commit c207665
Author: nullstalgia <[email protected]>
Date:   Mon Nov 27 23:15:38 2023 -0800

    Add optional (on by default) shocker Keep-Alive (#125)

    * Add optional (on by default) shocker Keep-Alive!

    * Move Keep-Alive manager into it's own task

    * Allow Idle Task to alongside Keep-Alive Task, plus iterator logic fix

    * Revert RFTransmitter Changes

    * CommandHandler Keep-Alive

    * Keep-Alive working in Command Handler

    Co-Authored-By: hhvrc <[email protected]>

    * Switch to using a queue kill message to avoid panic when deleting a mid-listening queue

    * Gateway Keep-Alive wording :)

    * Some cleanup

    * Mini CommandHandler cleanup

    * Add keep-alive toggling to Serial commands

    * Fix USB Serial on OpenShock Core

    * Revert keep-alive duration used during testing

    ---------

    Co-authored-by: hhvrc <[email protected]>

commit 4119946
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Nov 27 23:17:50 2023 +0000

    build(deps): Bump actions/checkout from 3 to 4

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](actions/checkout@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 1f621b8
Author: HentaiHeavenVR <[email protected]>
Date:   Mon Nov 27 16:02:08 2023 +0100

    Create codeql.yml (#129)

* Condense grouping networks by SSID, and sort by signal strength!

* Revert old WifiManager changes

* Removed unused declarations and includes

* Make network grouping global and have more context

* Fix text and connect button for WiFiDetails

* Restore sorting network groups by RSSI of strongest network.

* Cleaner sort statement

* Move group sorting into WiFiList

---------

Co-authored-by: hhvrc <[email protected]>
LucHeart added a commit that referenced this pull request Jan 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants