mbirth/gcd-parser
1
0
Fork 0
Code Issues 5 Pull Requests Activity

NEW device.get_name() METHOD! Added -q parameter to get_updates.

Browse Source 
Reworked device database for sub-ids.
This commit is contained in:
Markus Birth 2022-12-11 02:53:51 +01:00
parent a2e2e411e2
commit b73e95f454
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
7 changed files with 1759 additions and 1370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binsum.py
View File

@ -35,7 +35,7 @@ with open(FILE, "rb") as f:
start += 4
hwid = unpack("<H", block[start+24:start+24+2])[0]
fver = unpack("<H", block[start+28:start+28+2])[0]
print("- Hardware ID: 0x{:04x} / {:d} ({})".format(hwid, hwid, devices.DEVICES.get(hwid, "Unknown device")))
print("- Hardware ID: 0x{:04x} / {:d} ({})".format(hwid, hwid, devices.get_name(hwid, 0, "Unknown device")))
print("- Firmware Version: 0x{:04x} / {:04d}".format(fver, fver))
first_block = False
if END_MARKER in block:

8
find_hwids.py
View File

@ -32,7 +32,9 @@ results = sorted(set(results))
for r in results:
print(r, end="")
hw_id = int(r[5:9])
if hw_id in devices.DEVICES:
print(" - {}".format(devices.DEVICES[hw_id]), end="")
hw_id = r[5:9]
sub_id = r[10:]
device_name = devices.get_name(hw_id, sub_id)
if device_name:
print(" - {}".format(device_name), end="")
print()

20
get_updates.py
View File

@ -18,6 +18,7 @@ optp.add_option("-c", "--changelog", action="store_true", dest="changelog", help
optp.add_option("-l", "--license", action="store_true", dest="license", help="also show license")
optp.add_option("-E", "--express", action="store_false", dest="webupdater", default=True, help="Only query Garmin Express")
optp.add_option("-W", "--webupdater", action="store_false", dest="express", default=True, help="Only query WebUpdater")
optp.add_option("-q", "--quiet", action="store_true", dest="quiet", default=False, help="Only output results (if any)")
optp.add_option("--id", dest="unit_id", help="Specify custom Unit ID")
optp.add_option("--code", action="append", dest="unlock_codes", metavar="UNLOCK_CODE", default=[], help="Specify map unlock codes")
optp.add_option("--devicexml", dest="devicexml", metavar="FILE", help="Use specified GarminDevice.xml (also implies -E)")
@ -83,10 +84,11 @@ for i, sku in enumerate(device_skus):
if len(sku) <= 4:
device_skus[i] = "006-B{:>04}-00".format(sku)
if device_skus[0][0:5] == "006-B":
if device_skus[0][0:5] == "006-B" and not opts.quiet:
primary_hwid = int(device_skus[0][5:9])
device_name = devices.DEVICES.get(primary_hwid, "Unknown device")
print("Device {:04d} (guessed): {}".format(primary_hwid, device_name))
primary_subid = device_skus[0][10:]
device_name = devices.get_name(primary_hwid, primary_subid, "Unknown device")
print("Device {:04d}-{:02} (guessed): {}".format(primary_hwid, primary_subid, device_name))
if opts.unit_id:
print("Custom Unit ID: {}".format(opts.unit_id))
@ -99,14 +101,18 @@ for uc in opts.unlock_codes:
results = []
if opts.express:
print("Querying Garmin Express ...", end="", flush=True)
if not opts.quiet:
print("Querying Garmin Express ...", end="", flush=True)
results += us.query_express(device_skus)
print(" done.")
if not opts.quiet:
print(" done.")
if opts.webupdater:
print("Querying Garmin WebUpdater ...", end="", flush=True)
if not opts.quiet:
print("Querying Garmin WebUpdater ...", end="", flush=True)
results += us.query_webupdater(device_skus)
print(" done.")
if not opts.quiet:
print(" done.")
for r in results:
print(r)

3083
grmn/devices.py
View File

File diff suppressed because it is too large Load Diff

2
grmn/rgnbin.py
View File

@ -129,7 +129,7 @@ class RgnBin:
def __str__(self):
txt = "Binary payload, {} Bytes".format(len(self.payload))
if self.hwid:
txt += "\n - hw_id: 0x{:04x} / {:d} ({})".format(self.hwid, self.hwid, devices.DEVICES.get(self.hwid, RED + "Unknown device" + RESET))
txt += "\n - hw_id: 0x{:04x} / {:d} ({})".format(self.hwid, self.hwid, devices.get_name(self.hwid, 0, RED + "Unknown device" + RESET))
if self.version:
txt += "\n - Version: 0x{:04x} / {:d}".format(self.version, self.version)
cksum = ChkSum()

4
grmn/tlv.py
View File

@ -320,7 +320,7 @@ class TLV7(TLV):
fdesc = self.tlv6.fields[i]
(fid, v) = pair
if fid == 0x1009:
txt += "\n - Field {:d} ({:04x}): {:>20}: 0x{:04x} / {:d} ({})".format(i+1, fid, fdesc, v, v, devices.DEVICES.get(v, RED + "Unknown device" + RESET))
txt += "\n - Field {:d} ({:04x}): {:>20}: 0x{:04x} / {:d} ({})".format(i+1, fid, fdesc, v, v, devices.get_name(v, 0, RED + "Unknown device" + RESET))
elif fid == 0x2015:
txt += "\n - Field {:d} ({:04x}): {:>20}: {} Bytes".format(i+1, fid, fdesc, v)
elif fid == 0x4007:
@ -404,7 +404,7 @@ class TLVbinary0401(TLVbinary):
sku = self.value[10:20].decode("utf-8")
hwid = int(sku[4:8])
txt += "\n - SKU: {}-{}-{}".format(sku[0:3], sku[3:8], sku[8:10])
txt += "\n - hw_id: 0x{:04x} / {:d} ({})".format(hwid, hwid, devices.DEVICES.get(hwid, RED + "Unknown device" + RESET))
txt += "\n - hw_id: 0x{:04x} / {:d} ({})".format(hwid, hwid, devices.get_name(hwid, 0, RED + "Unknown device" + RESET))
txt += "\n - Version: 0x{:04x} / {:d}".format(version, version)
elif skuprobe == b"SW_I":
swistring = self.value[10:20].decode("utf-8")

10
list_missing_hwids.py
View File

@ -26,19 +26,19 @@ queue = []
for i in range(0, last_id+1):
if i % 10 == 0:
if len(cur_line) + len(queue) > 15:
print("./get_updates.py {}".format(" ".join(cur_line)))
print("./get_updates.py -q {}".format(" ".join(cur_line)))
cur_line = queue
else:
cur_line += queue
queue = []
if not i in missing:
if i not in missing:
continue
queue.append("{:04}".format(i))
missing_count += 1
cur_line += queue
if len(cur_line) > 0:
print("./get_updates.py {}".format(" ".join(cur_line)))
print("./get_updates.py -q {}".format(" ".join(cur_line)))
known_count = len(devices.DEVICES)
print()
@ -50,13 +50,13 @@ if len(sys.argv) > 1:
print("-" * 100)
print("Here are some possible future ids:")
print("./get_updates.py", end="")
print("./get_updates.py -q", end="")
cur_line = 0
for i in range(last_id + 1, last_id + 300):
if i % 10 == 0 and cur_line > 5:
print()
print("./get_updates.py", end="")
print("./get_updates.py -q", end="")
cur_line = 0
print(" {:04}".format(i), end="")
cur_line += 1