From d9b0beec315201b0fb3771b6044c11f859287416 Mon Sep 17 00:00:00 2001 From: "Stanislav Lechev [0xAF]" Date: Sun, 1 Oct 2023 01:23:54 +0300 Subject: [PATCH 1/2] add LSimpleMarker (fix custom markers) --- htdocs/lib/Leaflet.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/lib/Leaflet.js b/htdocs/lib/Leaflet.js index 8951fb9d..0336be7c 100644 --- a/htdocs/lib/Leaflet.js +++ b/htdocs/lib/Leaflet.js @@ -68,6 +68,9 @@ function LAprsMarker () { $.extend(this, new LMarker(), new AprsMarker()); } // Leaflet-Specific AircraftMarker function LAircraftMarker () { $.extend(this, new LMarker(), new AircraftMarker()); } +// Leaflet-Specific SimpleMarker +function LSimpleMarker() { $.extend(this, new LMarker(), new AprsMarker()); } + // // Leaflet-Specific Locator // From cc4e9e3a74baf6cdb91d4a0ece99aef1d21d7041 Mon Sep 17 00:00:00 2001 From: "Stanislav Lechev [0xAF]" Date: Sun, 1 Oct 2023 01:36:00 +0300 Subject: [PATCH 2/2] add ACARSDEC to docker builds --- docker/deb_based/install-owrxp-extra.sh | 8 ++++++-- docker/scripts/add-dependencies.sh | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docker/deb_based/install-owrxp-extra.sh b/docker/deb_based/install-owrxp-extra.sh index c7dfa5f4..24b1525c 100755 --- a/docker/deb_based/install-owrxp-extra.sh +++ b/docker/deb_based/install-owrxp-extra.sh @@ -33,7 +33,7 @@ esac echo "+ Install dev packages..." -BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libsoapysdr-dev debhelper cmake libprotobuf-dev protobuf-compiler libcodecserver-dev build-essential xxd qt5-qmake libpulse-dev libfaad-dev libopus-dev libfftw3-dev pkg-config libglib2.0-dev libconfig++-dev libliquid-dev libairspyhf-dev libpopt-dev libiio-dev libad9361-dev libhidapi-dev libasound2-dev qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev asciidoctor gfortran libhamlib-dev" +BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libsoapysdr-dev debhelper cmake libprotobuf-dev protobuf-compiler libcodecserver-dev build-essential xxd qt5-qmake libpulse-dev libfaad-dev libopus-dev libfftw3-dev pkg-config libglib2.0-dev libconfig++-dev libliquid-dev libairspyhf-dev libpopt-dev libiio-dev libad9361-dev libhidapi-dev libasound2-dev qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev asciidoctor gfortran libhamlib-dev libsndfile1-dev" apt-get -y install --no-install-recommends $BUILD_PACKAGES echo "+ Install SDRPlay..." @@ -103,10 +103,14 @@ mv /files/wsjtx/wsjtx.patch ${WSJT_DIR} cmakebuild ${WSJT_DIR} rm ${WSJT_TGZ} -echo "+ Install HFDL..." +echo "+ Install ACARSDEC..." git clone https://github.com/szpajder/libacars.git cmakebuild libacars v2.1.4 +git clone https://github.com/TLeconte/acarsdec.git +cmakebuild acarsdec + +echo "+ Install HFDL..." git clone https://github.com/szpajder/dumphfdl.git cmakebuild dumphfdl v1.4.1 diff --git a/docker/scripts/add-dependencies.sh b/docker/scripts/add-dependencies.sh index d00b7cee..a1156677 100755 --- a/docker/scripts/add-dependencies.sh +++ b/docker/scripts/add-dependencies.sh @@ -120,6 +120,9 @@ cmakebuild m17-cxx-demod v2.3 git clone https://github.com/szpajder/libacars.git cmakebuild libacars v2.1.4 +git clone https://github.com/TLeconte/acarsdec.git +cmakebuild acarsdec + git clone https://github.com/szpajder/dumphfdl.git cmakebuild dumphfdl v1.4.1