Added an option to run Flight Radar 24 CSVs in realtime

This commit is contained in:
nzkarit 2018-05-24 21:13:55 +12:00
parent 46a3ca9dd2
commit 59fdee124c
2 changed files with 12 additions and 1 deletions

View File

@ -62,6 +62,7 @@ def argParser():
parser.add_argument('-r', '--repeats', action='store', dest='repeats', type=int, default=cfg.getint('general', 'repeats'), help='How many repeats of the data to perform. Default: %(default)s') parser.add_argument('-r', '--repeats', action='store', dest='repeats', type=int, default=cfg.getint('general', 'repeats'), help='How many repeats of the data to perform. Default: %(default)s')
parser.add_argument('--csv', '--csvfile', '--in', '--input', action='store', type=str, default=cfg.get('general', 'csvfile'), dest='csvfile', help='Import a CSV file with the plane data in it. Default: %(default)s') parser.add_argument('--csv', '--csvfile', '--in', '--input', action='store', type=str, default=cfg.get('general', 'csvfile'), dest='csvfile', help='Import a CSV file with the plane data in it. Default: %(default)s')
parser.add_argument('--intermessagegap', action='store', type=int, default=cfg.get('general', 'intermessagegap'), dest='intermessagegap', help='When repeating or reading a CSV the number of microseconds between messages. Default: %(default)s') parser.add_argument('--intermessagegap', action='store', type=int, default=cfg.get('general', 'intermessagegap'), dest='intermessagegap', help='When repeating or reading a CSV the number of microseconds between messages. Default: %(default)s')
parser.add_argument('--realtime', action='store', default=cfg.getboolean('general', 'realtime'), type=auto_bool, dest='realtime', help='When running a CSV which has a timestamp column whether to run in realtime following the timestamp or if just follow intermessagegap. If realtime is set it will override intermessagegap. Default: %(default)s')
# TODO Make it so it can do a static checksum # TODO Make it so it can do a static checksum
return parser.parse_args() return parser.parse_args()
@ -88,10 +89,12 @@ def manyPlanes(arguments):
logger.info('Processing CSV file: %s' % (arguments.csvfile)) logger.info('Processing CSV file: %s' % (arguments.csvfile))
samples = bytearray() samples = bytearray()
logger.info('Repeating the message %s times' % (arguments.repeats)) logger.info('Repeating the message %s times' % (arguments.repeats))
prevtimestamp = 0
for i in range(0, arguments.repeats): for i in range(0, arguments.repeats):
with open(arguments.csvfile, newline='') as csvfile: with open(arguments.csvfile, newline='') as csvfile:
reader = csv.DictReader(csvfile, delimiter=',') reader = csv.DictReader(csvfile, delimiter=',')
for row in reader: for row in reader:
gap = arguments.intermessagegap
if not 'icao' in row.keys(): if not 'icao' in row.keys():
row['icao'] = arguments.icao row['icao'] = arguments.icao
else: else:
@ -120,6 +123,11 @@ def manyPlanes(arguments):
row['time'] = arguments.time row['time'] = arguments.time
if not 'surface' in row.keys(): if not 'surface' in row.keys():
row['surface'] = arguments.surface row['surface'] = arguments.surface
if 'timestamp' in row.keys():
if arguments.realtime:
gap = int(row['timestamp']) - prevtimestamp
gap = gap * 100000
prevtimestamp = int(row['timestamp'])
logger.debug('Row from CSV: %s' % (row)) logger.debug('Row from CSV: %s' % (row))
modes = ModeS() modes = ModeS()
(df17_even, df17_odd) = modes.df17_pos_rep_encode(row['capability'], row['icao'], row['typecode'], row['surveillancestatus'], row['nicsupplementb'], row['altitude'], row['time'], row['latitude'], row['longitude'], row['surface']) (df17_even, df17_odd) = modes.df17_pos_rep_encode(row['capability'], row['icao'], row['typecode'], row['surveillancestatus'], row['nicsupplementb'], row['altitude'], row['time'], row['latitude'], row['longitude'], row['surface'])
@ -130,7 +138,7 @@ def manyPlanes(arguments):
hackrf = HackRF() hackrf = HackRF()
samples_array = hackrf.hackrf_raw_IQ_format(df17_array) samples_array = hackrf.hackrf_raw_IQ_format(df17_array)
samples = samples+samples_array samples = samples+samples_array
gap_array = ppm.addGap(arguments.intermessagegap) gap_array = ppm.addGap(gap)
samples_array = hackrf.hackrf_raw_IQ_format(gap_array) samples_array = hackrf.hackrf_raw_IQ_format(gap_array)
samples = samples+samples_array samples = samples+samples_array
return samples return samples

View File

@ -4,6 +4,9 @@ repeats = 1
csvfile = csvfile =
# Currently in PPM.py one message is 48 dead air, 8 preamble, 112 message, 100 dead air, 8 preamble, 112 message, 48 dead air leaves us with 99564 microseconds to make a second # Currently in PPM.py one message is 48 dead air, 8 preamble, 112 message, 100 dead air, 8 preamble, 112 message, 48 dead air leaves us with 99564 microseconds to make a second
intermessagegap = 99564 intermessagegap = 99564
# This is the message length from PPM.py
messagelength = 436
realtime = false
[plane] [plane]
icao = 0x75008F icao = 0x75008F