# HG changeset patch # User Jim Unroe rock.unroe@gmail.com # Date 1367766835 14400 # Node ID 5fe562687fd3e7bb94fffcef06426b56d30ad271 # Parent 181c5ca5d8f726805ad73e730edc3283982ff806 [UV-5R] display image and radio firmware versions in existing notification message that appears after an upload when the two firmware versions do not match related to #845

diff -r 181c5ca5d8f7 -r 5fe562687fd3 chirp/uv5r.py --- a/chirp/uv5r.py Sat May 04 22:30:51 2013 -0400 +++ b/chirp/uv5r.py Sun May 05 11:13:55 2013 -0400 @@ -421,10 +421,11 @@ return # Old image, no aux block

if image_version != radio_version: - raise errors.RadioError("Upload finished, but the 'Other Settings' " - "could not be sent because the firmware " - "version of the image does not match that " - "of the radio") + msg = ("Upload finished, but the 'Other Settings' " + "could not be sent because the firmware " + "version of the image (%s) does not match " + "that of the radio (%s).") + raise errors.RadioError(msg % (image_version, radio_version))

# Auxiliary block at radio address 0x1EC0, our offset 0x1808 for i in range(0x1EC0, 0x2000, 0x10):