Commit Graph

1690 Commits

Author SHA1 Message Date
Adrian Batzill 6714148c45 Forward MLAT traffic to Stratux JSON output, marked with IsMlat:true value in JSON 2020-09-10 10:20:21 +02:00
Oliver Jowett 6a4a239d0f
Merge pull request #78 from Gluttton/fix_trivial_typo
fix a trivial copy-paste typo in comments
2020-09-08 10:44:13 -05:00
Oliver Jowett 418e13e6b6 Merge PR #61 (Stratux output format support) plus fixes 2020-09-08 23:36:34 +08:00
Oliver Jowett 303dcc9915 Fix stratux output timestamps to really be UTC as they claim 2020-09-08 23:35:17 +08:00
Oliver Jowett 7356676c5b Don't need conditional output on the stratux port, that's done in prepareWrite() 2020-09-08 23:30:24 +08:00
Oliver Jowett 9b06099971 Enable net mode on bare stratux port option 2020-09-08 23:25:01 +08:00
Oliver Jowett da3e9766de Harden the stratux output a bit: use safe_snprintf, jsonEscapeString 2020-09-08 23:22:53 +08:00
Oliver Jowett ec90edcd8d Simpify stratux service init 2020-09-08 23:21:34 +08:00
Oliver Jowett bc9336e0be Revert "forward mlat messages to Stratux"
This reverts commit c89930b4b9.
2020-09-08 23:10:18 +08:00
Oliver Jowett 917aa6a0e2 Merge branch 'stratux' of https://github.com/Determinant/dump1090-fa-stratux into Determinant-stratux 2020-09-08 23:08:37 +08:00
Determinant c89930b4b9
forward mlat messages to Stratux 2020-09-07 15:36:34 -04:00
Gluttton 992f036fc2 fix a trivial copy-paste typo in comments
Signed-off-by: Gluttton <gluttton@ukr.net>
2020-08-31 22:53:14 +03:00
Determinant d25103361a
make change according to the suggestions 2020-08-30 21:21:49 -04:00
eric1tran ee552eb058 Fix capitalization 2020-08-28 10:45:33 -05:00
Oliver Jowett 1dbb8ab234 Expose modea_hit / modec_hit in aircraft.json 2020-08-24 15:03:17 +08:00
Oliver Jowett fba10d3262 Update FreeBSD instructions to use pkg not ports for pkgconf 2020-08-24 14:15:09 +08:00
eric1tran 798c0a3fa5 Enable and add more map layers 2020-08-19 19:58:51 +00:00
Oliver Jowett 1d3e5c03e9 More _WIN32 ifdef pruning 2020-08-11 13:51:16 +08:00
Oliver Jowett ddce32849d Tweak --net behaviour to simplify using a subset of network ports.
This tries to retain the existing behaviour of --net / --net-only
while making it easier to say "listen on only these specific ports".

If --net or --net-only is specified, network mode is enabled and
default port values are assumed for any port not otherwise specified
on the command line. Specifying a port of 0 disables that port. This
is the same as the old behavior.

If --net or --net-only is not specified, but at least one
of the --net-xxx-port options is specified, then network mode is
enabled with no default port value and only those ports explicitly
configured on the command line are used.

This means you can e.g. configure a port-30005-only SDR receiver
by specifying just "--net-bo-port 30005"; or configure a
network-receive-only receiver (e.g. for SkyAware display) by
"--device-type none --net-bi-port 30004,30104". These were possible
previously but required turning off a lot of the default ports.
2020-08-11 13:44:39 +08:00
Oliver Jowett 1d04174f37 Update macos build notes 2020-08-11 13:15:41 +08:00
Oliver Jowett e00d12f817 Update README for FreeBSD build notes. 2020-08-11 13:04:53 +08:00
Oliver Jowett 10b9bc6614 Handle builds with no SDR support better.
Reorder --ifile pseudo-sdr after the "none" SDR so that a build with no real
SDR support defaults to "none" not --ifile

