Merge branch 'cpr' into az_map

This commit is contained in:
Nick Foster
2012-10-14 18:01:30 -07:00
6 changed files with 14 additions and 29 deletions
+2 -2
View File
@@ -48,8 +48,8 @@ class mainwindow(QtGui.QMainWindow):
#should round to actual achieved gain
self.ui.line_gain.insert("30")
#default to 3dB
self.ui.line_threshold.insert("3")
#default to 5dB
self.ui.line_threshold.insert("5")
self.ui.prog_rssi.setMinimum(-40)
self.ui.prog_rssi.setMaximum(0)
+1 -1
View File
@@ -151,7 +151,7 @@ if __name__ == '__main__':
help="set RF gain", metavar="dB")
parser.add_option("-r", "--rate", type="eng_float", default=4000000,
help="set ADC sample rate [default=%default]")
parser.add_option("-T", "--threshold", type="eng_float", default=3.0,
parser.add_option("-T", "--threshold", type="eng_float", default=5.0,
help="set pulse detection threshold above noise in dB [default=%default]")
parser.add_option("-a","--output-all", action="store_true", default=False,
help="output all frames")