Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASTERIX #34

Open
wants to merge 40 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
db8fd37
first attempt at asterix output
k2fc Mar 29, 2023
e8500ad
add send asterix output
k2fc Mar 29, 2023
23c37ad
fix squawk, add MOPS
k2fc Apr 4, 2023
26d7173
Merge branch 'dev' into asterix
k2fc Apr 4, 2023
35a854d
WIP redoing how the bytes are written
k2fc Apr 4, 2023
bfc3ad8
Asterix CAT021 mostly working
k2fc Apr 5, 2023
ebface6
Add met status, add asterix_reduce_out, prepare options for asterix_in
k2fc Apr 6, 2023
c996e05
change asterix_reduce_out to be more like --net-sbs-reduce option
k2fc Apr 6, 2023
eb75da0
Decode BDS4,4 Meteorological routine air report
k2fc Apr 8, 2023
4851017
Merge branch 'dev' into asterix
k2fc Apr 8, 2023
2830073
Beginnings of working ASTERIX in. Stuff is still broken, but it does…
k2fc Apr 22, 2023
541ecdc
Check for valid baro alt
k2fc Apr 22, 2023
b4b067a
try to send geom data using offset
k2fc Apr 22, 2023
0204c7b
fix error in decoding groundspeed
k2fc Apr 22, 2023
66ddf30
merge dev into asterix
k2fc Apr 22, 2023
ddbd6aa
fix indenting
k2fc Apr 22, 2023
1d8ea75
possibly properly interperet quality indicators
k2fc Apr 22, 2023
840ca97
assign values
k2fc Apr 23, 2023
bd7b82a
Add receiver ID
k2fc Apr 23, 2023
7460ae4
switch to using 24-bit position
k2fc Apr 23, 2023
bb12646
fix indenting
k2fc Apr 23, 2023
92c145b
send time when using 24-bit position also
k2fc Apr 23, 2023
05296e9
Fix indenting
k2fc Apr 23, 2023
8826143
Merge branch 'asterix' of github.com:k2fc/readsb into asterix
k2fc Apr 23, 2023
f9c01bd
send ASTERIX position from SBS data, too
k2fc Apr 23, 2023
02bd08a
add asterix_in to net_connectors
k2fc Apr 23, 2023
a50a1e4
add asterix_in and asterix_out to net_connector args
k2fc Apr 23, 2023
b2b4aa9
add asterix options to README.md
k2fc Apr 23, 2023
df9a948
correct item numbers
k2fc Apr 23, 2023
1e2cfaf
Merge branch 'asterix' of github.com:k2fc/readsb into asterix
k2fc Apr 23, 2023
fcf9e72
accidentally deleted json_out, and misspelled asterix
k2fc Apr 23, 2023
2440482
Correctly input/output Emitter Category
k2fc Apr 25, 2023
534c302
input address type
k2fc Apr 26, 2023
0c01620
don't try to use invalid asterix message
k2fc Apr 26, 2023
4aa7790
input/output I021/146, Selected Altitude
k2fc Apr 26, 2023
6cfeeec
undo free mm if invalid. seems to be incorrect
k2fc Apr 28, 2023
01d2f33
try to get address types working right
k2fc Apr 30, 2023
2fc71d0
Merge branch 'dev' into asterix
k2fc Apr 30, 2023
222c13f
Merge branch 'dev' into asterix
k2fc Jul 26, 2023
8bcbdac
Merge branch 'dev' into asterix
k2fc Aug 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
send ASTERIX position from SBS data, too
  • Loading branch information
k2fc committed Apr 23, 2023
commit f9c01bdd27bf9bea01e9e46afd9946402eb9773f
6 changes: 3 additions & 3 deletions net_io.c
Original file line number Diff line number Diff line change
@@ -1952,7 +1952,7 @@ static int decodeAsterixMessage(struct client *c, char *p, int remote, int64_t n
mm->addr = (((*p & 0xff) << 16) + ((*(p + 1) & 0xff) << 8) + (*(p + 2) & 0xff)) & 0xffffff;
p += 3;
if (fspec[1] & 0x8){ // I021/073 Time of Message Reception of Position
if (mm->cpr_decoded){
if (mm->cpr_decoded || mm->sbs_pos_valid){
uint64_t ts = readAsterixTime(&p);
if (fspec[1] & 0x4){ // I021/074 Time of Message Reception of Position=High Precision
readAsterixHighPrecisionTime(&ts, &p);
@@ -2230,7 +2230,7 @@ static void modesSendAsterixOutput(struct modesMessage *mm, struct net_writer *w
p++;

// I021/130 Position in WGS-84 co-ordinates
if(mm->cpr_decoded){
if (mm->cpr_decoded || mm->sbs_pos_valid){
fspec[0] |= 1 << 2;
int32_t lat;
int32_t lon;
@@ -2252,7 +2252,7 @@ static void modesSendAsterixOutput(struct modesMessage *mm, struct net_writer *w

// I021/131 Position in WGS-84 co-ordinates, high res.
/*
if(mm->cpr_decoded){
if (mm->cpr_decoded || mm->sbs_pos_valid){
fspec[0] |= 1 << 1;
int32_t lat;
int32_t lon;