Commit graph

868 commits

Author SHA1 Message Date
Malcolm Robb 228b770be8 Move declarations into a headed file
This is the start of breaking the main dump109.c file into smaller
modules to make it a bit more maintainable.

Move all the #define and structure declarations into dump1090.h
2013-05-24 23:32:12 +01:00
Malcolm Robb e86eb3921e VK1ET : Numerous changes to Port handling
Changes based on ideas from John VK1ET. His commit notes are as follows
:

1. Change input socket handling to avoid unnecessary memmove (use
pointers instead)

2. Add ability to read and decode binary beast format TCP.

3. Change output socket handling same as sbs_output - only call output
handler if there is a current client connected use separate ports for
beast in and out - no need for --net-beast flag. Will input/output
format defined by socket connected to. avr raw, beast binary and sbs can
be handled simultaneously.

4. Some comments changes, filtering of ModeAC to json,.
2013-05-24 22:29:00 +01:00
Malcolm Robb f64a65b5a2 Tidy up of UKUEHN's improvements
Resolves some merge conflicts that I couldn't find a way to fix during
the previous merge.

Remove a few Tabs that escaped in the edit/merge

Rename the fix_errors flag variable to nFix_crc since it now represents
the number of crc errors to attempt to fix.

Remove the aggressive variable since it's now part of nFix_crc

Only print phase correction statistics when phase correction is enabled.

Add an additional Modes.stat_ph_bit_fix[] to count the bits fixed during
phase correction
2013-05-24 21:51:44 +01:00
Malcolm Robb 9edba9332a UKUEHN : Various Improvements
Sorry Ulrich - I can't get Github to resolve the merge errors and
preserve your commit notes, so I'll add them here.
Improvements on bit error correction, doc update, preparation for
program installation/package build

Hi,
I committed some further improvements on the bit error correction code,
updated the readme, and implemented a way to install the program in the
linux file system hierarchy (allows for package building).

Regards,
Ulrich
2013-05-24 21:24:16 +01:00
Malcolm Robb ee742cf8db SBS Output Format changes
Bug fixes in the SBS output code as a result of an EMAIL from Liviu

Some software gets upset if null fields are output where the software is
expecting a valid value. This was being caused by DF0's outputting and
SBS MSG5. MSG5 needs Atert and SPI flags, which are derived from the FS
field. DF0 doesn't have an FS field, so cannot output a MSG5. Change so
that DF0 results in an SBS MSG7.

Also DF17/DF18 metypes 5 to 18 contain raw Lat/Lon data. However they
cannot be decoded into real Lat/Lon values unless both even and odd
parts are available Therefore, when we receive a DF17/DF18 we need to
check that we have successfully decoded the Lat/Lon before we attempt to
send an SBS MSG2 or MSG3. If we don't have a decoded Lat/Lon, send a
MSG7 instead.
2013-05-24 12:26:06 +01:00
Malcolm Robb 4c0ed6d5f1 Set AOG_VALID for DF-17/18 metype 19 2013-05-24 11:10:16 +01:00
Malcolm Robb 77bd1f40dc Include Vertical rate in aircraft structure 2013-05-24 11:07:49 +01:00
Brian Davenport 8b5c74ded8 Split into multiple JS files,
Selecting planes now works,
Started work on settings window,
Created extension.js, an area for new ideas to be tested or loaded out of.
2013-05-24 02:15:37 +00:00
Brian Davenport b0e0f96c94 Merge pull request #8 from MalcolmRobb/master
Pulling in from MalcomRobb's Master
2013-05-23 04:45:30 -07:00
terribl e0c752bb94 Merge branch 'master' of https://github.com/terribl/dump1090 2013-05-23 13:21:28 +03:00
terribl 143606209e Merge remote-tracking branch 'upstream/master' 2013-05-23 13:20:42 +03:00
terribl e309025c11 Merge remote-tracking branch 'upstream/master' 2013-05-23 13:16:14 +03:00
terribl 6bf2f2b54b Added global settings and untrackedDeveloperSettings.js-file.
untrackedDeveloperSettings.js
Create file and add line `var developerSettings = true;` on top of it.
After that some settings can be overwritten with deleloper's flavour.

-- Example File w/o line numbers --
var developerSettings = true;

