FGFS-4.1/adsb-out
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
nzkarit
2017-09-07 21:01:23 +12:00
parent f484c7eb63
commit fc8acdfe38
2 changed files with 72 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADSB_Encoder.py
+3 -102
View File
@@ -1,12 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
from encoder import *
from location import *
from conversions import *
from parity import *
from HackRF import HackRF from HackRF import HackRF
from PPM import PPM from PPM import PPM
from ModeS import ModeS
import os import os
############################################################### ###############################################################
@@ -26,103 +23,6 @@ import os
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import numpy
#from scipy.signal import hilbert
def df17_pos_rep_encode(ca, icao, tc, ss, nicsb, alt, time, lat, lon, surface):
format = 17 #The format type of an ADSB message
enc_alt = encode_alt_modes(alt, surface)
#print "Alt(%r): %X " % (surface, enc_alt)
#encode that position
(evenenclat, evenenclon) = cpr_encode(lat, lon, False, surface)
(oddenclat, oddenclon) = cpr_encode(lat, lon, True, surface)
#print "Even Lat/Lon: %X/%X " % (evenenclat, evenenclon)
#print "Odd Lat/Lon: %X/%X " % (oddenclat, oddenclon)
ff = 0
df17_even_bytes = []
df17_even_bytes.append((format<<3) | ca)
df17_even_bytes.append((icao>>16) & 0xff)
df17_even_bytes.append((icao>> 8) & 0xff)
df17_even_bytes.append((icao ) & 0xff)
# data
df17_even_bytes.append((tc<<3) | (ss<<1) | nicsb)
df17_even_bytes.append((enc_alt>>4) & 0xff)
df17_even_bytes.append((enc_alt & 0xf) << 4 | (time<<3) | (ff<<2) | (evenenclat>>15))
df17_even_bytes.append((evenenclat>>7) & 0xff)
df17_even_bytes.append(((evenenclat & 0x7f) << 1) | (evenenclon>>16))
df17_even_bytes.append((evenenclon>>8) & 0xff)
df17_even_bytes.append((evenenclon ) & 0xff)
df17_str = "{0:02x}{1:02x}{2:02x}{3:02x}{4:02x}{5:02x}{6:02x}{7:02x}{8:02x}{9:02x}{10:02x}".format(*df17_even_bytes[0:11])
#print df17_str , "%X" % bin2int(crc(df17_str+"000000", encode=True)) , "%X" % get_parity(hex2bin(df17_str+"000000"), extended=True)
df17_crc = bin2int(crc(df17_str+"000000", encode=True))
df17_even_bytes.append((df17_crc>>16) & 0xff)
df17_even_bytes.append((df17_crc>> 8) & 0xff)
df17_even_bytes.append((df17_crc ) & 0xff)
ff = 1
df17_odd_bytes = []
df17_odd_bytes.append((format<<3) | ca)
df17_odd_bytes.append((icao>>16) & 0xff)
df17_odd_bytes.append((icao>> 8) & 0xff)
df17_odd_bytes.append((icao ) & 0xff)
# data
df17_odd_bytes.append((tc<<3) | (ss<<1) | nicsb)
df17_odd_bytes.append((enc_alt>>4) & 0xff)
df17_odd_bytes.append((enc_alt & 0xf) << 4 | (time<<3) | (ff<<2) | (oddenclat>>15))
df17_odd_bytes.append((oddenclat>>7) & 0xff)
df17_odd_bytes.append(((oddenclat & 0x7f) << 1) | (oddenclon>>16))
df17_odd_bytes.append((oddenclon>>8) & 0xff)
df17_odd_bytes.append((oddenclon ) & 0xff)
df17_str = "{0:02x}{1:02x}{2:02x}{3:02x}{4:02x}{5:02x}{6:02x}{7:02x}{8:02x}{9:02x}{10:02x}".format(*df17_odd_bytes[0:11])
df17_crc = bin2int(crc(df17_str+"000000", encode=True))
df17_odd_bytes.append((df17_crc>>16) & 0xff)
df17_odd_bytes.append((df17_crc>> 8) & 0xff)
df17_odd_bytes.append((df17_crc ) & 0xff)
return (df17_even_bytes, df17_odd_bytes)
"""def frame_1090es_ppm_modulate(even, odd):
ppm = [ ]
for i in range(48): # pause
ppm.append( 0 )
ppm.append( 0xA1 ) # preamble
ppm.append( 0x40 )
for i in range(len(even)):
word16 = numpy.packbits(manchester_encode(~even[i]))
ppm.append(word16[0])
ppm.append(word16[1])
for i in range(100): # pause
ppm.append( 0 )
ppm.append( 0xA1 ) # preamble
ppm.append( 0x40 )
for i in range(len(odd)):
word16 = numpy.packbits(manchester_encode(~odd[i]))
ppm.append(word16[0])
ppm.append(word16[1])
for i in range(48): # pause
ppm.append( 0 )
#print '[{}]'.format(', '.join(hex(x) for x in ppm))
return bytearray(ppm)
"""
if __name__ == "__main__": if __name__ == "__main__":
@@ -150,7 +50,8 @@ if __name__ == "__main__":
time = 0 time = 0
surface = False surface = False
(df17_even, df17_odd) = df17_pos_rep_encode(ca, icao, tc, ss, nicsb, alt, time, lat, lon, surface) modes = ModeS()
(df17_even, df17_odd) = modes.df17_pos_rep_encode(ca, icao, tc, ss, nicsb, alt, time, lat, lon, surface)
#print ''.join(format(x, '02x') for x in df17_even) #print ''.join(format(x, '02x') for x in df17_even)
#print ''.join(format(x, '02x') for x in df17_odd) #print ''.join(format(x, '02x') for x in df17_odd)
ModeS.py
+69
View File
@@ -0,0 +1,69 @@
from location import *
from conversions import *
class ModeS:
"""This class handles the ModeS ADSB manipulation
"""
def df17_pos_rep_encode(self, ca, icao, tc, ss, nicsb, alt, time, lat, lon, surface):
"""
This will take the parameters for an ADSB type 17 message and reutrn the even and odd bytes
"""
format = 17 #The format type of an ADSB message
enc_alt = encode_alt_modes(alt, surface)
#print "Alt(%r): %X " % (surface, enc_alt)
#encode that position
(evenenclat, evenenclon) = cpr_encode(lat, lon, False, surface)
(oddenclat, oddenclon) = cpr_encode(lat, lon, True, surface)
#print "Even Lat/Lon: %X/%X " % (evenenclat, evenenclon)
#print "Odd Lat/Lon: %X/%X " % (oddenclat, oddenclon)
ff = 0
df17_even_bytes = []
df17_even_bytes.append((format<<3) | ca)
df17_even_bytes.append((icao>>16) & 0xff)
df17_even_bytes.append((icao>> 8) & 0xff)
df17_even_bytes.append((icao ) & 0xff)
# data
df17_even_bytes.append((tc<<3) | (ss<<1) | nicsb)
df17_even_bytes.append((enc_alt>>4) & 0xff)
df17_even_bytes.append((enc_alt & 0xf) << 4 | (time<<3) | (ff<<2) | (evenenclat>>15))
df17_even_bytes.append((evenenclat>>7) & 0xff)
df17_even_bytes.append(((evenenclat & 0x7f) << 1) | (evenenclon>>16))
df17_even_bytes.append((evenenclon>>8) & 0xff)
df17_even_bytes.append((evenenclon ) & 0xff)
df17_str = "{0:02x}{1:02x}{2:02x}{3:02x}{4:02x}{5:02x}{6:02x}{7:02x}{8:02x}{9:02x}{10:02x}".format(*df17_even_bytes[0:11])
#print df17_str , "%X" % bin2int(crc(df17_str+"000000", encode=True)) , "%X" % get_parity(hex2bin(df17_str+"000000"), extended=True)
df17_crc = bin2int(crc(df17_str+"000000", encode=True))
df17_even_bytes.append((df17_crc>>16) & 0xff)
df17_even_bytes.append((df17_crc>> 8) & 0xff)
df17_even_bytes.append((df17_crc ) & 0xff)
ff = 1
df17_odd_bytes = []
df17_odd_bytes.append((format<<3) | ca)
df17_odd_bytes.append((icao>>16) & 0xff)
df17_odd_bytes.append((icao>> 8) & 0xff)
df17_odd_bytes.append((icao ) & 0xff)
# data
df17_odd_bytes.append((tc<<3) | (ss<<1) | nicsb)
df17_odd_bytes.append((enc_alt>>4) & 0xff)
df17_odd_bytes.append((enc_alt & 0xf) << 4 | (time<<3) | (ff<<2) | (oddenclat>>15))
df17_odd_bytes.append((oddenclat>>7) & 0xff)
df17_odd_bytes.append(((oddenclat & 0x7f) << 1) | (oddenclon>>16))
df17_odd_bytes.append((oddenclon>>8) & 0xff)
df17_odd_bytes.append((oddenclon ) & 0xff)
df17_str = "{0:02x}{1:02x}{2:02x}{3:02x}{4:02x}{5:02x}{6:02x}{7:02x}{8:02x}{9:02x}{10:02x}".format(*df17_odd_bytes[0:11])
df17_crc = bin2int(crc(df17_str+"000000", encode=True))
df17_odd_bytes.append((df17_crc>>16) & 0xff)
df17_odd_bytes.append((df17_crc>> 8) & 0xff)
df17_odd_bytes.append((df17_crc ) & 0xff)
return (df17_even_bytes, df17_odd_bytes)