ABelliqueux/3dcam-headers
1
0
Fork 0
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

Now working thanks to @JonathanDotCel

Browse Source
This commit is contained in:
ABelliqueux 2021-04-26 12:32:21 +02:00
parent 367a5f7186
commit c7570b6804
1 changed files with 237 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

407
loadlvl.py Normal file → Executable file
View File

@ -1,6 +1,23 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# This working version corrected with the help of sickle :
# https://discord.com/channels/642647820683444236/663664210525290507/836029253593858060
# Corrected script by Sickle : http://psx.arthus.net/code/rawdog.py
# Sickle - 26/04/2021 :
# " Ooh, you were like frustratingly close dude! Few tiny issues:
# - first of your 3 rolling buffers was bugged (other 2 were spot on)
# - waiting too long between commands at points, unirom timed out
# - var i was missing the i += chunkSize so we were stuck in a loop there (e.g. tried to send a second chonk)
# - exit was gummed up with the main logic being in a while True: "
# As suggested:
# - Removed while True: loop
# - moved rolling buffer loops to WaitForResponse()
# - reduced sleeps
# - inc var i with chunkSize
import sys import sys
import serial import serial
import time import time
@ -18,7 +35,7 @@ address = '800b1470' # We're receiving this info as a string from the psx
# test data # test data
data = int(111111111111111111111111111111111).to_bytes(14, byteorder='big', signed=False) data = int(111111111111111111111111111111111).to_bytes(14, byteorder='little', signed=False)
size = len( data ) size = len( data )
@ -30,6 +47,43 @@ Saddr = 0
Slen = 0 Slen = 0
def WaitForResponse( expectedAnswer ):
responseBuffer = ""
while True:
if ser.in_waiting:
print( "Input buffer : " + str(ser.in_waiting))
chkValue = ser.read(1)
# Make sure byte value is < 128 so that it can be decoded to ascii :: always getting '\xc7' 'q' '\x1c' '\xc7' '\xab' '\xed' '1' '\x05'
if chkValue[0] < 128:
responseBuffer += chkValue.decode('ascii')
else:
responseBuffer += '.'
if len( responseBuffer ) > 4:
# remove first char in buffer
responseBuffer = responseBuffer[1:]
print( "Response buffer : " + responseBuffer )
if responseBuffer == expectedAnswer:
break
print( "Got response : " + responseBuffer + " - " + expectedAnswer )
def main(args): def main(args):
global checkSum, responseBuffer, Ssbin, Saddr, Slen, chunkSize global checkSum, responseBuffer, Ssbin, Saddr, Slen, chunkSize
@ -51,211 +105,224 @@ def main(args):
print("checkSum : " + str(checkSum) ) print("checkSum : " + str(checkSum) )
while True: # ~ while True:
# ~ global responseBuffer, Ssbin, Saddr, Slen, chunkSize # ~ global responseBuffer, Ssbin, Saddr, Slen, chunkSize
if not Ssbin:
if not Ssbin: print("Sending DEBG command...")
print("Sending DEBG command...")
ser.write( bytes( 'DEBG' , 'ascii' ) )
time.sleep(.3)
# Empty in waiting buffer to get rid of 'DEBGOKAY'
ser.reset_input_buffer()
time.sleep(.5)
print("Sending SBIN command...")
ser.write( bytes( 'SBIN' , 'ascii' ) )
time.sleep(.5)
ser.write( bytes( 'UPV2' , 'ascii' ) )
Ssbin = 1 ser.write( bytes( 'DEBG' , 'ascii' ) )
time.sleep(.5) time.sleep(.3)
while True:
# ~ while ser.in_waiting:
print(".")
responseBuffer += ser.read(12).decode('ascii' )
break # Empty in waiting buffer to get rid of 'DEBGOKAY'
print( "Buffer : " + responseBuffer )
if responseBuffer[-4:] == "OKAY": ser.reset_input_buffer()
responseBuffer = ""
# convert addr str > int > bytes
bytesAddr = int( address, 16 ).to_bytes( 4, byteorder='big', signed=False )
# same as ?
# ~ hexAddr = bytearray() time.sleep(.5)
print("Sending SBIN command...")
ser.write( bytes( 'SBIN' , 'ascii' ) )
time.sleep(.1)
ser.write( bytes( 'UPV2' , 'ascii' ) )
Ssbin = 1
time.sleep(.1)
# ~ while True:
#while ser.in_waiting:
# ~ print(".")
# ~ hexAddr.append( 0x80) # ~ responseBuffer += ser.read(12).decode('ascii' )
# ~ break
# ~ print( "Buffer : " + responseBuffer )
# ~ if responseBuffer[-4:] == "OKAY":
responseBuffer = ""
print("Waiting for OKAY...")
WaitForResponse("OKAY")
# convert addr str > int > bytes
bytesAddr = int( address, 16 ).to_bytes( 4, byteorder='little', signed=False )
# same as ?
# ~ hexAddr = bytearray()
# ~ hexAddr.append( 0x80)
# ~ hexAddr.append( 0x0b)
# ~ hexAddr.append( 0x14)
# ~ hexAddr.append( 0x70)
# ~ hexAddr.reverse()
# Convert and write address bytes to serial
ser.write( bytesAddr )
time.sleep(.1)
# Convert and write size bytes to serial
bytesSize = size.to_bytes( 4, byteorder='little', signed = False )
ser.write( bytesSize )
time.sleep(.1)
# Convert and write chekSum bytes to serial
bytesChk = checkSum.to_bytes( 4, byteorder='little', signed = False )
ser.write( bytesChk )
time.sleep(.1)
# Convert and write data bytes to serial
numChunk = math.ceil( len( data ) / chunkSize )
wait = 0
i = 0
while i < len( data ):
# ~ hexAddr.append( 0x0b) chunkChk = 0
# ~ hexAddr.append( 0x14) if ( i + chunkSize ) > len( data ):
chunkSize = len( data ) - i
print("Writing chunk " + str( i + 1 ) + " of " + str( numChunk ) )
# we know data length is < 2048, we'd need some code to cut the data in 2K chunks in real use case
# ~ print( "Input buffer b : " + str(ser.out_waiting))
# ~ print( "Output buffer b : " + str(ser.out_waiting))
# ~ for byte in range( len( data ) ):
ser.write( data )
# ~ time.sleep(.005)
time.sleep(.1)
# ~ hexAddr.append( 0x70) # Put chunk checksum calculation here
# ~ hexAddr.reverse() # Wait for output buffer to be empty
# Convert and write address bytes to serial while ser.out_waiting:
print("\*")
wait += 1
ser.write( bytesAddr ) time.sleep(.1)
time.sleep(.5) print("Wait : "+ str(wait))
# Convert and write size bytes to serial # reset input buffer
bytesSize = size.to_bytes( 4, byteorder='big', signed = False ) # ~ print( "Input buffer : " + str(ser.in_waiting))
# ~ print( "Output buffer : " + str(ser.out_waiting))
ser.write( bytesSize ) # ~ ser.reset_input_buffer()
time.sleep(.5) # wait for unirom to request the checksum
# Convert and write chekSum bytes to serial print( "Chunk" + str( i + 1 ) + " waiting for unirom to request checksum (CHEK)..." )
bytesChk = checkSum.to_bytes( 4, byteorder='big', signed = False ) WaitForResponse( "CHEK" )
# Wait for "CHEK" - MOVED to WaitForResponse()
# ~ while True:
# ~ if ser.in_waiting:
# ~ print( "Input buffer : " + str(ser.in_waiting))
#print(".")
# ~ chkValue = ser.read()
# ~ # Make sure byte value is < 128 so that it can be decoded to ascii :: always getting '\xc7' 'q' '\x1c' '\xc7' '\xab' '\xed' '1' '\x05'
# ~ print( "chkVal : " + str(chkValue) + " - " + str( int.from_bytes(chkValue, 'big') ) )
# ~ if int.from_bytes(chkValue, 'big') < 128:
# ~ responseBuffer += chkValue.decode('ascii')
# ~ if len( responseBuffer ) > 4:
# ~ # remove first char in buffer
# ~ responseBuffer = responseBuffer[1:]
# ~ print( "Response buffer : " + responseBuffer )
# ~ if responseBuffer == "CHEK":
# ~ print( "Got response : " + responseBuffer )
# ~ break
print( "Sending checksum to unirom..." );
ser.write( bytesChk ) ser.write( bytesChk )
time.sleep(.5) time.sleep( .1 )
# Convert and write data bytes to serial # Wait for "MORE" - replace with WaitForResponse()
numChunk = math.ceil( len( data ) / chunkSize ) # ~ while True:
wait = 0
i = 0
while i < len( data ):
chunkChk = 0 # ~ if ser.in_waiting:
if ( i + chunkSize ) > len( data ):
chunkSize = len( data ) - i # ~ print(".")
print("Writing chunk " + str( i + 1 ) + " of " + str( numChunk ) ) # ~ responseBuffer += ser.read().decode('ascii')
# we know data length is < 2048, we'd need some code to cut the data in 2K chunks in real use case
print( "Input buffer b : " + str(ser.out_waiting))
print( "Output buffer b : " + str(ser.out_waiting))
# ~ for byte in range( len( data ) ):
ser.write( data )
# ~ time.sleep(.005)
time.sleep(.5) # ~ if len( responseBuffer ) > 4:
# Put chunk checksum calculation here
# Wait for output buffer to be empty
while ser.out_waiting:
print("\*")
wait += 1
time.sleep(.5)
print("Wait : "+ str(wait))
# reset input buffer
print( "Input buffer : " + str(ser.in_waiting))
print( "Output buffer : " + str(ser.out_waiting))
# ~ ser.reset_input_buffer()
# wait for unirom to request the checksum
print( "Chunk" + str( i + 1 ) + " waiting for unirom to request checksum (CHEK)..." )
# Wait for "CHEK"
while True:
if ser.in_waiting:
print( "Input buffer : " + str(ser.in_waiting))
# ~ print(".") # ~ # remove first char in buffer
chkValue = ser.read() # ~ responseBuffer = responseBuffer[1:]
# Make sure byte value is < 128 so that it can be decoded to ascii :: always getting '\xc7' 'q' '\x1c' '\xc7' '\xab' '\xed' '1' '\x05'
print( "chkVal : " + str(chkValue) + " - " + str( int.from_bytes(chkValue, 'big') ) )
if int.from_bytes(chkValue, 'big') < 128:
responseBuffer += chkValue.decode('ascii')
if len( responseBuffer ) > 4:
# remove first char in buffer
responseBuffer = responseBuffer[1:]
# ~ print( "Response buffer : " + responseBuffer )
if responseBuffer == "CHEK":
print( "Got response : " + responseBuffer )
break
print( "Sending checksum to unirom..." ); # ~ if responseBuffer == "MORE":
ser.write( bytesChk )
time.sleep( 1 )
# Wait for "MORE"
while True:
if ser.in_waiting:
print(".") # ~ print( "Got response : " + responseBuffer )
responseBuffer += ser.read().decode('ascii') # ~ break
if len( responseBuffer ) > 4: WaitForResponse("MORE")
# remove first char in buffer
responseBuffer = responseBuffer[1:]
if responseBuffer == "MORE":
print( "Got response : " + responseBuffer )
break
print( str(i+1) + "chunk sent with correct checksum.") print( str(i+1) + "chunk sent with correct checksum.")
i += chunkSize
print("DONE!")
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':