If the "none" SDR was selected and network mode is not enabled, tell the
user about the problem rather than just failing to do anything useful.
2020-08-11 12:55:17 +08:00
Oliver Jowett 9237086b38 Fix on-exit memory leaks noticed by @Mictronics 2020-08-10 15:00:25 +08:00
eric1tran da3557fcfe Put aircraft count before page title 2020-08-09 00:33:59 -05:00
Assaf Sapir d353568c59
Fix MessageRate might be null and remove unused config (#71)
* Fix MessageRate might be null && unused config

* Page title edits

Co-authored-by: Eric Tran <eric1tran@gmail.com>
2020-08-08 18:26:57 -05:00
sigwx a0b0038df7
Control map via URL options (#58)
* Add URL options to hide different aspects of the default display, helpful for starting for a kiosk

* Fix spacing in changes

* More options to move map left/right/up/down

* Allow movement in all directions, consolidate some code

* Add controls for units and range rings from url

* Swap left/right,up/down behavior for map moves

* Convert #nohistory anchor tag to a query param like the other parameters. Make query parameters values explicitly state true

* Fix for enableRings so it will toggle the setting

* Use show/hide parameter values to avoid having a a showX/hideX parameter for each option, Rename some parameters, resize map when hiding banner/sidebar, cleanup

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: eric1tran <eric1tran@gmail.com>
2020-08-07 13:47:32 -05:00
Oliver Jowett af1f4f84a9 Merge PR #38 - OSX/FreeBSD/OpenBSD portabilty.
This is minimally tested on OSX, and not at all on *BSD.
Since I did some cleanups in the compat code without testing on *BSD,
it could well be broken there.

This may also fix #33 as #38 included those changes.
2020-08-07 15:09:22 +08:00
Oliver Jowett 286a6301f8 Try to clean up the compat stuff a bit 2020-08-07 15:08:45 +08:00
Oliver Jowett 74e11bd26f Reinstate the freebsd pkg-config workaround in another form 2020-08-07 14:43:44 +08:00
Oliver Jowett c3017cc0a4 bladerf seems to compile OK on osx, add it to the readme 2020-08-07 14:34:25 +08:00
Oliver Jowett 799b568dfb Add le64toh to compat.h for bladerf support on osx 2020-08-07 14:32:51 +08:00
Oliver Jowett 1174841f71 Fix merge conflicts, clean up the Makefile 2020-08-07 14:30:54 +08:00
Oliver Jowett 5a30efb137 Try to make the README a bit more up to date 2020-08-06 14:07:57 +08:00
Oliver Jowett c8d96acbdc Add support for custom builds that don't include all SDRs, to
reduce dependency requirements a little.

(Ideally we'd have some sort of module system here, and split
the dependencies out nicely into separate packages, but that's a
problem for other day; for now I can live with custom packages
having the same name as the full build, since we'll never
distribute them ourselves)
2020-08-06 14:06:20 +08:00
Oliver Jowett 48af886e46 Update maintainer address, clean up the control file a bit. 2020-08-06 14:05:55 +08:00
Oliver Jowett efb4c1f60f Drop the very legacy dump1090 upgrade package, assume nobody is using those
ancient packages any more.
2020-08-06 14:03:47 +08:00
Oliver Jowett 6dc0741481 Drop wheezy support.
Upstream Debian LTS support for wheezy ended in 2018.
2020-08-06 13:44:07 +08:00
Oliver Jowett 84dd2dfe0e Disable limesdr/hackrf support on jessie, stretch, wheezy 2020-08-05 20:28:50 +08:00
Oliver Jowett ce521f715a Strip out the long-dead --debug option code. 2020-08-05 20:14:57 +08:00
Oliver Jowett ce5cf89e60 If --device-type is given without a type, list the available types. 2020-08-05 20:12:06 +08:00
Oliver Jowett 2fa793d0d7 Add a separate --version arg. Don't spit out full help on option syntax problems. 2020-08-05 20:11:40 +08:00
Oliver Jowett f1bd1a5829 Packaging updates for limesdr support 2020-08-05 20:04:25 +08:00
Oliver Jowett 653ad6127a Use a bounce buffer for rtlsdr on ARM to work around zero-copy problems.
On 5.x kernels with the USB mmap problems fixed, the distributed librtlsdr
will use a zero-copy mapping for USB buffers. Unfortunately, there is
something about the nature of the mapping on ARM (at least on Pis) that
makes most access to the data extremely slow. The uc8_nodc converter is
about 35x slower in this case compared to working on a heap-allocated buffer.

Luckily, a plain memcpy() of the buffer is still reasonably fast, so
we can use a bounce buffer and copy the data out of the slow mapping, then
pass the copy to the converter. This mitigates most of the problem,
at the expense of always needing that extra copy (which does somewhat
defeat the purpose of zero-copy!)

Unfortunately, librtlsdr provides no reliable way to control or
detect the use of zero-copy mappings, so we have to assume the problem
is always there (at least on ARM) and pay the cost of an unnecessary
copy when zerocopy is _not_ in use, too.
2020-08-05 19:50:38 +08:00
Oliver Jowett d5d04060de Support older limesuite versions e.g. what's available on Raspbian Buster.
Unfortunately limesuite doesn't seem to provide an API identifier, so
we can't detect whether LMS_PATH_AUTO is supported or not. Change the
fallback to LMS_PATH_LNAW, since that appears to work on both mini
and full-fat limesdrs.
2020-08-05 19:50:38 +08:00
Oliver Jowett 1761b8ddc1 Fix hackrf compilation when uint64_t is not a long
(e.g. on arm, it's a long long)
2020-08-05 19:50:38 +08:00
Oliver Jowett e857d042aa 'make clean' should clean object files in oneoff/ too 2020-08-05 19:50:38 +08:00
Oliver Jowett c1f526b76d Clean up the bladerf driver a bit 2020-08-05 19:50:38 +08:00
Oliver Jowett 74607b31ed Factor out FIFO handling; reimplement as a linked list, not a circular buffer.
Update all the SDR implementation to use it.

This was getting pretty ugly with code getting copy&pasted in all the SDR
implementations. Unify it all and give it a simpler API. Linked list works out
much simpler than the circular buffer. Also, simplify copying the overlap region
around by just using a separate buffer (it's only a few hundred bytes long, so
the double copy is not a big deal).
2020-08-05 19:50:38 +08:00
Oliver Jowett aa2929196d If DUMP1090_VERSION is unset, use "unknown" as the version (not an empty string) 2020-08-05 19:50:38 +08:00
Oliver Jowett 104575c602 Might as well compile with -O3 2020-08-05 19:50:38 +08:00