Call CommunicationPort primitives directly in PwrUSBDevice

Problem: The do* methods went through private _sendCommandByte and _queryCommand
wrappers, which added nothing over the CommunicationPort API and hid the actual
port calls.

Solution: Drop both helpers. Each write now calls self.port.writeData(...)
directly, and each query inlines flush()/writeData()/readData() (the flush stays
because a report can exceed the requested length, leaving a buffered remainder).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: dccote

hardwarelibrary/powerstrips/pwrusb.py

@@ -172,18 +172,13 @@ def _validateOutlet(self, outlet: int):
             raise ValueError("Outlet must be 1..{0}, got {1}".format(
                 self.switchableOutletCount, outlet))
 
-    def _sendCommandByte(self, byte: int):
-        self.port.writeData(bytearray([byte]))
-
-    def _queryCommand(self, byte: int, replyLength: int) -> bytearray:
-        # Drop any leftover bytes from a previous report so this reply is read
-        # from a clean buffer (reports can be longer than the bytes we need).
-        self.port.flush()
-        self._sendCommandByte(byte)
-        return self.port.readData(length=replyLength)
-
     def deviceType(self) -> str:
-        reply = self._queryCommand(self.getDeviceTypeCommand, 1)
+        # flush() first so the reply is read from a clean buffer: a report can be
+        # longer than the bytes we need, leaving a remainder buffered from the
+        # previous query.
+        self.port.flush()
+        self.port.writeData(bytearray([self.getDeviceTypeCommand]))
+        reply = self.port.readData(length=1)
         return self.deviceTypes.get(reply[0], "Unknown")
 
     def doGetOutletCount(self) -> int:
@@ -192,7 +187,7 @@ def doGetOutletCount(self) -> int:
     def doSetOutletState(self, outlet: int, isOn: bool):
         self._validateOutlet(outlet)
         key = "on" if isOn else "off"
-        self._sendCommandByte(self.outletCommands[key][outlet - 1])
+        self.port.writeData(bytearray([self.outletCommands[key][outlet - 1]]))
         self._outletStateCache[outlet - 1] = bool(isOn)
 
     def doGetOutletState(self, outlet: int) -> bool:
@@ -202,20 +197,24 @@ def doGetOutletState(self, outlet: int) -> bool:
     def doSetOutletDefaultState(self, outlet: int, isOn: bool):
         self._validateOutlet(outlet)
         key = "defaultOn" if isOn else "defaultOff"
-        self._sendCommandByte(self.outletCommands[key][outlet - 1])
+        self.port.writeData(bytearray([self.outletCommands[key][outlet - 1]]))
 
     def doGetCurrent(self) -> float:
-        reply = self._queryCommand(self.getCurrentCommand, 2)
+        self.port.flush()
+        self.port.writeData(bytearray([self.getCurrentCommand]))
+        reply = self.port.readData(length=2)
         milliamps = (reply[0] << 8) | reply[1]
         return milliamps / 1000.0
 
     def doGetAccumulatedCharge(self) -> float:
-        reply = self._queryCommand(self.getChargeCommand, 4)
+        self.port.flush()
+        self.port.writeData(bytearray([self.getChargeCommand]))
+        reply = self.port.readData(length=4)
         milliampMinutes = (reply[0] << 24) | (reply[1] << 16) | (reply[2] << 8) | reply[3]
         return milliampMinutes / 60000.0
 
     def doResetAccumulatedCharge(self):
-        self._sendCommandByte(self.resetChargeCommand)
+        self.port.writeData(bytearray([self.resetChargeCommand]))
 
 
 class DebugPwrUSBPort(DebugPort):