var CONST_CENTERLAT = 60.0; // 45.0
var CONST_CENTERLON = 20.0; // 9.0
var CONST_ZOOMLVL   = 6; //5
-- End of Example File --

	modified:   .gitignore
	modified:   public_html/gmap.html
	modified:   public_html/script.js
2013-05-23 12:47:29 +03:00
Brian Davenport d2a15659e7 Couple more small tweaks to the tails of planes.
Added "CoolClock" both local and GMT to the info pane, http://randomibis.com/coolclock/
2013-05-22 17:09:12 +00:00
Malcolm Robb e50c2a5a54 Phase Enhancement changes
Phase enhancement is used to try and increase the signal amplitude when
Nyquist sample aliasing is suspected. In previous versions, this was
enabled by default. In this version, the default is off. There is now an
additional command line switch --phase-enhance to turn it on.

There are also additional debug statistics which count the number of
phase demodulation failures in for both uncorrected and phase corrected
passes.
2013-05-22 13:23:54 +01:00
Malcolm Robb b481c76909 mm structure initialisation
Ideally we should clear down the mm structure every loop of our
ModeA/C/S bit detector. However, we're getting 2Mbits of data per
second, and the structure is several tens of bytes long. Clearing down
every loop would require us to zero up to 100Mb per second. The memset
function may be fast, but it's still going to take up valuable processor
time.

So instead of clearing the whole structure every loop, just clear the
important parts.
2013-05-22 11:49:03 +01:00
terribl 2c7c1a4610 Merge remote-tracking branch 'upstream/master' 2013-05-22 11:34:43 +03:00
Brian Davenport b5424884ca Updated a copy/paste error, where I did not update the paste. 2013-05-22 00:48:16 -03:00
Brian Davenport caf413cc01 Working on adding paths to the planes. 2013-05-22 03:26:40 +00:00
Terhi 3117b1cda5 Merge pull request #6 from terribl/master
resetMap()

Did I manage to do this right? Let's try.
2013-05-21 20:18:39 -07:00
terribl f853550b3c Fixing resetMap()-bug. 2013-05-22 06:07:35 +03:00
Malcolm Robb 4a3113f65a Decode DF-18 2013-05-22 00:05:03 +01:00
Malcolm Robb 08ffc3f541 Change mm.crc checks to mm.correctedbits
Instead of force clearing mm.crc to zero if we successfully correct bit
errors, just use the mm.correctedbits variable. This allows us to print
out the crc value containing the errors during list output modes.
2013-05-21 23:16:49 +01:00
Brian Davenport c43c922148 Making the inital checkin to the refactored map page. 2013-05-21 20:28:16 +00:00
Brian Davenport 05c9ebbb76 Merge pull request #3 from terribl/master
New settings div
2013-05-21 12:36:21 -07:00
terribl a1d4a9f320 Merge branch 'settings' 2013-05-21 21:46:58 +03:00
Malcolm Robb be6cb6eaf0 VK1ET : Use error corrected DF17
Actually use the (DF17) messages where we do bit correction.

Other changes to AVR message I/O.
1) treat mlat timestamp of zero as invalid (easier to work with than
(-1) and equally unlikely).
2) If we don't have a valid timestamp send a without timestamp
'*.......' message rather than '@.......' with invalid time.
3) Drop interpretation of obsolete AVR ' #' & '$' formats - they
wouldn't have worked anyway (wrong length).
2013-05-21 16:43:07 +01:00
Malcolm Robb e33591d65d VK1ET : Check Bit Correction against ICAO cache
If we error correct a DF17 frame, check that the ICAOaddr exists in our
recently seen ICAO cache. This reduces the likelyhood of birthday
paradox solutions producing false ICAO addresses
2013-05-21 16:01:54 +01:00
Malcolm Robb 542b94dedb VK1ET : Changes to fixBitErrors()
1) Reduce complexity of fixBitErrors()
2) Inline flipBits()
3) Remove validation checks that can never occur.
2013-05-21 13:40:07 +01:00
terribl d7df2ad706 Merge remote-tracking branch 'upstream/master' 2013-05-21 15:27:54 +03:00
Malcolm Robb 0a0ba165db VK1ET : Changes to modesInitError()
Restrict Syndromes to exclude DF bits. Do NOT introduce syndromes for
errors in the first 5 bits (DF field)

