From 010ff8cb6051feceb3ba543ebcf168aeb0179550 Mon Sep 17 00:00:00 2001 From: lwvmobile <59371473+lwvmobile@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:53:45 -0500 Subject: [PATCH 1/3] Tweaks to Instal Script and Readme --- src/dsd_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dsd_file.c b/src/dsd_file.c index f130475..5b25780 100644 --- a/src/dsd_file.c +++ b/src/dsd_file.c @@ -45,7 +45,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d) } if (opts->payload == 1) //make opt variable later on to toggle this { - fprintf (stderr, "[%2X] ", b); + fprintf (stderr, "[%02X] ", b); } fputc (b, opts->mbe_out_f); } @@ -80,7 +80,7 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d) } if (opts->payload == 1) //make opt variable later on to toggle this { - fprintf (stderr, "[%2X] ", b); + fprintf (stderr, "[%02X] ", b); } fputc (b, opts->mbe_out_f); From fdaeae1307103172ee94820622a10969978e462d Mon Sep 17 00:00:00 2001 From: lwvmobile <59371473+lwvmobile@users.noreply.github.com> Date: Tue, 22 Feb 2022 18:03:50 -0500 Subject: [PATCH 2/3] Update README.md --- README.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7e18990..de79b2a 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,9 @@ The Current list of objectives include: ## How to clone, check out, and build this branch -Using the included install.sh should make for a simple and painless clone, build, and install on any Debian or Ubuntu based system. Simply acquire or copy the script, and run it. +### Ubuntu 20.04/LM20/Debian Bullseye or Newer: + +Using the included install.sh should make for a simple and painless clone, build, and install on newer Debian or Ubuntu based system. Simply acquire or copy the script, and run it. ``` wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/pulseaudio/install.sh @@ -81,14 +83,23 @@ chmod +x install.sh ./install.sh ``` -Or you can elect to manually follow the steps down below. +### Ubuntu 18.04/LM19/Buster Note: +Or you can elect to manually follow the steps down below. Do NOT Manually build and install ITPP 4.3.1 on older systems, it is currently not wanting to build on Ubuntu 18.04 and Linux Mint 19. Install it from the repository instead. + +## Manual Install + +First, install dependency packages. This guide will assume you are using Ubuntu 20.04 based distros. Check your package manager for equivalent packages if different. PortAudio is not currently used in this build, and is disabled in CMakeLists.txt, you can re-enable it if you wish, but it isn't recommended unless you have a very specific reason to do so. Some of these dependencies are not currently be used, but may be used in future builds. -First, install dependency packages. This guide will assume you are using Debian/Ubuntu based distros. Check your package manager for equivalent packages if different. PortAudio is not currently used in this build, and is disabled in CMakeLists.txt, you can re-enable it if you wish, but it isn't recommended unless you have a very specific reason to do so. Some of these dependencies are not currently be used, but may be used in future builds. ``` sudo apt update -sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential +sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncursesw5-dev +``` + +### Build and Install ITPP - ONLY IF NOT IN REPO!! + +``` wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files tar xjf itpp* #if you can't cd into this folder, double check folder name first @@ -136,7 +147,7 @@ sudo make install sudo ldconfig ``` -Optional 'Virtual Sinks' for routing audio from SDR++ or GQRX, etc, into DSD-FME +Optional 'Virtual Sinks' for routing audio from SDR++ or GQRX, Media Players, etc. into DSD-FME You may wish to direct sound into DSD-FME via Virtual Sinks. You may set up a Virtual Sink or two on your machine for routing audio in and out of applications to other applications using the following command, and opening up pavucontrol "PulseAudio Volume Control" in the menu to change line out of application to virtual sink, and line in of DSD-FME to monitor of virtual sink. This command will not persist past a reboot, so you will need to invoke them each time you reboot, or search for how to add this to your conf files for persistency if desired. From 8669f6c309ea207f14957d639f7781a2f2a70519 Mon Sep 17 00:00:00 2001 From: lwvmobile <59371473+lwvmobile@users.noreply.github.com> Date: Tue, 22 Feb 2022 18:07:40 -0500 Subject: [PATCH 3/3] remove ITPP from auto building users will need to manually build ITPP if they cannot download and install it from their repo. --- install.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/install.sh b/install.sh index ab0230b..397f7c7 100644 --- a/install.sh +++ b/install.sh @@ -13,21 +13,24 @@ Y='y' if [[ $Y == $ANSWER ]]; then sudo apt update -sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential +sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev libncurses5 libncurses5-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncursesw5-dev +echo ITPP Manual Build and Install has been temporarily removed from this script due to issues with older versions of Ubuntu. +echo Please check to see that libitpp-dev has successfully been downloaded and installed from the repo. +read -p "Press enter to continue" -wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files -tar xjf itpp* +#wget -O itpp-latest.tar.bz2 http://sourceforge.net/projects/itpp/files/latest/download?source=files +#tar xjf itpp* #if you can't cd into this folder, double check folder name first -cd itpp-4.3.1 -mkdir build -cd build -cmake .. -make -j `nproc` -sudo make install -sudo ldconfig -cd .. -cd .. +#cd itpp-4.3.1 +#mkdir build +#cd build +#cmake .. +#make -j `nproc` +#sudo make install +#sudo ldconfig +#cd .. +#cd .. git clone https://github.com/lwvmobile/mbelib cd mbelib