Cherry pick from RC#13185
Merged
Merged
Conversation
Add type information and fix port listing for seikantk driver Move registration of seikantk to bdDetect - This reflects how the other drivers are registered Fall back to base implementation for check method All other drivers for which check is shadowed either do not support auto-detection yet or cannot be detected passively i.e. because they're using a serial connection.
Duplication of the string makes it a "magic value" and hard to trace its meaning.
Explicitly map to BrailleDisplayDriver on the module.
Ensure there is no confusion with KEY_HID="hid" in bdDetect.py
* add setting to disable HID Braille
seanbudd
approved these changes
Dec 22, 2021
seanbudd
left a comment
Member
There was a problem hiding this comment.
I performed git diff origin/cherryPickFromRC release-2021.3.1 --stat and confirmed that the only changes are translations
Contributor
Author
|
When the build completes I'll do the fast forward merge. |
feerrenrut
added a commit
that referenced
this pull request
Dec 22, 2021
Beta to master Includes changes from the point release 2021.3.1. See also #13185 for further details.
seanbudd
added a commit
that referenced
this pull request
Feb 24, 2022
Initially changes for 2021.3.1 were delivered to beta, subsequently it was decided to avoid complications with translations, to make changes directly on RC. The changes were cherry picked from beta. There were then several more changes made squashed / merged to RC These changes need to be cherry picked back into the beta branch. This was done in #13185 Changes for 2021.3.3 were cherrypicked directly to rc. But because rc and beta/master have diverged, these changes need to be cherrypicked back to master and beta. An exchange of merging master and beta has already occurred since the last release. As a result, these changes need to be cherry-picked directly to master, to get eventually merged to beta. Description of how this pull request fixes the issue: Update the changes file from release-2021.3.3 No other introduced changes from 2021.3.2 and 2021.3.3 need to be cherry-picked back to master. This is because 2021.3.2 and 2021.3.3 was created from code existing on master.
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Link to issue number:
None
Summary of the issue:
Initially changes for the point release were delivered to beta, subsequently it was decided to avoid complications with translations, to make changes directly on RC.
The changes were cherry picked from beta.
There were then several more changes made squashed / merged to RC
These changes need to be cherry picked back into the beta branch.
Description of how this pull request fixes the issue:
Testing strategy:
Check that the diff between the release tag an this branch is only the translations (already on beta):
Known issues with pull request:
Change log entries:
None
Code Review Checklist: