mirror of
https://github.com/fairwaves/UHD-Fairwaves.git
synced 2025-11-02 21:13:14 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93d4343d85 | ||
|
|
1421327cfe | ||
|
|
1e0c879f53 |
7
debian/changelog
vendored
7
debian/changelog
vendored
@@ -1,3 +1,10 @@
|
||||
umtrx (1.0.15) trusty; urgency=medium
|
||||
|
||||
* host: Python 2 compatibility for umtrx_property_tree.py
|
||||
* utils: s/USRP/UmTRX/g in console output of umtrx_net_burner.py
|
||||
|
||||
-- Rauf Gyulaliev <rauf.gyulaliev@fairwaves.co> Tue, 15 Aug 2017 03:03:23 +0300
|
||||
|
||||
umtrx (1.0.14) trusty; urgency=medium
|
||||
|
||||
* Quick build fix.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright 2010-2011 Ettus Research LLC
|
||||
# Copyright 2013-2017 Fairwaves, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -16,8 +17,6 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# TODO: make it autodetect UHD devices
|
||||
|
||||
import optparse
|
||||
import math
|
||||
import os
|
||||
@@ -495,7 +494,7 @@ class burner_socket(object):
|
||||
########################################################################
|
||||
def get_options():
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option("--addr", type="string", help="USRP-N2XX device address", default='')
|
||||
parser.add_option("--addr", type="string", help="UmTRX device address", default='')
|
||||
parser.add_option("--fw", type="string", help="firmware image path (optional)", default='')
|
||||
parser.add_option("--fpga", type="string", help="fpga image path (optional)", default='')
|
||||
parser.add_option("--reset", action="store_true", help="reset the device after writing", default=False)
|
||||
@@ -527,7 +526,7 @@ if __name__=='__main__':
|
||||
|
||||
if options.overwrite_safe and not options.read:
|
||||
print("Are you REALLY, REALLY sure you want to overwrite the safe image? This is ALMOST ALWAYS a terrible idea.")
|
||||
print("If your image is faulty, your USRP2+ will become a brick until reprogrammed via JTAG.")
|
||||
print("If your image is faulty, your UmTRX will become a brick until reprogrammed via JTAG.")
|
||||
response = raw_input("""Type "yes" to continue, or anything else to quit: """)
|
||||
if response != "yes": sys.exit(0)
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ class umtrx_property_tree:
|
||||
d = dict(action=action, path=path)
|
||||
if value_type is not None: d['type'] = value_type
|
||||
if value is not None: d['value'] = value
|
||||
return self.s.send(bytes(json.dumps(d)+'\n', 'UTF-8'))
|
||||
return self.s.send((json.dumps(d)+'\n').encode('UTF-8'))
|
||||
|
||||
def _recv_response(self):
|
||||
resp = self.f.readline().strip()
|
||||
|
||||
Reference in New Issue
Block a user