chipmunkmc/edl
1
0
Fork 0
mirror of https://github.com/bkerler/edl.git synced 2025-03-14 00:59:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wrong renaming

Browse source
This commit is contained in:
Bjoern Kerler 2022-06-29 08:31:48 +02:00
parent 7e86613ee2
commit 5ef9472c7b
No known key found for this signature in database
GPG key ID: 52E823BB96A55380
3 changed files with 22 additions and 22 deletions

2
edlclient/Library/sahara.py
View file

@ -572,7 +572,7 @@ class sahara(metaclass=LogBase):
sys.exit(1) sys.exit(1)
return self.mode return self.mode
else: else:
self.error(self.get_error_desc(pkt.image_tx_status)) self.error(self.get_error_desc(pkt.image_id))
return "error" return "error"
else: else:
self.error("Unknown response received on uploading loader.") self.error("Unknown response received on uploading loader.")

2
edlclient/Library/sahara_defs.py
View file

@ -268,7 +268,7 @@ class CommandHandler:
cmd = st.dword() cmd = st.dword()
len = st.dword() len = st.dword()
image_id = st.dword() image_id = st.dword()
status = st.dword() image_tx_status = st.dword()
return req return req

40
edlclient/Tools/qc_diag.py
View file

@ -70,14 +70,14 @@ diagerror = {
nvitem_type = [ nvitem_type = [
("item", "H"), ("item", "H"),
("rawdata", "128s"), ("rawdata", "128s"),
("image_tx_status", "H") ("status", "H")
] ]
subnvitem_type = [ subnvitem_type = [
("item", "H"), ("item", "H"),
("index", "H"), ("index", "H"),
("rawdata", "128s"), ("rawdata", "128s"),
("image_tx_status", "H") ("status", "H")
] ]
@ -460,27 +460,27 @@ class qcdiag(metaclass=LogBase):
return res return res
def DecodeNVItems(self, nvitem): def DecodeNVItems(self, nvitem):
if nvitem.image_tx_status == 0x1: if nvitem.status == 0x1:
return "Internal DMSS use" return "Internal DMSS use"
elif nvitem.image_tx_status == 0x2: elif nvitem.status == 0x2:
return "Unrecognized command" return "Unrecognized command"
elif nvitem.image_tx_status == 0x3: elif nvitem.status == 0x3:
return "NV memory full" return "NV memory full"
elif nvitem.image_tx_status == 0x4: elif nvitem.status == 0x4:
return "Command failed" return "Command failed"
elif nvitem.image_tx_status == 0x5: elif nvitem.status == 0x5:
return "Inactive Item" return "Inactive Item"
elif nvitem.image_tx_status == 0x6: elif nvitem.status == 0x6:
return "Bad Parameter" return "Bad Parameter"
elif nvitem.image_tx_status == 0x7: elif nvitem.status == 0x7:
return "Item was read-only" return "Item was read-only"
elif nvitem.image_tx_status == 0x8: elif nvitem.status == 0x8:
return "Item not defined for this target" return "Item not defined for this target"
elif nvitem.image_tx_status == 0x9: elif nvitem.status == 0x9:
return "No more free memory" return "No more free memory"
elif nvitem.image_tx_status == 0xA: elif nvitem.status == 0xA:
return "Internal use" return "Internal use"
elif nvitem.image_tx_status == 0x0: elif nvitem.status == 0x0:
return "OK" return "OK"
return "" return ""
@ -495,7 +495,7 @@ class qcdiag(metaclass=LogBase):
ItemNumber = hex(item) + ": " ItemNumber = hex(item) + ": "
returnanswer = "NVItem " + ItemNumber + info returnanswer = "NVItem " + ItemNumber + info
print(returnanswer) print(returnanswer)
if nvitem.image_tx_status == 0: if nvitem.status == 0:
print("-----------------------------------------") print("-----------------------------------------")
print(self.prettyprint(nvitem.data)) print(self.prettyprint(nvitem.data))
else: else:
@ -513,7 +513,7 @@ class qcdiag(metaclass=LogBase):
ItemNumber = hex(item) + "," + hex(index) + ": " ItemNumber = hex(item) + "," + hex(index) + ": "
returnanswer = "NVItem " + ItemNumber + info returnanswer = "NVItem " + ItemNumber + info
print(returnanswer) print(returnanswer)
if nvitem.image_tx_status == 0: if nvitem.status == 0:
print("-----------------------------------------") print("-----------------------------------------")
print(self.prettyprint(nvitem.data)) print(self.prettyprint(nvitem.data))
else: else:
@ -532,10 +532,10 @@ class qcdiag(metaclass=LogBase):
old = prog old = prog
res, nvitem = self.read_nvitem(item) res, nvitem = self.read_nvitem(item)
if res != False: if res != False:
if nvitem.image_tx_status != 0x5: if nvitem.status != 0x5:
nvitem.image_tx_status = self.DecodeNVItems(nvitem) nvitem.status = self.DecodeNVItems(nvitem)
nvitems.append(dict(id=nvitem.item, name=nvitem.name, data=hexlify(nvitem.data).decode("utf-8"), nvitems.append(dict(id=nvitem.item, name=nvitem.name, data=hexlify(nvitem.data).decode("utf-8"),
status=nvitem.image_tx_status)) status=nvitem.status))
else: else:
errors += nvitem + "\n" errors += nvitem + "\n"
pos += 1 pos += 1
@ -573,7 +573,7 @@ class qcdiag(metaclass=LogBase):
if item in self.nvlist: if item in self.nvlist:
name = self.nvlist[item] name = self.nvlist[item]
data = self.unpackdata(res["rawdata"]) data = self.unpackdata(res["rawdata"])
res = nvitem(res["item"], 0, data, res["image_tx_status"], name) res = nvitem(res["item"], 0, data, res["status"], name)
return [True, res] return [True, res]
elif data[0] == 0x14: elif data[0] == 0x14:
return [False, f"Error 0x14 trying to read nvitem {hex(item)}."] return [False, f"Error 0x14 trying to read nvitem {hex(item)}."]
@ -595,7 +595,7 @@ class qcdiag(metaclass=LogBase):
if item in self.nvlist: if item in self.nvlist:
name = self.nvlist[item] name = self.nvlist[item]
data = self.unpackdata(res["rawdata"]) data = self.unpackdata(res["rawdata"])
res = nvitem(res["item"], index, data, res["image_tx_status"], name) res = nvitem(res["item"], index, data, res["status"], name)
return [True, res] return [True, res]
elif data[0] == 0x14: elif data[0] == 0x14:
return [False, f"Error 0x14 trying to read nvitem {hex(item)}."] return [False, f"Error 0x14 trying to read nvitem {hex(item)}."]