Merge branch 'main' into dev

README.md

@@ -96,13 +96,13 @@ services:
       - SITESHOW=on
       - PROMETHEUS_ENABLE=on
       - REALTIME=on
-#     ais-catcher receiver related parameters
+#     ais-catcher receiver-related parameters
       - RTLSDR_DEVICE_SERIAL=${RTLSDR_DEVICE_SERIAL}
       - RTLSDR_DEVICE_GAIN=${RTLSDR_DEVICE_GAIN}
       - RTLSDR_DEVICE_PPM=${RTLSDR_DEVICE_PPM}
       - RTLSDR_DEVICE_BANDWIDTH=${RTLSDR_DEVICE_BANDWIDTH}
       - AISCATCHER_DECODER_AFC_WIDE=${AISCATCHER_DECODER_AFC_WIDE}
-#     aggregrators related parameters
+#     aggregrators-related parameters
       - AIRFRAMES_STATION_ID=${AIRFRAMES_STATION_ID}
       - AISCATCHER_FEEDER_KEY=${AISCATCHER_FEEDER_KEY}
       - AISHUB_UDP_PORT=${AISHUB_UDP_PORT}
@@ -146,7 +146,6 @@ RTLSDR_DEVICE_SERIAL=DEVICE-SERIAL
 RTLSDR_DEVICE_GAIN=xxx
 RTLSDR_DEVICE_PPM=xxx
 AISCATCHER_DECODER_AFC_WIDE=on
-AISCATCHER_CHANNELS=AB CD
 STATION_NAME=My Station Name
 #
 # keys and params for aggregators:
@@ -185,7 +184,7 @@ You can use `rtl_test` to see which devices and device serials are connected to
 | `RTLSDR_DEVICE_GAIN` | SDR device gain. Can also be set to `auto` | `33` |
 | `RTLSDR_DEVICE_PPM`| PPM deviation of your RTLSDR device | Empty |
 | `RTLSDR_DEVICE_BANDWIDTH` | Channel bandwitdh of the receiver | `192K` |
-| `AISCATCHER_CHANNELS` | Channels flag for `ais-catcher`. Set to `AB`, `CD`, or `AB CD` | Empty |
+| `AISCATCHER_CHANNELS` | Channels flag for `ais-catcher`. Set to `AB` (receive on channel AB, default value if omitted), `CD` (receive on channel CD), or `CD AB` (receive on channel CD but forward this data to aggregators saying it's channel AB; this can be used to send channels CD data to aggregators that can't handle CD data) | Empty (`AB`) |
 | `AISCATCHER_DECODER_MODEL` | Decoder model number for `ais-catcher` | `2` |
 | `AISCATCHER_DECODER_AFC_WIDE` | `-go AFC_WIDE` flag for `ais-catcher`. Recommended to set to `on` | `on` |
 | `AISCATCHER_DECODER_FP_DS` | `-go PF_DS` flag for `ais-catcher` | Empty |
@@ -271,7 +270,7 @@ timeout 180s docker run \
     --rm \
     -it \
     --entrypoint /usr/bin/get-creds \
-    ghcr.io/sdr-enthusiasts/shipxplorer:latest
+    ghcr.io/sdr-enthusiasts/docker-shipfeeder:latest
 ```
 
 This will run the container for 3 minutes, allowing a sharing key to be generated.

aiscatcher.sha

@@ -1 +1 @@
-"sha256:d5bfe7700a6222f4e90c5e19f97330264016b2c81aa73933cad32af9e7282eea""sha256:b3dee2e195ebd0564c5aa09e4e961a95666b0e6a3dbd86612f73b6f2b8346eb2""sha256:ef2e88f79d0cd22b0566517595cf0140cd0ecf23330b5411f1fbf330219b7c48""sha256:933d7cf2eb395103110b2290674913118355c18ab9e89b6989559f03d91f5a6e""sha256:86231e68cad19271c96902b2f4f824f8b9612a91ef521364547bc0d352fa0221"
+"sha256:632c9acfd93532b723b336652bd6545081c85afdfb35e0cc0d85a48be5d2a0a7""sha256:bff80bb19c995f5f3a4aa967d5f5c04769a3ad21974a291cacc9d9ed99726952""sha256:0bd85d5980e9e9172ea372fea70d0adaa5ec776fc365ff99d461df1553521108""sha256:1f7ea93498beeba07394a8940b2dd778ec0e65be8a019211a36ba2f480d8e6da""sha256:5c6eab502917d59ed9d225e6161006096fa7450559acd4f3e4ecf53704518747""sha256:8fa97f6c08d2ccd22032b76e7007b638291f83302b045b0b14b55c7f99829dfc""sha256:c9b4b8bc4352a0200cf24d9030231ea8948144be5818bf57e457a6a77029d73f""sha256:9ec334fe1ccfe8c9a060231fdf67bc1620b6809c1fd321ece72ac1eef1bacae9""sha256:1015563d7558dceb7bf522fe44ea5281834e95192bef442c0f7d84f557e24107""sha256:a3425723cc1cd7d06440d39175c67ac23992ff9653bd77a03aef38c1f0f9cef9"

config-examples/.env.sample

@@ -5,7 +5,6 @@ RTLSDR_DEVICE_SERIAL=DEVICE-SERIAL
 RTLSDR_DEVICE_GAIN=xxx
 RTLSDR_DEVICE_PPM=xxx
 AISCATCHER_DECODER_AFC_WIDE=on
-AISCATCHER_CHANNELS=AB CD
 STATION_NAME=My Station Name
 #
 # keys and params for aggregators:
@@ -26,4 +25,4 @@ SHIPPINGEXPLORER_UDP_PORT=xxxxx
 SHIPXPLORER_SHARING_KEY=xxxxxxxxxxxxxxxxxxx
 SHIPXPLORER_SERIAL_NUMBER=SXTRPI00xxxx
 VESSELFINDER_UDP_PORT=xxxx
-VESSELTRACKER_UDP_PORT=xxxx
+VESSELTRACKER_UDP_PORT=xxxx

rootfs/etc/s6-overlay/scripts/aiscatcher

@@ -123,7 +123,7 @@ if [[ -n "$AIRFRAMES_STATION_ID" ]]; then
 fi
 
 # AIS-Catcher:
-if chk_enabled "$AISCATCHER_SHAREDATA" || [[ -z "$AISCATCHER_FEEDER_KEY" ]]; then
+if chk_enabled "$AISCATCHER_SHAREDATA" && [[ -z "$AISCATCHER_FEEDER_KEY" ]]; then
     aiscatcher_command+=("-X")
     AISCATCHER_EXTRA_OPTIONS="$(sed -E 's/-X\s+[0-9]*\s*//g'<<< "$AISCATCHER_EXTRA_OPTIONS")" # Remove any -X from param to avoid duplication
 elif [[ -n "$AISCATCHER_FEEDER_KEY" ]]; then