FGFS-4.1/pyModeS
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various fixing

Browse Source
This commit is contained in:
JoseAndresMR 2018-06-26 23:15:57 +02:00
parent 715d0a3c66
commit 44b277f0ad
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pyModeS/decoder/adsb.py
View File

@ -246,11 +246,11 @@ def nic_v2(msg, nic_a, nic_b, nic_c):
nic_df = pd.read_csv('/home/josmilrom/Libraries/pyModeS/pyModeS/decoder/adsb_ua_parameters/NIC_v2.csv', sep=',')
if tc in range(5,9):
nic_df_extract = [(nic_df.TC == tc) & (nic_df.NICa == nic_a) & (nic_df.NICc == nic_c)]
nic_df_extract = nic_df[(nic_df.TC == tc) & (nic_df.NICa == nic_a) & (nic_df.NICc == nic_c)]
elif tc in range(9,19):
nic_df_extract = [(nic_df.TC == tc) & (nic_df.NICa == nic_a) & (nic_df.NICb == nic_b)]
nic_df_extract = nic_df[(nic_df.TC == tc) & (nic_df.NICa == nic_a) & (nic_df.NICb == nic_b)]
elif tc in range(20,23):
nic_df_extract = [nic_df.TC == tc]
nic_df_extract = nic_df[nic_df.TC == tc]
Rc = nic_df_extract['Rc'][0]
@ -341,10 +341,10 @@ def nac_p(msg):
if tc == 29:
nac_p = common.bin2int(msgbin[71:75])
nacp_df_extract = nac_p[nacp_df.NACp == nac_p]
nacp_df_extract = nacp_df[nacp_df.NACp == nac_p]
elif tc == 31:
nac_p = common.bin2int(msgbin[76:80])
nacp_df_extract = nac_p[nacp_df.NACp == nac_p]
nacp_df_extract = nacp_df[nacp_df.NACp == nac_p]
HFU = nacp_df_extract['HFU'][0]
VEPU = nacp_df_extract['VEPU'][0]

8
pyModeS/decoder/adsb_ua_parameters/NACv.csv
View File

@ -1,6 +1,6 @@
NAVc,HFOMr,VFOMr
0,'unknown’,'unknown’
1,10,"15,2"
2,3,"4,5"
3,1,"1,5"
4,"0,3","0,46"
1,10,15.2
2,3,4.5
3,1,1.5
4,0.3,0.46

1 NAVc HFOMr VFOMr
2 0 'unknown’ 'unknown’
3 1 10 15,2 15.2
4 2 3 4,5 4.5
5 3 1 1,5 1.5
6 4 0,3 0.3 0,46 0.46

16
pyModeS/decoder/adsb_ua_parameters/NIC_v1.csv
View File

@ -1,11 +1,11 @@
TC,NICs,NIC,Rc,VPL
5,0,12,"7,5",'undefined’
6,0,11,25,'undefined’
7,1,10,75,'undefined’
7,0,9,185,'undefined’
5,0,11,7.5,'undefined’
6,0,10,25,'undefined’
7,1,9,75,'undefined’
7,0,8,185,'undefined’
8,0,1,'unknown’,'undefined’
9,0,11,"7,5",11
10,0,10,25,"37,5"
9,0,11,7.5,11
10,0,10,25,37.5
11,1,9,75,112
11,0,8,185,'undefined’
12,0,7,370,'undefined’
@ -17,6 +17,6 @@ TC,NICs,NIC,Rc,VPL
16,0,2,14008,'undefined’
17,0,1,37000,'undefined’
18,0,0,'unknown’,'undefined’
20,0,11,"7,5",11
21,0,10,25,"37,5"
20,0,11,7.5,11
21,0,10,25,37.5
22,0,0,'unknown’,112

1 TC NICs NIC Rc VPL
2 5 0 12 11 7,5 7.5 'undefined’
3 6 0 11 10 25 'undefined’
4 7 1 10 9 75 'undefined’
5 7 0 9 8 185 'undefined’
6 8 0 1 'unknown’ 'undefined’
7 9 0 11 7,5 7.5 11
8 10 0 10 25 37,5 37.5
9 11 1 9 75 112
10 11 0 8 185 'undefined’
11 12 0 7 370 'undefined’
17 16 0 2 14008 'undefined’
18 17 0 1 37000 'undefined’
19 18 0 0 'unknown’ 'undefined’
20 20 0 11 7,5 7.5 11
21 21 0 10 25 37,5 37.5
22 22 0 0 'unknown’ 112

