arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00
Code Issues Releases Wiki Activity

drop FirmwareUpdate.force field

Browse Source
This commit is contained in:
Pavol Rusnak 2013-10-21 18:30:43 +02:00
parent 624d500c84
commit f863e1e602
4 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd.py
View File

@ -121,7 +121,7 @@ class Commands(object):
raise Exception("Trezor firmware header expected") raise Exception("Trezor firmware header expected")
fp.seek(0) fp.seek(0)
return self.client.firmware_update(fp=open(args.file, 'r'), force=args.force) return self.client.firmware_update(fp=open(args.file, 'r'))
list.help = 'List connected Trezor USB devices' list.help = 'List connected Trezor USB devices'
ping.help = 'Send ping message' ping.help = 'Send ping message'
@ -164,7 +164,6 @@ class Commands(object):
firmware_update.arguments = ( firmware_update.arguments = (
(('-f', '--file'), {'type': str}), (('-f', '--file'), {'type': str}),
(('-o', '--force'), {'type': bool, 'default': False})
) )
def list_usb(): def list_usb():

3
protobuf/trezor.proto
View File

@ -350,8 +350,7 @@ message TxOutput {
// //
message FirmwareUpdate { message FirmwareUpdate {
required bool force = 1; // Force update, suppress message about wiping storage area required bytes payload = 1 [(binary) = true]; // Firmware to flash into device
required bytes payload = 2 [(binary) = true]; // Firmware to flash into device
} }
// **************************************************************************** // ****************************************************************************

4
trezorlib/client.py
View File

@ -260,11 +260,11 @@ class TrezorClient(object):
self.init_device() self.init_device()
return isinstance(resp, proto.Success) return isinstance(resp, proto.Success)
def firmware_update(self, fp, force=False): def firmware_update(self, fp):
if self.features.bootloader_mode == False: if self.features.bootloader_mode == False:
raise Exception("Device must be in bootloader mode") raise Exception("Device must be in bootloader mode")
resp = self.call(proto.FirmwareUpdate(force=force, payload=fp.read())) resp = self.call(proto.FirmwareUpdate(payload=fp.read()))
if isinstance(resp, proto.Success): if isinstance(resp, proto.Success):
return True return True

47
trezorlib/trezor_pb2.py
View File

File diff suppressed because one or more lines are too long