Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/rc' into fix-17421
Browse files Browse the repository at this point in the history
  • Loading branch information
seanbudd committed Dec 19, 2024
2 parents f866ffc + e8ebe86 commit aa2c220
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
18 changes: 17 additions & 1 deletion source/brailleDisplayDrivers/brailliantB.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,27 @@ def __init__(self, port="auto"):

def _initAttempt(self):
if self.isHid:
# Ensure to set self.numCells only at the end of this method to prevent display writes before the capabilities/numCells request
numCells = 0
# First try to get cell count from _writeSize
try:
# _writeSize includes 4 bytes of overhead, so subtract 4
numCells = self._dev._writeSize - 4
except AttributeError:
log.debugWarning("Could not get _writeSize from HID device")

# Adjust numCells based on reported number of cells
try:
data: bytes = self._dev.getFeature(HR_CAPS)
reportedNumCells = data[24]
if reportedNumCells > 0:
# Update numCells based on reported cell count from the device
numCells = reportedNumCells
else:
log.debugWarning("Could not get number of cells from HID device using HR_CAPS")
except WindowsError:
return # Fail!
self.numCells = data[24]
self.numCells = numCells
else:
# This will cause the display to return the number of cells.
# The _serOnReceive callback will see this and set self.numCells.
Expand Down
2 changes: 1 addition & 1 deletion source/buildVersion.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def formatVersionForGUI(year, major, minor):
name = "NVDA"
version_year = 2024
version_major = 4
version_minor = 1
version_minor = 2
version_build = 0 # Should not be set manually. Set in 'sconscript' provided by 'appVeyor.yml'
version = _formatDevVersionString()
publisher = "unknown"
Expand Down
3 changes: 2 additions & 1 deletion user_docs/en/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

## 2024.4.2

This is a patch release to fix a bug with reading math in Chromium Browsers (Chrome, Edge).
This is a patch release to release bugs with reading math in Chromium, and braille devices.

### Bug fixes

* Fixed bug with with reading math in Chromium Browsers (Chrome, Edge). (#17421, @NSoiffer)
* Humanware Brailliant BI 40X devices running firmware version 2.4 now work as expected. (#17518, @bramd)

## 2024.4.1

Expand Down

0 comments on commit aa2c220

Please sign in to comment.