monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow qusb2snes to configure itself (now that it has a menu on first run) and bind to port 23070

This commit is contained in:
Fabian Dill 2020-11-11 12:36:02 +01:00
parent ee9336983c
commit dc8a7133a3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MultiClient.py
View File

@ -635,13 +635,8 @@ async def snes_write(ctx : Context, write_list):
if ctx.snes_state != SNES_ATTACHED or ctx.snes_socket is None or not ctx.snes_socket.open or ctx.snes_socket.closed: if ctx.snes_state != SNES_ATTACHED or ctx.snes_socket is None or not ctx.snes_socket.open or ctx.snes_socket.closed:
return False return False
PutAddress_Request = { PutAddress_Request = {"Opcode": "PutAddress", "Operands": [], 'Space': 'SNES'}
"Opcode" : "PutAddress",
"Operands" : []
}
PutAddress_Request['Space'] = 'SNES'
try: try:
#will pack those requests as soon as qusb2snes actually supports that for real #will pack those requests as soon as qusb2snes actually supports that for real
for address, data in write_list: for address, data in write_list:
@ -1356,7 +1351,7 @@ async def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('diff_file', default="", type=str, nargs="?", parser.add_argument('diff_file', default="", type=str, nargs="?",
help='Path to a Berserker Multiworld Binary Patch file') help='Path to a Berserker Multiworld Binary Patch file')
parser.add_argument('--snes', default='localhost:8080', help='Address of the QUsb2snes server.') parser.add_argument('--snes', default='localhost:23070', help='Address of the QUsb2snes server.')
parser.add_argument('--connect', default=None, help='Address of the multiworld host.') parser.add_argument('--connect', default=None, help='Address of the multiworld host.')
parser.add_argument('--password', default=None, help='Password of the multiworld host.') parser.add_argument('--password', default=None, help='Password of the multiworld host.')
parser.add_argument('--loglevel', default='info', choices=['debug', 'info', 'warning', 'error', 'critical']) parser.add_argument('--loglevel', default='info', choices=['debug', 'info', 'warning', 'error', 'critical'])

3
setup.py
View File

@ -128,6 +128,9 @@ else:
qusb2sneslog = buildfolder / "QUsb2Snes" / "log.txt" qusb2sneslog = buildfolder / "QUsb2Snes" / "log.txt"
if os.path.exists(qusb2sneslog): if os.path.exists(qusb2sneslog):
os.remove(qusb2sneslog) os.remove(qusb2sneslog)
qusb2snesconfig = buildfolder / "QUsb2Snes" / "config.ini"
if os.path.exists(qusb2snesconfig):
os.remove(qusb2snesconfig)
if signtool: if signtool:
for exe in exes: for exe in exes: