jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-22 13:30:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ability to control bluetooth settings on RNode devices that were connected over USB after Sideband was started

Browse Source
This commit is contained in:
Mark Qvist 2022-11-23 21:19:31 +01:00
parent c499706daf
commit 982439cc2e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbapp/sideband/core.py
View File

@ -1259,6 +1259,7 @@ class SidebandCore():
if self.getstate("wants.bt_on"): if self.getstate("wants.bt_on"):
self.setstate("wants.bt_on", False) self.setstate("wants.bt_on", False)
self.owner_app.discover_usb_devices()
self.setstate("executing.bt_on", True) self.setstate("executing.bt_on", True)
if self.interface_rnode != None: if self.interface_rnode != None:
self.interface_rnode.enable_bluetooth() self.interface_rnode.enable_bluetooth()
@ -1267,10 +1268,13 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0: if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"] target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, enable_bluetooth = True) RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, enable_bluetooth = True)
else:
RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_on", False) self.setstate("executing.bt_on", False)
if self.getstate("wants.bt_off"): if self.getstate("wants.bt_off"):
self.setstate("wants.bt_off", False) self.setstate("wants.bt_off", False)
self.owner_app.discover_usb_devices()
self.setstate("executing.bt_off", True) self.setstate("executing.bt_off", True)
if self.interface_rnode != None: if self.interface_rnode != None:
self.interface_rnode.disable_bluetooth() self.interface_rnode.disable_bluetooth()
@ -1279,10 +1283,13 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0: if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"] target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, disable_bluetooth = True) RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, disable_bluetooth = True)
else:
RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_off", False) self.setstate("executing.bt_off", False)
if self.getstate("wants.bt_pair"): if self.getstate("wants.bt_pair"):
self.setstate("wants.bt_pair", False) self.setstate("wants.bt_pair", False)
self.owner_app.discover_usb_devices()
self.setstate("executing.bt_pair", True) self.setstate("executing.bt_pair", True)
if self.interface_rnode != None: if self.interface_rnode != None:
self.interface_rnode.bluetooth_pair() self.interface_rnode.bluetooth_pair()
@ -1291,6 +1298,8 @@ class SidebandCore():
if len(self.owner_app.usb_devices) > 0: if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"] target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True) RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True)
else:
RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_pair", False) self.setstate("executing.bt_pair", False)
if (now - last_usb_discovery > 5): if (now - last_usb_discovery > 5):