diff --git a/README-cn.md b/README-cn.md index 795f9fb..719641e 100644 --- a/README-cn.md +++ b/README-cn.md @@ -277,10 +277,10 @@ Page 2 A0:DE:0F:99:EF:78 incoming CoD: 0x5a020c Service Class: 0b1011010000 - Telephony - Object Transfer - Capturing - Networking + Telephony + Object Transfer + Capturing + Networking Major Device Class: 0b00010, Phone link type: 0x01 - ACL ... ... @@ -445,26 +445,32 @@ Number of services: 6 Service (0x0100 - 0x0112, 7 characteristics) Declaration - Handle: 0x0100 - Type: 2800 (Primary Service declaration) - Value: 1812 (Human Interface Device) - Permissions: Read (no authen/author) + Handle: 0x0100 + Type: 2800 (Primary Service declaration) + Value: 1812 (Human Interface Device) + Permissions: Read (no authen/author) Characteristic (2 descriptors) Declaration - Handle: 0x010d - Type: 2803 (Characteristic declaration) - Value: - Properties: - Handle: 0x010e - UUID: 2A4D (Report) - Permissions: Read (no authen/author) + Handle: 0x010d + Type: 2803 (Characteristic declaration) + Value: + Properties: Read, Write Without Response, Write, Notify + Handle: 0x010e + UUID: 2A4D (Report) + Permissions: Read (no authen/author) + + Value + Handle: 0x0302 + Type: 4A02 (Unknown) + Value: Read Not Permitted + Permissions: Higher layer specific Descriptor - Handle: 0x010f - Type: 2902 (Client Characteristic Configuration declaration) - Value: b'\x00\x00' - Permissions: Read (no authen/author), Write (higher layer specifies authen/author) + Handle: 0x010f + Type: 2902 (Client Characteristic Configuration declaration) + Value: b'\x00\x00' + Permissions: Read (no authen/author), Write (higher layer specifies authen/author) ... ... @@ -512,11 +518,9 @@ Options: #### `--collect-btsnoop-log`: 收集正在产生的 btsnoop log -
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log +
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log; file btsnoop_hci.log 
-$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log
-$ file btsnoop_hci.log
 btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
diff --git a/README.md b/README.md index 7b31cd5..5c7c616 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ Number of service records: 18
-#### `--lmp-features` Read LMP features of a remote BR/EDR device +#### `--lmp-features`: Read LMP features of a remote BR/EDR device
$ sudo bluing br --lmp-features 6A:8D:99:33:56:AE @@ -307,7 +307,7 @@ Page 2
-### `le`: command: Low Energy system +### `le` command: Low Energy system
$ bluing le --help @@ -426,7 +426,7 @@ Responder Key Distribution: 0x01
-#### `--gatt` Discover GATT Profile hierarchy of a remote LE device +#### `--gatt`: Discover GATT Profile hierarchy of a remote LE device
$ sudo bluing le --gatt --addr-type=public 18:D9:8F:77:24:F1 @@ -439,32 +439,38 @@ Discovering all descriptors of characteristic 0x0002 ⠴ ... ... - + ----------------GATT Scan Result---------------- Number of services: 6 - + Service (0x0100 - 0x0112, 7 characteristics) Declaration - Handle: 0x0100 - Type: 2800 (Primary Service declaration) - Value: 1812 (Human Interface Device) - Permissions: Read (no authen/author) - + Handle: 0x0100 + Type: 2800 (Primary Service declaration) + Value: 1812 (Human Interface Device) + Permissions: Read (no authen/author) + Characteristic (2 descriptors) Declaration - Handle: 0x010d - Type: 2803 (Characteristic declaration) - Value: - Properties: - Handle: 0x010e - UUID: 2A4D (Report) - Permissions: Read (no authen/author) - + Handle: 0x010d + Type: 2803 (Characteristic declaration) + Value: + Properties: Read, Write Without Response, Write, Notify + Handle: 0x010e + UUID: 2A4D (Report) + Permissions: Read (no authen/author) + + Value + Handle: 0x0302 + Type: 4A02 (Unknown) + Value: Read Not Permitted + Permissions: Higher layer specific + Descriptor - Handle: 0x010f - Type: 2902 (Client Characteristic Configuration declaration) - Value: b'\x00\x00' - Permissions: Read (no authen/author), Write (higher layer specifies authen/author) + Handle: 0x010f + Type: 2902 (Client Characteristic Configuration declaration) + Value: b'\x00\x00' + Permissions: Read (no authen/author), Write (higher layer specifies authen/author) ... ...
@@ -510,12 +516,11 @@ Options: -#### `--collect-btsnoop-log` Collect the btsnoop log being generated +#### `--collect-btsnoop-log`: Collect the btsnoop log being generated -
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log +
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log; file btsnoop_hci.log 
-$ file btsnoop_hci.log
 btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