6
pyModeS/decoder/adsb_ua_parameters/NIC_v2.csv
View File

@ -1,5 +1,5 @@
TC,NICa,NICb,NICc,NIC,Rc
5,0,0,0,11,"7,5"
5,0,0,0,11,7.5
6,0,0,0,10,25
7,1,0,0,9,75
7,0,0,0,8,185
@ -7,7 +7,7 @@ TC,NICa,NICb,NICc,NIC,Rc
8,1,0,0,6,556
8,0,0,1,6,1111
8,0,0,0,0,'unknown’
9,0,0,0,11,"7,5"
9,0,0,0,11,7.5
10,0,0,0,10,25
11,1,1,0,9,75
11,0,0,0,8,185
@ -21,6 +21,6 @@ TC,NICa,NICb,NICc,NIC,Rc
16,0,0,0,2,14800
17,0,0,0,1,37000
18,0,0,0,0,'unknown’
20,0,0,0,11,"7,5"
20,0,0,0,11,7.5
21,0,0,0,10,25
22,0,0,0,0,'unknown’

1 TC NICa NICb NICc NIC Rc
2 5 0 0 0 11 7,5 7.5
3 6 0 0 0 10 25
4 7 1 0 0 9 75
5 7 0 0 0 8 185
7 8 1 0 0 6 556
8 8 0 0 1 6 1111
9 8 0 0 0 0 'unknown’
10 9 0 0 0 11 7,5 7.5
11 10 0 0 0 10 25
12 11 1 1 0 9 75
13 11 0 0 0 8 185
21 16 0 0 0 2 14800
22 17 0 0 0 1 37000
23 18 0 0 0 0 'unknown’
24 20 0 0 0 11 7,5 7.5
25 21 0 0 0 10 25
26 22 0 0 0 0 'unknown’

6
pyModeS/decoder/adsb_ua_parameters/NUCp.csv
View File

@ -1,9 +1,9 @@
TC,NUCp,HPL,Rcu,Rcv
5,9,"7,5",3,'undefined’
5,9,7.5,3,'undefined’
6,8,25,10,'undefined’
7,7,185,93,'undefined’
8,6,'unknown’,'unknown’,'undefined’
9,9,"7,5",3,'undefined’
9,9,7.5,3,'undefined’
10,8,25,10,'undefined’
11,7,185,93,'undefined’
12,6,370,185,'undefined’
@ -13,6 +13,6 @@ TC,NUCp,HPL,Rcu,Rcv
16,2,18520,9260,'undefined’
17,1,37040,18520,'undefined’
18,0,'unknown’,'unknown’,'undefined’
20,9,"7,5",3,4
20,9,7.5,3,4
21,8,25,10,15
22,0,'unknown’,'unknown’,'unknown’

1 TC NUCp HPL Rcu Rcv
2 5 9 7,5 7.5 3 'undefined’
3 6 8 25 10 'undefined’
4 7 7 185 93 'undefined’
5 8 6 'unknown’ 'unknown’ 'undefined’
6 9 9 7,5 7.5 3 'undefined’
7 10 8 25 10 'undefined’
8 11 7 185 93 'undefined’
9 12 6 370 185 'undefined’
13 16 2 18520 9260 'undefined’
14 17 1 37040 18520 'undefined’
15 18 0 'unknown’ 'unknown’ 'undefined’
16 20 9 7,5 7.5 3 4
17 21 8 25 10 15
18 22 0 'unknown’ 'unknown’ 'unknown’

8
pyModeS/decoder/adsb_ua_parameters/NUCv.csv
View File

@ -1,6 +1,6 @@
NUCp,HVE,VVE
0,'unknown’,'unknown’
1,10,"15,2"
2,3,"4,5"
3,1,"1,5"
4,"0,3","1,46"
1,10,15.2
2,3,4.5
3,1,1.5
4,0.3,1.46

1 NUCp HVE VVE
2 0 'unknown’ 'unknown’
3 1 10 15,2 15.2
4 2 3 4,5 4.5
5 3 1 1,5 1.5
6 4 0,3 0.3 1,46 1.46