Skip to content

Fix rmt and crash loop #341

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.

Sign up for GitHub

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

Merged
hhvrc merged 2 commits into from
Jan 24, 2025
Merged

Fix rmt and crash loop #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e26b710
Fix rmt timing issue
hhvrc Jan 24, 2025
4230d24
Fix crash loop
hhvrc Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/SemVer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ bool OpenShock::TryParseSemVer(std::string_view semverStr, SemVer& semver)
if (!restStr.empty()) {
if (plusIdx != std::string_view::npos) {
semver.build = restStr.substr((plusIdx - patchStr.length()) + 1);
patchStr.remove_suffix(semver.build.length() + 1);
restStr.remove_suffix(semver.build.length() + 1);

if (!semver.build.empty() && !_semverIsBuild(semver.build)) {
OS_LOGE(TAG, "Invalid build: %s", semver.build.c_str());
Expand All @@ -364,7 +364,7 @@ bool OpenShock::TryParseSemVer(std::string_view semverStr, SemVer& semver)
}

if (dashIdx != std::string_view::npos) {
semver.prerelease = patchStr.substr(1);
semver.prerelease = restStr.substr(1);

if (!semver.prerelease.empty() && !_semverIsPrerelease(semver.prerelease)) {
OS_LOGE(TAG, "Invalid prerelease: %s", semver.prerelease.c_str());
Expand Down
1 change: 1 addition & 0 deletions src/radio/RFTransmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ void RFTransmitter::TransmitTask()
auto it = std::find_if(sequences.begin(), sequences.end(), [&cmd](const sequence_t& seq) { return seq.encoder.shockerId() == cmd.shockerId; });
if (it != sequences.end()) {
it->encoder.fillSequence(cmd.type, cmd.intensity);
it->until = cmd.until;
continue;
}
}
Expand Down
Loading