diff --git a/index-cn.html b/index-cn.html index 9054fab..18d9ec7 100644 --- a/index-cn.html +++ b/index-cn.html @@ -929,10 +929,10 @@

A0:DE:0F:99:EF:78 incoming CoD: 0x5a020c Service Class: 0b1011010000 - Telephony - Object Transfer - Capturing - Networking + Telephony + Object Transfer + Capturing + Networking Major Device Class: 0b00010, Phone link type: 0x01 - ACL ... ... @@ -1079,26 +1079,32 @@

Service (0x0100 - 0x0112, 7 characteristics) Declaration - Handle: 0x0100 - Type: 2800 (Primary Service declaration) - Value: 1812 (Human Interface Device) - Permissions: Read (no authen/author) + Handle: 0x0100 + Type: 2800 (Primary Service declaration) + Value: 1812 (Human Interface Device) + Permissions: Read (no authen/author) Characteristic (2 descriptors) Declaration - Handle: 0x010d - Type: 2803 (Characteristic declaration) - Value: - Properties: - Handle: 0x010e - UUID: 2A4D (Report) - Permissions: Read (no authen/author) + Handle: 0x010d + Type: 2803 (Characteristic declaration) + Value: + Properties: Read, Write Without Response, Write, Notify + Handle: 0x010e + UUID: 2A4D (Report) + Permissions: Read (no authen/author) + + Value + Handle: 0x0302 + Type: 4A02 (Unknown) + Value: Read Not Permitted + Permissions: Higher layer specific Descriptor - Handle: 0x010f - Type: 2902 (Client Characteristic Configuration declaration) - Value: b'\x00\x00' - Permissions: Read (no authen/author), Write (higher layer specifies authen/author) + Handle: 0x010f + Type: 2902 (Client Characteristic Configuration declaration) + Value: b'\x00\x00' + Permissions: Read (no authen/author), Write (higher layer specifies authen/author) ... ...

@@ -1139,10 +1145,8 @@

--collect-btsnoop-log: 收集正在产生的 btsnoop log

-
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log -
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log
-$ file btsnoop_hci.log
-btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
+
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log; file btsnoop_hci.log
+
btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
 

 

 
plugin 命令：插件管理

diff --git a/index.html b/index.html
index 4ea125e..f174e1c 100644
--- a/index.html
+++ b/index.html
@@ -880,7 +880,7 @@ 
--lmp-features Read LMP features of a remote BR/EDR device

+
--lmp-features: Read LMP features of a remote BR/EDR device

 
 
$ sudo bluing br --lmp-features 6A:8D:99:33:56:AE
 
Version
@@ -955,7 +955,7 @@ 
le: command: Low Energy system

+
le command: Low Energy system

 
 
$ bluing le --help
 
Usage:
@@ -1062,7 +1062,7 @@ 
--gatt Discover GATT Profile hierarchy of a remote LE device

+
--gatt: Discover GATT Profile hierarchy of a remote LE device

 
 
$ sudo bluing le --gatt --addr-type=public 18:D9:8F:77:24:F1
 
Connecting ⠋
@@ -1073,32 +1073,38 @@ 
⠴
 ... ... 
-
+
 ----------------GATT Scan Result----------------
 Number of services: 6
-
+
 Service (0x0100 - 0x0112, 7 characteristics)
     Declaration
-    Handle: 0x0100
-    Type:   2800 (Primary Service declaration)
-    Value:  1812 (Human Interface Device)
-    Permissions: Read (no authen/author)
-    
+        Handle: 0x0100
+        Type:   2800 (Primary Service declaration)
+        Value:  1812 (Human Interface Device)
+        Permissions: Read (no authen/author)
+
     Characteristic (2 descriptors)
         Declaration
