Compare commits

..

No commits in common. "cecb4b3acbbb0605cf83b6ebc66adc907c053c57" and "9e4ae3c6fe776f55c31638ba894e35fd142dc50c" have entirely different histories.

2 changed files with 2 additions and 10 deletions

View File

@ -193,12 +193,7 @@ class AndroidBluetoothManager():
if self.connected and self.rfcomm_reader != None: if self.connected and self.rfcomm_reader != None:
available = self.rfcomm_reader.available() available = self.rfcomm_reader.available()
if available > 0: if available > 0:
if hasattr(self.rfcomm_reader, "readNBytes"):
return self.rfcomm_reader.readNBytes(available) return self.rfcomm_reader.readNBytes(available)
else:
# Compatibility mode for older android versions lacking readNBytes
rb = self.rfcomm_reader.read().to_bytes(1, "big")
return rb
else: else:
return bytes([]) return bytes([])
else: else:

View File

@ -217,9 +217,6 @@ def prettytime(time, verbose=False):
tstr += c tstr += c
if tstr == "":
return "0s"
else:
return tstr return tstr
def phyparams(): def phyparams():