chipmunkmc/mtkclient
1
0
Fork 0
mirror of https://github.com/bkerler/mtkclient.git synced 2024-11-14 19:25:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Min is a built-in function

Browse source
This commit is contained in:
ColdWindScholar 2024-05-04 17:15:43 +08:00
parent 045e71d2da
commit b1b7d172ce
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mtkclient/Library/utils.py
View file

@ -208,14 +208,14 @@ class progress:
if lefttime > 0:
sec = lefttime
if sec > 60:
min = sec // 60
minutes = sec // 60
sec = sec % 60
if min > 60:
h = min // 24
min = min % 24
hinfo = "%02dh:%02dm:%02ds left" % (h, min, sec)
if minutes > 60:
h = minutes // 24
minutes = minutes % 24
hinfo = "%02dh:%02dm:%02ds left" % (h, minutes, sec)
else:
hinfo = "%02dm:%02ds left" % (min, sec)
hinfo = "%02dm:%02ds left" % (minutes, sec)
else:
hinfo = "%02ds left" % sec

2
mtkclient/Tools/parsebootrom.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash
for i in `find ./bootrom -name "*.bin"|sort`;do ./mtkclient/Tools/brom_to_offs $i;done
for i in $(find ./bootrom -name "*.bin"|sort);do ./mtkclient/Tools/brom_to_offs "$i";done

12
mtkclient/gui/toolkit.py
View file

@ -34,14 +34,14 @@ class TimeEstim:
if lefttime > 0:
sec = lefttime
if sec > 60:
min = sec // 60
minutes = sec // 60
sec = sec % 60
if min > 60:
h = min // 24
min = min % 24
hinfo = "%02dh:%02dm:%02ds" % (h, min, sec)
if minutes > 60:
h = minutes // 24
minutes = minutes % 24
hinfo = "%02dh:%02dm:%02ds" % (h, minutes, sec)
else:
hinfo = "%02dm:%02ds" % (min, sec)
hinfo = "%02dm:%02ds" % (minutes, sec)
else:
hinfo = "%02ds" % sec

18
stage2
View file

@ -131,7 +131,7 @@ class Stage2(metaclass=LogBase):
if self.cdc.connected:
self.cdc.close()
def readflash(self, type: int, start, length, display=False, filename: str = None):
def readflash(self, type_: int, start, length, display=False, filename: str = None):
if not self.emmc_inited:
self.init_emmc()
wf = None
@ -145,7 +145,7 @@ class Stage2(metaclass=LogBase):
# emmc_switch(1)
self.usbwrite(pack(">I", 0xf00dd00d))
self.usbwrite(pack(">I", 0x1002))
self.usbwrite(pack(">I", type))
self.usbwrite(pack(">I", type_))
# kick-wdt
# self.usbwrite(pack(">I", 0xf00dd00d))
@ -190,7 +190,7 @@ class Stage2(metaclass=LogBase):
sectors = (length // 0x200) + (1 if length % 0x200 else 0)
self.info("Reading user data...")
if self.cdc.connected:
self.readflash(type=0, start=start, length=length, display=True, filename=filename)
self.readflash(type_=0, start=start, length=length, display=True, filename=filename)
def preloader(self, start, length, filename):
sectors = 0
@ -201,7 +201,7 @@ class Stage2(metaclass=LogBase):
self.info("Reading preloader...")
if self.cdc.connected:
if sectors == 0:
buffer = self.readflash(type=1, start=0, length=0x4000, display=False)
buffer = self.readflash(type_=1, start=0, length=0x4000, display=False)
if len(buffer) != 0x4000:
print("Error on reading boot1 area.")
return
@ -212,7 +212,7 @@ class Stage2(metaclass=LogBase):
st = buffer[start:start + 4]
if st == b"MMM\x01":
length = unpack("<I", buffer[start + 0x20:start + 0x24])[0]
data = self.readflash(type=1, start=0, length=start + length, display=True)
data = self.readflash(type_=1, start=0, length=start + length, display=True)
if len(data) != start + length:
print("Warning, please rerun command, length doesn't match.")
idx = data.find(b"MTK_BLOADER_INFO")
@ -228,11 +228,11 @@ class Stage2(metaclass=LogBase):
return
else:
length = 0x40000
self.readflash(type=1, start=0, length=length, display=True, filename=filename)
self.readflash(type_=1, start=0, length=length, display=True, filename=filename)
print("Done")
print("Error on getting preloader info, aborting.")
else:
self.readflash(type=1, start=start, length=length, display=True, filename=filename)
self.readflash(type_=1, start=start, length=length, display=True, filename=filename)
print("Done")
def boot2(self, start, length, filename):
@ -244,10 +244,10 @@ class Stage2(metaclass=LogBase):
self.info("Reading boot2...")
if self.cdc.connected:
if sectors == 0:
self.readflash(type=2, start=0, length=0x40000, display=True, filename=filename)
self.readflash(type_=2, start=0, length=0x40000, display=True, filename=filename)
print("Done")
else:
self.readflash(type=1, start=start, length=length, display=True, filename=filename)
self.readflash(type_=1, start=start, length=length, display=True, filename=filename)
print("Done")
def memread(self, start, length, filename=None):