-        Handle: 0x010d
-        Type:   2803 (Characteristic declaration)
-        Value:
-            Properties: 
-            Handle:     0x010e
-            UUID:       2A4D (Report)
-        Permissions: Read (no authen/author)
-        
+            Handle: 0x010d
+            Type:   2803 (Characteristic declaration)
+            Value:
+                Properties: Read, Write Without Response, Write, Notify
+                Handle:     0x010e
+                UUID:       2A4D (Report)
+            Permissions: Read (no authen/author)
+
+        Value
+            Handle: 0x0302
+            Type:   4A02 (Unknown)
+            Value:  Read Not Permitted
+            Permissions: Higher layer specific
+
         Descriptor
-        Handle: 0x010f
-        Type:   2902 (Client Characteristic    Configuration declaration)
-        Value:  b'\x00\x00'
-        Permissions: Read (no authen/author), Write (higher layer specifies authen/author)
+            Handle: 0x010f
+            Type:   2902 (Client Characteristic    Configuration declaration)
+            Value:  b'\x00\x00'
+            Permissions: Read (no authen/author), Write (higher layer specifies authen/author)
 ... ...
 

 

@@ -1137,11 +1143,10 @@ 
andr
     -o <file>                Place the output into  [default: ./btsnoop_hci.log]
 

 

-
--collect-btsnoop-log Collect the btsnoop log being generated

+
--collect-btsnoop-log: Collect the btsnoop log being generated

 
-
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log
-
$ file btsnoop_hci.log
-btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
+
$ bluing android -t 3 --collect-btsnoop-log -o btsnoop_hci.log; file btsnoop_hci.log
+
btsnoop_hci.log: BTSnoop version 1, HCI UART (H4)
 

 

 
plugin command: Manage plugins

@@ -1237,7 +1242,7 @@ 
Manag
 
           

           
-            
--lmp-features Read LMP features of a remote BR/EDR device

+            
--lmp-features: Read LMP features of a remote BR/EDR device

 
           

           
@@ -1252,7 +1257,7 @@ 
Manag
       

     

         
-          
le: command: Low Energy system

+          
le command: Low Energy system

 
           
         

@@ -1270,7 +1275,7 @@ 
Manag
 
           

           
-            
--gatt Discover GATT Profile hierarchy of a remote LE device

+            
--gatt: Discover GATT Profile hierarchy of a remote LE device

 
           

           
@@ -1287,7 +1292,7 @@ 
Manag
         
diff --git a/setup.cfg b/setup.cfg
index b4182b9..1363efb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,10 +36,10 @@ install_requires =
     PyGObject >= 3.42.2
     dbus-python >= 1.3.2
     xpycommon >= 0.0.23
-    bthci >= 0.0.40
-    btsm >= 0.0.15
-    btatt >= 0.0.18
-    btgatt >= 0.0.21
+    bthci >= 0.0.41
+    btsm >= 0.0.16
+    btatt >= 0.0.19
+    btgatt >= 0.0.22
 
 package_dir =
     =src
diff --git a/src/bluing/__init__.py b/src/bluing/__init__.py
index 215dcc5..72425ae 100644
--- a/src/bluing/__init__.py
+++ b/src/bluing/__init__.py
@@ -2,7 +2,7 @@
 
 PKG_NAME = 'bluing'
 APP_NAME = PKG_NAME
-VERSION = '0.11.0'
+VERSION = '0.11.1'
 DEBUG_VERSION = ''
 
 
diff --git a/src/bluing/common.py b/src/bluing/common.py
index f1b52e4..052e166 100644
--- a/src/bluing/common.py
+++ b/src/bluing/common.py
@@ -4,7 +4,6 @@
 import pkg_resources
 
 from dbus.exceptions import DBusException
-from gi.repository import GObject
 
 from xpycommon.log import Logger
 from xpycommon.ui import blue, red
@@ -12,8 +11,6 @@
 from . import LOG_LEVEL
 
 
-mainloop = GObject.MainLoop()
-
 logger = Logger(__name__, LOG_LEVEL)
 
 oui_file = pkg_resources.resource_stream(__name__, "res/oui.txt")
diff --git a/src/bluing/le/gatt_scan.py b/src/bluing/le/gatt_scan.py
index 78755bf..d1ef7d0 100644
--- a/src/bluing/le/gatt_scan.py
+++ b/src/bluing/le/gatt_scan.py
@@ -8,7 +8,6 @@
 
 from xpycommon.ui import green, blue, yellow, red, INDENT
 from xpycommon.log import Logger