Use the --aggressive flag to see if we populate the two-bit error
syndromes. If --aggressive is not specified, then we don't attempt to
fix two bit errors.
2013-05-21 13:25:33 +01:00
terribl 0dfc083aa5 New settings area
New settings area can be opened by clicking Settings-link and closed by same link or OK-button. No settings to change yet.

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-21 15:19:36 +03:00
Malcolm Robb 640d63a0d1 VK1ET: Shorten CRC calculation
We don't need to include the CRC itself one bit at a time. This shortens
the loop count by 24 iterations, so should be much faster
2013-05-21 12:54:34 +01:00
Malcolm Robb f33a7090b0 VK1ET : Better pthread termination
Close threads, mutex and conditions using pthread functions

Also, correct/update a few comments.
2013-05-21 12:08:35 +01:00
Malcolm Robb 92fd06bcd6 VK1ET : Bugfix in Error correction table
vk1etI believe there is an error in the way the CRC error syndromes are
being created in the two bit case. The inner loop was introducing an
extra error bit each time through rather than moving it. Below is the
modified code fragment for syndrome creation collapsedSun 07:26
19 May 2013 07:26vk1et [notifications@github.com]Actions
To:Mantirez/dump1090 ‎[dump1090@noreply.github.com]‎Cc:MMalcolmRobb
‎[Support@ATTAvionics.com]‎

To help protect your privacy, some content in this message has been
blocked. If you're sure this message is from a trusted sender and you
want to re-enable the blocked features, click here.
Bugfix first noted by VK1ET, and posted here :
https://github.com/antirez/dump1090/pull/23#issuecomment-18113094

I believe there is an error in the way the CRC error syndromes are being
created in the two bit case. The inner loop was introducing an extra
error bit each time through rather than moving it.
2013-05-21 11:28:56 +01:00
MalcolmRobb bd39479e70 Merge pull request #6 from bdavenport/tablesort
Table sort & bit cleaner look with larger tables on smaller screens
2013-05-21 02:35:00 -07:00
terribl 0ee5cdb5de Fixed a bug on Settings-link placement 2013-05-21 11:43:08 +03:00
terribl 2d1325f014 Changing info_footer to info_settings.
Location from footer to top right hand corner.

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-21 10:33:02 +03:00
Brian Davenport 8e23983c86 Merge pull request #1 from terribl/master
Added link to FlightStats-service
2013-05-20 04:04:11 -07:00
terribl 9e8c1053bd Added link to FlightStats for flights with flight number.
modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-20 11:21:08 +03:00
Brian Davenport e1a06656d5 Added terribl's suggestion. 2013-05-19 15:44:19 +00:00
Brian Davenport 4dc9271ee0 Adds a bit of sorting to the table by clicking column headers
Also made the design work for lower resolution monitors, especially when the list has 20+ planes.
2013-05-18 21:54:59 +00:00
Malcolm Robb eac2a90a8a Version update
Version update for terribl and bdavenport's combined changes
2013-05-14 22:26:26 +01:00
MalcolmRobb 7cff495346 Merge pull request #3 from terribl/master
Web client
2013-05-14 14:20:06 -07:00
terribl 7b99ad5f6c Few bugs 2013-05-14 13:04:31 +03:00
terribl 72142fac84 Combined effort and code from bdavenport and me.
Added quite a lot of new things this time - see modified files or just
be brave and try :)

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-14 12:55:16 +03:00
terribl 9ea6f3e8e2 Merge remote-tracking branch 'upstream/master' 2013-05-14 12:54:05 +03:00
Malcolm Robb df4a24bf14 Version update for Ulrich
Updated the version number for Ulrich's code

Replaced some Tabs with spaces

Forward declaration of the fixBitErrors() function required for M$ VC
6.0 to suppress warning messages.
2013-05-14 10:49:57 +01:00
MalcolmRobb e0bc0ba814 Merge pull request #4 from ukuehn/master
Bit error correction code improved
2013-05-14 02:30:18 -07:00
Ulrich Kuehn feab602088 Call new error correction code. Instead of bit positions record no. of corrected bits. 2013-05-12 17:57:26 +02:00