feat: add support for rtl_tcp (#30)

fix #29 Requires appox. 35-40 Mbit/s bandwidth. Example RTL_TCP command: ./rtl_tcp -a 0.0.0.0 -f 1090000000 -s 2400000 -p 30005 -P 28 -g -10 Use correct frequency, sample rate and ppm_error value.
Thom-x · Sep 8, 2020 · a4d1e50 · a4d1e50
1 parent d580791
commit a4d1e50
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -142,7 +142,8 @@ RUN apt-get update && \
     apt-get install -y \
     libssl-dev \
     tcl-dev \
-    chrpath && \
+    chrpath \
+    netcat && \
     rm -rf /var/lib/apt/lists/*
 
 ## Clone source code, build & Install tcl-tls

diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ Example :
 | Environment Variable                  | Configuration property   | value             | Configuration file      |
 |---------------------------------------|--------------------------|-------------------|-------------------------|
 | `FR24FEED_TEST=value`                 | `test`                   | `value`           | `fr24feed.init`         |
-| `FR24FEED_TEST_DASH_TEST=value`       | `test-test`              | `value2`          | `fr24feed.init`         |
+| `FR24FEED_TEST_DASH_TEST=value2       | `test-test`              | `value2`          | `fr24feed.init`         |
 | `PIAWARE_TEST=value`                  | `test`                   | `value`           | `piaware.conf`          |
 
 ## Dump1090 & Web UI
@@ -135,6 +135,10 @@ Example :
 | `HTML_SITE_LON`                       | `9.0`                    |                                                                   |
 | `HTML_SITE_NAME`                      | `My Radar Site`          |                                                                   |
 | `DUMP1090_ADDITIONAL_ARGS`            | empty                    | Additial arguments for dump1090 e.g.: `--json-location-accuracy 2`|
+| `DUMP1090_OVER_NETCAT`                | `false`                  | Use dump1090 in combination with netcat to feed data from rtl_tcp server. (Requires appox. 35-40Mbit/s). Example RTL_TCP command: `./rtl_tcp -a 0.0.0.0 -f 1090000000 -s 2400000 -p 30005 -P 28 -g -10`|
+| `DUMP1090_REMOTE_HOST`                | empty                    | IP of rtl_tcp server                                              |
+| `DUMP1090_REMOTE_PORT`                | empty                    | Port of rtl_tcp server                                            |
+
 
 Ex : `-e "HTML_SITE_NAME=My site"`
 

diff --git a/root/etc/services.d/dump1090/run b/root/etc/services.d/dump1090/run
@@ -20,7 +20,12 @@ then
 	default_value "site_lat" "45.0"
 	default_value "site_lon" "9.0"
 	default_value2 "additional_args" ""
-	/usr/lib/fr24/dump1090 --net --write-json /usr/lib/fr24/public_html/data --raw --quiet --lat ${HTML_SITE_LAT} --lon ${HTML_SITE_LON} ${DUMP1090_ADDITIONAL_ARGS}
+        if [ "$DUMP1090_OVER_NETCAT" == "true" ]
+	then
+                /bin/nc ${DUMP1090_REMOTE_HOST} ${DUMP1090_REMOTE_PORT} | /usr/lib/fr24/dump1090 --net --write-json /usr/lib/fr24/public_html/data --raw --quiet --lat ${HTML_SITE_LAT} --lon ${HTML_SITE_LON} ${DUMP1090_ADDITIONAL_ARGS} --ifile -
+        else
+                /usr/lib/fr24/dump1090 --net --write-json /usr/lib/fr24/public_html/data --raw --quiet --lat ${HTML_SITE_LAT} --lon ${HTML_SITE_LON} ${DUMP1090_ADDITIONAL_ARGS}
+	fi
 else
 	tail -f /dev/null
 fi