-from xpycommon.dbus import mainloop, mainloop_thread
 
 import pkg_resources
 from halo import Halo
@@ -18,7 +17,7 @@
 
 from .. import BlueScanner, ScanResult
 from .ui import LOG_LEVEL
-from .agent import BluingBtAgent
+from .gatt_scan_bt_agent import GattScanBtAgent
 
 
 logger = Logger(__name__, LOG_LEVEL)
@@ -185,10 +184,10 @@ def print(self):
             print(blue("Service"), "(0x{:04x} - 0x{:04x}, {} characteristics)".format(
                 service.start_handle, service.end_handle, len(service.get_characts())))
             print(INDENT + blue("Declaration"))
-            print(INDENT + "Handle: 0x{:04x}".format(service.start_handle))
-            print(INDENT + "Type:   {:04X} ({})".format(service.declar.type.int16, service.declar.type.name))
-            print(INDENT + "Value:  {} ({})".format(green(uuid_str_for_show), service_name))
-            print(INDENT + "Permissions:", service.declar.permissions_desc)
+            print(INDENT*2 + "Handle: 0x{:04x}".format(service.start_handle))
+            print(INDENT*2 + "Type:   {:04X} ({})".format(service.declar.type.int16, service.declar.type.name))
+            print(INDENT*2 + "Value:  {} ({})".format(green(uuid_str_for_show), service_name))
+            print(INDENT*2 + "Permissions:", service.declar.permissions_desc)
             print() # An empty line before Characteristic Group
             
             # Prints each Gharacteristic group
@@ -214,13 +213,13 @@ def print(self):
                     
                 print(INDENT + yellow("Characteristic"), '({} descriptors)'.format(len(charact.descriptors)))
                 print(INDENT*2 + yellow("Declaration"))
-                print(INDENT*2 + "Handle: 0x{:04x}".format(charact.declar.handle))
-                print(INDENT*2 + "Type:   {:04X} ({})".format(charact.declar.type.int16, charact.declar.type.name))
-                print(INDENT*2 + "Value:")
-                print(INDENT*3 + "Properties: {}".format(green(', '.join(charact.declar.get_property_names()))))
-                print(INDENT*3 + "Handle:    ", green("0x{:04x}".format(charact.declar.value.handle)))
-                print(INDENT*3 + "UUID:       {} ({})".format(green(uuid_str_for_show), charact_name))
-                print(INDENT*2 + "Permissions: {}\n".format(charact.declar.permissions_desc))
+                print(INDENT*3 + "Handle: 0x{:04x}".format(charact.declar.handle))
+                print(INDENT*3 + "Type:   {:04X} ({})".format(charact.declar.type.int16, charact.declar.type.name))
+                print(INDENT*3 + "Value:")
+                print(INDENT*4 + "Properties: {}".format(green(', '.join(charact.declar.get_property_names()))))
+                print(INDENT*4 + "Handle:    ", green("0x{:04x}".format(charact.declar.value.handle)))
+                print(INDENT*4 + "UUID:       {} ({})".format(green(uuid_str_for_show), charact_name))
+                print(INDENT*3 + "Permissions: {}\n".format(charact.declar.permissions_desc))
 
                 if charact.value_declar is not None:
                     try:
@@ -238,11 +237,11 @@ def print(self):
                     else:
                         value_print = green(str(charact.value_declar.value))
                     
-                    print(INDENT*2 + yellow("Value declaration"))
-                    print(INDENT*2 + "Handle: 0x{:04x}".format(charact.value_declar.handle))
-                    print(INDENT*2 + "Type:   {} ({})".format(type_str_for_show, value_declar_name))
-                    print(INDENT*2 + "Value:  {}".format(value_print))
-                    print(INDENT*2 + "Permissions: {}\n".format(charact.value_declar.permissions_desc))
+                    print(INDENT*2 + yellow("Value"))
+                    print(INDENT*3 + "Handle: 0x{:04x}".format(charact.value_declar.handle))
+                    print(INDENT*3 + "Type:   {} ({})".format(type_str_for_show, value_declar_name))
+                    print(INDENT*3 + "Value:  {}".format(value_print))
+                    print(INDENT*3 + "Permissions: {}\n".format(charact.value_declar.permissions_desc))
                 
                 # Prints each Characteristic Descriptor
                 for descriptor in charact.get_descriptors():
