Commit graph

526 commits

Author SHA1 Message Date
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
Ulrich Kuehn 6d5d7a4244 Test code for new bit error correction plus timing. This code is run when debugging. 2013-05-12 17:41:22 +02:00
Ulrich Kuehn 0a4fc6e98f Added code for table based correction of bit errors. Code is not called yet except initialisation. 2013-05-12 17:33:44 +02:00
terribl ae69cd5d48 Web view JavaScript modifications.
modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-12 15:15:18 +03:00
terribl 6f228b9c88 Upstream merge finalized 2013-05-12 09:53:07 +03:00
terribl cac715e40a Upstream merge conflicts resolved 2013-05-12 09:50:20 +03:00
terribl 78f565cb4f Really minor tweaks 2013-05-12 09:37:17 +03:00
Malcolm Robb f56679a61d VK1ET : Bugfix pTimestamp printf()
Change the type of pTimestamp from char* to unsigned char* to stop sign
extension messing up the printf("%02X,pTimestamp stuff
2013-05-12 01:17:38 +01:00
Malcolm Robb 8feabda35b BDAVENPORT : Adds a Table
Implement improvements to the public_html stuff as supplied by
bdavenport.
No changes to the C code.
2013-05-12 00:57:30 +01:00
terribl e65e873c13 Added flags to json for valid position and heading
As MalcolmRobb suggested.

	modified:   dump1090.c
	modified:   public_html/script.js
2013-05-11 23:36:11 +03:00
terribl ebadf90a57 Merge remote-tracking branch 'upstream/master' 2013-05-11 21:52:48 +03:00
Malcolm Robb c83d404c4a Update of some comments, Version and release 2013-05-11 16:11:45 +01:00
terribl e6080e259f Some map view changes
modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
2013-05-11 17:04:23 +03:00
Malcolm Robb d0469061ff Update ModeA/C to ModeS
Update the ModeA/C to Mode S comparison routine to use bFlags.
2013-05-11 15:02:34 +01:00
terribl bf4ccaca06 bdavenports .diff-file 2013-05-11 13:15:09 +03:00
Malcolm Robb 6427fcc1ee VK1ET : --Interactive display changes
Based on a submission by VK1ET, but I've tweaked it a bit to use the
bFlags.

Basically, only print out values in --interactive that have been
received from the aircraft. Previous versions would display 0.000 for
lat and long for any positionless aircraft. This version prints blanks
instead for any/all fields that are not yet known.
2013-05-10 18:17:19 +01:00
Malcolm Robb cd86d58898 Major Rewrite of SBS output code
Remove dependency of the SBS output code on the historic (a) aircraft
structure. The only items that were required were the decoded aircraft
Lat/Lon and these are now included in the mm structure.

Rewrite the SBS output code to use mm->bFlags when populating the output
fields. This ensures that all available data is output, and also that no
stale data is sent.

Using the mm->bFlags variable for SBS output means there is no further
requirement for the sbsFlags member in the aircraft structure, so remove
it.

Cross your fingers and hope this hasn't introduced too many bugs !
2013-05-10 17:27:34 +01:00
Malcolm Robb 7df6d656a0 Implement additional Decoding and Tidy
Implement additional bFlags to validate AircraftOnGround, and FS.

Decode Aircraft On Ground from DF0, DF4, DF5, DF16, DF20, and DF21 where
possible.
Flag FS as valid for DF4, DF5, DF20, DF21,

Remove dr and um from the mm structure. They're only used in console
list output mode, so decode them there if required.
2013-05-10 17:17:10 +01:00
Malcolm Robb 60aa63b421 Merge remote-tracking branch 'origin/master' into Debug
Conflicts:
	dump1090.c
2013-05-10 11:02:46 +01:00
terribl f59e82aee9 fix .gitignore file 2013-05-10 12:58:24 +03:00
Malcolm Robb 914923f8bb Fix terribl's commit for Microsoft C
Microsoft Visual C 6.0 doesn't support inline declaration of variables.

Also, need to update the version number.
2013-05-10 00:12:36 +01:00
terribl c5fdde64e4 Added resetMap()-function to web-view.
+ some small tweaks.

	modified:   dump1090.c
	modified:   public_html/script.js
2013-05-09 21:57:33 +03:00
Malcolm Robb 735429b87a Additional bFlags for Lat/Lon decoding
Additional flags in the bFlags variables for even and odd CPR lat/lon
updates.

Change the interactiveReceiveData function to use the bFlags when
updating the aircraft (a) structure from the newly received (mm) message
structure. This should hopefully be faster than basically re-decoding
the DF, type and subtypes all over again.

If we decode the lat/lon into the aircraft (a) structure, back populate
it into the message (mm) structure. This allows us to print a decoded
Lat/Lon in the decoded message list output.
2013-05-09 18:48:07 +01:00
Malcolm Robb f011f07e9f Tidy up ModeA/C mm and a structure
If --modeac is specified, then the program will be building an aircraft
list. Calculate the altitude when we create the aircraft structure (a) ,
and then back copy it into the mm structure. This avoids us having to do
a second ModeAtoModeC conversion in the list output display.

Also - bug fix in the ns_vel calculation.
2013-05-09 16:40:04 +01:00
terribl 6968bf92a6 Splitted gmap.html to multiple files in new 'public_html'-directory.
Changes to 'dump1090.c'-file made accordingly.

	modified:   .gitignore
	modified:   dump1090.c
	deleted:    gmap.html
	new file:   public_html/gmap.html
	new file:   public_html/script.js
	new file:   public_html/style.css
2013-05-09 17:59:26 +03:00
Malcolm Robb fc7d1e27c9 Complete the bFlags decoding
Update the bFlags structure member to indicate which other structure
members contain decoded values.

Also, trim out mm structure members that are simple bitwise ands from
the raw data, unless the results are used in lots of places whereby
decoding them once is more efficient.
2013-05-09 15:29:25 +01:00
Malcolm Robb a3d62f96b7 VK1ET : More Decoding of DF-17 ground reports
Extend the DF-17 CPR decoding to use User Lat/Lon for ground positions.

Also start implementing a bFlags structure variable to indicate which
fields in the mm and a data structures contain valid values.
2013-05-09 15:06:07 +01:00
Malcolm Robb cc464b0a34 User Lat/Lon setting
Based on initial code supplied by VK1ET

Allow the user to specify their receivers (technically their aerials)
physical location. This is required for decoding ground positions, and
also for uploading aircraft data to various sharer sites.

The position can be hardwired by setting the MODES_USER_LATITUDE_DFLT
and MODES_USER_LONGITUDE_DFLT constants before compilation, or entered
at runtime via the new command line switches --lat and --lon.   Either
way, the values are checked for validity before use.
2013-05-09 11:29:18 +01:00
Malcolm Robb 5f009a3264 VK1ET ; Decode DF-17 ground position reports 2013-05-09 00:40:57 +01:00
Malcolm Robb 6b53c9e73a Move the clearing of mm for modeA/C
Only clear mm after we are sure we have got a Mode A/C. This reduces
processor load.

Also tidy up some Linux compiler warnings that result from the last
change.
2013-05-08 22:38:31 +01:00
Malcolm Robb 8048cbec6b Better decoding of DF-17 Airborne Velocity
Based on a submission by VK1ET. Fully decode DF-17, metype 19. Take care
to only update fields that are valid in the data.

Also, initialise (to zero) the mm structures before use
2013-05-08 22:16:38 +01:00
Malcolm Robb 6af4bb7431 VK1ET : Only Decode valid AC12 and AC13 altitudes
Decode DF17 altitudes only if valid (i.e. must be a non-zero field)
2013-05-08 20:13:11 +01:00
Malcolm Robb 8efe64982a Tidy up some comments and initialisation 2013-05-08 19:48:08 +01:00
Malcolm Robb dd72fc6dd5 VK1ET : Allow stats in --interactive mode 2013-05-08 19:38:10 +01:00
Malcolm Robb fb5ef77cd1 VK1ET : Fix AC12 Altitude decoding 2013-05-08 19:34:47 +01:00
Malcolm Robb 71ace95fd4 Additional Timestamps for Lat Lon
1) Implement additional timestamps to remember when a new Lat/Lon value
is generated.

