kopia lustrzana https://github.com/projecthorus/horus-gui
Add dial freq entry
rodzic
b6ba21559c
commit
6a03ffb5b9
|
@ -237,6 +237,13 @@ widgets["habitatUploadPosition"].setToolTip(
|
||||||
"Note that it can take a few minutes for your new information to\n"\
|
"Note that it can take a few minutes for your new information to\n"\
|
||||||
"appear on the map."
|
"appear on the map."
|
||||||
)
|
)
|
||||||
|
widgets["dialFreqLabel"] = QtGui.QLabel("<b>Radio Dial Freq (MHz):</b>")
|
||||||
|
widgets["dialFreqEntry"] = QtGui.QLineEdit("")
|
||||||
|
widgets["dialFreqEntry"].setToolTip(
|
||||||
|
"Optional entry of your radio's dial frequency in MHz.\n"\
|
||||||
|
"Used to provide frequency information on Habitat & SondeHub."\
|
||||||
|
)
|
||||||
|
|
||||||
widgets["saveSettingsButton"] = QtGui.QPushButton("Save Settings")
|
widgets["saveSettingsButton"] = QtGui.QPushButton("Save Settings")
|
||||||
|
|
||||||
w1_habitat.addWidget(widgets["habitatUploadLabel"], 0, 0, 1, 1)
|
w1_habitat.addWidget(widgets["habitatUploadLabel"], 0, 0, 1, 1)
|
||||||
|
@ -252,9 +259,11 @@ w1_habitat.addWidget(widgets["userAntennaLabel"], 4, 0, 1, 1)
|
||||||
w1_habitat.addWidget(widgets["userAntennaEntry"], 4, 1, 1, 2)
|
w1_habitat.addWidget(widgets["userAntennaEntry"], 4, 1, 1, 2)
|
||||||
w1_habitat.addWidget(widgets["userRadioLabel"], 5, 0, 1, 1)
|
w1_habitat.addWidget(widgets["userRadioLabel"], 5, 0, 1, 1)
|
||||||
w1_habitat.addWidget(widgets["userRadioEntry"], 5, 1, 1, 2)
|
w1_habitat.addWidget(widgets["userRadioEntry"], 5, 1, 1, 2)
|
||||||
w1_habitat.addWidget(widgets["habitatUploadPosition"], 6, 0, 1, 3)
|
w1_habitat.addWidget(widgets["dialFreqLabel"], 6, 0, 1, 1)
|
||||||
w1_habitat.layout.setRowStretch(7, 1)
|
w1_habitat.addWidget(widgets["dialFreqEntry"], 6, 1, 1, 2)
|
||||||
w1_habitat.addWidget(widgets["saveSettingsButton"], 8, 0, 1, 3)
|
w1_habitat.addWidget(widgets["habitatUploadPosition"], 7, 0, 1, 3)
|
||||||
|
w1_habitat.layout.setRowStretch(8, 1)
|
||||||
|
w1_habitat.addWidget(widgets["saveSettingsButton"], 9, 0, 1, 3)
|
||||||
|
|
||||||
d0_habitat.addWidget(w1_habitat)
|
d0_habitat.addWidget(w1_habitat)
|
||||||
|
|
||||||
|
@ -747,12 +756,20 @@ def handle_new_packet(frame):
|
||||||
_snr = get_latest_snr()
|
_snr = get_latest_snr()
|
||||||
#logging.info(f"Packet SNR: {_snr:.2f}")
|
#logging.info(f"Packet SNR: {_snr:.2f}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
_radio_dial = float(widgets["dialFreqEntry"].text())*1e6
|
||||||
|
habitat_uploader.last_freq_hz = _radio_dial
|
||||||
|
except:
|
||||||
|
_radio_dial = None
|
||||||
|
|
||||||
if type(frame.data) == str:
|
if type(frame.data) == str:
|
||||||
# RTTY packet handling.
|
# RTTY packet handling.
|
||||||
# Attempt to extract fields from it:
|
# Attempt to extract fields from it:
|
||||||
try:
|
try:
|
||||||
_decoded = parse_ukhas_string(frame.data)
|
_decoded = parse_ukhas_string(frame.data)
|
||||||
_decoded['snr'] = _snr
|
_decoded['snr'] = _snr
|
||||||
|
if _radio_dial:
|
||||||
|
_decoded['f_centre'] = _radio_dial
|
||||||
# If we get here, the string is valid!
|
# If we get here, the string is valid!
|
||||||
widgets["latestRawSentenceData"].setText(f"{_packet} ({_snr:.1f} dB SNR)")
|
widgets["latestRawSentenceData"].setText(f"{_packet} ({_snr:.1f} dB SNR)")
|
||||||
widgets["latestDecodedSentenceData"].setText(f"{_packet}")
|
widgets["latestDecodedSentenceData"].setText(f"{_packet}")
|
||||||
|
@ -777,6 +794,9 @@ def handle_new_packet(frame):
|
||||||
try:
|
try:
|
||||||
_decoded = decode_packet(frame.data)
|
_decoded = decode_packet(frame.data)
|
||||||
_decoded['snr'] = _snr
|
_decoded['snr'] = _snr
|
||||||
|
if _radio_dial:
|
||||||
|
_decoded['f_centre'] = _radio_dial
|
||||||
|
|
||||||
widgets["latestRawSentenceData"].setText(f"{_packet} ({_snr:.1f} dB SNR)")
|
widgets["latestRawSentenceData"].setText(f"{_packet} ({_snr:.1f} dB SNR)")
|
||||||
widgets["latestDecodedSentenceData"].setText(_decoded['ukhas_str'])
|
widgets["latestDecodedSentenceData"].setText(_decoded['ukhas_str'])
|
||||||
habitat_uploader.add(_decoded['ukhas_str']+'\n')
|
habitat_uploader.add(_decoded['ukhas_str']+'\n')
|
||||||
|
|
|
@ -62,6 +62,8 @@ class HabitatUploader(object):
|
||||||
self.listener_antenna = listener_antenna
|
self.listener_antenna = listener_antenna
|
||||||
self.position_uploaded = False
|
self.position_uploaded = False
|
||||||
|
|
||||||
|
self.last_freq_hz = None
|
||||||
|
|
||||||
self.callsign_init = False
|
self.callsign_init = False
|
||||||
self.uuids = []
|
self.uuids = []
|
||||||
|
|
||||||
|
@ -91,6 +93,10 @@ class HabitatUploader(object):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if self.last_freq_hz:
|
||||||
|
# Add in frequency information if we have it.
|
||||||
|
_data["receivers"][_user_call]["rig_info"] = {"frequency": self.last_freq_hz}
|
||||||
|
|
||||||
# The URl to upload to.
|
# The URl to upload to.
|
||||||
_url = f"{self.HABITAT_URL}{self.HABITAT_DB}/_design/payload_telemetry/_update/add_listener/{sha256(_sentence_b64).hexdigest()}"
|
_url = f"{self.HABITAT_URL}{self.HABITAT_DB}/_design/payload_telemetry/_update/add_listener/{sha256(_sentence_b64).hexdigest()}"
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue