coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force vdisk for From Virtdisk firmware upgrade

Browse Source
This commit is contained in:
scgbckbone 2023-05-10 11:49:35 +02:00 committed by doc-hex
parent 037fc27dcd
commit eb0f22ec6b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shared/actions.py
View File

@ -217,7 +217,7 @@ async def dev_enable_protocol(*a):
await ux_show_story('Back to normal USB mode.')
async def microsd_upgrade(*a):
async def microsd_upgrade(menu, label, item):
# Upgrade vis MicroSD card
# - search for a particular file
# - verify it lightly
@ -226,14 +226,16 @@ async def microsd_upgrade(*a):
# - reboot into bootloader, which finishes install
from sigheader import FW_HEADER_OFFSET, FW_HEADER_SIZE, FW_MAX_LENGTH_MK4
force_vdisk = item.arg
fn = await file_picker('Pick firmware image to use (.DFU)', suffix='.dfu',
min_size=0x7800, max_size=FW_MAX_LENGTH_MK4)
min_size=0x7800, max_size=FW_MAX_LENGTH_MK4,
force_vdisk=force_vdisk)
if not fn: return
failed = None
with CardSlot() as card:
with CardSlot(force_vdisk=force_vdisk) as card:
with card.open(fn, 'rb') as fp:
from version import has_psram
if has_psram:

4
shared/flow.py
View File

@ -193,8 +193,8 @@ FileMgmtMenu = [
UpgradeMenu = [
# xxxxxxxxxxxxxxxx
MenuItem('Show Version', f=show_version),
MenuItem('From MicroSD', f=microsd_upgrade), # mk4: misnomer, could be vdisk too
MenuItem('From VirtDisk', predicate=vdisk_enabled, f=microsd_upgrade),
MenuItem('From MicroSD', f=microsd_upgrade, arg=False),
MenuItem('From VirtDisk', predicate=vdisk_enabled, f=microsd_upgrade, arg=True), # force_vdisk=True
MenuItem('Bless Firmware', f=bless_flash),
]