From 85b91a0719cf4cac41f428a779445f695825d1ae Mon Sep 17 00:00:00 2001 From: nzkarit Date: Mon, 18 Sep 2017 23:15:20 +1200 Subject: [PATCH] Getting logging working in the classes. Well one is enough for now --- ADSB_Encoder.py | 7 +++++-- HackRF.py | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ADSB_Encoder.py b/ADSB_Encoder.py index f3a8f44..b211064 100755 --- a/ADSB_Encoder.py +++ b/ADSB_Encoder.py @@ -84,9 +84,9 @@ def singlePlane(arguments): return samples def manyPlanes(arguments): - logger.info('Processing CSV file') - logger.info('Repeating the message %s times' % (arguments.repeats)) + logger.info('Processing CSV file') samples = bytearray() + logger.info('Repeating the message %s times' % (arguments.repeats)) for i in range(0, arguments.repeats): with open(arguments.csvfile, newline='') as csvfile: reader = csv.DictReader(csvfile, delimiter=',') @@ -126,11 +126,13 @@ def manyPlanes(arguments): return samples def writeOutputFile(filename, data): + logger.info('Writing tmp.iq8s file') SamplesFile = open('tmp.iq8s', 'wb') SamplesFile.write(data) SamplesFile.close() os.system('sync') os.system('rm %s' % (filename)) + logger.info('dd for file: %s' % (filename)) os.system("dd if=tmp.iq8s of=%s bs=4k seek=63 > /dev/null 2>&1" % (filename)) os.system('sync') os.system('rm tmp.iq8s') @@ -153,6 +155,7 @@ if __name__ == "__main__": else: data = manyPlanes(arguments) writeOutputFile(arguments.outputfilename, data) + logger.info('Complete') diff --git a/HackRF.py b/HackRF.py index 61753d9..0edfe4a 100644 --- a/HackRF.py +++ b/HackRF.py @@ -1,4 +1,5 @@ import numpy +import logging ############################################################### # Further work on fork # Copyright (C) 2017 David Robinson @@ -6,6 +7,10 @@ class HackRF: """The HackRF class has functions from converting data into a format into which the hackrf can process """ + logger = None + + def __init__(self): + self.logger = logging.getLogger(__name__) def hackrf_raw_IQ_format(self, ppm): """ @@ -15,7 +20,8 @@ class HackRF: Returns: bytearray: containing the IQ data """ - + print(self.logger) + self.logger.debug('Creating hackRF bytearray from the ppm stuff') signal = [] bits = numpy.unpackbits(numpy.asarray(ppm, dtype=numpy.uint8)) for bit in bits: