Style: uart formatting
This commit is contained in:
Roy
@@ -2003,18 +2003,18 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(0x0A)
|
||||
ins.append(0x01) #length
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('[CC2650]', 'att_check_mem_survive','0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'check_mem_survive att_write','0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException:
|
||||
self.log_verbose('[CC2650]', 'check_mem_survive CC2650 send fail')
|
||||
self.log_verbose('[CC2650]', 'check_mem_survive send fail')
|
||||
|
||||
else:
|
||||
try:
|
||||
chk_mem_response = self._cc2650.recv_uart(0.001)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_verbose('[CC2650]', 'check_mem_survive CC2650 response timeout, no memory board')
|
||||
self.log_verbose('[CC2650]', 'check_mem_survive response timeout, no memory board')
|
||||
|
||||
if chk_mem_response is None:
|
||||
return False
|
||||
@@ -2041,25 +2041,25 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(0x03)
|
||||
ins.append(0x01) #length
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('[CC2650]', 'att_scan','0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'scan_callback att_write','0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException:
|
||||
raise RecvTimeout('scan_callback CC2650 send fail')
|
||||
self.log_verbose('[CC2650]', 'scan_callback send fail')
|
||||
|
||||
else:
|
||||
try:
|
||||
scan_response = self._cc2650.recv_uart(0.01)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_info("scan_callback CC2650 response timeout, no device")
|
||||
self.log_verbose('[CC2650]', 'scan_callback response timeout, no device')
|
||||
return False
|
||||
|
||||
if scan_response is None:
|
||||
return False
|
||||
|
||||
scan_response_hex = ''.join(format(i, '02X') for i in scan_response)
|
||||
self.log_verbose('[CC2650]', 'scan_response', '0x'+scan_response_hex)
|
||||
self.log_verbose('[CC2650]', 'scan_callback success', '0x'+scan_response_hex)
|
||||
|
||||
if len(scan_response) <= 2:
|
||||
print('******************************************************************')
|
||||
@@ -2139,7 +2139,6 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
address = response.mac_address
|
||||
addr_type = response.addr_type
|
||||
address_s = cc2650.address_str(address)
|
||||
self.log_info(DEVICE_CONNECTING, address_s)
|
||||
|
||||
connected = False
|
||||
connect_response = None
|
||||
@@ -2158,19 +2157,18 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(address[4])
|
||||
ins.append(address[5])
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('connect')
|
||||
self.log_verbose('[CC2650]', 'att_connect', '0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'connect att_write', '0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_info("connect CC2650 send fail")
|
||||
self.log_verbose('[CC2650]', 'connect send fail')
|
||||
continue
|
||||
|
||||
else:
|
||||
try:
|
||||
connect_response = self._cc2650.recv_uart(2)
|
||||
except RecvTimeout:
|
||||
self.log_info("connect CC2650 response timeout")
|
||||
self.log_verbose('[CC2650]', 'connect response timeout')
|
||||
return None
|
||||
|
||||
else:
|
||||
@@ -2186,14 +2184,14 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
connect_ack[2] == 48 and connect_ack[3] == 4:
|
||||
connected = True
|
||||
connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
|
||||
self.log_verbose('[CC2650]', 'connect_response', '0x'+connect_response_hex)
|
||||
self.log_verbose('[CC2650]', 'connect success', '0x'+connect_response_hex)
|
||||
|
||||
if connected == True:
|
||||
# CC2650Device(device_id, master, scan_response) is a slave device
|
||||
# device_id is don't care, because it will be overwrite later
|
||||
dont_care = 0
|
||||
self._device = ret = CC2650Device(device_id=dont_care, master=self, response_info=response)
|
||||
self.log_info(DEVICE_CONNECTED, address_s)
|
||||
self.log_verbose('[CC2650]', DEVICE_CONNECTED, address_s)
|
||||
return ret
|
||||
|
||||
self.log_verbose('[CC2650]', 'connect fail')
|
||||
@@ -2209,63 +2207,21 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(0x08)
|
||||
ins.append(0x01) #length
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('disconnect', device)
|
||||
self.log_verbose('[CC2650]', 'att_disconnect','0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'disconnect att_write','0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException:
|
||||
self.log_info("disconnect CC2650 send fail")
|
||||
self.log_verbose('[CC2650]', 'disconnect send fail')
|
||||
continue
|
||||
|
||||
else:
|
||||
# reset single 2650 after disconnected
|
||||
self.reset_internal()
|
||||
self.reset_hardware()
|
||||
self.log_verbose('[CC2650]', 'disconnect success')
|
||||
return True
|
||||
|
||||
self.log_verbose('[CC2650]', 'disconnect fail')
|
||||
return False
|
||||
|
||||
# # if disconnect ack, use this funtion
|
||||
# def disconnect_ack(self, device: int, force=False) -> bool:
|
||||
# disconnect_response = None
|
||||
# ins = bytearray()
|
||||
# self._interface.flush_input()
|
||||
|
||||
# try:
|
||||
# ins.append(0x08)
|
||||
# ins.append(0x01) #length
|
||||
# ins.append(0xF1)
|
||||
# self.log_verbose('disconnect', device)
|
||||
# self.log_verbose('[CC2650]', 'att_disconnect','0x'+str.upper(ins.hex()))
|
||||
# self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
# except SerialTimeoutException:
|
||||
# self.log_info("disconnect CC2650 send fail")
|
||||
# continue
|
||||
|
||||
# else:
|
||||
# try:
|
||||
# disconnect_response = self._cc2650.recv_uart(0.01)
|
||||
|
||||
# except RecvTimeout:
|
||||
# self.log_info("disconnect CC2650 response timeout")
|
||||
|
||||
# if disconnect_response is None:
|
||||
# return False
|
||||
|
||||
# disconnect_response_hex = ''.join(format(i, '02X') for i in disconnect_response)
|
||||
# self.log_verbose('[CC2650]', 'disconnect_response', '0x'+disconnect_response_hex)
|
||||
|
||||
# pack_len = disconnect_response[0]
|
||||
# disconnect_ack = disconnect_response[1:pack_len+1]
|
||||
|
||||
# if disconnect_ack == [3]:
|
||||
# # reset single 2650 after disconnected
|
||||
# self.reset_internal()
|
||||
# self.reset_hardware()
|
||||
# return True
|
||||
# self.log_verbose('[CC2650]', 'disconnect fail')
|
||||
# return False
|
||||
|
||||
@synchronized
|
||||
def write_characteristic(self, device: int, handle: int, data: bytes) -> bool:
|
||||
@@ -2279,19 +2235,19 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(handle)
|
||||
ins.extend(data)
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('write_characteristic', device, handle)
|
||||
self.log_verbose('[CC2650]', 'att_write','0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'write_characteristic', device, str(hex(handle).upper()))
|
||||
self.log_verbose('[CC2650]', 'write_characteristic att_write','0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException:
|
||||
raise RecvTimeout('write_characteristic CC2650 send fail')
|
||||
self.log_verbose('[CC2650]', 'write_characteristic send fail')
|
||||
|
||||
else:
|
||||
try:
|
||||
write_response = self._cc2650.recv_uart(0.5)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_info("write_characteristic CC2650 response timeout")
|
||||
self.log_verbose('[CC2650]', 'write_characteristic response timeout')
|
||||
|
||||
if write_response is None:
|
||||
return False
|
||||
@@ -2318,25 +2274,25 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
ins.append(0x02) #length
|
||||
ins.append(handle)
|
||||
ins.append(0xF1)
|
||||
self.log_verbose('read_characteristic', device, handle)
|
||||
self.log_verbose('[CC2650]', 'att_read', '0x'+str.upper(ins.hex()))
|
||||
self.log_verbose('[CC2650]', 'read_characteristic', device, '0x'+str(hex(handle).upper()))
|
||||
self.log_verbose('[CC2650]', 'read_characteristic att_write','0x'+str.upper(ins.hex()))
|
||||
self._cc2650.send("bytes", bytes(ins))
|
||||
|
||||
except SerialTimeoutException:
|
||||
raise RecvTimeout('read_characteristic CC2650 send fail')
|
||||
|
||||
self.log_verbose('[CC2650]', 'read_characteristic send fail')
|
||||
|
||||
else:
|
||||
try:
|
||||
read_response = self._cc2650.recv_uart(1)
|
||||
|
||||
except RecvTimeout:
|
||||
self.log_info("read_characteristic CC2650 response timeout")
|
||||
self.log_verbose('[CC2650]', 'read_characteristic response timeout')
|
||||
|
||||
if read_response is None:
|
||||
return None
|
||||
|
||||
read_response_hex = ''.join(format(i, '02X') for i in read_response)
|
||||
self.log_verbose('[CC2650]', 'read_response', '0x'+read_response_hex)
|
||||
self.log_verbose('[CC2650]', 'read_characteristic success', '0x'+read_response_hex)
|
||||
|
||||
return bytes(read_response)
|
||||
|
||||
@@ -2439,7 +2395,6 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
self._cc2650_log_level = self.log_level
|
||||
|
||||
def read_characteristic(self, device: int, handle: int) -> Optional[bytes]:
|
||||
self.log_verbose('read_characteristic', device, '0x%02X' % handle)
|
||||
|
||||
master = self._cc2650[device]
|
||||
|
||||
@@ -2497,11 +2452,6 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
|
||||
|
||||
self._interface.flush()
|
||||
self._selector.select(device_id)
|
||||
# self._mem_selector.select(device_id)
|
||||
# print("multiMaster selector = ", device_id)
|
||||
# print("\n")
|
||||
|
||||
# device._notify_flag = enable
|
||||
try:
|
||||
master.write_characteristic(device_id, self.NOTIFY_HANDLE, value)
|
||||
except SendInstructionTimeoutError:
|
||||
|
||||
Reference in New Issue
Block a user