removed unused imports, cleanup

This commit is contained in:
Robert Martin
2020-04-04 01:35:14 +09:00
parent f2a0e86677
commit 1a26b30d82
2 changed files with 27 additions and 33 deletions
+10 -13
View File
@@ -2,7 +2,6 @@ import argparse
import asyncio
import logging
import os
import socket
from contextlib import contextmanager
from joycontrol import logging_default as log
@@ -11,7 +10,6 @@ from joycontrol.controller import Controller
from joycontrol.memory import FlashMemory
from joycontrol.protocol import controller_protocol_factory
from joycontrol.server import create_hid_server
from joycontrol.report import InputReport
logger = logging.getLogger(__name__)
@@ -19,9 +17,8 @@ logger = logging.getLogger(__name__)
async def _main(controller, reconnect_bt_addr=None, capture_file=None, spi_flash=None, device_id=None):
factory = controller_protocol_factory(controller, spi_flash=spi_flash)
ctl_psm, itr_psm = 17, 19
transport, protocol = await create_hid_server(factory,
reconnect_bt_addr=reconnect_bt_addr,
ctl_psm=ctl_psm, itr_psm=itr_psm, capture_file=capture_file, device_id=device_id)
transport, protocol = await create_hid_server(factory, reconnect_bt_addr=reconnect_bt_addr, ctl_psm=ctl_psm,
itr_psm=itr_psm, capture_file=capture_file, device_id=device_id)
controller_state = protocol.get_controller_state()
@@ -46,8 +43,8 @@ if __name__ == '__main__':
parser.add_argument('-l', '--log')
parser.add_argument('-d', '--device_id')
parser.add_argument('--spi_flash')
parser.add_argument('-r', '--reconnect_bt_addr', type=str, default=None,
help='The Switch console bluetooth address, for reconnecting as an already paired controller')
parser.add_argument('-r', '--reconnect_bt_addr', type=str, default=None,
help='The Switch console Bluetooth address, for reconnecting as an already paired controller')
args = parser.parse_args()
if args.controller == 'JOYCON_R':
@@ -80,10 +77,10 @@ if __name__ == '__main__':
with get_output(args.log) as capture_file:
loop = asyncio.get_event_loop()
loop.run_until_complete(
_main(controller,
reconnect_bt_addr=args.reconnect_bt_addr,
capture_file=capture_file,
spi_flash=spi_flash,
device_id=args.device_id
)
_main(controller,
reconnect_bt_addr=args.reconnect_bt_addr,
capture_file=capture_file,
spi_flash=spi_flash,
device_id=args.device_id
)
)