Skip to content

Commit

Permalink
fix meteor sync finding
Browse files Browse the repository at this point in the history 
fix meteor sync finding
  • Loading branch information
@7andahalf
7andahalf committed Jul 27, 2018
1 parent 75a8e4f commit 4ae0972
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 35 deletions.
16 changes: 9 additions & 7 deletions directdemod/decode_funcube.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def getSyncs(self):

numCtrs = int(chunkerObj.getChunks[-1][-1]*12000/2048000)
start_time = time.time()
lastMin = 0
lastMin = None
ctrMain = 0
for i in chunkerObj.getChunks[:]:

Expand All @@ -196,7 +196,7 @@ def getSyncs(self):
### MAXSYNC detection by correlation

# start storing 2mhz values near sync possible regions
if ctr > lastMin + (4.9*12000) - (2*len(sync12khz)) or not maxBuffRetain == -1:
if not lastMin is None and (ctr > lastMin + (4.9*12000) - (2*len(sync12khz)) or not maxBuffRetain == -1):
if len(maxResBuff) == 0:
maxBuffStart = ctrMain
maxResBuff.append(lim(np.real(i*pllObj.output)/2))
Expand Down Expand Up @@ -255,9 +255,11 @@ def getSyncs(self):
timing += 1
ctrMain += 1

# check usefulness
if np.min(np.abs(np.diff(maxSyncs) - (4.98*2048000))) < (0.2*2048000):
self.__useful = 1

return list(maxSyncs)[1:]
if len(maxSyncs) > 0:
# check usefulness
if np.min(np.abs(np.diff(maxSyncs) - (4.98*2048000))) < (0.2*2048000):
self.__useful = 1
return list(maxSyncs)[1:]
else:
return []

104 changes: 76 additions & 28 deletions directdemod/decode_meteorm2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class agc():
def __init__(self):
self.mean = 180.0
self.mean = 3.0
self.dc = 0.0

def adjust(self, inp):
Expand All @@ -28,8 +28,8 @@ def adjust(self, inp):
self.mean = (self.mean * 1.0 * (65536.0 - 1) + ((np.real(inp)*np.real(inp) + np.imag(inp)*np.imag(inp))**0.5)) / 65536.0

# multiply the input value
if 180.0 / self.mean > 20:
return inp * 20
if 180.0 / self.mean > 200:
return inp * 200
else:
return inp * 180.0 / self.mean

Expand Down Expand Up @@ -171,10 +171,37 @@ def getSyncs(self):

sync72khz = np.repeat(sync, 1)

sync72khz1 = []
for i in range(len(sync72khz)):
if i%2 == 0:
sync72khz1.append(sync72khz[i])
else:
sync72khz1.append(1-sync72khz[i])
sync72khz1 = np.array(sync72khz1)

sync72khz2 = []
for i in range(len(sync72khz)):
if i%2 == 1:
sync72khz2.append(sync72khz[i])
else:
sync72khz2.append(1-sync72khz[i])
sync72khz2 = np.array(sync72khz2)


sync[sync == 1] = 127
sync[sync == 0] = -128
sync2mhz = np.repeat(sync, int(2048000/72000))

sync = np.array(sync72khz1[:])
sync[sync == 1] = 127
sync[sync == 0] = -128
sync2mhz1 = np.repeat(sync, int(2048000/72000))

sync = np.array(sync72khz2[:])
sync[sync == 1] = 127
sync[sync == 0] = -128
sync2mhz2 = np.repeat(sync, int(2048000/72000))

maxResBuff = []
minResBuff1 = []
minResBuff2 = []
Expand All @@ -189,10 +216,12 @@ def getSyncs(self):
lastMin = None
ctrMain = 0

sync2mhzChosen = sync2mhz

for i in chunkerObj.getChunks[:]:

#interpolate
sig = comm.commSignal(self.__sigsrc.sampFreq, self.__sigsrc.read(*i)+ (127.5 + 1j*127.5))
sig = comm.commSignal(self.__sigsrc.sampFreq, self.__sigsrc.read(*i))
sig.offsetFreq(self.__offset)
sig.filter(bf)

Expand All @@ -202,7 +231,7 @@ def getSyncs(self):
### MAXSYNC detection by correlation

# start storing 2mhz values near sync possible regions
if not lastMin is None and (ctr > lastMin + (0.1*72000) - (2*len(sync72khz)) or not maxBuffRetain == -1):
if not lastMin is None and (ctr > lastMin + (0.1*72000) - (2*len(sync72khz)) or not maxBuffRetain == -1) and not ctr > lastMin + (1*72000):
if len(maxResBuff) == 0:
maxBuffStart = ctrMain
corrVal = i*pllObj.output
Expand All @@ -217,7 +246,7 @@ def getSyncs(self):
maxResBuff.pop(0)
elif maxBuffRetain == 0:
maxBuffRetain -= 1
corr = np.abs(np.correlate(maxResBuff,sync2mhz, mode='same'))
corr = np.abs(np.correlate(maxResBuff,sync2mhzChosen, mode='same'))
logging.info("MAXSYNC %d", maxBuffStart+(np.argmax(corr)/2.0))
#print("MAXSYNC", maxBuffStart, np.argmax(corr), maxBuffStart+np.argmax(corr))
maxSyncs.append(maxBuffStart+(np.argmax(corr)/2.0))
Expand All @@ -241,15 +270,6 @@ def getSyncs(self):
gardnerA = pllObj.loop(gardnerA)
ctr += 1