2) Increase callsign[] character array to 16 chars  to make it long word
aligned.

3) Change some more comments from /* to //
2013-05-07 21:52:54 +01:00
Malcolm Robb ed076d0d98 Change initialisation of structures
Use memset to clear entire structures at initial creation to zero, and
then populate values that should not be zero. Do this rather than
individually clear each structure member to zero.

This should be faster, plus it's safer when new structure members are
added because you don't have to remember to initialise them.
2013-05-02 13:05:25 +01:00
Malcolm Robb 8870de2b9a Update --interactive with DF20/21 callsigns 2013-05-01 12:54:37 +01:00
Malcolm Robb 5457c5b177 Tidy DF17 print output routine 2013-04-30 18:25:32 +01:00
Malcolm Robb 36778f1284 Extract callsign from DF20 and DF21 2013-04-30 18:18:37 +01:00
Malcolm Robb 14c54599ac Improve callsign extraction from DF17
Use 32 bit registers to hold multiple characters and shift them. This
removes the need for multiple memory reads.

Also tidy up the DF-17 extraction routine to make it more readable.
2013-04-30 18:12:18 +01:00
Malcolm Robb 539faaaf27 Rename Gillham conversion function
ICAO documents refer to AC13 for altitude encoding and ID13 for squawk
wncoding. Rename decodeGillhamField to decodeID13Field to better
represent this.
2013-04-30 18:07:16 +01:00
Malcolm Robb 9783b4786a Generate an average Signal Strength
Remember the last 8 signal strengths for each aircraft and average them
for --interactive display. This produces a less jittery indication.
2013-04-30 18:03:30 +01:00