Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
aa2il committed Nov 26, 2024
1 parent b7451ae commit 285e3d0
Show file tree
Hide file tree
Showing 41 changed files with 11,292 additions and 35 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
/dist_1.0/bandmap
/dist_1.0/bandmap.exe
/dist_1.0/bandmap_setup.exe
/work/*
/work2/*
/work3/*
/OLD/*
/JUNK/*
/work/__pycache__/*
/work/save*
/work*/__pycache__/*
Empty file modified Corrections.txt
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions DIFF
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#set ROOT="/media/${USER}/aa2il"
set ROOT="/media/${USER}/marconi"
#set ROOT="/media/${USER}/hertz"
#set ROOT="/media/${USER}/sproul"
set ROOT="/media/${USER}/sproul-win"
set ROOT="/media/${USER}/sproul"
#set ROOT="/media/${USER}/sproul-win"
#set ROOT="/media/${USER}/3D76-ECB1"
#set ROOT="/media/${USER}/acer"
#set ROOT="/media/${USER}/cartman"
Expand All @@ -30,7 +30,7 @@ set old=${ROOT}${PTH}

# Override if needed
#set old='save34'
#set old='work2'
set old='work'
echo OLD=$old

rm -f DIFFS
Expand Down
Empty file modified Friends.txt
100644 → 100755
Empty file.
7 changes: 4 additions & 3 deletions Most_Wanted.txt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
A8OK
C21MM
V55LA
VP8G
S9Z


5 changes: 3 additions & 2 deletions bm_gui.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from widgets_tk import StatusBar
from tcp_server import open_udp_client,KEYER_UDP_PORT
from bm_udp import *
from load_history import load_history

#########################################################################################

Expand Down Expand Up @@ -614,7 +615,7 @@ def SelectBands(self,allow_change=False):

# Get latest logbook
now = datetime.utcnow().replace(tzinfo=UTC)
if self.P.PARSE_LOG and len(self.qsos)==0:
if self.P.STAND_ALONE or len(self.qsos)==0:
if self.P.LOG_NAME0:
# Log for operator if different from current callsign
# We won't keep reading this file so we set REVISIT=False
Expand Down Expand Up @@ -1166,7 +1167,7 @@ def Settings(self):

# Print out log
def ShowLog(self):
print('\nLOG::::::::::',self.P.PARSE_LOG)
print('\nLOG::::::::::',self.P.STAND_ALONE)
for qso in self.qsos:
print(qso)
print(' ')
Expand Down
6 changes: 5 additions & 1 deletion bm_udp.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ def bm_udp_msg_handler(self,sock,msg):
def spot_list_query(P,sock=None,band=None):

print('BM UDP SPOTLIST QUERY: band=',band)
if not hasattr(P,'gui'):
if not hasattr(P,'gui') and False:
print('BM UDP SPOTLIST QUERY: No Gui?')
return

if not band:
Expand Down Expand Up @@ -194,16 +195,19 @@ def spot_list_query(P,sock=None,band=None):
#print("Size of decompressed text",a3_size,'\na3=',a3)
#print("\nDifference of size= ", a_size-a2_size)

print('BM UDP SPOTLIST QUERY: Sending compressed message ...')
if sock:
sock.send(msg22)
else:
P.udp_server.Broadcast(msg22)

else:

print('BM UDP SPOTLIST QUERY: Sending message ...')
if sock:
sock.send(msg2.encode())
else:
P.udp_server.Broadcast(msg2)

print('BM UDP SPOTLIST QUERY: Done.')

30 changes: 15 additions & 15 deletions cluster_feed.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def cluster_feed(self):
print('spot=',spot)

# Check for band changes
if tn.nsleep>=1 and True:
if tn.nsleep>=1:
band = self.band.get()
#logging.info("Calling Get band ...")
frq2 = 1e-6*self.sock.get_freq(VFO=self.VFO)
Expand Down Expand Up @@ -204,7 +204,7 @@ def digest_spot(self,line):

# Check for logged contact
if "<adif_ver" in line:
print('\nCluster Feed: LOGGED Contact Detected ...')
print('\nDIGEST SPOT: LOGGED Contact Detected ...')
qso=parse_adif(-1,line)
#print('qso=',qso)
self.qsos.append( qso[0] )
Expand All @@ -230,12 +230,12 @@ def digest_spot(self,line):

# Fix common mistakes
if dx_call==None:
print('CLUSTER_FEED: *** CORRECTION - blank call?????',dx_call)
print('DIGEST SPOT: *** CORRECTION - blank call?????',dx_call)
pprint(vars(obj))
elif len(dx_call)<3:
print('CLUSTER_FEED: *** CORRECTION but dont know what to do - call=',dx_call)
print('DIGEST SPOT: *** CORRECTION but dont know what to do - call=',dx_call)
elif dx_call in self.corrections:
print('CLUSTER_FEED: *** NEED A CORRECTION ***',dx_call)
print('DIGEST SPOT: *** NEED A CORRECTION ***',dx_call)
dx_call = self.corrections[dx_call]
obj.dx_call = dx_call
elif dx_call[0]=='T' and dx_call[1:] in self.P.members:
Expand Down Expand Up @@ -267,7 +267,7 @@ def digest_spot(self,line):
keep=False

if False:
print('CLUSTER FEED:',line.strip())
print('DIGEST SPOT:',line.strip())
print('keep=',keep,'\tb=',b)

if keep:
Expand Down Expand Up @@ -298,14 +298,14 @@ def digest_spot(self,line):
except:
bg=0
self.tn.highlight_spot(dx_call,fg,bg)
#print('CLUSTER FEED: call=',obj.dx_call,'\tsnr=',obj.snr,'\tfg/bg=',fg,bg,'\t',obj.snr.isnumeric(),int(obj.snr),len(obj.snr))
#print('DIGEST SPOT: call=',obj.dx_call,'\tsnr=',obj.snr,'\tfg/bg=',fg,bg,'\t',obj.snr.isnumeric(),int(obj.snr),len(obj.snr))

# Pull out info from the spot
freq=float( obj.frequency )
mode=obj.mode
band=obj.band
self.nspots+=1
print('CLUSTER FEED: call=',obj.dx_call,'\tfreq=',freq,'\tmode=',mode,'\tband=',band,'\tnspots=',self.nspots)
print('DIGEST SPOT: call=',obj.dx_call,'\tfreq=',freq,'\tmode=',mode,'\tband=',band,'\tnspots=',self.nspots)

dxcc=obj.dx_station.country
if dxcc==None and False:
Expand Down Expand Up @@ -352,11 +352,11 @@ def digest_spot(self,line):

# Call already in list - Update spot info
#if VERBOSITY>=2:
print("CLUSTER FEED: Dupe call =",dx_call,'\tfreq=',freq,
print("DIGEST SPOT: Dupe call =",dx_call,'\tfreq=',freq,
'\tmode=',mode,'\tband=',band,'\tidx1=',idx1)
for i in idx1:
if VERBOSITY>=2:
print('CLUSTER FEED A i=',i,self.SpotList[i].dx_call,
print('\tA i=',i,self.SpotList[i].dx_call,
'\ttime=',self.SpotList[i].time,obj.time,
'\tfreq=',self.SpotList[i].frequency,obj.frequency)
self.SpotList[i].time=obj.time
Expand All @@ -366,13 +366,13 @@ def digest_spot(self,line):
if self.P.CLUSTER=='WSJT':
self.SpotList[i].df=obj.df
if VERBOSITY>=2:
print('CLUSTER FEED B i=',i,self.SpotList[i].dx_call,
print('\tB i=',i,self.SpotList[i].dx_call,
'\ttime=',self.SpotList[i].time,obj.time,
'\tfreq=',self.SpotList[i].frequency,obj.frequency)

# Update list box entry - In progress
idx2 = [i for i,x in enumerate(self.current) if x.dx_call == dx_call and x.band==b]
if len(idx2)>0 and True:
if len(idx2)>0:
bgc = self.lb.itemcget(idx2[0], 'background')
#print '&&&&&&&&&&&&&&&&&&&&&& Modifying ',idx2[0],dx_call,bgc
#print lb.get(idx2[0])
Expand Down Expand Up @@ -404,7 +404,7 @@ def digest_spot(self,line):
else:

# New call - maintain a list of all spots sorted by freq
print("CLUSTER FEED: New call =",dx_call,'\tfreq=',freq,
print("DIGEST SPOT: New call =",dx_call,'\tfreq=',freq,
'\tmode=',mode,'\tband=',band)
self.SpotList.append( obj )
# self.SpotList.sort(key=lambda x: x.frequency, reverse=False)
Expand Down Expand Up @@ -442,7 +442,7 @@ def digest_spot(self,line):
elif xm in ['SSB','LSB','USB','FM']:
xm='PH'
if xm not in self.P.SHOW_MODES:
#print('CLUSTER_FEED: Culling',xm,'spot - ', self.P.SHOW_MODES)
#print('DIGEST SPOT: Culling',xm,'spot - ', self.P.SHOW_MODES)
return True

# Cull dupes
Expand Down Expand Up @@ -491,7 +491,7 @@ def digest_spot(self,line):
cull_old_spots(self)

if VERBOSITY>=1:
print('CLUSTER FEED B: nspots=',self.nspots,len(self.SpotList),len(self.current))
print('DIGEST SPOT: nspots=',self.nspots,len(self.SpotList),len(self.current))
return True

#########################################################################################
Expand Down
13 changes: 5 additions & 8 deletions params.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,10 @@ def __init__(self):

self.MAX_HOURS_DUPE = args.hours

self.CONTEST_MODE = args.contest
self.DESKTOP = args.desktop
self.SMALL_FONT = args.small or self.CONTEST_MODE

self.PARSE_LOG = self.CONTEST_MODE and True
self.PARSE_LOG = True
#self.PARSE_LOG = False
self.CONTEST_MODE = args.contest
self.DESKTOP = args.desktop
self.SMALL_FONT = args.small or self.CONTEST_MODE
self.STAND_ALONE = True

self.BM_GEO = args.bm_geo
self.TEST_MODE = args.test
Expand Down Expand Up @@ -253,7 +250,7 @@ def __init__(self):
self.LOG_NAME = os.path.expanduser( self.LOG_NAME.replace('[MYCALL]',MY_CALL2 ) )
self.NODES = NODES
self.threads = []
print('LOG_NAME=',self.LOG_NAME,'\tPARGE_LOG=',self.PARSE_LOG)
print('LOG_NAME=',self.LOG_NAME,'\tSTAND_ALONE=',self.STAND_ALONE)

if self.SERVER=="WSJT" or args.buttons:
self.ALLOW_CHANGES=True
Expand Down
7 changes: 7 additions & 0 deletions work/Corrections.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
AA2IR AA2IL
T2IL AA2IL
TA2IL AA2IL
TY4GS KY4GS
EW5LXS W5LXS
NS0RCWT NS0R
NS0RCWO NS0R
62 changes: 62 additions & 0 deletions work/DIFF
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#! /bin/csh -f
#############################################################################
#
# Script to compare working code version on RPi to configured version
#
#############################################################################
#
# Specify root where old version exists
#set ROOT="/media/${USER}/305f60b3-8413-4edb-afc1-4e4ce064aab3/home/${USER}"
#set ROOT="/media/${USER}/pi"
#set ROOT="/media/${USER}/aa2il"
set ROOT="/media/${USER}/marconi"
#set ROOT="/media/${USER}/hertz"
set ROOT="/media/${USER}/sproul"
#set ROOT="/media/${USER}/sproul-win"
#set ROOT="/media/${USER}/3D76-ECB1"
#set ROOT="/media/${USER}/acer"
#set ROOT="/media/${USER}/cartman"
if( !(-e $ROOT) )then
set ROOT="${ROOT}2"
endif

# Add path down to old version
set N=`echo $HOME | wc -c`
echo N=$N
#set PTH=`pwd | cut -c ${N}-`
set PTH=`pwd | sed 's/\/home2//g' | cut -c ${N}-`
echo PTH=$PTH
set old=${ROOT}${PTH}

# Override if needed
#set old='save34'
set old='work'
echo OLD=$old

rm -f DIFFS
foreach i (*.py DIFF *.bat *.txt dist/*.iss)
echo $i
set n=`diff -w $old/$i $i | wc -l`
if( !( -e $old/$i ) )then
echo NO SUCH FILE $old/$i
cp $i $old/$i
else if( $n > 0 ) then
echo ---------------------------------- >> DIFFS
echo $i >> DIFFS
echo " " >> DIFFS
diff -w $old/$i $i >> DIFFS
echo " " >> DIFFS

#kompare $old/$i $i
kompare $i $old/$i
endif
end

chmod +x bandmap.py DIFF

#cat DIFFS
set f=`basename $ROOT`
echo $f
if( $f == "acer" )then
cp $old/dist/*.exe $old/dist/Output/*.exe dist
endif
82 changes: 82 additions & 0 deletions work/Friends.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# CWA 0
yl3jd,Hanz,Advisor
kb1fgc,Rich,Classmate
wz4m,Tommy,Classmate
k5vba,Stan,Classmate
k0pir,Rich,Classmate
k3es,Brian,Classmate
n0zt,Dan,Hanz Former Student

# CWA 1
n7kom,Former Student
nj7v,Charlie,Former Student
SV2HUD,Vas,Former Student
N7AUE,Jim,Muley
WB7UKC,Marty Mueller
KM6GOX,Derek,Former Student

# CWops
k6rb,Rob,#3,Sponsored me
n3jt,Jim,#1,Sponsored me
wt9u,Jim,Sponsored me
kr2q,Doug,NJ
k3jt,Terry,WV
w5tm,Ed,OK
ky4gs,Amanda,SC
ko4vw,Steve,GA
w7zdx,Bog
w7brs,Jeff,OR
vk2/w7brs,Jeff,Lord Howe Island
NQ2W,Will,NY
K4PQC,PHIL,GA
k9uiy,Vic,IL
W5LXS,Roger,TX

# CWA 2
KE7MPO,Skip,WA,Former Student
W5CYN,Jim,,Former Student
N0RPM,Jason,Former Student
AG5ZN,Bill,Former Student
W0WL,Joe,Former Student

# CWA 3
AA7TO,Jr,,Former Student
KN6RDC,Christian,,Former Student
N3RTW,Sean,Former Student
N5GG,Colin,Former Student
N6GV,Gary,Former Student
WB0RLJ,Jim,Former Student

# CWA 4
AC7FX,John,Former Student
NN7O,Tom,Former Student
AE5JT,Jeff,Former Student
W0ABE,Justin,Former Student

# CWA 5
KC6EOA,Brad,Student
KC7TAK,Ryan,Student
WE7DW,Dave,Student
WB3ERS,Nat,Student
VA4ADM,Pavel,Student

# Locals
k6pa,Troy, Bought Army Tower from him
n6utc,Efram,VHFer
n6mi,Scott,VHF guru
n6vi,Marty,VHF guru
wa7bnm,Bruce
n6ki,Dennis
N6GP,Tim,VHFer
w6sx,Hank

# Clubs
n6ror,ROARS
W5LVC,Colin,Dallas Club
#K4HTA,Sean,VA Club

# Other
N7AAE,Marty Mueller, Jim's brother
VE3INE,Mary,Prospective student

# DX - should be in Most Wanted list, not here!
4 changes: 4 additions & 0 deletions work/Most_Wanted.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VP8G
S9Z


Loading

0 comments on commit 285e3d0

Please sign in to comment.