# 72khz buffer
minResBuff1.append(limBin(np.real(gardnerA)))
minResBuff1.append(limBin(np.imag(gardnerA)))
minResBuff1 = minResBuff1[-1*len(sync72khz):]

minResBuff2.append(limBin(np.imag(gardnerA)))
minResBuff2.append(limBin(np.real(gardnerA)))
minResBuff2 = minResBuff2[-1*len(sync72khz):]

# print periodic status
try:
if ctr%1000 == 0:
Expand All @@ -258,19 +278,47 @@ def getSyncs(self):
except:
pass

buff1corr, buff2corr = 0, 0
if len(minResBuff1) == len(sync72khz):
buff1corr = np.abs(np.sum(np.abs(np.array(minResBuff1) - sync72khz)) - (len(sync72khz)/2))
if len(minResBuff2) == len(sync72khz):
buff2corr = np.abs(np.sum(np.abs(np.array(minResBuff2) - sync72khz)) - (len(sync72khz)/2))

# see if sync is present
if buff1corr > 30 or buff2corr > 30:
logging.info("MINSYNC: %d %f %f",ctr, buff1corr, buff2corr)
#print("MINSYNC:",ctr, np.abs(np.sum(np.abs(np.array(minResBuff) - sync72khz)) - (len(sync72khz)/2)))
minSyncs.append(ctr)
lastMin = ctr
maxBuffRetain = 2 * len(sync2mhz)
if lastMin is None or ctr > lastMin + 0.1*(72000):
# 72khz buffer
minResBuff1.append(limBin(np.real(gardnerA)))
minResBuff1.append(limBin(np.imag(gardnerA)))
minResBuff1 = minResBuff1[-1*len(sync72khz):]

minResBuff2.append(limBin(np.imag(gardnerA)))
minResBuff2.append(limBin(np.real(gardnerA)))
minResBuff2 = minResBuff2[-1*len(sync72khz):]

buff1corr, buff2corr, buff3corr, buff4corr, buff5corr, buff6corr = 0, 0, 0, 0, 0, 0
if len(minResBuff1) == len(sync72khz):
buff1corr = np.abs(np.sum(np.abs(np.array(minResBuff1) - sync72khz)) - (len(sync72khz)/2))
#if len(minResBuff2) == len(sync72khz):
# buff2corr = np.abs(np.sum(np.abs(np.array(minResBuff2) - sync72khz)) - (len(sync72khz)/2))

#if len(minResBuff1) == len(sync72khz1):
# buff3corr = np.abs(np.sum(np.abs(np.array(minResBuff1) - sync72khz1)) - (len(sync72khz1)/2))
if len(minResBuff2) == len(sync72khz1):
buff4corr = np.abs(np.sum(np.abs(np.array(minResBuff2) - sync72khz1)) - (len(sync72khz1)/2))

#if len(minResBuff1) == len(sync72khz2):
# buff5corr = np.abs(np.sum(np.abs(np.array(minResBuff1) - sync72khz2)) - (len(sync72khz2)/2))
#if len(minResBuff2) == len(sync72khz2):
# buff6corr = np.abs(np.sum(np.abs(np.array(minResBuff2) - sync72khz2)) - (len(sync72khz2)/2))

if buff1corr > 30 or buff2corr > 30:
sync2mhzChosen = sync2mhz
if buff3corr > 30 or buff4corr > 30:
sync2mhzChosen = sync2mhz1
if buff4corr > 30 or buff6corr > 30:
sync2mhzChosen = sync2mhz2

# see if sync is present
if buff1corr > 30 or buff2corr > 30 or buff3corr > 30 or buff4corr > 30 or buff5corr > 30 or buff6corr > 30:
logging.info("MINSYNC: %d",ctr)
#logging.info("MINSYNC: %d %f %f %f %f %f %f",ctr, buff1corr, buff2corr, buff3corr, buff4corr, buff5corr, buff6corr)
#print("MINSYNC:",ctr, np.abs(np.sum(np.abs(np.array(minResBuff) - sync72khz)) - (len(sync72khz)/2)))
minSyncs.append(ctr)
lastMin = ctr
maxBuffRetain = 2 * len(sync2mhz)

timing += 1
ctrMain += 1
Expand Down

0 comments on commit 4ae0972

Please sign in to comment.