@@ -260,11 +259,11 @@ def print(self):
                             value_print = green(str(descriptor.value))
                               
                     print(INDENT*2 + yellow("Descriptor"))
-                    print(INDENT*2 + "Handle: {}".format(green('0x{:04x}'.format(descriptor.handle))))
-                    print(INDENT*2 + "Type:   {} ({})".format(green("{:04X}".format(descriptor.type.int16)), yellow(descriptor.type.name)))
-                    print(INDENT*2 + "Value: ", value_print)
-                    print(INDENT*2 + "Permissions: {}\n".format(descriptor.permissions_desc))
-                    
+                    print(INDENT*3 + "Handle: {}".format(green('0x{:04x}'.format(descriptor.handle))))
+                    print(INDENT*3 + "Type:   {} ({})".format(green("{:04X}".format(descriptor.type.int16)), yellow(descriptor.type.name)))
+                    print(INDENT*3 + "Value: ", value_print)
+                    print(INDENT*3 + "Permissions: {}\n".format(descriptor.permissions_desc))
+
     def to_dict(self) -> dict:
         j = {
             "Addr": self.addr,
@@ -286,15 +285,13 @@ def __init__(self, iface: str = 'hci0', io_cap: str = 'NoInputNoOutput'):
         self.result = GattScanResult()
         self.gatt_client = None
         self.spinner = Halo(placement='right')
-        self.bt_agent = BluingBtAgent(io_cap)
+        self.bt_agent = GattScanBtAgent(io_cap)
         self.bt_agent.register()
 
     def scan(self, addr: str, addr_type: int = ADDR_TYPE_PUBLIC) -> GattScanResult:
         logger.debug("Entered scan()")
 
         try:
-            mainloop_thread.start()
-            
             self.result.addr = addr.upper()
             self.result.addr_type = addr_type
                     
@@ -340,11 +337,16 @@ def scan(self, addr: str, addr_type: int = ADDR_TYPE_PUBLIC) -> GattScanResult:
                     logger.debug("characts: {}".format(characts))
                 
                     for charact in characts:
-                        logger.debug("Characteristics\n" +
-                                    "Handle:       0x{:04x}\n".format(charact.declar.handle) +
-                                    "Properties:   0x{:02X}\n".format(charact.declar.value.properties) +
-                                    "Value handle: 0x{:04x}\n".format(charact.declar.value.handle) +
-                                    "UUID:         {}".format(charact.declar.value.uuid))
+                        logger.debug("Found characteristic declaration\n"
+                                     "    Handle: 0x{:04x}\n"
+                                     "    Type:   {}\n"
+                                     "    Value:\n"
+                                     "        Properties: 0x{:02X} - {}\n"
+                                     "        Handle:     0x{:04x}\n"
+                                     "        UUID:       {}".format(
+                                         charact.declar.handle, charact.declar.type, 
+                                         charact.declar.value.properties, charact.declar.get_property_names(), 
+                                         charact.declar.value.handle, charact.declar.value.uuid))
                         service.add_charact(charact)
                 except TimeoutError as e:
                     # When discovering all characteristics fo a service encounters a timeout,
@@ -499,7 +501,6 @@ def scan(self, addr: str, addr_type: int = ADDR_TYPE_PUBLIC) -> GattScanResult:
             
             if self.bt_agent.registered:
                 self.bt_agent.unregister()
-                mainloop.quit()
             try:
                 # Reset and clean bluetooth service
                 output = subprocess.check_output(' '.join(['bluetoothctl', 'untrust', addr]), 
diff --git a/src/bluing/le/agent.py b/src/bluing/le/gatt_scan_bt_agent.py
similarity index 98%
rename from src/bluing/le/agent.py
rename to src/bluing/le/gatt_scan_bt_agent.py
index 7a5e867..f43c31f 100644
--- a/src/bluing/le/agent.py
+++ b/src/bluing/le/gatt_scan_bt_agent.py
@@ -11,7 +11,7 @@
 logger = Logger(__name__, LOG_LEVEL)
 
 
-class BluingBtAgent(BtAgent):
+class GattScanBtAgent(BtAgent):
     def __init__(self, io_cap: str = 'NoInputNoOutput', suffix: int = 0) -> None:
         super().__init__(APP_NAME, io_cap, suffix)