scrape/gqrx-panadapter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified, solved the tuning step problem, but now tuning is backwards again (if I disable Swap I/Q), or just wrong (if I enable Swap I/Q).

Browse Source
This commit is contained in:
Rob French 2020-09-29 11:48:12 -05:00
parent 623956731c
commit b3887bc68d
1 changed files with 31 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
gqrx-panadapter.py
View File

@ -28,15 +28,7 @@ from Tkinter import *
DEBUG=True DEBUG=True
# States delay_secs = 0.05 # 50 msec delay
WAITING = 0
RIG_CMD = 1
RIG_WAIT = 2
GQRX_CMD = 3
GQRX_WAIT = 4
DELAY = 5
delay_secs = 0.5
timeout = 0.0 timeout = 0.0
usb_if_offset = 0 #-2250 usb_if_offset = 0 #-2250
@ -119,16 +111,12 @@ def calc_lnb_lo(freq, ifreq, isusb=True):
def get_rig_freq(rs): def get_rig_freq(rs):
rs.send(b'm\n') rs.send(b'm\n')
is_usb = True if rs.recv(1024).splitlines()[0] == "USB" else False is_usb = True if rs.recv(1024).splitlines()[0] == "USB" else False
rs.send(b'n\n')
print(rs.recv(1024))
step = 1000
rs.send(b'f\n') rs.send(b'f\n')
return (int(rs.recv(1024)), is_usb, step) return (int(rs.recv(1024)), is_usb)
def set_rig_freq(rs, freq): def set_rig_freq(rs, freq):
if DEBUG: if DEBUG:
print('Set Rig freq: {}'.format(freq).encode()) print('Set Rig freq: {}'.format(freq).encode())
rs.send(b'F ' + str(freq) + '\n') rs.send(b'F ' + str(freq) + '\n')
rs.recv(1024) rs.recv(1024)
@ -139,16 +127,13 @@ def get_gqrx_freq(gs):
def set_gqrx_freq(gs, freq): def set_gqrx_freq(gs, freq):
if DEBUG: if DEBUG:
print('Set GQRX Freq: {}'.format(freq).encode()) print('Set GQRX Freq: {}'.format(freq).encode())
gs.send('F {}'.format(freq).encode()) gs.send('F {}'.format(freq).encode())
gs.recv(1024) gs.recv(1024)
def set_gqrx_lnb_lo(gs, freq, ifreq, isusb): def set_gqrx_lnb_lo(gs, freq, ifreq, isusb):
lnb = calc_lnb_lo(freq, ifreq, isusb) lnb = calc_lnb_lo(freq, ifreq, isusb)
if DEBUG: if DEBUG:
print('Set LNB Freq: {}'.format(lnb).encode()) print('Set LNB Freq: {}'.format(lnb).encode())
gs.send('LNB_LO {}'.format(lnb).encode()) gs.send('LNB_LO {}'.format(lnb).encode())
gs.recv(1024) gs.recv(1024)
@ -185,18 +170,13 @@ def main():
try: try:
if_freq = int(args.ifreq * 1e6) if_freq = int(args.ifreq * 1e6)
old_is_usb = True old_is_usb = False
tmp_is_usb = True
old_rig_freq = -1 # force initial update old_rig_freq = -1 # force initial update
old_gqrx_freq = -1 # force initial update old_gqrx_freq = -1 # force initial update
tuning_step = -1 (rig_freq, is_usb) = get_rig_freq(rs)
(rig_freq, is_usb, tuning_step) = get_rig_freq(rs)
gqrx_freq = get_gqrx_freq(gs) gqrx_freq = get_gqrx_freq(gs)
state = WAITING
tk = Tk() tk = Tk()
window = MainWindow(tk) window = MainWindow(tk)
@ -204,7 +184,7 @@ def main():
allow_rig_to_gqrx = window.rig_to_gqrx.get() allow_rig_to_gqrx = window.rig_to_gqrx.get()
allow_gqrx_to_rig = window.gqrx_to_rig.get() allow_gqrx_to_rig = window.gqrx_to_rig.get()
(rig_freq, is_usb, tuning_step) = get_rig_freq(rs) (rig_freq, is_usb) = get_rig_freq(rs)
gqrx_freq = get_gqrx_freq(gs) gqrx_freq = get_gqrx_freq(gs)
#----------------------------------------------------------------- #-----------------------------------------------------------------
@ -226,53 +206,39 @@ def main():
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Regardless of anything else, if the rig freq changes, the # Regardless of anything else, if the rig freq changes, the
# LNB LO frequency must be updated. # LNB LO frequency must be updated (even if allow_rig_to_gqrx is
if (rig_freq != old_rig_freq): # false).
if rig_freq != old_rig_freq or is_usb != old_is_usb:
if DEBUG:
print("\nRig freq changed -- update LNB LO\n")
set_gqrx_lnb_lo(gs, rig_freq, if_freq, is_usb) set_gqrx_lnb_lo(gs, rig_freq, if_freq, is_usb)
set_gqrx_freq(gs, gqrx_freq) set_gqrx_freq(gs, gqrx_freq)
if DEBUG: #time.sleep(delay_secs)
print("\nFreq mismatch, updated LNB LO\n")
if state == WAITING: if allow_rig_to_gqrx and (rig_freq != old_rig_freq or is_usb != old_is_usb):
if allow_rig_to_gqrx and ((rig_freq != old_rig_freq or is_usb != old_is_usb) or (rig_freq != gqrx_freq)): if DEBUG:
set_gqrx_lnb_lo(gs, rig_freq, if_freq, is_usb) print("\nRig freq to Gqrx freq\n")
set_gqrx_freq(gs, rig_freq) set_gqrx_lnb_lo(gs, rig_freq, if_freq, is_usb)
timeout = time.time() + delay_secs set_gqrx_freq(gs, rig_freq)
if DEBUG: #time.sleep(delay_secs)
print("\nNew state: RIG_CMD\n")
elif allow_gqrx_to_rig and ((gqrx_freq != old_gqrx_freq) or (abs(rig_freq - gqrx_freq) >= tuning_step)):
tmp_is_usb = is_usb
set_rig_freq(rs, gqrx_freq)
set_gqrx_lnb_lo(gs, gqrx_freq, if_freq, is_usb)
set_gqrx_freq(gs, gqrx_freq)
timeout = time.time() + delay_secs
state = GQRX_CMD
if DEBUG:
print("\nNew state: GQRX_CMD\n");
if state == RIG_CMD and (time.time() > timeout or rig_freq == gqrx_freq): elif allow_gqrx_to_rig and gqrx_freq != old_gqrx_freq:
#if rig_freq != old_rig_freq or is_usb != old_is_usb:
# set_gqrx_freq(gs, rig_freq, if_freq, is_usb)
# timeout = time.time() + delay_secs
#elif time.time() > timeout or rig_freq == gqrx_freq:
state = WAITING
if DEBUG: if DEBUG:
print("\nNew state: WAITING\n"); print("\nGqrx freq to Rig freq\n")
if state == GQRX_CMD and (time.time() > timeout or (abs(rig_freq - gqrx_freq) < tuning_step)): # First set the rig frequency,then wait to ensure it takes.
#if gqrx_freq != old_gqrx_freq: set_rig_freq(rs, gqrx_freq)
# set_rig_freq(rs, gs, gqrx_freq, if_freq, tmp_is_usb) #time.sleep(delay_secs)
# timeout = time.time() + delay_secs
#elif time.time() > timeout or rig_freq == gqrx_freq:
state = WAITING
if DEBUG:
print("\nNew state: WAITING\n");
is_usb = tmp_is_usb
else:
pass
# Now grab the rig frequency and use it to re-set the Gqrx
# frequency. This is due to the fact that tuning steps on
# the rig may prevent the actual Gqrx frequency from being
# set, so Gqrx will use whatever the rig accepted.
(rig_freq, is_usb) = get_rig_freq(rs)
set_gqrx_lnb_lo(gs, rig_freq, if_freq, is_usb)
set_gqrx_freq(gs, rig_freq)
#time.sleep(delay_secs)
tk.update_idletasks() tk.update_idletasks()
tk.update() tk.update()
time.sleep(args.interval / 1000.0) time.sleep(args.interval / 1000.0)