Merge cc1d8f3 into 74987f3

EdKweon · web-flow · commit 5527eaa9cfa6 · 2024-01-29T04:48:44.000Z
diff --git a/source/brailleDisplayDrivers/hims.py b/source/brailleDisplayDrivers/hims.py
@@ -116,6 +116,25 @@ def _get_keys(self):
 		})
 		return keys
 
+
+class BrailleEdge2S(BrailleEdge):
+	"""This device is the BrailleEdge which doesn't use the hims driver.
+	It only uses a SPP connection.
+	"""
+	usbId = "VID_1A86&PID_55D3"
+
+	def _get_keys(self) -> dict[str, str]:
+		keys = Model._get_keys(self)
+
+		keys.update({
+			0x01 << 16: "leftSideScrollUp",
+			0x02 << 16: "rightSideScrollUp",
+			0x04 << 16: "rightSideScrollDown",
+			0x08 << 16: "leftSideScrollDown",
+		})
+		return keys
+
+
 class BrailleSense2S(BrailleSense):
 	"""Braille Sense with one scroll key on both sides.
 	Also referred to as Braille Sense Classic."""
@@ -171,6 +190,7 @@ def _get_keys(self):
 	BrailleSenseQX,
 	BrailleSenseQ,
 	BrailleEdge,
+	BrailleEdge2S,
 	SmartBeetle,
 	BrailleSense4S,
 	BrailleSense2S,
@@ -196,6 +216,7 @@ def registerAutomaticDetection(cls, driverRegistrar: bdDetect.DriverRegistrar):
 		# Sync Braille, serial device
 		driverRegistrar.addUsbDevices(bdDetect.DeviceType.SERIAL, {
 			"VID_0403&PID_6001",
+			"VID_1A86&PID_55D3",  # Braille Edge2S 40
 		})
 
 		driverRegistrar.addBluetoothDevices(lambda m: any(m.id.startswith(prefix) for prefix in (
@@ -265,23 +286,20 @@ def _sendCellCountRequest(self):
 
 	def _sendIdentificationRequests(self, match: bdDetect.DeviceMatch):
 		log.debug("Considering sending identification requests for device %s"%str(match))
-		if match.type == bdDetect.DeviceType.CUSTOM:  # USB Bulk
+		if "bluetoothName" in match.deviceInfo:  # Bluetooth
 			matchedModelsMap = [
 				modelTuple for modelTuple in modelMap if(
-					modelTuple[1].usbId == match.id
+					modelTuple[1].bluetoothPrefix
+					and match.id.startswith(modelTuple[1].bluetoothPrefix)
 				)
 			]
-		elif "bluetoothName" in match.deviceInfo: # Bluetooth
+		else:  # USB Bulk, Serial
 			matchedModelsMap = [
 				modelTuple for modelTuple in modelMap if(
-					modelTuple[1].bluetoothPrefix
-					and match.id.startswith(modelTuple[1].bluetoothPrefix)
+					modelTuple[1].usbId == match.id
 				)
 			]
-		else: # The only serial device we support which is not bluetooth, is a Sync Braille
-			self._model = SyncBraille()
-			log.debug("Use %s as model without sending an additional identification request"%self._model.name)
-			return
+		
 		if not matchedModelsMap:
 			log.debugWarning("The provided device match to send identification requests didn't yield any results")
 			matchedModelsMap = modelMap
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -7,6 +7,7 @@ What's New in NVDA
 
 == New Features ==
 - In Windows 11, NVDA will announce alerts from voice typing and suggested actions including the top suggestion when copying data such as phone numbers to the clipboard (Windows 11 2022 Update and later). (#16009, @josephsl)
+- Added support for the BrailleEdgeS2 braille device. (#16033)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ What's New in NVDA`
`7`	`7`
`8`	`8`	`== New Features ==`
`9`	`9`	`- In Windows 11, NVDA will announce alerts from voice typing and suggested actions including the top suggestion when copying data such as phone numbers to the clipboard (Windows 11 2022 Update and later). (#16009, @josephsl)`
	`10`	`+- Added support for the BrailleEdgeS2 braille device. (#16033)`
`10`	`11`	`-`
`11`	`12`
`12`	`13`