Version/Date Update;

Sending Audio to a Icecast 2 Server via FFmpeg (Windows)

.gitignore

@@ -7,6 +7,4 @@ build
 examples
 *.bin
 *.ans
-*.patch
-*.zip
-result
+*.patch

CMakeLists.txt

@@ -39,14 +39,13 @@ if (LZ)
     add_definitions(-DLIMAZULUTWEAKS) 
 endif ()
 
-#use cmake option -DSID=ON to enable P25p1 Soft ID decoding -- Experimental
-option(SID
-    "Build with P25p1 LSD/Soft ID Enabled" OFF)
-if (SID)
-    add_definitions(-DSOFTID) 
+#use cmake option -DTONES to change default location of the tones.wav files (lwvmobile precompiled 'Aero' releases only)
+option(TN
+    "Build with tone wav files in the dsd-fme folder and not in /usr/share/" OFF)
+if (TN)
+    add_definitions(-DTONES) 
 endif ()
 
-
 include(git_revision)
 git_describe(GIT_TAG)
 
@@ -59,7 +58,7 @@ find_package(PulseAudio REQUIRED)
 find_package(CODEC2)
 
 include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR})
-set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARY})
+set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${CURSES_LIBRARY})
 
 if(RTLSDR_FOUND)
     find_package(Threads)
@@ -89,11 +88,6 @@ include_directories("${PROJECT_SOURCE_DIR}/include")
 ADD_EXECUTABLE(dsd-fme ${SRCS} ${HEADERS})
 TARGET_LINK_LIBRARIES(dsd-fme ${LIBS})
 
-target_compile_options(dsd-fme PRIVATE -Wunused-but-set-variable -Wunused-variable -Wunused-parameter
-                       -Wempty-body -Wunused-label $<$<COMPILE_LANGUAGE:C>:-Wpointer-sign>
-                       -Wmisleading-indentation -Wparentheses -Wunused-value -Wreturn-type
-                       -Wtautological-compare)
-
 include(GNUInstallDirs)
 install(TARGETS dsd-fme DESTINATION ${CMAKE_INSTALL_BINDIR})
 

README.md

@@ -2,17 +2,17 @@
 # Digital Speech Decoder - Florida Man Edition
 
 DSD-FME is an evolution of the original DSD project from 'DSD Author' using the base code of [szechyjs](https://github.com/szechyjs/dsd "szechyjs"), some code and ideas from [LouisErigHerve](https://github.com/LouisErigHerve/dsd "LouisErigHerve"), [Boatbod OP25](https://github.com/boatbod/op25 "Boatbod OP25") and 
-[Osmocom OP25](https://gitea.osmocom.org/op25/op25 "Osmocom OP25"), along with other snippets of code, information, and inspirations from other projects including [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDRTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), [OK-DMRlib](https://github.com/OK-DMR/ok-dmrlib "OK-DMRlib"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"), Eric Cottrell, SP5WWP and others. Finally, this is all brought together with original code to extend the fuctionality and add new features including NCurses Terminal and Menu system, Pulse Audio, TCP Direct Link Audio, RIGCTL, Trunking Features, LRRP/GPS Mapping, P25 Phase 2, EDACS, YSF, M17, OP25 Capture Bin compatability, etc. DSD-FME is primarily focused with Linux Desktop users in mind, so please understand that this version may not compile, compile easily, or run correctly in other environments.
+[Osmocom OP25](https://gitea.osmocom.org/op25/op25 "Osmocom OP25"), along with other snippets of code, information, and inspirations from other projects including [DSDcc](https://github.com/f4exb/dsdcc "DSDcc"), [SDRTRunk](https://github.com/DSheirer/sdrtrunk "SDRTrunk"), [MMDVMHost](https://github.com/g4klx/MMDVMHost "MMDVMHost"), [LFSR](https://github.com/mattames/LFSR "LFSR"), [OK-DMRlib](https://github.com/OK-DMR/ok-dmrlib "OK-DMRlib"), and [EZPWD-Reed-Solomon](https://github.com/pjkundert/ezpwd-reed-solomon "EZPWD"), Eric Cottrell, SP5WWP and others. Finally, this is all brought together with original code to extend the fuctionality and add new features including NCurses Terminal and Menu system, Pulse Audio, TCP Direct Link Audio, RIGCTL, Trunking Features, LRRP/GPS Mapping, P25 Phase 2, EDACS, YSF, OP25 Capture Bin compatability, etc. DSD-FME is primarily focused with Linux Desktop users in mind, so please understand that this version may not compile, compile easily, or run correctly in other environments.
 
-This project wouldn't be possible without a few good people providing me plenty of sample audio files to run over and over again. Special thanks to jurek1111, KrisMar, noamlivne, racingfan360, iScottyBotty, LimaZulu, Forts, thewraithe2008, RayAir, Cretu, ilyacodes, and others for the many hours of wav samples and information provided by them. Most importantly, HRH17, whose insight, information, samples, and willingness to let me remote into a computer half-way across the globe in order to test trunking features are what make DSD-FME what it has become. I'd also like to thank mrscanner2008 for providing an additional remote where additional NXDN Type-C, 'Idas' Type-D, and XPT decoding and trunking could be sorted out. Thanks to volo-zyko for cleaning up a lot of code. Thank you everybody.
+This project wouldn't be possible without a few good people providing me plenty of sample audio files to run over and over again. Special thanks to jurek1111, KrisMar, noamlivne, racingfan360, iScottyBotty, LimaZulu, Forts, thewraithe2008, RayAir, Cretu, and others for the many hours of wav samples and information provided by them. Most importantly, HRH17, whose insight, information, samples, and willingness to let me remote into a computer half-way across the globe in order to test trunking features are what make DSD-FME what it has become. I'd also like to thank mrscanner2008 for providing an additional remote where additional NXDN Type-C, 'Idas' Type-D, and XPT decoding and trunking could be sorted out. Thank you everybody.
 
-![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme2.png)
+![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/main/dsd-fme2.png)
 
-![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme3.png)
+![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/main/dsd-fme3.png)
 
 ## Information
 
-See the [examples](https://github.com/lwvmobile/dsd-fme/tree/audio_work/examples "examples") folder for information on [cloning and installing](https://github.com/lwvmobile/dsd-fme/blob/audio_work/examples/Install_Notes.md "cloning and installing"), [example usage](https://github.com/lwvmobile/dsd-fme/blob/audio_work/examples/Example_Usage.md "example usage"), and [trunking examples](https://github.com/lwvmobile/dsd-fme/blob/audio_work/examples/trunking.sh "trunking examples").
+See the [examples](https://github.com/lwvmobile/dsd-fme/tree/main/examples "examples") folder for information on [cloning and installing](https://github.com/lwvmobile/dsd-fme/blob/main/examples/Install_Notes.md "cloning and installing"), [example usage](https://github.com/lwvmobile/dsd-fme/blob/main/examples/Example_Usage.md "example usage"), and [trunking examples](https://github.com/lwvmobile/dsd-fme/blob/main/examples/trunking.sh "trunking examples").
 
 ## License
 Copyright (C) 2010 DSD Author

download-and-install-Arch.sh

@@ -1,52 +1,67 @@
 #! /bin/bash
-#
-cdir=$(pwd)
 clear
-printf "Digital Speech Decoder: Florida Man Edition - Auto Installer For Arch Linux\n
-This will install the required packages, clone, build, and install DSD-FME only.
-This has been tested on Arch 2023.08.01 and Manjaro XFCE 22.1.3 Minimal.\n
-MBELib is considered a requirement on this build.
-You must view the Patent Notice prior to continuing.
-The Patent Notice can be found at the site below.
-https://github.com/lwvmobile/mbelib#readme
-Please confirm that you have viewed the patent notice by entering y below.\n\n"
-read -p "Have you viewed the patent notice? y/N " ANSWER
-ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
-if [ "$ANSWER" = "y" ]; then
+echo DSD-FME Digital Speech Decoder - Florida Man Edition Auto Installer For Arch Linux
+echo This will install the required packages, clone, build, and install DSD-FME only.
+echo This has been tested on Arch 2023.08.01 and Manjaro XFCE 22.1.3 Minimal.
+echo 
+echo MBELib is considered a requirement on this build.
+echo You must view this notice prior to continuing. 
+echo The Patent Notice can be found at the site below.
+echo https://github.com/lwvmobile/mbelib#readme
+echo Please confirm that you have viewed the patent notice by entering y below.
+echo
+echo y/N
+read ANSWER
+Y='y'
+if [[ $Y == $ANSWER ]]; then
 
-  sudo pacman -Syu #always run a full update first, partial upgrades aren't supported in Arch -- including downloading dependencies, that may require an updated dependency, and breaks same dependency on another package, a.k.a, dependency hell
-  sudo pacman -S libpulse cmake ncurses lapack perl fftw rtl-sdr codec2 base-devel libsndfile git wget
+sudo pacman -Syu #always run a full update first, partial upgrades aren't supported in Arch -- including downloading dependencies, that may require an updated dependency, and breaks same dependency on another package, a.k.a, dependency hell
+sudo pacman -S libpulse cmake ncurses lapack perl fftw rtl-sdr codec2 base-devel libsndfile git wget
 
-  printf "Installing itpp 4.3.1 from Arch Strike --Tested on Arch 2023.08.01 and Manjaro XFCE 22.1.3 Minimal\n"
-  wget https://mirror.archstrike.org/x86_64/archstrike/itpp-4.3.1-3-x86_64.pkg.tar.xz
-  sudo pacman -U itpp-4.3.1-3-x86_64.pkg.tar.xz
-  sudo rm -R itpp-4.3.1-3-x86_64.pkg.tar.xz
+echo Installing itpp 4.3.1 from Arch Strike --Tested on Arch 2023.08.01 and Manjaro XFCE 22.1.3 Minimal
+wget https://mirror.archstrike.org/x86_64/archstrike/itpp-4.3.1-3-x86_64.pkg.tar.xz
+sudo pacman -U itpp-4.3.1-3-x86_64.pkg.tar.xz
+sudo rm -R itpp-4.3.1-3-x86_64.pkg.tar.xz
 
-  git clone https://github.com/lwvmobile/mbelib
-  cd mbelib
-  git checkout ambe_tones
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
-  sudo cp /usr/local/lib/libmbe.so /usr/lib/libmbe.so 
-  cd $cdir
+git clone https://github.com/lwvmobile/mbelib
+cd mbelib
+git checkout ambe_tones
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+#sudo cp /usr/local/lib/libmbe.a /usr/lib/libmbe.a
+sudo cp /usr/local/lib/libmbe.so /usr/lib/libmbe.so #this is the only one we need to copy 
+#sudo cp /usr/local/lib/libmbe.so.1 /usr/lib/libmbe.so.1
+#sudo cp /usr/local/lib/libmbe.so.1.3 /usr/lib/libmbe.so.1.3
+cd ..
+cd ..
 
-  git clone https://github.com/lwvmobile/dsd-fme
-  ### For branch audio_work - git clone --branch audio_work https://github.com/lwvmobile/dsd-fme
-  cd dsd-fme
-  #git checkout audio_work
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
+git clone https://github.com/lwvmobile/dsd-fme
+### For branch v2.1b - git clone --branch v2.1b https://github.com/lwvmobile/dsd-fme
+cd dsd-fme
+git checkout v2.1b
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+sudo rm -R dsd-fme
 
-  printf "Any issues, Please report to either:\nhttps://github.com/lwvmobile/dsd-fme/issues or\nhttps://forums.radioreference.com/threads/dsd-fme.438137/\n\n"
+echo Any issues, Please report to either
+echo https://github.com/lwvmobile/dsd-fme/issues
+echo https://forums.radioreference.com/threads/dsd-fme.438137/
 
 else
-  printf "Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.\n\n"
-fi
+echo
+echo Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.
+fi

download-and-install-nodeps.sh

@@ -1,17 +1,23 @@
 #! /bin/bash
 clear
-printf "\nDigital Speech Decoder: Florida Man Edition - Auto Installer\n
-This will clone, build, and install DSD-FME only.
-If DSD-FME has never been installed on this machine, 
-then you will need to install the dependencies first!
-Please run download-and-install.sh instead.\n\n"
-read -p "Press Enter to continue..." x
+echo DSD-FME Digital Speech Decoder - Florida Man Edition Auto Installer 
+echo This will clone, build, and install DSD-FME only.
+echo If you need dependencies installed, please run download-and-install.sh instead. 
+echo
+
+read -p "Press enter to continue"
+
 git clone https://github.com/lwvmobile/dsd-fme
 cd dsd-fme
-#git checkout audio_work
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
 mkdir build
 cd build
 cmake ..
-make -j $(nproc)
+make -j `nproc`
 sudo make install
-sudo ldconfig
+sudo ldconfig

download-and-install-ubuntu2404lts.sh

@@ -1,44 +0,0 @@
-#! /bin/bash
-#
-cdir=$(pwd)
-clear
-printf "Digital Speech Decoder: Florida Man Edition - Auto Installer\n
-MBELib is considered a requirement on this build.
-You must view the Patent Notice prior to continuing.
-The Patent Notice can be found at the site below.
-https://github.com/lwvmobile/mbelib#readme
-Please confirm that you have viewed the patent notice by entering y below:\n\n"
-read -p "Have you viewed the patent notice? y/N " ANSWER
-ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
-if [ "$ANSWER" = "y" ]; then
-  sudo apt update
-  sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncurses-dev libncurses6 libcodec2-dev
-  chkitpp=$(sudo apt list libitpp-dev 2>&1|grep -ci "installed")
-  if [ "$chkitpp" -lt "1" ];then 
-    printf "\nFor some reason, ITPP did NOT install!\nYou may have to manually install it.\n\n"
-    read -p "Press Enter to exit..." x
-    exit 1
-  fi
-  git clone https://github.com/lwvmobile/mbelib
-  cd mbelib
-  git checkout ambe_tones
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
-  cd $cdir
-  git clone https://github.com/lwvmobile/dsd-fme
-  cd dsd-fme
-  #git checkout audio_work
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
-else
-  printf "\nSorry, you cannot build DSD-FME without acknowledging the Patent Notice.\nExiting...\n\n"
-  exit 2
-fi

download-and-install.sh

@@ -1,44 +1,67 @@
 #! /bin/bash
-#
-cdir=$(pwd)
 clear
-printf "Digital Speech Decoder: Florida Man Edition - Auto Installer\n
-MBELib is considered a requirement on this build.
-You must view the Patent Notice prior to continuing.
-The Patent Notice can be found at the site below.
-https://github.com/lwvmobile/mbelib#readme
-Please confirm that you have viewed the patent notice by entering y below:\n\n"
-read -p "Have you viewed the patent notice? y/N " ANSWER
-ANSWER=$(printf "$ANSWER"|tr '[:upper:]' '[:lower:]')
-if [ "$ANSWER" = "y" ]; 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 libitpp-dev libncursesw5-dev libcodec2-dev
-  chkitpp=$(sudo apt list libitpp-dev 2>&1|grep -ci "installed")
-  if [ "$chkitpp" -lt "1" ];then 
-    printf "\nFor some reason, ITPP did NOT install!\nYou may have to manually install it.\n\n"
-    read -p "Press Enter to exit..." x
-    exit 1
-  fi
-  git clone https://github.com/lwvmobile/mbelib
-  cd mbelib
-  git checkout ambe_tones
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
-  cd $cdir
-  git clone https://github.com/lwvmobile/dsd-fme
-  cd dsd-fme
-  #git checkout audio_work
-  mkdir build
-  cd build
-  cmake ..
-  make -j $(nproc)
-  sudo make install
-  sudo ldconfig
+echo DSD-FME Digital Speech Decoder - Florida Man Edition Auto Installer
+echo MBELib is considered a requirement on this build.
+echo You must view this notice prior to continuing. 
+echo The Patent Notice can be found at the site below.
+echo https://github.com/lwvmobile/mbelib#readme
+echo Please confirm that you have viewed the patent notice by entering y below.
+echo
+echo y/N
+read ANSWER
+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 libitpp-dev libncursesw5-dev libcodec2-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*
+#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 ..
+
+git clone https://github.com/lwvmobile/mbelib
+cd mbelib
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+cd ..
+cd ..
+
+git clone https://github.com/lwvmobile/dsd-fme
+cd dsd-fme
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
+mkdir build
+cd build
+cmake ..
+make -j `nproc`
+sudo make install
+sudo ldconfig
+
 else
-  printf "\nSorry, you cannot build DSD-FME without acknowledging the Patent Notice.\nExiting...\n\n"
-  exit 2
-fi
+echo
+echo Sorry, you cannot build DSD-FME without acknowledging the Patent Notice.
+fi
+
+
+

examples/Audio_Plumbing.md

@@ -1,74 +0,0 @@
-
-
-## Audio Plumbing
-
-While using DSD-FME to demodulate and decode RF Audio, you will find it necessary to properly plumb (or route) audio from each input source and output sink properly. This mini tutorial aims to help you do such when using Pulse Audio.
-
-You will first want to locate and run the virtualsink.sh script file via `sh virtualsink.sh` command. This will create two null-sink, or 'virtual sinks' for us to plumb audio from point A to point B. 
-
-Here are screenshots of a proper setup using pavucontrol, or "Pulse Audio Volume Control", having voice input from the encoder listening to your microphone, the RF Output going into the "Virtual_Sink" null-sink, and on the playback side, playing back voice to our speakers, with RF modulated audio being monitored on "Virtual-Sink" null-sink.
-
-![Audio 1](https://github.com/lwvmobile/dsd-fme/blob/aw_dev/examples/pavucontrol_plumbing1.png)
-
-![Audio 2](https://github.com/lwvmobile/dsd-fme/blob/aw_dev/examples/pavucontrol_plumbing2.png)
-
-The general idea is that we want to route RF modulated audio into our Virtual_Sink and have our decoder listen to the same sink. Voice Output should always be to Audio Hardware (speakers, headphones, etc).
-
-Note, that using the virtualsink.sh will create these sinks for us for the duration of your computers boot. If you reboot, they will not persist. Configuration files can be modified to always have these sinks available, or the `virtualsink.sh` script can be executed on login, but you must do so at your own risk and own research, it is out of the scope of this tutorial to create persistent sinks.
-
-In case of the usage of a headless environment and pavucontrol is not viable, you may use alternatives such as pulsemixer which is similar in functionality, just as a CLI tool and not a GUI tool.
-
-Users can now use the `-O` CLI argument to list out all pulse audio input sources and output sinks and pass an optional argument alongside `pulse`, appending the name or index number to select the device each time. This method will work in both Linux environments as well as Cygwin builds (making sure to start the pulseaudio.exe server in the back first with the specified .bat file or command, see below).
-
-For Example:
-
-The Output (truncated) of `dsd-fme -O`
-
-```
-=======[ Output Device #1 ]=======
-Description: Family 17h (Models 00h-0fh) HD Audio Controller Analog Stereo
-Name: alsa_output.pci-0000_0d_00.3.analog-stereo
-Index: 1
-
-=======[ Output Device #4 ]=======
-Description: Virtual_Sink1
-Name: virtual_sink1
-Index: 4
-
-=======[ Output Device #5 ]=======
-Description: Virtual_Sink2
-Name: virtual_sink2
-Index: 5
-
-=======[ Input Device #2 ]=======
-Description: Family 17h (Models 00h-0fh) HD Audio Controller Analog Stereo
-Name: alsa_input.pci-0000_0d_00.3.analog-stereo
-Index: 2
-
-=======[ Input Device #5 ]=======
-Description: Monitor of Virtual_Sink1
-Name: virtual_sink1.monitor
-Index: 5
-
-=======[ Input Device #6 ]=======
-Description: Monitor of Virtual_Sink2
-Name: virtual_sink2.monitor
-Index: 6
-```
-
-You might use any of the following for input and output options:
-
-```
--i pulse
--i pulse:6
--i pulse:virtual_sink2.monitor
-
--o pulse
--o pulse:1
--o pulse:alsa_output.pci-0000_0d_00.3.analog-stereo
-```
-
-Something to keep in mind is that often times, you only need to set these values once, as a pulse audio server (or plugin) can often times remember these settings, even across reboots, as long as the same hardware is present for future use (real or null-sink).
-
-<!-- TODO: Add This later -->
-<!-- Cygwin Note: Running the supplied `0p - start-pulse-audio-backend.bat` file will not only start up the pulse audio server for you, but also setup your null-sinks, and enumerate all devices for you to use, making it an easy selection for your start up .bat files. See any notes in the precomplied .zip file for more information. -->

examples/Example_Usage.md

@@ -1,6 +1,6 @@
 ### Example Usage and Notes!
 
-`dsd-fme` is all you need to run for pulse input, pulse output, and auto detect for DMR BS/MS, and P25. To use other decoding methods which cannot be auto detected, please use the following command line switches.
+`dsd-fme` is all you need to run for pulse input, pulse output, and auto detect for DMR BS/MS, and P25. To use other decoding methods which cannot be auto detected, please use the following command line switches. Make sure to route audio into and out of DSD-FME using pavucontrol and virtual sinks as needed.
 
 ```
 -ft XDMA decoder class (P25p1 and p2, YSF, and DMR Stereo)
@@ -8,23 +8,19 @@
 -fa Legacy Auto (not recommended)
 -fi NXDN48
 -fn NXDN96
--fp Provoice
--fh EDACS Standard / Network
--fH EDACS Standard / Network with ESK
--fe EDACS Extended Addresssing
--fE EDACS Extended Addressing with ESK
+-fp ProVoice
 -fm dPMR, also may need to use -xd if inverted dPMR.
+-fr DMR Mono, also may need to use -xr if inverted DMR.
 -f1 P25P1
--f2 P25P2 (may need to specify wacn/sys/nac manually if traffic channel)
+-f2 P25P2 (may need to specify wacn/sys/nac manually)
 -fx X2-TDMA
 -fy YSF
--fz M17 Audio
 ```
 
-## Conventional Frequency Scanner
-This feature is used to allow DSD-FME to use RIGCTL or RTL input and cycle through frequencies to attain a frame sync. 
+## Conventional Frequency "Fast Scanner"
+This feature is used to allow DSD-FME to use RIGCTL or RTL input and cycle through frequencies as fast as possible to attain a frame sync. 
 
-This works almost identically to how the trunkng methods work, but instead of locking onto a control channel and tuning based on its decoding, it tunes through all loaded frequencies in a CSV file and stops when it finds a frame sync. This method is meant for loading a bunch of conventional non-trunking frequencies that signal only when voice or short data bursts are present (DMR T2, Conventional P25 P1, Conventional NXDN, etc) and decode them until the frame sync stops and then resume its scan. This method uses SDR++ RIGCTL, or RTL internal handling to go through signal. -Y is the scan switch. Note: This method will NOT perform at a level similar to a real hardware scanner, SDR tuning is not nearly as fast or reliable at locking onto signal.
+This works almost identically to how the trunkng methods work, but instead of locking onto a control channel and tuning based on its decoding, it rapidly tunes through all loaded frequencies in a CSV file and stops when it finds a frame sync. This method is meant for loading a bunch of conventional non-trunking frequencies that signal only when voice or short data bursts are present (DMR T2, Conventional P25 P1, Conventional NXDN, etc) and decode them until the frame sync stops and then resume its scan. This method uses SDR++ RIGCTL, or RTL internal handling to go through signal. -Y is the fast scanner switch.
 
 To scan through a mixture of DMR and P25 Conventional, use:
 `dsd-fme -i tcp -C channel_map.csv -G group.csv -Y -U 4532 -N 2> log.ans` 
@@ -35,9 +31,9 @@ To scan through NXDN48 only conventional, use:
 To scan through NXDN96 only conventional, use: 
 `dsd-fme -fn -i tcp -C channel_map.csv -Y -U 4532 -N 2> log.ans`
 
-The Channel Map setup will be identical to any of the channel maps found for trunking systems, channel numbers do not matter and can be arbitrarily organized, and frequencies can be duplicated to be 'scanned' more frequently in larger CSV files. Scan speed by default is 1 second, and is most stable at that speed. This can be adjusted by using the `-t 2` option, for example, to specify 2 seconds of hang time per frequency. ~~If activity occurs on a frequency, an additional 2 seconds of 'hangtime' will occur on that frequency for any follow up voice activity.~~ Using `-t 0` will forego the one second wait time, and this can work in some situations, but is not advised as it may skip during the middle of transmissions, or skip over them entirely without a framesync.
+The Channel Map setup will be identical to any of the channel maps found for trunking systems, channel numbers do not matter and can be arbitrarily organized, and frequencies can be duplicated to be 'scanned' more frequently in larger CSV files. Scan speed by default is 1 second, and is most stable at that speed. This can be adjusted by using the `-t 2` option, for example, to specify 2 seconds of hang time per frequency. ~~If activity occurs on a frequency, an additional 2 seconds of 'hangtime' will occur on that frequency for any follow up voice activity.~~
 
-Please Note: DMR Simplex may not behave well on scan, I have not been able to test it as such, but given the nature of the on-off timeslot signalling on DMR Simplex, missed frame syncs and skipping/resuming scan may occur.
+Please Note: DMR Simplex may not behave well on fast scan, I have not been able to test it as such, but given the nature of the on-off timeslot signalling on DMR Simplex, missed frame syncs and skipping/resuming scan may occur.
 
 ## Trunking Examples
 Please see trunking.sh for sample start up scripts or scroll down to the bottom for more explanation.
@@ -49,9 +45,7 @@ and in a second terminal tab, same folder, run
 
 `tail -n 40 -f voice.log`
 
-### Audio Plumbing
-
-Please see [Audio Plumbing](https://github.com/lwvmobile/dsd-fme/blob/aw_dev/examples/Audio_Plumbing.md "Audio Plumbing") for general help with audio plumbing (routing from A to B).
+Then you can open up your pavucontrol "Pulse Audio Volume Control" or "Volume Control" application and route input into DSD-FME from any application and DSD-FME output to the left and right speakers respectively. (unlock the channel in the application stream and adjust left and right independently)
 
 ### Input ###
 
@@ -80,7 +74,7 @@ Detailed Setup:
 
 ```
 RTL-SDR options:
- Usage: rtl:dev:freq:gain:ppm:bw:sq:vol
+ Usage: rtl:dev:freq:gain:ppm:bw:sq:udp
   NOTE: all arguments after rtl are optional now for trunking, but user configuration is recommended
   dev  <num>    RTL-SDR Device Index Number
   freq <num>    RTL-SDR Frequency (851800000 or 851.8M) 
@@ -88,9 +82,9 @@ RTL-SDR options:
   ppm  <num>    RTL-SDR PPM Error (default = 0)
   bw   <num>    RTL-SDR Bandwidth kHz (default = 12)(8, 12, 16, 24)  
   sq   <num>    RTL-SDR Squelch Level vs RMS Value (Optional)
-  vol  <num>    RTL-SDR Sample 'Volume' Multiplier (default = 2)(1,2,3)
- Example: dsd-fme -fs -i rtl -C cap_plus_channel.csv -T
- Example: dsd-fme -fp -i rtl:0:851.375M:22:-2:24:0:2
+  udp  <num>    RTL-SDR Legacy UDP Remote Port (Optional -- External Use Only)
+ Example: dsd-fme-zdev -fs -i rtl -C cap_plus_channel.csv -T
+ Example: dsd-fme-zdev -fp -i rtl:0:851.375M:22:-2:24:0:6021
 
 ```
 
@@ -106,11 +100,11 @@ and in a second terminal tab, same folder, run
 
 EDACS Trunking (w/ channel map import)
 
---EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (see switches above for STD/NET, EA, and ESK modes)
+--EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (Tested and Working on EDACS/EDACS-EA with Provoice, Analog Voice Monitoring and Per Call is Experimental)
 
-`dsd-fme -i tcp -fE -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans`
+`dsd-fme -i tcp -fp -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans`
 
---NXDN48 Trunking (Direct Frequency Assignment) with SDR++ (untested for frequency accuracy)
+--NXDN48 Trunking (standard band plan) with SDR++ (untested for frequency accuracy)
 
 `dsd-fme -fi -i tcp -T -U 4532 -N 2> log.ans`
 
@@ -140,16 +134,14 @@ Trunking Note1: All samples above can also be run with the RTL input method and
 
 Trunking Note2: QPSK Phase 1 and Phase 2 Systems may be subceptible to LSM distortion issues, but seem to do okay, but require really good signal. Some CRC issues still occur with Phase 2 TDMA LCCH Mac Signal that can affect reliability, I believe this issue is ultimately caused by the PSK demodulation inside of FME. I also don't believe this will work on 8-level PSK, but I cannot determine that at the moment. Update: I have improved the LCCH Mac Signal decoding my increasing the QPSK decision point buffers to their maximum values. 
 
-Trunking Note3: DMR Trunking has been coded, and some testing and tweaks have been carried out. Cap+, Con+, and TIII systems seem to do well with trunking now. Placing the frequency for the control channel at channel map 0 in your channel_map.csv file is not required now if using RIGCTL or the RTL Input, both can poll the VFO for the current frequency if it believes its on a control channel, but setting a fake channel number (i.e. 999) first with the CC frequency will result in finding the CC faster on startup if desired. If you need to map out your channels for TIII, you can observe the console output and look for channel numbers. For conveniece I have included the DSDPlus style LSN-esque numbering into the console print so it will make it easier for users from DSDPlus to map frequencies into the channel_map.csv file. Make sure your channel numbers are the lpcn (12-bit logical physical channel number - decimal format) values from the log, and not the LPCN+TS (13-bit DSDPlus LSN) values. Notice: TIII Site ID value needs work to determine proper DMRLA values for system area and sub area.
+Trunking Note3: DMR Trunking has been coded, and some testing and tweaks have been carried out. Cap+, Con+, and TIII systems seem to do well with trunking now. Placing the frequency for the control channel at channel map 0 in your channel_map.csv file is not required now if using RIGCTL or the RTL Input, both can poll the VFO for the current frequency if it believes its on a control channel, but setting a fake channel number (i.e. 999) first with the CC frequency will result in finding the CC faster on startup if desired. If you need to map out your channels for TIII, you can observe the console output and look for channel numbers. For conveniece I have included the DSDPlus channel numbering (as best as I can figure it, but they seem consistent) into the console print so it will make it easier for users from DSDPlus to map frequencies into the channel_map.csv file. Make sure your channel numbers are the Cd (channel decimal) values from the log, and not the C+ (dsdplus) values. Notice: TIII Site ID value needs work to determine proper DMRLA values for system area and sub area.
 
 ```
-00:43:00 Sync: +DMR  [slot1]  slot2  | Color Code=00 | CSBK
  Talkgroup Voice Channel Grant (TV_GRANT) - Logical
-  LPCN: 0075; TS: 2; LPCN+TS: 0152; Target: 16518173 - Source: 16533625
-
+  Ch [036] Cd [0054] C+ [0110] - TS [1] - Target [01900500] - Source [01900505]
 ```
 
-Use channel 75 in your import file, which would correspond to dsdplus channels 151 and 152 (151 = TS1 / 152 = TS2).
+Use channel 54 in your import file, which would correspond to dsdplus channels 109 and 110 (109 = TS0 / 110 = TS1).
 
 For Connect Plus, enumerate your list from 1 to the last channel and add the frequency. For Capacity Plus, LSN 1 and 2 will share the same frequency, 3 and 4 will share, 5 and 6 will share, and 7-8 will share, as Capacity Plus counts each 'channel' as two seperate channels (LSN), one for each time slot. Capacity Plus Quirk: DSD-FME makes its best effort to follow the rest channel in the event that the sync is lost for longer than the hangtime, but occassionally, DSD-FME may lose the rest channel and will have to hunt through all frequencies to find it again.
 
@@ -182,13 +174,14 @@ M - toggle c4fm/qpsk 8/3 (phase 2 tdma control channel)
 R - start capturing symbol capture bin (date/time name file)
 r - stop capturing symbol capture bin
 spacebar - replay last symbol capture bin (captures must be stopped first)
-s - stop playing symbol capture bin or wav input file (lower s)
+s - stop playing symbol capture bin or wav input file
 P - start per call decoded wav files (Capital P)
-p - stop per call decoded wav files (lower p)
+p - stop per call decoded wav files (Lower p)
 t - toggle trunking (needs either rtl input, or rigctl connection)
 y - toggle scanner (needs either rtl input, or rigctl connection)
-1 - Toggle Voice Synthesis in TDMA Slot 1 or FDMA Conventional Voice
-2 - Toggle Voice Synthesis in TDMA Slot 2
+1 - Lockout Tuning/Playback of TG in Slot 1 or Conventional -- Current Session Only if no group.csv file specified
+2 - Lockout Tuning/Playback of TG in Slot 2 -- Current Session Only if no group.csv file specified
+0 - Toggle Audio Smoothing - May produce crackling if enabled on RTL/TCP or wav/bin files
 w - Toggle Trunking/Playback White List (Allow A Groups Only) / Black List (Block B or DE groups only) Mode
 g - Toggle Trunking Tuning to Group Calls (DMR T3, Con+, Cap+, P25, NXDN)
 u - Toggle Trunking Tuning to Private Calls (DMR T3, Cap+, P25)
@@ -198,35 +191,13 @@ e - Toggle Trunking Tuning to Encrypted Calls (P25)
 9 - Connect to SDR++ RIGCTL Server with Defaults/Retry RIGCTL Connection
 D - Reset DMR Site Parms/Call Strings, etc.
 Z - Simulate NoCarrier/No VC/CC sync (capital Z)
-
-! - Lockout Tuning/Playback of TG in Slot 1 or Conventional -- Current Session Only if no group.csv file specified
-@ - Lockout Tuning/Playback of TG in Slot 2 -- Current Session Only if no group.csv file specified
-
-k - Hold TG in Slot 1 or Conventional, or clear current hold
-l - Hold TG in Slot 2 on TDMA Systems, or clear current hold
-
-C - Drop Call and Return to CC during trunking operation
-L - Manual Cycle Forward Channel Tuned when RIGCTL or using RTL input and channel csv loaded
-
-S - Toggle between EDACS Standard/Network and Extended Addressing mode (Capital S)
-A - Toggle EDACS ESK Mask (none vs A0)
-
-H - Toggle High Pass Filter on Digital Sythesized Voice
-V - Toggle Low  Pass Filter on Analog Voice or Raw Signal Monitoring
-B - Toggle High Pass Filter on Analog Voice or Raw Signal Monitoring
-N - Toggle Passband  Filter on Analog Voice or Raw Signal Monitoring
-
-v - Cycle RTL Input Volume Multiplier 1X, 2X, 3X (lower v)
-
 ```
 
 ## Sending Audio to a Icecast 2 Server via FFmpeg (Windows)
 
 Make sure to enable "Stereo Mix" from Volume Control Panel and then disable Windows Sounds.
 
-```
-ffmpeg -f dshow -i audio="Stereo Mix (Realtek High Definition Audio)" -c:a aac -b:a 64k -content_type 'audio/aac' -vn -f adts icecast://source:password@192.168.5.251:8844/DSDFME
-```
+`ffmpeg -f dshow -i audio="Stereo Mix (Realtek High Definition Audio)" -c:a aac -b:a 64k -content_type 'audio/aac' -vn -f adts icecast://source:password@192.168.5.251:8844/DSDFME`
 
 ## Sending Audio to a Icecast 2 Server via FFmpeg (Linux w/ Pulse Audio)
 
@@ -252,125 +223,3 @@ francis@12coresx:~$ ffmpeg -f pulse -i 0 -c:a libmp3lame -ab 64k -f mp3 icecast:
 
 
 ```
-
-Note: Do not run this command for ffmpeg/icecast piped to the main dsd-fme command, make sure these are running in seperate terminals.
-
-## Sending Audio to UDP Target/Port
-
-Audio can be sent to a target address on your local area network with the UDP blaster using the `-o udp:targetaddress:port` option.
-Note: Any analog audio monitoring will not function properly over UDP port (rate difference issues)
-
-Example (Short 8k/2):
-`dsd-fme -fs -o udp:192.168.7.8:23470`
-
-Receiving End (Short 8k/2):
-`socat stdio udp-listen:23470 | play --buffer 640 -q -b 16 -r 8000 -c2 -t s16 -`
-
-Example (Short 8k/1):
-`dsd-fme -f1 -o udp:192.168.7.8:23469`
-
-Receiving End (Short 8k/1):
-`socat stdio udp-listen:23469 | play --buffer 320 -q -b 16 -r 8000 -c1 -t s16 -`
-
-Example (Float 8k/2):
-`dsd-fme -ft -y -o udp:192.168.7.8:23468`
-
-Receiving End (Float 8k/2):
-`socat stdio udp-listen:23468 | play --buffer 1280 -q -b 16 -r 8000 -c2 -t f32 -`
-
-Example (Float 8k/1):
-`dsd-fme -fi -y -o udp:192.168.7.8:23467`
-
-Receiving End (Float 8k/1):
-`socat stdio udp-listen:23467 | play --buffer 640 -q -b 16 -r 8000 -c1 -t f32 -`
-
-Note: --buffer option in play is calculated by (channels * samples * sizeof(samples)), 
-where samples is 160 for mono, 320 for stereo, and short samples are 2 and float samples are 4.
-This is vital to prevent 'lag' or cut-off audio when the UDP audio doesn't fill the default buffer size.
-
-Note2: Be sure to start the receiving end AFTER starting DSD-FME. If DSD-FME is restarted, make sure to restart the receiving end as well, as socat/UDP closes the UDP port listening when DSD-FME closes the UDP socket.
-
-Note3: socat version 1.8 may have a `E xioopen_ipdgram_listen(): unknown address family 0` problem, downgrading to 1.7.4 is recommended if this occurs. `sudo downgrade socat`.
-
-## Record 48k/1 audio with rtl_fm
-
-You can record suitable audio to feed as input to dsd-fme with `-i` using rtl_fm:
-
-`rtl_fm -M nfm -f [FREQ] -s 48k -g 42 -l 20 > input.wav`
-
-You can also combine that with `socat` to send the audio to a remote dsd-fme instance in real time while keeping a local copy on the host where the RTL-SDR dongle is:
-
-`rtl_fm -M fm -f [FREQ] -s 48k -g 42 -l 20 | tee input.wav | socat -u - TCP-LISTEN:1234,forever,reuseaddr`
-
-On the remote side where dsd-fme is, use the TCP input:
-
-`dsd-fme -i tcp:192.168.7.8:1234 -N`
-
-Note: As always, when using rtl_fm, play with `-l` and `-g` to find a good squelch and gain values for your environment - you will know if the squelch is the right value when `input.wav` does not increase in size in the absence of useful signal on the monitored frequency.
-
-## Using the Experimental M17 Encoder (and Decoder)
-
-You can use the experimental M17 Voice Stream and Packet encoder with the following examples.
-
-Encode/Decode Local Feedback Voice Stream (Single Session):
-
-`dsd-fme -fZ -i pulse -o pulse -M M17:3:SP5WWP:BROADCAST:48000`
-
-Using the `-8` option (raw audio monitor) will instead send encoded raw audio to output instead of decoded audio. For example,
-
-To send a voice stream out of stdout into SOCAT TCP to a second/remote DSD-FME session to decode:
-
-Encode (Upper Z):
-
-`dsd-fme -fZ -8 -i pulse -M M17:9:LWVMOBILE:DSD-FME:48000 -o - | socat stdio tcp-listen:7355,forever,reuseaddr`
-
-Decode (Lower z): 
-
-`dsd-fme -fz -i tcp:192.168.7.8:7355`
-
-NOTE: When using tcp input for M17 decoding, DSD-FME will keep the TCP connection alive with constant retries, so no need to restart the decoding session on connection failure.
-
-SMS Packet Encoder (Text Only):
-
-`dsd-fme -fP -8 -S "This is a sample message sent over M17 Packet Data using DSD-FME to encode it."`
-
-SMS Packet Encoder (over SOCAT TCP):
-
-`dsd-fme -fP -8 -S "This is a sample message sent over M17 Packet Data using DSD-FME to encode it and SOCAT to send it over TCP." -o - | socat stdio tcp-listen:7355,forever,reuseaddr`
-
-Many combinations of input and output can be used as well, and using features like raw audio saving with `-6 m17str.wav` will save a wav file of your encoded audio to be replayed later with `-i m17str.wav`
-Also note, features function similarly, like -Z for payload, and input options include pulse, oss, stdin, rtl, tcp, etc, using those as the mic in for voice encoding. With the right setup of input/output/input using SOCAT TCP pipes, it is conceivable to use DSD-FME to convert analog audio from NFM into M17 audio, or even change another digital format supported by DSD-FME into M17 audio, if desired (purely for research and fun purposes). Ncurses terminal will function with internal encoder/decoder and wav file creation, with toggle encode/tx with `\` key, but will not function with stdout properly.
-
-The `-M` switch is used to specify user M17 variables, the string is in the format of M17:CAN:SRC:DST:INPUT_RATE.
-CAN 1-15; SRC and DST have to be no more than 9 UPPER base40 characters.
-BASE40: '  ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-/.'
-Input Rate Default is 48000; Use Multiples of 8000 up to 48000.
-Values not entered into the M17: string are set to default values. M17:7:DSD-FME:DSD-FME:48000
-
-Fun Example Transmuting OTA Analog Things into M17:
-
-Start up in sequence.
-
-Terminal #1 (RTL Input):
-`dsd-fme -fZ -8 -M M17:1:ANALOG:M17:48000 -i rtl:0:162.425M -o - | socat stdio tcp-listen:7310,forever,reuseaddr`
-
-Terminal #2:
-`dsd-fme -fz -i tcp:127.0.0.1:7310`
-
-Fun Example Transmuting OTA Digital Things into M17:
-
-Start up all three of these in sequence.
-
-Terminal #1 (connecting to SDR++):
-`dsd-fme -fi -i tcp:127.0.0.1:7355 -o - | socat stdio tcp-listen:7300,forever,reuseaddr`
-
-Terminal #2:
-`dsd-fme -fZ -8 -M M17:2:NXDN:M17:8000 -i tcp:127.0.0.1:7300 -o - | socat stdio tcp-listen:7301,forever,reuseaddr`
-
-Terminal #3:
-`dsd-fme -fz -i tcp:127.0.0.1:7301`
-
-Note: Transmuting only carries over voice when audio is output, and will not carry any ID values, or any other data payloads.
-This mode is only meant for educational or fun purposes, please do not retransmit stuff that doesn't belong to you.
-
-Information on this section will be updated as features are added or modified, etc. If you need help with a particular function and can't find a suitable answer, always open a new issue here, or make contact on the radio reference forum for additional examples, guidance, ideas, help, etc.

examples/Install_Notes.md

@@ -1,28 +1,23 @@
 ## How to clone and build this branch
 
-### Ubuntu 22.04/20.04/LM20/Debian Bullseye:
+### Ubuntu 22.04/20.04/LM20/Debian Bullseye or Newer:
 
 Using the included download-and-install.sh should make for a simple and painless clone, build, and install on newer Debian/Ubuntu/Mint/Pi systems. Simply acquire or copy the script, and run it. Update: Ubuntu 23.04 and RPi Bullseye 64-bit has been tested working with the installer script and functions appropriately.
 
 If you need all dependencies build and installed first (only on Debian/Ubuntu/Mint/Pi), run:
 
 ```
-wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/audio_work/download-and-install.sh
-sh download-and-install.sh
-```
-
-### Debian 12 (SID) / Ubuntu 24.04 LTS (Updated Ncurses Dependencies)
-
-```
-wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/audio_work/download-and-install-ubuntu2404lts.sh
-sh download-and-install-ubuntu2404lts.sh
+wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/main/download-and-install.sh
+chmod +x download-and-install.sh
+./download-and-install.sh
 ```
 
 ### Arch Based Distros:
 
 ```
-wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/audio_work/download-and-install-Arch.sh
-sh download-and-install-Arch.sh
+wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/v2.1b/download-and-install-Arch.sh
+chmod +x download-and-install-Arch.sh
+./download-and-install-Arch.sh
 ```
 
 ### Other:
@@ -30,8 +25,9 @@ sh download-and-install-Arch.sh
 If you have dependencies already installed, please run this instead:
 
 ```
-wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/audio_work/download-and-install-nodeps.sh
-sh download-and-install-nodeps.sh
+wget https://raw.githubusercontent.com/lwvmobile/dsd-fme/main/download-and-install-nodeps.sh
+chmod +x download-and-install-nodeps.sh
+./download-and-install-nodeps.sh
 ```
 
 ## Manual Install
@@ -42,10 +38,7 @@ Debian/Mint/Ubuntu/Pi
 
 ```
 sudo apt update
-#Ubuntu 22.04 lts / Debian 11 and lower
-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 libcodec2-dev
-#Ubuntu 24.04 lts / Debian 12
-#sudo apt install libpulse-dev pavucontrol libsndfile1-dev libfftw3-dev liblapack-dev socat libusb-1.0-0-dev rtl-sdr librtlsdr-dev libusb-1.0-0-dev cmake git wget make build-essential libitpp-dev libncurses-dev libncurses6 libcodec2-dev
+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 libcodec2-dev
 ```
 
 Fedora 36/37 -- from https://github.com/lwvmobile/dsd-fme/issues/99
@@ -89,11 +82,10 @@ cd ..
 cd ..
 ```
 
-MBELib is considered a requirement in this build. You must read this notice prior to continuing. [MBElib Patent Notice](https://github.com/lwvmobile/mbelib#readme "MBElib Patent Notice") 
+MBELib is considered a requirement in this build. You must read this notice prior to continuing. [MBElib Patent Notice](https://github.com/lwvmobile/mbelib#readme "MBElib Patent Notice") This version of MBELib is 1.3.2 and prints to STDERR, using the stock 1.3.0 MBElib may cause problems with print alignments if paired with this version of DSD-FME, or cause future compatibility issues.
 
 ```
 git clone https://github.com/lwvmobile/mbelib
-git checkout ambe_tones
 cd mbelib
 mkdir build
 cd build
@@ -106,26 +98,19 @@ cd ..
 ```
 
 Note: Some environment/distro users (Cygwin, Arch, and others) may need to manually copy any libmbe files found in the build folder to the /usr/lib folder on root.
-
-```
-cp libmbe* /usr/lib
-cp cygmbe* /usr/lib
-cp cygmbe* /bin
-```
-
-or
-
-```
-sudo cp libmbe* /usr/lib
-sudo cp cygmbe* /usr/lib
-sudo cp cygmbe* /bin
-```
+`sudo cp libmbe* /usr/lib`
 
 Finish by running these steps to clone and build DSD-FME.
 
 ```
 git clone https://github.com/lwvmobile/dsd-fme
 cd dsd-fme
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
 mkdir build
 cd build
 cmake ..
@@ -152,6 +137,12 @@ Then you can build and install using
 ```
 git clone https://github.com/lwvmobile/dsd-fme
 cd dsd-fme
+cp tone8.wav /usr/share/
+cp tone24.wav /usr/share/
+cp tone48.wav /usr/share/
+chmod 777 /usr/share/tone8.wav
+chmod 777 /usr/share/tone24.wav
+chmod 777 /usr/share/tone48.wav
 mkdir build
 cd build
 # -DAERO=ON is optional, but recommended if you want the older OSS support as well
@@ -182,31 +173,13 @@ sudo make install
 sudo ldconfig
 ```
 
-### Applying Patches -- Recommended For Advanced Users Only
-
-More experimental or potentially functionality changing or temperamental features may be included as seperate .patch files inside of the patch folder, and are not included in the source code by default. 
-If users wish to try or use these patches, then they can apply patches and build/rebuild with the following procedure. Make sure you have changed to the dsd-fme directory first, either by the top
-command, or by otherwise opening the terminal to the clone folder.
+If the call alert wav files aren't playing, then make sure to run the following in the dsd-fme folder to copy the wav files to the /usr/share/ folder and give them adequate permission to be accessed.
 
 ```
-cd dsd-fme
-git apply patch/patchname.patch
-cd build
-make
-sudo make install
-```
-
-If you later wish to update to the latest version via `git pull`, you may first need to reset any patches, perform the `git pull`, and then reapply patches.
-A procedure for this is similar to, but not limited to:
-
-```
-cd dsd-fme
-git reset --hard
-git pull
-git apply patch/xyz.patch
-cd build
-make
-sudo make install
-```
-
-NOTE: Patches can potential break over time with further changes to code, requiring merge resolution or other manual intervention to re-apply patches.
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
+```

examples/trunking.sh

@@ -9,6 +9,10 @@
 #dsd-fme -i tcp:192.168.7.8:7355 -U 4532 -T -mq -N 2> log.ans
 #dsd-fme -i rtl:0:855.625M:0:-2:12 -T -mq -N 2> log.ans
 
+#P25 P2 TDMA CC with QPSK (Simulcast)
+#dsd-fme -i tcp:192.168.7.8:7355 -U 4532 -T -f2 -m2 -N 2> log.ans
+#dsd-fme -i rtl:0:855.625M:0:-2:12 -T -f2 -m2 -N 2> log.ans
+
 #P25 P2 TDMA CC with C4FM
 #dsd-fme -i tcp:192.168.7.8:7355 -U 4532 -T -f2 -N 2> log.ans
 #dsd-fme -i rtl:0:855.625M:0:-2:12 -T -f2 -m2 -N 2> log.ans
@@ -17,21 +21,9 @@
 dsd-fme -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.ans
 #dsd-fme -fs -i rtl:0:450M:44:-2:8 -T -C connect_plus_chan.csv -G group.csv -N 2> log.ans
 
-#EDACS Standard Network Analog and Digital
-#dsd-fme -fh -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-#dsd-fme -fh -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-
-#EDACS Standard Network Analog and Digital (with ESK)
-#dsd-fme -fH -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-#dsd-fme -fH -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-
-#EDACS Extended Address Analog and Digital
-#dsd-fme -fe -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-#dsd-fme -fe -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-
-#EDACS Extended Address Analog and Digital (with ESK)
-#dsd-fme -fE -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
-#dsd-fme -fE -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
+#EDACS/EDACS-EA Digital Only
+#dsd-fme -fp -i tcp:192.168.7.5:7355 -U 4532 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
+#dsd-fme -fp -i rtl:0:850M:44:-2:24 -T -C edacs_channel_map.csv -G group.csv -N 2> log.ans
 
 #NXDN48 Type-C or Type-D Trunking with Channel Map
 #dsd-fme -fi -i tcp -T -U 4532 -C nxdn_channel_map.csv -N 2> log.ans

flake.lock

@@ -1,64 +0,0 @@
-{
-  "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1709336216,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1711163522,
-        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,18 +0,0 @@
-{
-  description = "Digital Speech Decoder - Florida Man Edition ";
-
-  inputs = {
-    flake-parts.url = "github:hercules-ci/flake-parts";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  };
-
-  outputs = inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
-      perSystem = { config, pkgs, ... }: {
-        packages.default = config.packages.dsd-fme;
-
-        packages.dsd-fme = pkgs.callPackage ./package.nix { };
-      };
-    };
-}

include/descramble.h

@@ -52,7 +52,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 					state = S2; // lower path
 				} else {
 					state = S0; // upper path
-				} // end else - if
+				}; // end else - if
 				out[loop]=0;
 				break;
 			
@@ -61,7 +61,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 					state = S2; // lower path
 				} else {
 					state = S0; // upper path
-				} // end else - if
+				}; // end else - if
 				out[loop]=1;
 				break;
 			
@@ -70,7 +70,7 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 					state = S3; // lower path
 				} else {
 					state = S1; // upper path
-				} // end else - if
+				}; // end else - if
 				out[loop]=0;
 				break;
 			
@@ -79,12 +79,12 @@ int traceBack (int * out, int * m_pathMemory0, int * m_pathMemory1, int * m_path
 					state = S3; // lower path
 				} else {
 					state = S1; // upper path
-				} // end else - if
+				}; // end else - if
 				out[loop]=1;
 				break;
 			
-		} // end switch
-	} // end for
+		}; // end switch
+	}; // end for
 
 return(length);
 }; // end function

include/dsd.h

@@ -61,13 +61,11 @@
 //OSS support
 #include <sys/soundcard.h>
 
-#include <pulse/pulseaudio.h> //PULSE AUDIO
 #include <pulse/simple.h>     //PULSE AUDIO
 #include <pulse/error.h>      //PULSE AUDIO
-#include <pulse/introspect.h> //PULSE AUDIO
 
 #define SAMPLE_RATE_IN 48000 //48000
-#define SAMPLE_RATE_OUT 8000 //8000
+#define SAMPLE_RATE_OUT 48000 //8000,
 
 #ifdef USE_RTLSDR
 #include <rtl-sdr.h>
@@ -76,56 +74,12 @@
 #include <locale.h>
 #include <ncurses.h>
 
-#define UNUSED(x)                       ((void)x)
-#define UNUSED2(x1, x2)                 (UNUSED(x1), UNUSED(x2))
-#define UNUSED3(x1, x2, x3)             (UNUSED(x1), UNUSED(x2), UNUSED(x3))
-#define UNUSED4(x1, x2, x3, x4)         (UNUSED(x1), UNUSED(x2), UNUSED(x3), UNUSED(x4))
-#define UNUSED5(x1, x2, x3, x4, x5)     (UNUSED(x1), UNUSED(x2), UNUSED(x3), UNUSED(x4), UNUSED(x5))
-
 #ifdef USE_CODEC2
 #include <codec2/codec2.h>
 #endif
 
 extern volatile uint8_t exitflag; //fix for issue #136
 
-//new audio filter stuff from: https://github.com/NedSimao/FilteringLibrary
-typedef struct {
-    float coef[2];
-    float v_out[2];
-}LPFilter;
-
-typedef struct {
-    float coef;
-    float v_out[2];
-    float v_in[2];
-
-}HPFilter;
-
-typedef struct {
-    LPFilter lpf;
-    HPFilter hpf;
-    float out_in;
-}PBFilter;
-
-typedef struct {
-    float alpha;
-    float beta;
-
-    float vin[3];
-    float vout[3];
-
-}NOTCHFilter;
-//end new filters
-
-// Field list is here: http://0pointer.de/lennart/projects/pulseaudio/doxygen/structpa__sink__info.html
-typedef struct pa_devicelist
-{
-  uint8_t initialized;
-  char name[512];
-  uint32_t index;
-  char description[256];
-} pa_devicelist_t;
-
 //group csv import struct
 typedef struct
 {
@@ -250,8 +204,8 @@ typedef struct
   SF_INFO *audio_in_file_info;
 
   uint32_t rtlsdr_center_freq;
-  int rtlsdr_ppm_error;
-  int audio_in_type;
+  int rtlsdr_ppm_error; 
+  int audio_in_type; 
   char audio_out_dev[1024];
   int audio_out_fd;
   int audio_out_fdR; //right channel audio for OSS hack
@@ -271,16 +225,15 @@ typedef struct
   FILE *symbol_out_f;
   float audio_gain;
   float audio_gainR;
-  float audio_gainA;
   int audio_out;
   int dmr_stereo_wav;
-  char wav_out_dir[512];
   char wav_out_file[1024];
   char wav_out_fileR[1024];
   char wav_out_file_raw[1024];
   char symbol_out_file[1024];
   char lrrp_out_file[1024];
   char szNumbers[1024]; //**tera 10/32/64 char str
+  short int symbol_out;
   short int mbe_out; //flag for mbe out, don't attempt fclose more than once
   short int mbe_outR; //flag for mbe out, don't attempt fclose more than once
   SNDFILE *wav_out_f;
@@ -311,10 +264,6 @@ typedef struct
   int ssize;
   int msize;
   int playfiles;
-  int m17encoder;
-  int m17encoderbrt;
-  int m17encoderpkt;
-  int m17decoderip;
   int delay;
   int use_cosine_filter;
   int unmute_encrypted_p25;
@@ -327,7 +276,6 @@ typedef struct
   int rtl_started;
   long int rtl_rms;
   int monitor_input_audio;
-  int analog_only;
   int pulse_raw_rate_in;
   int pulse_raw_rate_out;
   int pulse_digi_rate_in;
@@ -342,8 +290,6 @@ typedef struct
   pa_simple *pulse_digi_dev_in;
   pa_simple *pulse_digi_dev_out;
   pa_simple *pulse_digi_dev_outR;
-  char pa_input_idx[100];
-  char pa_output_idx[100];
   int use_ncurses_terminal;
   int ncurses_compact;
   int ncurses_history;
@@ -379,17 +325,11 @@ typedef struct
   int rigctlportno;
   char rigctlhostname[1024];
 
-  //UDP Socket Blaster Audio
-  int udp_sockfd;   //digital
-  int udp_sockfdA; //analog 48k1
+  //udp socket for GQRX, SDR++, etc
+  int udp_sockfd;
   int udp_portno;
-  char udp_hostname[1024];
-
-  //M17 UDP for IP frame output
-  int m17_use_ip;     //if enabled, open UDP and broadcast IP frame
-  int m17_portno;    //default is 17000
-  int m17_udp_sock; //actual UDP socket for M17 to send to
-  char m17_hostname[1024];
+  char * udp_hostname;
+  SNDFILE *udp_file_in;
 
   //tcp socket for SDR++, etc
   int tcp_sockfd;
@@ -412,7 +352,7 @@ typedef struct
   char group_in_file[1024];
   char lcn_in_file[1024];
   char chan_in_file[1024];
-  char key_in_file[1024];
+  char key_in_file[1024];  
   //end import filenames
 
   //reverse mute
@@ -443,19 +383,9 @@ typedef struct
   //Trunking - Tune Enc Calls (P25 only on applicable grants with svc opts)
   uint8_t trunk_tune_enc_calls;
 
-  //OSS audio 48k/1 - slot preference
+  //OSS audio - slot preference
   int slot_preference;
 
-  //hard set slots to synthesize
-  int slot1_on;
-  int slot2_on;
-
-  //enable filter options
-  int use_lpf;
-  int use_hpf;
-  int use_pbf;
-  int use_hpf_d;
-
   //'DSP' Format Output
   uint8_t use_dsp_output;
   char dsp_out_file[2048];
@@ -463,9 +393,6 @@ typedef struct
   //Use P25p1 heuristics
   uint8_t use_heuristics;
 
-  //Use floating point audio output
-  int floating_point;
-
 } dsd_opts;
 
 typedef struct
@@ -490,22 +417,7 @@ typedef struct
   //analog/raw signal audio buffers
   short analog_out[960];
   int analog_sample_counter;
-  //new stereo float sample storage
-  float f_l[160]; //single sample left
-  float f_r[160]; //single sample right
-  float f_l4[4][160]; //quad sample for up to a P25p2 4V
-  float f_r4[4][160]; //quad sample for up to a P25p2 4V
-  //new stereo short sample storage
-  short s_l[160]; //single sample left
-  short s_r[160]; //single sample right
-  short s_l4[18][160]; //quad sample for up to a P25p2 4V
-  short s_r4[18][160]; //quad sample for up to a P25p2 4V
-  //new stereo short sample storage tapped from 48_k internal upsampling
-  short s_lu[160*6]; //single sample left
-  short s_ru[160*6]; //single sample right
-  short s_l4u[4][160*6]; //quad sample for up to a P25p2 4V
-  short s_r4u[4][160*6]; //quad sample for up to a P25p2 4V
-  //end
+  //
   int audio_out_idx;
   int audio_out_idx2;
   int audio_out_idxR;
@@ -558,7 +470,6 @@ typedef struct
   char slot0light[8];
   float aout_gain;
   float aout_gainR;
-  float aout_gainA;
   float aout_max_buf[200];
   float aout_max_bufR[200];
   float *aout_max_buf_p;
@@ -601,7 +512,6 @@ typedef struct
   unsigned int debug_audio_errorsR;
   unsigned int debug_header_errors;
   unsigned int debug_header_critical_errors;
-  int debug_mode; //debug misc things
 
   // Last dibit read
   int last_dibit;
@@ -661,15 +571,15 @@ typedef struct
 
   //new stuff below here
   uint8_t data_conf_data[2];            //flag for confirmed data blocks per slot
-  uint8_t dmr_pdu_sf[2][24*128];        //unified pdu 'superframe' //[slot][byte] -- increased capacity to 127(+1) full rate blocks
+  uint8_t dmr_pdu_sf[2][288];          //unified pdu 'superframe' //[slot][byte]
   uint8_t cap_plus_csbk_bits[2][12*8*8]; //CSBK Cap+ FL initial and appended block bit storage, by slot
   uint8_t cap_plus_block_num[2];         //received block number storage -- per timeslot
-  uint8_t data_block_crc_valid[2][127]; //flag each individual block as good crc on confirmed data
+  uint8_t data_block_crc_valid[2][25]; //flag each individual block as good crc on confirmed data
   char dmr_embedded_signalling[2][7][48]; //embedded signalling 2 slots by 6 vc by 48 bits (replacing TS1SuperFrame.TimeSlotRawVoiceFrame.Sync structure)
 
   char dmr_cach_fragment[4][17]; //unsure of size, will need to check/verify
   int dmr_cach_counter; //counter for dmr_cach_fragments 0-3; not sure if needed yet.
-
+  
   //dmr talker alias new/fixed stuff
   uint8_t dmr_alias_format[2]; //per slot
   uint8_t dmr_alias_len[2]; //per slot
@@ -683,22 +593,13 @@ typedef struct
 
   dPMRVoiceFS2Frame_t dPMRVoiceFS2Frame;
 
-  //new audio filter structs
-  LPFilter RCFilter;
-  HPFilter HRCFilter;
-  PBFilter PBF;
-  NOTCHFilter NF;
-  LPFilter RCFilterL;
-  HPFilter HRCFilterL;
-  LPFilter RCFilterR;
-  HPFilter HRCFilterR;
-
   char dpmr_caller_id[20];
   char dpmr_target_id[20];
 
   int dpmr_color_code;
 
   short int dmr_stereo; //need state variable for upsample function
+  short int dmr_ms_rc;
   short int dmr_ms_mode;
   unsigned int dmrburstL;
   unsigned int dmrburstR;
@@ -726,7 +627,6 @@ typedef struct
   int p2_vch_chan_num; //vch channel number (0 or 1, not the 0-11 TS)
   int ess_b[2][96]; //external storage for ESS_B fragments
   int fourv_counter[2]; //external reference counter for ESS_B fragment collection
-  int voice_counter[2]; //external reference counter for 18V x 2 P25p2 Superframe
   int p2_is_lcch; //flag to tell us when a frame is lcch and not sacch
 
   //iden freq storage for frequency calculations
@@ -747,45 +647,25 @@ typedef struct
   int symbol_throttle; //throttle speed
   int use_throttle; //only use throttle if set to 1
 
+  //dstar header for ncurses
+  unsigned char dstarradioheader[41];
+
   //dmr trunking stuff
   int dmr_rest_channel;
   int dmr_mfid; //just when 'fid' is used as a manufacturer ID and not a feature set id
   int dmr_vc_lcn;
   int dmr_vc_lsn;
   int dmr_tuned_lcn;
-  uint16_t dmr_cc_lpcn; //dmr t3 logical physical channel number
-  uint32_t tg_hold; //single TG to hold on when enabled
 
   //edacs
   int ea_mode;
-
+  int esk_mode;
   unsigned short esk_mask;
   unsigned long long int edacs_site_id;
   int edacs_lcn_count; //running tally of lcn's observed on edacs system
   int edacs_cc_lcn; //current lcn for the edacs control channel
   int edacs_vc_lcn; //current lcn for any active vc (not the one we are tuned/tuning to)
   int edacs_tuned_lcn; //the vc we are currently tuned to...above variable is for updating all in the matrix
-  int edacs_vc_call_type; //the type of call on the given VC - see defines below
-  int edacs_a_bits;  //  Agency Significant Bits
-  int edacs_f_bits;  //   Fleet Significant Bits
-  int edacs_s_bits;  //Subfleet Significant Bits
-  int edacs_a_shift; //Calculated Shift for A Bits
-  int edacs_f_shift; //Calculated Shift for F Bits
-  int edacs_a_mask;  //Calculated Mask for A Bits
-  int edacs_f_mask;  //Calculated Mask for F Bits
-  int edacs_s_mask;  //Calculated Mask for S Bits
-
-  //flags for EDACS call type
-  #define EDACS_IS_VOICE         0x01
-  #define EDACS_IS_DIGITAL       0x02
-  #define EDACS_IS_EMERGENCY     0x04
-  #define EDACS_IS_GROUP         0x08
-  #define EDACS_IS_INDIVIDUAL    0x10
-  #define EDACS_IS_ALL_CALL      0x20
-  #define EDACS_IS_INTERCONNECT  0x40
-  #define EDACS_IS_TEST_CALL     0x80
-  #define EDACS_IS_AGENCY_CALL  0x100
-  #define EDACS_IS_FLEET_CALL   0x200
 
   //trunking group and lcn freq list
   long int trunk_lcn_freq[26]; //max number on an EDACS system, should be enough on DMR too hopefully
@@ -797,7 +677,6 @@ typedef struct
   time_t last_cc_sync_time; //use this to start hunting for CC after signal lost
   time_t last_vc_sync_time; //flag for voice activity bursts, tune back on con+ after more than x seconds no voice
   time_t last_active_time; //time the a 'call grant' was received, used to clear the active_channel strings after x seconds
-  time_t last_t3_tune_time; //last time a DMR T3 grant was received, this is used to prevent a rogue p_clear condition from immediately sending back to CC
   int is_con_plus; //con_plus flag for knowing its safe to skip payload channel after x seconds of no voice sync
 
   //new nxdn stuff
@@ -826,7 +705,7 @@ typedef struct
   int keyloader; //let us know the keyloader is active
 
   //dmr late entry mi
-  uint64_t late_entry_mi_fragment[2][8][3];
+  uint64_t late_entry_mi_fragment[2][7][3];
 
   //dmr manufacturer branding and sub_branding (i.e., Motorola and Con+)
   char dmr_branding[20];
@@ -835,8 +714,8 @@ typedef struct
   //Remus DMR End Call Alert Beep
   int dmr_end_alert[2]; //dmr TLC end call alert beep has already played once flag
 
-  //Bitmap Filtering Options
-  int audio_smoothing;
+  //Upsampled Audio Smoothing
+  uint8_t audio_smoothing;
 
   //YSF Fusion Call Strings and Info
   uint8_t ysf_dt; //data type -- VD1, VD2, Full Rate, etc.
@@ -852,26 +731,13 @@ typedef struct
   char ysf_rm4[6];
   char ysf_txt[21][21]; //text storage blocks
 
-  //DSTAR Call Strings and Info
-  char dstar_rpt1[9];
-  char dstar_rpt2[9];
-  char dstar_dst[9];
-  char dstar_src[13];
-  char dstar_txt[60];
-  char dstar_gps[60];
-
   //M17 Storage
   uint8_t m17_lsf[360];
-  uint8_t m17_pkt[850];
-  uint8_t m17_pbc_ct; //pbc packet counter
   uint8_t m17_str_dt; //stream contents
 
   unsigned long long int m17_dst;
   unsigned long long int m17_src;
-  uint8_t m17_can; //can value that was decoded from signal
-  int m17_can_en; //can value supplied to the encoding side
-  int m17_rate;  //sampling rate for audio input
-  int m17_vox;  //vox enabled via RMS value
+  uint8_t m17_can;
 
   char m17_dst_csd[20];
   char m17_src_csd[20];
@@ -882,15 +748,6 @@ typedef struct
   uint8_t m17_meta[16]; //packed meta
   uint8_t m17_enc;      //enc type
   uint8_t m17_enc_st;   //scrambler or data subtye
-  int m17encoder_tx;    //if TX (encode + decode) M17 Stream is enabled
-  int m17encoder_eot;   //signal if we need to send the EOT frame
-
-  //misc str storage
-  char str50a[50];
-  char str50b[50];
-  char str50c[50];
-  char m17dat[50];  //user supplied m17 data input string
-  char m17sms[800]; //user supplied sms text string
 
   //Codec2
   #ifdef USE_CODEC2
@@ -904,7 +761,7 @@ typedef struct
  * Frame sync patterns
  */
 
-//M17 Sync Patterns
+//The inverse of LSF also seems to be Stream Frame Type, only going to work on Stream mode for now
 #define M17_LSF     "11113313"
 #define M17_STR     "33331131"
 //alternating with last symbol opposite of first symbol of LSF
@@ -912,8 +769,8 @@ typedef struct
 #define M17_PIV     "13131313"
 #define M17_PRE_LSF "3131313133331131" //Preamble + LSF
 #define M17_PIV_LSF "1313131311113313" //Preamble + LSF
-#define M17_BRT     "31331111"
-#define M17_PKT     "13113333"
+// #define M17_BRT     "31331111"
+// #define M17_PKT     "13113333"
 
 #define FUSION_SYNC     "31111311313113131131"
 #define INV_FUSION_SYNC "13333133131331313313"
@@ -955,7 +812,7 @@ typedef struct
 #define NXDN_PANDFSW      "3131133313131331131" //19 symbols
 #define INV_NXDN_PANDFSW  "1313311131313113313" //19 symbols
 
-#define DMR_RESERVED_SYNC  "131331111133133133311313"
+#define DMR_RC_DATA_SYNC  "131331111133133133311313"
 
 #define DMR_DIRECT_MODE_TS1_DATA_SYNC  "331333313111313133311111"
 #define DMR_DIRECT_MODE_TS1_VOICE_SYNC "113111131333131311133333"
@@ -967,10 +824,6 @@ typedef struct
 #define INV_PROVOICE_EA_SYNC "13313133113113333311313133133311"
 #define PROVOICE_EA_SYNC     "31131311331331111133131311311133"
 
-//EDACS/PV EOT dotting sequence
-#define DOTTING_SEQUENCE_A  "131313131313131313131313131313131313131313131313" //0xAAAA...
-#define DOTTING_SEQUENCE_B  "313131313131313131313131313131313131313131313131" //0x5555...
-
 //define the provoice conventional string pattern to default 85/85 if not enabled, else mute it so we won't double sync on accident in frame_sync
 #ifdef PVCONVENTIONAL
 #define PROVOICE_CONV        "00000000000000000000000000000000" //all zeroes should be unobtainable string in the frame_sync synctests
@@ -979,7 +832,7 @@ typedef struct
 #define PROVOICE_CONV        "13131333111311311313131313131313" //TX 85 RX 85 (default programming value)
 #define INV_PROVOICE_CONV    "31313111333133133131313131313131" //TX 85 RX 85 (default programming value)
 #endif
-//we use the short sync instead of the default 85/85 when PVCONVENTIONAL is defined by cmake
+//we use the short sync instead of the default 85/85 wnen PVCONVENTIONAL is defined by cmake
 #define PROVOICE_CONV_SHORT                 "1313133311131131" //16-bit short pattern, last 16-bits change based on TX an RX values
 #define INV_PROVOICE_CONV_SHORT             "3131311133313313"
 //In this pattern (inverted polarity, the norm for PV) 3 is bit 0, and 1 is bit 1 (2 level GFSK)
@@ -1012,47 +865,19 @@ typedef struct
 void processdPMRvoice (dsd_opts * opts, dsd_state * state);
 void processAudio (dsd_opts * opts, dsd_state * state);
 void processAudioR (dsd_opts * opts, dsd_state * state);
-void openPulseInput (dsd_opts * opts);
-void openPulseOutput (dsd_opts * opts);
-void openOSSOutput (dsd_opts * opts);
+void openPulseInput (dsd_opts * opts);  //not sure if we need to just pass opts, or opts and state yet
+void openPulseOutput (dsd_opts * opts);  //not sure if we need to just pass opts, or opts and state yet
 void closePulseInput (dsd_opts * opts);
 void closePulseOutput (dsd_opts * opts);
 void writeSynthesizedVoice (dsd_opts * opts, dsd_state * state);
 void writeSynthesizedVoiceR (dsd_opts * opts, dsd_state * state);
-void playSynthesizedVoice (dsd_opts * opts, dsd_state * state);   //short mono output slot 1
-void playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state);  //short mono output slot 2
-//new float stuff
-void playSynthesizedVoiceFS (dsd_opts * opts, dsd_state * state);  //float stereo mix
-void playSynthesizedVoiceFS3 (dsd_opts * opts, dsd_state * state); //float stereo mix 3v2 DMR
-void playSynthesizedVoiceFS4 (dsd_opts * opts, dsd_state * state); //float stereo mix 4v2 P25p2
-void playSynthesizedVoiceFM (dsd_opts * opts, dsd_state * state);  //float mono
-void agf (dsd_opts * opts, dsd_state * state, float samp[160], int slot); //float gain control
-void agsm (dsd_opts * opts, dsd_state * state, short * input, int len); //short gain control for analog things
-void analog_gain (dsd_opts * opts, dsd_state * state, short * input, int len); //manual gain handling for analong things
-//new short stuff
-void playSynthesizedVoiceMS (dsd_opts * opts, dsd_state * state);    //short mono mix
-void playSynthesizedVoiceMSR (dsd_opts * opts, dsd_state * state);   //short mono mix R (needed for OSS 48k input/output)
-void playSynthesizedVoiceSS (dsd_opts * opts, dsd_state * state);   //short stereo mix
-void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state);  //short stereo mix 3v2 DMR
-void playSynthesizedVoiceSS4 (dsd_opts * opts, dsd_state * state);  //short stereo mix 4v2 P25p2
-void playSynthesizedVoiceSS18 (dsd_opts * opts, dsd_state * state); //short stereo mix 18V Superframe
-void upsampleS (short invalue, short prev, short outbuf[6]); //upsample 8k to 48k short
-//
+void playSynthesizedVoice (dsd_opts * opts, dsd_state * state);
+void playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state);
 void openAudioOutDevice (dsd_opts * opts, int speed);
 void openAudioInDevice (dsd_opts * opts);
 
-//pulse sources and sinks
-void parse_pulse_input_string  (dsd_opts * opts, char * input);
-void parse_pulse_output_string (dsd_opts * opts, char * input);
-void pa_state_cb (pa_context *c, void *userdata);
-void pa_sinklist_cb (pa_context *c, const pa_sink_info *l, int eol, void *userdata);
-void pa_sourcelist_cb (pa_context *c, const pa_source_info *l, int eol, void *userdata);
-int pa_get_devicelist (pa_devicelist_t *input, pa_devicelist_t *output);
-int pulse_list();
-
 int getDibit (dsd_opts * opts, dsd_state * state);
 int get_dibit_and_analog_signal (dsd_opts * opts, dsd_state * state, int * out_analog_signal);
-int digitize (dsd_opts* opts, dsd_state* state, int symbol);
 
 void skipDibit (dsd_opts * opts, dsd_state * state, int count);
 void saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d);
@@ -1073,6 +898,7 @@ void openWavOutFileR (dsd_opts * opts, dsd_state * state);
 void openWavOutFileRaw (dsd_opts * opts, dsd_state * state);
 void openSymbolOutFile (dsd_opts * opts, dsd_state * state);
 void closeSymbolOutFile (dsd_opts * opts, dsd_state * state);
+void writeSymbolOutFile (dsd_opts * opts, dsd_state * state);
 void writeRawSample (dsd_opts * opts, dsd_state * state, short sample);
 void closeWavOutFile (dsd_opts * opts, dsd_state * state);
 void closeWavOutFileL (dsd_opts * opts, dsd_state * state);
@@ -1089,6 +915,7 @@ void initState (dsd_state * state);
 void usage ();
 void liveScanner (dsd_opts * opts, dsd_state * state);
 void cleanupAndExit (dsd_opts * opts, dsd_state * state);
+// void sigfun (int sig); //not necesary
 int main (int argc, char **argv);
 void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv);
 void processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24]);
@@ -1098,16 +925,8 @@ int getSymbol (dsd_opts * opts, dsd_state * state, int have_sync);
 void upsample (dsd_state * state, float invalue);
 void processDSTAR (dsd_opts * opts, dsd_state * state);
 
-//new cleaner, sleaker, nicer mbe handler...maybe -- wrap around ifdef later on with cmake options
-void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24]);
-void soft_tonef (float samp[160], int n, int ID, int AD);
-
 //new p25lcw
 void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t irrecoverable_errors);
-//new p25 1/2 rate decoder
-int p25_12(uint8_t * input, uint8_t treturn[12]);
-//new p25 lsd fec function
-int p25p1_lsd_fec(uint8_t * input);
 
 void processP25lcw (dsd_opts * opts, dsd_state * state, char *lcformat, char *mfid, char *lcinfo);
 void processHDU (dsd_opts * opts, dsd_state * state);
@@ -1118,17 +937,10 @@ void processTDULC (dsd_opts * opts, dsd_state * state);
 void processProVoice (dsd_opts * opts, dsd_state * state);
 void processX2TDMAdata (dsd_opts * opts, dsd_state * state);
 void processX2TDMAvoice (dsd_opts * opts, dsd_state * state);
-void processDSTAR_HD (dsd_opts * opts, dsd_state * state); //DSTAR Header
-void processDSTAR_SD (dsd_opts * opts, dsd_state * state, uint8_t * sd); //DSTAR Slow Data
+void processDSTAR_HD (dsd_opts * opts, dsd_state * state);
 void processYSF(dsd_opts * opts, dsd_state * state); //YSF
 void processM17STR(dsd_opts * opts, dsd_state * state); //M17 (STR)
-void processM17PKT(dsd_opts * opts, dsd_state * state); //M17 (PKT)
 void processM17LSF(dsd_opts * opts, dsd_state * state); //M17 (LSF)
-void processM17IPF(dsd_opts * opts, dsd_state * state); //M17 (IPF)
-void encodeM17STR(dsd_opts * opts, dsd_state * state); //M17 (STR) encoder
-void encodeM17BRT(dsd_opts * opts, dsd_state * state); //M17 (BRT) encoder
-void encodeM17PKT(dsd_opts * opts, dsd_state * state); //M17 (PKT) encoder
-void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len); //M17 (PKT) decoder
 void processP2(dsd_opts * opts, dsd_state * state); //P2
 void processTSBK(dsd_opts * opts, dsd_state * state); //P25 Trunking Single Block
 void processMPDU(dsd_opts * opts, dsd_state * state); //P25 Multi Block PDU (SAP 0x61 FMT 0x15 or 0x17 for Trunking Blocks)
@@ -1137,16 +949,7 @@ short nxdn_filter(short sample);
 short dpmr_filter(short sample);
 short m17_filter(short sample);
 
-//utility functions
 uint64_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength);
-uint64_t convert_bits_into_output (uint8_t * input, int len);
-void pack_bit_array_into_byte_array (uint8_t * input, uint8_t * output, int len);
-void pack_bit_array_into_byte_array_asym (uint8_t * input, uint8_t * output, int len);
-void unpack_byte_array_into_bit_array (uint8_t * input, uint8_t * output, int len);
-
-//ambe pack and unpack functions
-void pack_ambe (char * input, uint8_t * output, int len);
-void unpack_ambe (uint8_t * input, char * ambe);
 
 void ncursesOpen (dsd_opts * opts, dsd_state * state);
 void ncursesPrinter (dsd_opts * opts, dsd_state * state);
@@ -1166,31 +969,20 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 //end
 void nxdn_message_type (dsd_opts * opts, dsd_state * state, uint8_t MessageType);
 void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182]);
-//Osmocom OP25 12 Rate Trellis Decoder (for NXDN, M17, YSF, etc)
-void trellis_decode(uint8_t result[], const uint8_t source[], int result_len);
 
 //OP25 NXDN CRC functions
-int load_i(const uint8_t val[], int len);
-uint8_t crc6(const uint8_t buf[], int len);
-uint16_t crc12f(const uint8_t buf[], int len);
-uint16_t crc15(const uint8_t buf[], int len);
-uint16_t crc16cac(const uint8_t buf[], int len);
-uint8_t crc7_scch(uint8_t bits[], int len); //converted from op25 crc6
+static inline int load_i(const uint8_t val[], int len);
+static uint8_t crc6(const uint8_t buf[], int len);
+static uint16_t crc12f(const uint8_t buf[], int len);
+static uint16_t crc15(const uint8_t buf[], int len);
+static uint16_t crc16cac(const uint8_t buf[], int len);
+static uint8_t crc7_scch(uint8_t bits[], int len); //converted from op25 crc6
 
 /* NXDN Convolution functions */
 void CNXDNConvolution_start(void);
 void CNXDNConvolution_decode(uint8_t s0, uint8_t s1);
 void CNXDNConvolution_chainback(unsigned char* out, unsigned int nBits);
 void CNXDNConvolution_encode(const unsigned char* in, unsigned char* out, unsigned int nBits);
-void CNXDNConvolution_init();
-
-//libM17 viterbi decoder
-uint32_t viterbi_decode(uint8_t* out, const uint16_t* in, const uint16_t len);
-uint32_t viterbi_decode_punctured(uint8_t* out, const uint16_t* in, const uint8_t* punct, const uint16_t in_len, const uint16_t p_len);
-void viterbi_decode_bit(uint16_t s0, uint16_t s1, const size_t pos);
-uint32_t viterbi_chainback(uint8_t* out, size_t pos, uint16_t len);
-void viterbi_reset(void);
-uint16_t q_abs_diff(const uint16_t v1, const uint16_t v2);
 
 //keeping these
 void NXDN_SACCH_Full_decode(dsd_opts * opts, dsd_state * state);
@@ -1250,18 +1042,12 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
 void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[]);
 uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25]);
 uint32_t dmr_34(uint8_t * input, uint8_t treturn[18]); //simplier trellis decoder
-void beeper (dsd_opts * opts, dsd_state * state, int lr); //the tone beeper function
-void dmr_gateway_identifier (uint32_t source, uint32_t target); //translate special addresses
+void beeper (dsd_opts * opts, dsd_state * state, int type); //the tone beeper function
 
-//Embedded Alias and GPS reports
+//Embedded Alias and GPS
 void dmr_embedded_alias_header (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
 void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
 void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
-void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[]);
-void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input);
-void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int type);
-void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int slot);
-void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input);
 
 //"DMR STEREO"
 void dmrBSBootstrap (dsd_opts * opts, dsd_state * state);
@@ -1278,20 +1064,11 @@ void dmr_reset_blocks (dsd_opts * opts, dsd_state * state);
 void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[]);
 void dmr_locn (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[]);
 
-//Time and Date Functions
-char * getTime();
-char * getTimeC();
-char * getTimeN(time_t t);
-char * getDate();
-char * getDateH();
-char * getDateN(time_t t);
-
 //dmr alg stuff
 void dmr_alg_reset (dsd_opts * opts, dsd_state * state);
 void dmr_alg_refresh (dsd_opts * opts, dsd_state * state);
-void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc, uint8_t ambe_fr[4][24], uint8_t ambe_fr2[4][24], uint8_t ambe_fr3[4][24]);
+void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc, char ambe_fr[4][24], char ambe_fr2[4][24], char ambe_fr3[4][24]);
 void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state);
-void dmr_decode_syscode(dsd_opts * opts, dsd_state * state, uint8_t * cs_pdu_bits, int csbk_fid, int type);
 
 //handle Single Burst (Voice Burst F) or Reverse Channel Signalling
 void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power);
@@ -1303,7 +1080,7 @@ bool crc8_ok(uint8_t bits[], unsigned int len);
 //modified CRC functions for SB/RC
 uint8_t crc7(uint8_t bits[], unsigned int len);
 uint8_t crc3(uint8_t bits[], unsigned int len);
-uint8_t crc4(uint8_t bits[], unsigned int len);
+uint8_t crc4(uint8_t bits[], unsigned int len); 
 
 //LFSR and LFSRP code courtesy of https://github.com/mattames/LFSR/
 void LFSR(dsd_state * state);
@@ -1363,10 +1140,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 //P25 Channel to Frequency
 long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channel);
 
-//P25 CRC Functions
-int crc16_lb_bridge (int payload[190], int len);
-int crc12_xb_bridge (int payload[190], int len);
-
 //NXDN Channel to Frequency, Courtesy of IcomIcR20 on RR Forums
 long int nxdn_channel_to_frequency (dsd_opts * opts, dsd_state * state, uint16_t channel);
 
@@ -1394,33 +1167,7 @@ int UDPBind (char *hostname, int portno);
 
 //EDACS
 void edacs(dsd_opts * opts, dsd_state * state);
-unsigned long long int edacs_bch (unsigned long long int message);
-void eot_cc(dsd_opts * opts, dsd_state * state); //end of TX return to CC
-
-//Generic Tuning Functions
-void return_to_cc (dsd_opts * opts, dsd_state * state);
-
-//initialize static float filter memory
-void init_rrc_filter_memory();
-
-//misc audio filtering for analog
-long int raw_rms(short *samples, int len, int step);
-void init_audio_filters(dsd_state * state);
-void lpf(dsd_state * state, short * input, int len);
-void hpf(dsd_state * state, short * input, int len);
-void pbf(dsd_state * state, short * input, int len);
-void nf(dsd_state * state, short * input, int len);
-void hpf_dL(dsd_state * state, short * input, int len);
-void hpf_dR(dsd_state * state, short * input, int len);
-//from: https://github.com/NedSimao/FilteringLibrary
-void LPFilter_Init(LPFilter *filter, float cutoffFreqHz, float sampleTimeS);
-float LPFilter_Update(LPFilter *filter, float v_in);
-void HPFilter_Init(HPFilter *filter, float cutoffFreqHz, float sampleTimeS);
-float HPFilter_Update(HPFilter *filter, float v_in);
-void PBFilter_Init(PBFilter *filter, float HPF_cutoffFreqHz, float LPF_cutoffFreqHz, float sampleTimeS);
-float PBFilter_Update(PBFilter *filter, float v_in);
-void NOTCHFilter_Init(NOTCHFilter *filter, float centerFreqHz, float notchWidthHz, float sampleTimeS);
-float NOTCHFilter_Update(NOTCHFilter *filter, float vin);
+unsigned long long int edacs_bch (unsigned long long int message); 
 
 //csv imports
 int csvGroupImport(dsd_opts * opts, dsd_state * state);
@@ -1429,15 +1176,6 @@ int csvChanImport(dsd_opts * opts, dsd_state * state);
 int csvKeyImportDec(dsd_opts * opts, dsd_state * state);
 int csvKeyImportHex(dsd_opts * opts, dsd_state * state);
 
-//UDP Socket Connect and UDP Socket Blaster (audio output)
-int udp_socket_connect(dsd_opts * opts, dsd_state * state);
-int udp_socket_connectA(dsd_opts * opts, dsd_state * state);
-void udp_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
-void udp_socket_blasterA(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
-int m17_socket_receiver(dsd_opts * opts, void * data);
-int udp_socket_connectM17(dsd_opts * opts, dsd_state * state);
-int m17_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data);
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1445,7 +1183,7 @@ extern "C" {
 #ifdef USE_RTLSDR
 void open_rtlsdr_stream(dsd_opts *opts);
 void cleanup_rtlsdr_stream();
-int get_rtlsdr_sample(int16_t *sample, dsd_opts * opts, dsd_state * state);
+void get_rtlsdr_sample(int16_t *sample, dsd_opts * opts, dsd_state * state);
 void rtlsdr_sighandler();
 void rtl_dev_tune(dsd_opts * opts, long int frequency);
 long int rtl_return_rms();
@@ -1453,11 +1191,14 @@ void rtl_clean_queue();
 #endif
 
 
-//Phase 2 RS/FEC Functions
+//Phase 2 Helper Functions
 int ez_rs28_ess (int payload[96], int parity[168]); //ezpwd bridge for FME
 int ez_rs28_facch (int payload[156], int parity[114]); //ezpwd bridge for FME
 int ez_rs28_sacch (int payload[180], int parity[132]); //ezpwd bridge for FME
 int isch_lookup (uint64_t isch); //isch map lookup
+int bd_bridge (int payload[196], uint8_t decoded[12]); //bridge to Michael Ossmann Block De-interleaver and 1/2 rate trellis decoder
+int crc16_lb_bridge (int payload[190], int len);
+int crc12_xb_bridge (int payload[190], int len);
 
 #ifdef __cplusplus
 }

include/fcs.h

@@ -75,7 +75,7 @@ for (loop=0; loop < size; loop++) {
 
 	m_crc = (m_crc >> 8) ^ ccittTab[tmp];
 
-} // end for
+}; // end for
 
 // calculate and save crc-value in fields 54 and 55 of dvframe
 m_crc = ~m_crc;

install.sh

@@ -1,8 +1,12 @@
-#!/bin/bash
-#
+sudo cp tone8.wav /usr/share/
+sudo cp tone24.wav /usr/share/
+sudo cp tone48.wav /usr/share/
+sudo chmod 777 /usr/share/tone8.wav
+sudo chmod 777 /usr/share/tone24.wav
+sudo chmod 777 /usr/share/tone48.wav
 mkdir build
 cd build
 cmake ..
-make -j $(nproc)
+make -j `nproc`
 sudo make install
-sudo ldconfig
+sudo ldconfig

package.nix

@@ -1,46 +0,0 @@
-{ lib
-, stdenv
-, cmake
-, mbelib
-, libsndfile
-, ncurses
-, pulseaudio
-, rtl-sdr
-, itpp
-, codec2
-, portaudioSupport ? true
-, portaudio ? null
-}:
-
-assert portaudioSupport -> portaudio != null;
-
-stdenv.mkDerivation {
-  name = "dsd-fme";
-
-  src = ./.;
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    mbelib
-    libsndfile
-    itpp
-    rtl-sdr
-    ncurses.dev
-    pulseaudio.dev
-    codec2
-  ] ++ lib.optionals portaudioSupport [ portaudio ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Digital Speech Decoder - Florida Man Edition";
-    longDescription = ''
-      DSD is able to decode several digital voice formats from discriminator
-      tap audio and synthesize the decoded speech. Speech synthesis requires
-      mbelib, which is a separate package.
-    '';
-    homepage = "https://github.com/szechyjs/dsd";
-    license = licenses.mit;
-    platforms = platforms.unix;
-  };
-}

patch/DMR_MONO_MODE_20240201.patch

@@ -1,51 +0,0 @@
-diff --git a/src/dmr_pi.c b/src/dmr_pi.c
-index 55dfb83..33fb3ba 100644
---- a/src/dmr_pi.c
-+++ b/src/dmr_pi.c
-@@ -14,6 +14,9 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
- {
-   UNUSED2(opts, CRCCorrect);
- 
-+  //force slot to 0 if using dmr mono handling
-+  if (opts->dmr_mono == 1) state->currentslot = 0;
-+
-   if((IrrecoverableErrors == 0)) 
-   {
- 
-diff --git a/src/dsd_frame.c b/src/dsd_frame.c
-index 3b2a3e1..ba32618 100644
---- a/src/dsd_frame.c
-+++ b/src/dsd_frame.c
-@@ -160,7 +160,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
-           sprintf (state->slot2light, " slot2 ");
-           //we can safely open MBE on any MS or mono handling
-           if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state); 
--          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
-+          // if (opts->p25_trunk == 0) //line disabled to allow mono mode while trunking
-+            dmrMSBootstrap (opts, state); 
-         }
-         if (opts->dmr_mono == 1 && state->synctype == 32)
-         {
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 7be5912..8db6dc3 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -2302,13 +2302,13 @@ main (int argc, char **argv)
-             state.rf_mod = 0;  //
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
--            opts.dmr_mono = 0;
--            opts.dmr_stereo = 1;
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-             state.dmr_stereo = 0; //0
-             // opts.setmod_bw = 7000;
--            sprintf (opts.output_name, "DMR Stereo");
--            fprintf (stderr,"-fr / DMR Mono switch has been deprecated.\n");
--            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
- 
-           }
-           else if (optarg[0] == 'm')

patch/MTL_MONO_MODE_20240328.patch

@@ -1,152 +0,0 @@
-diff --git a/src/dmr_pi.c b/src/dmr_pi.c
-index 7542c61..d1c8e39 100644
---- a/src/dmr_pi.c
-+++ b/src/dmr_pi.c
-@@ -14,6 +14,9 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
- {
-   UNUSED2(opts, CRCCorrect);
- 
-+  //force slot to 0 if using dmr mono handling
-+  if (opts->dmr_mono == 1) state->currentslot = 0;
-+
-   if((IrrecoverableErrors == 0)) 
-   {
- 
-diff --git a/src/dsd_audio2.c b/src/dsd_audio2.c
-index 756e468..13316df 100644
---- a/src/dsd_audio2.c
-+++ b/src/dsd_audio2.c
-@@ -988,6 +988,9 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
-   memset (stereo_samp2, 0, sizeof(stereo_samp2));
-   memset (stereo_samp3, 0, sizeof(stereo_samp3));
- 
-+  if (opts->dmr_mono == 1)
-+    memcpy (state->s_r4, state->s_l4, sizeof(state->s_r4));
-+
-   //dmr enc checkdown for whether or not to fill the stereo sample or not for playback or writing
-   encL = encR = 0;
-   encL = (state->dmr_so  >> 6) & 0x1;
-@@ -1070,8 +1073,16 @@ void playSynthesizedVoiceSS3 (dsd_opts * opts, dsd_state * state)
-   }
- 
-   //flag either left or right as 'enc' to mute if B
--  if (strcmp(modeL, "B") == 0) encL = 1;
--  if (strcmp(modeR, "B") == 0) encR = 1;
-+  if (strcmp(modeL, "B") == 0)
-+  {
-+    encL = 1;
-+    encR = 1;
-+  }
-+  if (strcmp(modeR, "B") == 0)
-+  {
-+    encR = 1;
-+    encL = 1;
-+  }
- 
-   //check to see if we need to enable slot and toggle slot preference here
-   //this method will always favor slot 2 (this is a patch anyways, so....meh)
-diff --git a/src/dsd_frame.c b/src/dsd_frame.c
-index 577169c..275abb6 100644
---- a/src/dsd_frame.c
-+++ b/src/dsd_frame.c
-@@ -160,7 +160,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
-           sprintf (state->slot2light, " slot2 ");
-           //we can safely open MBE on any MS or mono handling
-           if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state); 
--          if (opts->p25_trunk == 0) dmrMSBootstrap (opts, state); 
-+          // if (opts->p25_trunk == 0) //line disabled to allow mono mode while trunking
-+            dmrMSBootstrap (opts, state); 
-         }
-         if (opts->dmr_mono == 1 && state->synctype == 32)
-         {
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 3ca7788..22462a0 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -1645,9 +1645,9 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
--  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW MTL (20240201) \n");
-   #else
--  fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-+  fprintf (stderr, "Build Version: AW MTL %s \n", GIT_TAG);
-   #endif
-   fprintf (stderr,"MBElib Version: %s\n", versionstr);
- 
-@@ -2474,14 +2474,18 @@ main (int argc, char **argv)
-             opts.mod_qpsk = 0;
-             opts.mod_gfsk = 0;
-             state.rf_mod = 0;
--            opts.dmr_stereo = 1;
--            opts.dmr_mono = 0;
-+            // opts.dmr_stereo = 1;
-+            // opts.dmr_mono = 0;
-             // opts.setmod_bw = 7000;
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
--            sprintf (opts.output_name, "DMR");
--            
--            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-+            state.dmr_stereo = 0; //0
-+            // opts.setmod_bw = 7000;
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
-           }
-           //change ft to only do P25 and DMR (TDMA trunking modes)
-           else if (optarg[0] == 't')
-@@ -2558,13 +2562,13 @@ main (int argc, char **argv)
-             state.rf_mod = 0;  //
-             opts.pulse_digi_rate_out = 8000;
-             opts.pulse_digi_out_channels = 2;
--            opts.dmr_mono = 0;
--            opts.dmr_stereo = 1;
-+            opts.dmr_mono = 1;
-+            opts.dmr_stereo = 0; //not sure if this will break anything
-             state.dmr_stereo = 0; //0
-             // opts.setmod_bw = 7000;
--            sprintf (opts.output_name, "DMR Stereo");
--            fprintf (stderr,"-fr / DMR Mono switch has been deprecated.\n");
--            fprintf (stderr,"Decoding DMR Stereo BS/MS Simplex\n");
-+            sprintf (opts.output_name, "DMR Mono");
-+            // fprintf (stderr,"-fr / DMR Mono switch enabled. \n NOTE: Some ENC options in Slot 2 may not work properly.\n");
-+            fprintf (stderr,"\n Decoding DMR Stereo BS/MS Simplex in Mono Single Slot Only Configuration.\n");
- 
-           }
-           else if (optarg[0] == 'm')
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index 73965dc..e5b38aa 100644
---- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -2297,8 +2297,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
--    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
--    printw ("------------------------------------------------------------------------------\n");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW MTL (20240328)");
-+    printw ("------------------------------------------------------------------------------\n"); 
-   }
- #elif LIMAZULUTWEAKS
-   if (opts->ncurses_compact == 1)
-@@ -2336,12 +2336,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       #endif
-       #ifdef AERO_BUILD
-       if (i == 5) printw (" %s ", "Aero Build");
--      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 6) printw (" AW MTL (20240328) \n");
-       #elif ZDEV_BUILD
--      if (i == 5) printw (" %s ", "AW ");
-+      if (i == 5) printw (" %s ", "AW MTL");
-       if (i == 6) printw (" %s \n", GIT_TAG);
--      #else
--      if (i == 5) printw (" %s ", "AW ");
-+      #else 
-+      if (i == 5) printw (" %s ", "AW MTL");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-       #endif
-       else printw ("\n");

patch/cretu_no_dmr_idle.patch

@@ -1,277 +0,0 @@
-diff --git a/include/dsd.h b/include/dsd.h
-index 9ebf3f1..c5ac68a 100644
---- a/include/dsd.h
-+++ b/include/dsd.h
-@@ -18,16 +18,16 @@
-  */
- 
- //defined by CMakeLists.txt -- Disable by using cmake -DCOLORS=OFF ..
--#ifdef PRETTY_COLORS
--#define KNRM  "\x1B[0m"
--#define KRED  "\x1B[31m"
--#define KGRN  "\x1B[32m"
--#define KYEL  "\x1B[33m"
--#define KBLU  "\x1B[34m"
--#define KMAG  "\x1B[35m"
--#define KCYN  "\x1B[36m"
--#define KWHT  "\x1B[37m"
--#else
-+// #ifdef PRETTY_COLORS
-+// #define KNRM  "\x1B[0m"
-+// #define KRED  "\x1B[31m"
-+// #define KGRN  "\x1B[32m"
-+// #define KYEL  "\x1B[33m"
-+// #define KBLU  "\x1B[34m"
-+// #define KMAG  "\x1B[35m"
-+// #define KCYN  "\x1B[36m"
-+// #define KWHT  "\x1B[37m"
-+// #else
- #define KNRM  ""
- #define KRED  ""
- #define KGRN  ""
-@@ -36,7 +36,7 @@
- #define KMAG  ""
- #define KCYN  ""
- #define KWHT  ""
--#endif
-+// #endif
- 
- #include "config.h"
- #include <stdio.h>
-diff --git a/src/dmr_bs.c b/src/dmr_bs.c
-index bdab262..17a9e70 100644
---- a/src/dmr_bs.c
-+++ b/src/dmr_bs.c
-@@ -266,14 +266,14 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
-   if ( strcmp (sync, DMR_BS_DATA_SYNC) == 0 )
-   {
-     
--    fprintf (stderr,"%s ", timestr);
-+    // fprintf (stderr,"%s ", timestr);
-     if (internalslot == 0)
-     {
-       if (opts->inverted_dmr == 0)
-       {
--        fprintf (stderr,"Sync: +DMR  ");
-+        // fprintf (stderr,"Sync: +DMR  ");
-       }
--      else fprintf (stderr,"Sync: -DMR  ");
-+      else {}//fprintf (stderr,"Sync: -DMR  ");
-       
-       vc1 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
- 
-@@ -284,9 +284,9 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
-     {
-       if (opts->inverted_dmr == 0)
-       {
--        fprintf (stderr,"Sync: +DMR  ");
-+        // fprintf (stderr,"Sync: +DMR  ");
-       }
--      else fprintf (stderr,"Sync: -DMR  ");
-+      else {}//fprintf (stderr,"Sync: -DMR  ");
- 
-       vc2 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
- 
-diff --git a/src/dmr_data.c b/src/dmr_data.c
-index 87f4dfd..57e5647 100644
---- a/src/dmr_data.c
-+++ b/src/dmr_data.c
-@@ -232,10 +232,10 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-     sprintf(state->slot2light, "[sLoT2]");
-   }
- 
--  if (state->dmr_ms_mode == 0)
--  {
--    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
--  }
-+  // if (state->dmr_ms_mode == 0)
-+  // {
-+  //   fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-+  // }
- 
-   // Slot type - Second part - Parity bit
-   for (i = 0; i < 5; i++)
-@@ -292,6 +292,13 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-     info[(2*i) + 98] = (1 & (dibit >> 1));  // bit 1
-     info[(2*i) + 99] = (1 & dibit);         // bit 0
-   }
-+
-+  // if (state->dmr_ms_mode == 0 && burst != 0x09)
-+  if (burst != 0x09)
-+  {
-+    printFrameSync (opts, state, "+DMR ", 90, NULL); //don't think the values matter
-+    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
-+  }
-   
-   //don't run on MS Reverse Channel Data
-   if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
-@@ -303,15 +310,16 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-   } 
- 
-   //ending line break
--  fprintf(stderr, "\n");
-+  if (burst != 0x09)
-+    fprintf(stderr, "\n");
- 
-   END:
-   if (SlotTypeOk == 0 || cach_okay != 1)
-   {
--    fprintf (stderr, "%s", KRED);
--    fprintf (stderr, "| CACH/Burst FEC ERR");
--    fprintf (stderr, "%s", KNRM);
--    fprintf (stderr, "\n");
-+    // fprintf (stderr, "%s", KRED);
-+    // fprintf (stderr, "| CACH/Burst FEC ERR");
-+    // fprintf (stderr, "%s", KNRM);
-+    // fprintf (stderr, "\n");
-     dmr_reset_blocks (opts, state); //failsafe to reset all data header and blocks when bad tact or slottype
-   }
- 
-diff --git a/src/dmr_dburst.c b/src/dmr_dburst.c
-index fe81158..078524d 100644
---- a/src/dmr_dburst.c
-+++ b/src/dmr_dburst.c
-@@ -205,7 +205,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
-   //flag off prop head when not looking at data blocks
-   if (databurst != 0x6 && databurst != 0x7 && databurst != 0x8 && databurst != 0xA && databurst != 0xB) state->data_p_head[slot] = 0;
- 
--  if (databurst != 0xEB)
-+  if (databurst != 0xEB && databurst != 0x09)
-   {
-     if (state->dmr_ms_mode == 0)
-     { 
-diff --git a/src/dmr_flco.c b/src/dmr_flco.c
-index 839b085..e43b568 100644
---- a/src/dmr_flco.c
-+++ b/src/dmr_flco.c
-@@ -790,21 +790,23 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
-     crc = crc8_ok(slco_bits, 36);
- 
-     //only run SLCO on good everything
--    if (h1 && h2 && h3 && crc) dmr_slco (opts, state, slco_bits);
--    else
--    {
--      //this line break issue is wracking on my OCD for clean line breaks
--      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) ; //no line break if current slot is voice with payload enabled
--      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) ; //no line break if current slot is voice with payload enabled
--      else fprintf (stderr, "\n");
--      fprintf (stderr, "%s", KRED);
--      fprintf (stderr, " SLCO CRC ERR");
--      fprintf (stderr, "%s", KNRM);
--      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
--        fprintf (stderr, "\n");
--      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
--        fprintf (stderr, "\n");
--    } 
-+    if (h1 && h2 && h3 && crc) {} //dmr_slco (opts, state, slco_bits);
-+    // else
-+    // {
-+    //   //this line break issue is wracking on my OCD for clean line breaks
-+    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) {} //no line break if current slot is voice with payload enabled
-+    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) {} //no line break if current slot is voice with payload enabled
-+    //   else {} //fprintf (stderr, "\n");
-+    //   // fprintf (stderr, "%s", KRED);
-+    //   // fprintf (stderr, " SLCO CRC ERR");
-+    //   // fprintf (stderr, "%s", KNRM);
-+    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
-+    //     fprintf (stderr, "\n");
-+    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
-+    //     fprintf (stderr, "\n");
-+    // } 
-+
-+    UNUSED(opts);
-     
-   }
-   return (err); //return err value based on success or failure, even if we aren't checking it
-@@ -935,8 +937,11 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
-   uint8_t xpt_hash = (uint8_t)ConvertBitIntoBytes(&slco_bits[20], 8); //priority TG hash
- 
-   //initial line break
--  fprintf (stderr, "\n");
--  fprintf (stderr, "%s", KYEL);
-+  if (slco != 0)
-+  {
-+    fprintf (stderr, "\n");
-+    fprintf (stderr, "%s", KYEL);
-+  }
- 
-   if (slco == 0x2) //C_SYS_Parms
-   {
-@@ -973,7 +978,8 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
-     else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode);
-   }
-   else if (slco == 0x0) //null
--    fprintf (stderr, " SLCO NULL ");
-+    // fprintf (stderr, " SLCO NULL ");
-+    {}
-   else if (slco == 0x1)
-   {
-     fprintf (stderr, " Activity Update"); //102 361-2 7.1.3.2
-diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
-index 062bb20..f47a447 100644
---- a/src/dsd_frame_sync.c
-+++ b/src/dsd_frame_sync.c
-@@ -940,7 +940,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-                 sprintf(state->ftype, "DMR ");
-                 if (opts->errorbars == 1)
-                 {
--                  printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
-+                  // printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
-                 }
-                 state->lastsynctype = 10;
-                 state->last_cc_sync_time = time(NULL); 
-@@ -1068,7 +1068,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-                 sprintf(state->ftype, "DMR ");
-                 if (opts->errorbars == 1) //&& opts->dmr_stereo == 0
-                 {
--                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
-+                  // printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
-                 }
-                 state->lastsynctype = 13;
-                 state->last_cc_sync_time = time(NULL); 
-@@ -1443,7 +1443,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-             {
-               if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
-                 {
--                  fprintf (stderr,"Sync: no sync\n");
-+                  // fprintf (stderr,"Sync: no sync\n");
-                   // fprintf (stderr,"Press CTRL + C to close.\n"); 
- 
-                 }
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 98f2ead..b09cb81 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -1687,7 +1687,7 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
--  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW (20240523) \n");
-   #else
-   fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-   #endif
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index a5442af..514b9ae 100644
---- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -2423,7 +2423,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
--    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240523)");
-     printw ("------------------------------------------------------------------------------\n");
-   }
- #elif LIMAZULUTWEAKS
-@@ -2462,8 +2462,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
-       #endif
-       #ifdef AERO_BUILD
--      if (i == 5) printw (" %s ", "Aero Build");
--      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 5) printw (" %s ", "Cretu Build");
-+      if (i == 6) printw (" AW (20240523) \n");
-       #elif ZDEV_BUILD
-       if (i == 5) printw (" %s ", "AW ");
-       if (i == 6) printw (" %s \n", GIT_TAG);

patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch

@@ -1,120 +0,0 @@
-diff --git a/src/dmr_block.c b/src/dmr_block.c
-index 893b0e8..e7f9de7 100644
---- a/src/dmr_block.c
-+++ b/src/dmr_block.c
-@@ -783,6 +783,6 @@ void dmr_reset_blocks (dsd_opts * opts, dsd_state * state)
-   //reset some strings -- resetting call string here causes random blink on ncurses terminal (cap+)
-   // sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-   // sprintf (state->call_string[1], "%s", "                     "); //21 spaces
--  sprintf (state->dmr_lrrp_gps[0], "%s", "");
--  sprintf (state->dmr_lrrp_gps[1], "%s", "");
-+  // sprintf (state->dmr_lrrp_gps[0], "%s", ""); //disabled for dmr data call persistence #174
-+  // sprintf (state->dmr_lrrp_gps[1], "%s", ""); //disabled for dmr data call persistence #174
- }
-\ No newline at end of file
-diff --git a/src/dmr_data.c b/src/dmr_data.c
-index 3541152..3cae906 100644
---- a/src/dmr_data.c
-+++ b/src/dmr_data.c
-@@ -267,7 +267,20 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
-   state->color_code_ok = SlotTypeOk;
- 
-   //not sure why I still have two variables for this, need to look and see what state->color_code still ties into
--  if (SlotTypeOk == 1) state->dmr_color_code = state->color_code;
-+  if (SlotTypeOk == 1) 
-+  {
-+    if (state->dmr_color_code != state->color_code)
-+    {
-+      //Zero out values on color code change #174
-+      state->lasttg = 0;
-+      state->lasttgR =0;
-+      state->lastsrc = 0;
-+      state->lastsrcR = 0;
-+      sprintf (state->dmr_lrrp_gps[0], "%s", "");
-+      sprintf (state->dmr_lrrp_gps[1], "%s", "");
-+      state->dmr_color_code = state->color_code;
-+    }
-+  }
- 
-   /* Reconstitute the burst type */
-   burst = (uint8_t)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]);
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 5531ef3..5598793 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -257,10 +257,10 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   //zero out right away if not trunking
-   if (opts->p25_trunk == 0)
-   {
--    state->lasttg = 0;
--    state->lastsrc = 0;
--    state->lasttgR = 0;
--    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
- 
-     //zero out vc frequencies?
-     state->p25_vc_freq[0] = 0;
-@@ -290,10 +290,10 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   //mainly bugfix for ncurses and per call wavs (edacs) and also signal fade, etc
-   if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && time(NULL) - state->last_cc_sync_time > opts->trunk_hangtime) 
-   {
--    state->lasttg = 0;
--    state->lastsrc = 0;
--    state->lasttgR = 0;
--    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
- 
-   }
-     
-@@ -431,7 +431,7 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-   memset(state->dmr_alias_len, 0, sizeof(state->dmr_alias_len));
-   memset(state->dmr_alias_block_segment, 0, sizeof(state->dmr_alias_block_segment));
-   memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
--  memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
-+  // memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
- 
-   // memset(state->active_channel, 0, sizeof(state->active_channel));
- 
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index 4646e77..e9ecab1 100644
---- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -3104,7 +3104,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     }
- 
-     //LRRP
--    if(state->dmrburstL != 16) //only during data and no trunking
-+    // if(state->dmrburstL != 16) //only during data and no trunking //disabled for dmr data call persistence #174
-     {
-       attron(COLOR_PAIR(4));
-       printw  ("%s", state->dmr_lrrp_gps[0]);
-@@ -3298,7 +3298,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       }
- 
-       //LRRP
--      if(state->dmrburstR != 16) //only during data and no trunking
-+      // if(state->dmrburstR != 16) //only during data and no trunking //disabled for dmr data call persistence #174
-       {
-         attron(COLOR_PAIR(4));
-         printw  ("%s", state->dmr_lrrp_gps[1]);
-@@ -3978,10 +3978,10 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     dmr_reset_blocks (opts, state);
- 
-     //zero out additional items
--    state->lasttg = 0;
--    state->lasttgR = 0;
--    state->lastsrc = 0;
--    state->lastsrcR = 0;
-+    // state->lasttg = 0; //disabled for dmr voice call persistence #174
-+    // state->lasttgR = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrc = 0; //disabled for dmr voice call persistence #174
-+    // state->lastsrcR = 0; //disabled for dmr voice call persistence #174
-     state->payload_algid = 0;
-     state->payload_algidR = 0;
-     state->payload_keyid = 0;

patch/extra/ghost_box_wip3_awd.patch

@@ -1,330 +0,0 @@
-diff --git a/include/dsd.h b/include/dsd.h
-index 4a75702..3cf085e 100644
---- a/include/dsd.h
-+++ b/include/dsd.h
-@@ -317,6 +317,7 @@ typedef struct
-   long int rtl_rms;
-   int monitor_input_audio;
-   int analog_only;
-+  int ghosts_only;
-   int pulse_raw_rate_in;
-   int pulse_raw_rate_out;
-   int pulse_digi_rate_in;
-@@ -1342,6 +1343,8 @@ void rtl_udp_tune(dsd_opts * opts, dsd_state * state, long int frequency);
- long int GetCurrentFreq(int sockfd);
- bool SetFreq(int sockfd, long int freq);
- bool SetModulation(int sockfd, int bandwidth);
-+bool SetModulationWFM(int sockfd, int bandwidth);
-+void death (dsd_opts * opts, dsd_state * state);
- //commands below unique to GQRX only, not usable on SDR++
- bool GetSignalLevel(int sockfd, double *dBFS);
- bool GetSquelchLevel(int sockfd, double *dBFS);
-diff --git a/src/3.c b/src/3.c
-index e104993..b9033bd 100644
---- a/src/3.c
-+++ b/src/3.c
-@@ -591,4 +591,176 @@ long int raw_rms(int16_t *samples, int len, int step) //use samplespersymbol as
-   rms = (long int)sqrt((p-err) / len);
-   if (rms < 0) rms = 150;
-   return rms;
--}
-\ No newline at end of file
-+}
-+
-+
-+//Ghosts
-+void death (dsd_opts * opts, dsd_state * state)
-+{
-+	int i, x, result = 0;
-+	short ghosts[960];
-+	short spooks[960];
-+	short demons[960];
-+	short sample = 0;
-+
-+	memset (ghosts, 0, 960*sizeof(short));
-+	memset (spooks, 0, 960*sizeof(short));
-+	memset (demons, 0, 960*sizeof(short));
-+
-+	while (!exitflag) //while the software is running
-+	{
-+		//death on speaks at 48k/1 short output
-+    if (opts->audio_in_type == 0)
-+    {
-+      for (i = 0; i < 960; i++)
-+      {
-+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
-+        ghosts[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
-+        spooks[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
-+        demons[i] = sample;
-+      }
-+    }
-+
-+		if (opts->audio_in_type == 8)
-+    {
-+      for (i = 0; i < 960; i++)
-+      {
-+        result = sf_read_short(opts->tcp_file_in, &sample, 1);
-+        if (result == 0)
-+        {
-+          sf_close(opts->tcp_file_in);
-+          fprintf (stderr, "Connection to the Underworld Severed.\n");
-+          fprintf (stderr, "Closing Death Speech Decoder.\n");
-+          cleanupAndExit(opts, state);
-+        }
-+        ghosts[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        result = sf_read_short(opts->tcp_file_in, &sample, 1);
-+        if (result == 0)
-+        {
-+          sf_close(opts->tcp_file_in);
-+          fprintf (stderr, "Connection to the Underworld Severed.\n");
-+          fprintf (stderr, "Closing Death Speech Decoder.\n");
-+          cleanupAndExit(opts, state);
-+        }
-+        spooks[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        result = sf_read_short(opts->tcp_file_in, &sample, 1);
-+        if (result == 0)
-+        {
-+          sf_close(opts->tcp_file_in);
-+          fprintf (stderr, "Connection to the Underworld Severed.\n");
-+          fprintf (stderr, "Closing Death Speech Decoder.\n");
-+          cleanupAndExit(opts, state);
-+        }
-+        demons[i] = sample;
-+      }
-+    }
-+
-+		//RTL Input
-+    #ifdef USE_RTLSDR
-+    if (opts->audio_in_type == 3)
-+    {
-+      for (i = 0; i < 960; i++)
-+      {
-+        get_rtlsdr_sample(&sample, opts, state);
-+        ghosts[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        get_rtlsdr_sample(&sample, opts, state);
-+        spooks[i] = sample;
-+      }
-+
-+      for (i = 0; i < 960; i++)
-+      {
-+        get_rtlsdr_sample(&sample, opts, state);
-+        demons[i] = sample;
-+      }
-+    }
-+    #endif
-+
-+		//The Dead Don't Like OSS input yet
-+
-+		//Listen to the Howls of the Deceased
-+		if (opts->audio_out_type == 0 && opts->slot1_on == 1)
-+    {
-+      pa_simple_write(opts->pulse_raw_dev_out, ghosts, 960*2, NULL);
-+      pa_simple_write(opts->pulse_raw_dev_out, spooks, 960*2, NULL);
-+      pa_simple_write(opts->pulse_raw_dev_out, demons, 960*2, NULL);
-+    }
-+
-+    if (opts->audio_out_type == 8) //UDP Audio
-+    {
-+      udp_socket_blasterA (opts, state, 960*2, ghosts);
-+      udp_socket_blasterA (opts, state, 960*2, spooks);
-+      udp_socket_blasterA (opts, state, 960*2, demons);
-+    }
-+
-+    //added a condition check so that if OSS output and 8K, switches to 48K when opening OSS
-+    if (opts->audio_out_type == 5 && opts->floating_point == 0 && opts->slot1_on == 1)
-+    {
-+      write (opts->audio_out_fd, ghosts, 960*2);
-+      write (opts->audio_out_fd, spooks, 960*2);
-+      write (opts->audio_out_fd, demons, 960*2);
-+    }
-+
-+    //STDOUT -- I don't see the harm of adding this here, will be fine for analog only or digital only (non-mixed analog and digital)
-+    if (opts->audio_out_type == 1 && opts->floating_point == 0 && opts->slot1_on == 1)
-+    {
-+      write (opts->audio_out_fd, ghosts, 960*2);
-+      write (opts->audio_out_fd, spooks, 960*2);
-+      write (opts->audio_out_fd, demons, 960*2);
-+    }
-+
-+		//Undulate the Crystal Ball
-+		if (x >= opts->trunk_hangtime)
-+		{
-+			long int spook_channel = state->trunk_lcn_freq[0];
-+
-+			//rigctl
-+			if (opts->use_rigctl == 1)
-+			{
-+				if (opts->setmod_bw != 0 )  SetModulationWFM(opts->rigctl_sockfd, opts->setmod_bw);
-+				SetFreq(opts->rigctl_sockfd, spook_channel);
-+			}
-+
-+			//rtl
-+			if (opts->audio_in_type == 3)
-+			{
-+				#ifdef USE_RTLSDR
-+				rtl_dev_tune(opts, spook_channel);
-+				#endif
-+			}
-+
-+			//
-+			state->trunk_lcn_freq[0] += 200000;
-+
-+			if (state->trunk_lcn_freq[0] > 106100000)
-+				state->trunk_lcn_freq[0] = 87900000;
-+
-+			x = 0;
-+
-+		}
-+
-+		x++;
-+
-+	} //end while loop
-+} //end ghosts
-\ No newline at end of file
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index ca878e9..f14995d 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -696,6 +696,7 @@ initOpts (dsd_opts * opts)
- 
-   opts->monitor_input_audio = 0; //enable with -8
-   opts->analog_only = 0; //only turned on with -fA
-+  opts->ghosts_only = 0; //ghostbox mode with -fG
- 
-   opts->inverted_p2 = 0;
-   opts->p2counter = 0;
-@@ -1358,6 +1359,7 @@ usage ()
-   printf ("Decoder options:\n");
-   printf ("  -fa           Auto Detection\n");
-   printf ("  -fA           Passive Analog Audio Monitor\n");
-+  printf ("  -fG           Ghosts, Demons, Specters, Ghouls, and Skeletons (Ghost Box)\n");
-   printf ("  -ft           TDMA Trunking P25p1 Control and Voice, P25p2 Trunked Channels, and DMR\n");
-   printf ("  -fs           DMR TDMA BS and MS Simplex\n");
-   printf ("  -f1           Decode only P25 Phase 1\n");
-@@ -2172,6 +2174,35 @@ main (int argc, char **argv)
-             sprintf (opts.output_name, "Analog Monitor");
-             fprintf (stderr,"Only Monitoring Passive Analog Signal\n");
-           }
-+          else if (optarg[0] == 'G') //listen to spooky scary skeletons
-+          {
-+            opts.frame_dstar = 0;
-+            opts.frame_x2tdma = 0;
-+            opts.frame_p25p1 = 0;
-+            opts.frame_p25p2 = 0;
-+            opts.frame_nxdn48 = 0;
-+            opts.frame_nxdn96 = 0;
-+            opts.frame_dmr = 0;
-+            opts.frame_dpmr = 0;
-+            opts.frame_provoice = 0;
-+            opts.frame_ysf = 0;
-+            opts.frame_m17 = 0;
-+            opts.pulse_digi_rate_out = 8000;
-+            opts.pulse_digi_out_channels = 1;
-+            opts.dmr_stereo = 0;
-+            state.dmr_stereo = 0;
-+            opts.dmr_mono = 0;
-+            state.rf_mod = 0;
-+            opts.monitor_input_audio = 1;
-+            opts.ghosts_only = 1;
-+            state.trunk_lcn_freq[0] = 87900000; //everybody knows ghosts live on the Broadcast FM band
-+            opts.setmod_bw = 150000; //Ghosts annunciate clearly with about 150,000 PB
-+            opts.trunk_hangtime = 0;
-+            opts.rtlsdr_center_freq = 850000000;
-+            opts.rtl_bandwidth = 48;
-+            sprintf (opts.output_name, "Ghost Box");
-+            fprintf (stderr,"Sounds of the Dead.\n");
-+          }
-           else if (optarg[0] == 'd')
-           {
-             opts.frame_dstar = 1;
-@@ -3462,6 +3493,22 @@ main (int argc, char **argv)
-       processM17IPF(&opts, &state);
-     }
- 
-+    else if (opts.ghosts_only == 1)
-+    {
-+      #ifdef USE_RTLSDR
-+      if(opts.audio_in_type == 3)
-+        open_rtlsdr_stream(&opts);
-+      #endif
-+
-+      if (opts.audio_in_type == 0)
-+        openPulseInput(&opts);
-+
-+      if (opts.audio_out_type == 0)
-+        openPulseOutput(&opts);
-+
-+      death(&opts, &state);
-+    }
-+
-     else
-     {
- 
-diff --git a/src/dsd_rigctl.c b/src/dsd_rigctl.c
-index 820ac7e..f12bacc 100644
---- a/src/dsd_rigctl.c
-+++ b/src/dsd_rigctl.c
-@@ -163,6 +163,28 @@ bool SetModulation(int sockfd, int bandwidth)
-     return true;
- }
- 
-+bool SetModulationWFM(int sockfd, int bandwidth) 
-+{
-+    char buf[BUFSIZE];
-+    //the bandwidth is now a user/system based configurable variable
-+    sprintf (buf, "M WFM %d\n", bandwidth); //SDR++ has changed the token from FM to NFM, even if Ryzerth fixes it later, users may still have an older version
-+    Send(sockfd, buf);
-+    Recv(sockfd, buf);
-+
-+    //if it fails the first time, send the other token instead
-+    if (strcmp(buf, "RPRT 1\n") == 0 ) //sdr++ has a linebreak here, is that in all versions of the protocol?
-+    {
-+        sprintf (buf, "M WFM %d\n", bandwidth); //anything not SDR++
-+        Send(sockfd, buf);
-+        Recv(sockfd, buf);
-+    }
-+
-+    if (strcmp(buf, "RPRT 1\n") == 0 )
-+        return false;
-+
-+    return true;
-+}
-+
- bool GetSignalLevel(int sockfd, double *dBFS)
- {
-     char buf[BUFSIZE];
-diff --git a/src/rtl_sdr_fm.cpp b/src/rtl_sdr_fm.cpp
-index ad04667..dd6566c 100644
---- a/src/rtl_sdr_fm.cpp
-+++ b/src/rtl_sdr_fm.cpp
-@@ -1034,7 +1034,7 @@ void open_rtlsdr_stream(dsd_opts *opts)
- 	//init with low pass if decoding P25 or EDACS/Provoice
- 	if (opts->frame_p25p1 == 1 || opts->frame_p25p2 == 1 || opts->frame_provoice == 1)
-   	demod_init_ro2(&demod);
--	else if (opts->analog_only == 1 || opts->m17encoder == 1)
-+	else if (opts->analog_only == 1 || opts->m17encoder == 1 || opts->ghosts_only == 1)
- 		demod_init_analog(&demod);
- 	else demod_init(&demod);
-   output_init(&output);

patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240601b.patch

@@ -1,499 +0,0 @@
-diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
-index 6ee44d6..45502a4 100644
---- a/src/dmr_csbk.c
-+++ b/src/dmr_csbk.c
-@@ -520,6 +520,26 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               //rigctl
-               if (opts->use_rigctl == 1)
-               {
-+                
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 if (GetCurrentFreq(opts->rigctl_sockfd) != state->p25_cc_freq)
-                   dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away from current frequency
-@@ -554,6 +574,26 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               else if (opts->audio_in_type == 3)
-               {
-                 #ifdef USE_RTLSDR
-+                
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 uint32_t tempf = (uint32_t)state->p25_cc_freq;
-                 if (opts->rtlsdr_center_freq != tempf)
-diff --git a/src/dmr_flco.c b/src/dmr_flco.c
-index 839b085..637debf 100644
---- a/src/dmr_flco.c
-+++ b/src/dmr_flco.c
-@@ -298,20 +298,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
- 
-     if (type != 2) //VLC and EMB, set our target, source, so, and fid per channel
-     {
--      if (state->currentslot == 0)
--      {
--        state->dmr_fid = fid;
--        state->dmr_so = so;
--        state->lasttg = target;
--        state->lastsrc = source;
--      }
--      if (state->currentslot == 1)
--      {
--        state->dmr_fidR = fid;
--        state->dmr_soR = so;
--        state->lasttgR = target;
--        state->lastsrcR = source;
--      }
-+      //moved per call further down past the call_string stuff
- 
-       //update cc amd vc sync time for trunking purposes (particularly Con+)
-       if (opts->p25_is_tuned == 1)
-@@ -337,6 +324,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gain = opts->audio_gain;
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+        {
-+          closeWavOutFileL (opts, state);
-+          opts->wav_out_f = NULL;
-+        }
-       }
-       if (state->currentslot == 1)
-       {
-@@ -350,6 +343,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gainR = opts->audio_gain; 
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+        {
-+          closeWavOutFileR (opts, state);
-+          opts->wav_out_fR = NULL;
-+        }
-       }
-       
-     }
-@@ -612,6 +611,69 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-       fprintf (stderr, "Key %010llX ", state->RR);
-       fprintf (stderr, "%s ", KNRM);
-     }
-+
-+    if (type != 2)
-+    {
-+      if (state->currentslot == 0)
-+      {
-+        state->dmr_fid = fid;
-+        state->dmr_so = so;
-+        state->lasttg = target;
-+        state->lastsrc = source;
-+        char * timestr = NULL;
-+        char * datestr = NULL;
-+        timestr = getTime();
-+        datestr = getDate();
-+
-+        //setup a call string for the per call (group/private and/or emergency)
-+        char cs[200]; memset (cs, 0, 200*sizeof(char));
-+        int x = 0;
-+        for (int i = 0; i < 200; i++)
-+        {
-+          //copy over non space and non termination values from call string
-+          if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
-+            cs[x++] = state->call_string[0][i];
-+        }
-+        cs[x] = 0; //terminate
-+
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f == NULL)
-+        {
-+          sprintf (opts->wav_out_file, "%s/%s %s CC %d - %s - TG %d - RD %d", opts->wav_out_dir, datestr, timestr, state->dmr_color_code, cs, target, source);
-+          openWavOutFileL (opts, state);
-+        }
-+        free (timestr); free(datestr);
-+      }
-+      if (state->currentslot == 1)
-+      {
-+        state->dmr_fidR = fid;
-+        state->dmr_soR = so;
-+        state->lasttgR = target;
-+        state->lastsrcR = source;
-+        char * timestr = NULL;
-+        char * datestr = NULL;
-+        timestr = getTime();
-+        datestr = getDate();
-+
-+        //setup a call string for the per call (group/private and/or emergency)
-+        char cs[200]; memset (cs, 0, 200*sizeof(char));
-+        int x = 0;
-+        for (int i = 0; i < 200; i++)
-+        {
-+          //copy over non space and non termination values from call string
-+          if (i != 0 && state->call_string[1][i] != ' ' && state->call_string[1][i] != 0)
-+            cs[x++] = state->call_string[1][i];
-+        }
-+        cs[x] = 0; //terminate
-+
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR == NULL)
-+        {
-+          sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - %s - TG %d - RD %d", opts->wav_out_dir, datestr, timestr, state->dmr_color_code, cs, target, source);
-+          openWavOutFileR (opts, state);
-+        }
-+      }
-+    }
-     
-   }
- 
-diff --git a/src/dsd_file.c b/src/dsd_file.c
-index 6f4ecaa..f4b201d 100644
---- a/src/dsd_file.c
-+++ b/src/dsd_file.c
-@@ -555,6 +555,16 @@ void closeWavOutFile (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+  result = rename (opts->wav_out_file, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileF %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_file, newfilename, 1023);
-+  opts->wav_out_file[1023] = 0;
-+
- }
- 
- void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-@@ -562,6 +572,16 @@ void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+  result = rename (opts->wav_out_file, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileL %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_file, newfilename, 1023);
-+  opts->wav_out_file[1023] = 0;
-+
- }
- 
- void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-@@ -569,6 +589,15 @@ void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_fR);
-+  char newfilename[1032];
-+  int result; UNUSED(result);
-+  sprintf (newfilename, "%s.wav", opts->wav_out_fileR);
-+  result = rename (opts->wav_out_fileR, newfilename);
-+  // fprintf (stderr, "\n Close WAV FileR %s; Result: %d \n", newfilename, result);
-+
-+  //copy back to wav_out_file string for ncurses display
-+  memcpy (opts->wav_out_fileR, newfilename, 1023);
-+  opts->wav_out_fileR[1023] = 0;
- }
- 
- void closeWavOutFileRaw (dsd_opts * opts, dsd_state * state)
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 3fb0893..a6d45e5 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -107,6 +107,32 @@ void
- noCarrier (dsd_opts * opts, dsd_state * state)
- {
- 
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
- // #ifdef AERO_BUILD //NOTE: Blame seems to be synctest8 not being initialized (will continue to test)
- // //TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
- // if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-@@ -1692,9 +1718,9 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
--  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW (20240601) G Build\n");
-   #else
--  fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-+  fprintf (stderr, "Build Version: AW %s G Build\n", GIT_TAG);
-   #endif
-   fprintf (stderr,"MBElib Version: %s\n", versionstr);
- 
-diff --git a/src/dsd_mbe.c b/src/dsd_mbe.c
-index fe71539..2702b5d 100644
---- a/src/dsd_mbe.c
-+++ b/src/dsd_mbe.c
-@@ -1197,7 +1197,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0)
-     {
-       //write wav to per call on left channel Slot 1
--      writeSynthesizedVoice (opts, state);
-+      if (opts->wav_out_f != NULL)
-+        writeSynthesizedVoice (opts, state);
-     }
-   }
- 
-@@ -1207,7 +1208,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0)
-     {
-       //write wav to per call on right channel Slot 2
--      writeSynthesizedVoiceR (opts, state);
-+      if (opts->wav_out_fR != NULL)
-+        writeSynthesizedVoiceR (opts, state);
-     }
-   }
- 
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index a5442af..0cd538d 100644
---- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -1071,7 +1071,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
-         if (choicec == 12)
-         {
-           //flesh out all closewavs and sprint "" wav filenames
--          closeWavOutFile (opts, state);
-+          // closeWavOutFile (opts, state);
-           closeWavOutFileL (opts, state);
-           closeWavOutFileR (opts, state);
-           //closeWavOutFileRaw (opts, state);
-@@ -2153,7 +2153,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       char cs[200]; memcpy (cs, state->call_string[0], 200*sizeof(char));
- 
-       //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileL (opts, state);
-+      if (opts->wav_out_f != NULL)
-+        closeWavOutFileL (opts, state);
- 
-       // sprintf (opts->wav_out_file, "%s/%s %s NXDN - RAN %d - DST %d - SRC %d.wav", opts->wav_out_dir, datestr, timestr, rn, tgn, src); //original
-       sprintf (opts->wav_out_file, "%s/%s %s NXDN - RAN %d - %s - DST %d - SRC %d.wav", opts->wav_out_dir, datestr, timestr, rn, cs, tgn, src); //with call string
-@@ -2198,27 +2199,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
--    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
--    {
--      //setup a call string for the per call (group/private and/or emergency)
--      char cs[200]; memset (cs, 0, 200*sizeof(char));
--      int x = 0;
--      for (int i = 0; i < 200; i++)
--      {
--        //copy over non space and non termination values from call string
--        if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
--          cs[x++] = state->call_string[0][i];
--      }
--      cs[x] = 0; //terminate
--
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileL (opts, state);
--
--      // sprintf (opts->wav_out_file, "%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tg, rd); //original
--      sprintf (opts->wav_out_file, "%s/%s %s MS - CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tg, rd); //with cs call string
--
--      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2233,7 +2221,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   }
- 
-   //DMR BS Slot 1 - matrix 0-4
--  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 || lls == 35 || lls == 36) )
-+  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 ) ) //|| lls == 35 || lls == 36
-   {
- 
-     for (short int k = 0; k < 4; k++)
-@@ -2254,27 +2242,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[4][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
--    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
--    {
--      //setup a call string for the per call (group/private and/or emergency)
--      char cs[200]; memset (cs, 0, 200*sizeof(char));
--      int x = 0;
--      for (int i = 0; i < 200; i++)
--      {
--        //copy over non space and non termination values from call string
--        if (i != 0 && state->call_string[0][i] != ' ' && state->call_string[0][i] != 0)
--          cs[x++] = state->call_string[0][i];
--      }
--      cs[x] = 0; //terminate
--
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileL (opts, state);
--
--      // sprintf (opts->wav_out_file, "%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tg, rd); //original
--      sprintf (opts->wav_out_file, "%s/%s %s CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tg, rd); //with call string
--
--      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2310,34 +2285,21 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rdR and tgR are not 0
--    if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
--    {
--      //setup a call string for the per call (group/private and/or emergency)
--      char cs[200]; memset (cs, 0, 200*sizeof(char));
--      int x = 0;
--      for (int i = 0; i < 200; i++)
--      {
--        //copy over non space and non termination values from call string
--        if (i != 0 && state->call_string[1][i] != ' ' && state->call_string[1][i] != 0)
--          cs[x++] = state->call_string[1][i];
--      }
--      cs[x] = 0; //terminate
--
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileR (opts, state);
--
--      // sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, tgR, rdR); //original
--      sprintf (opts->wav_out_fileR, "%s/%s %s CC %d - %s - DST %d - SRC %d.wav",  opts->wav_out_dir, datestr, timestr, dcc, cs, tgR, rdR); //with call string
--
--      openWavOutFileR (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_fR != NULL)
-+    //     closeWavOutFileR (opts, state);
-+    //   sprintf (opts->wav_out_fileR, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tgR, rdR);
-+    //   openWavOutFileR (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
--    if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
--    {
--      //fprintf (stderr, "BEEP 1 BS RIGHT\n");
--      beeper (opts, state, 1);
--      state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
--    }
-+    // if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //fprintf (stderr, "BEEP 1 BS RIGHT\n");
-+    //   beeper (opts, state, 1);
-+    //   state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
-+    // }
- 
-     memset(state->dmr_alias_block_segment[1], 0, sizeof(state->dmr_alias_block_segment[1]));
-     sprintf (state->dmr_embedded_gps[1], "%s", "");
-@@ -2423,8 +2385,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
--    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
--    printw ("------------------------------------------------------------------------------\n");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240601)");
-+    printw ("------------------------------------------------------------------------------\n"); 
-   }
- #elif LIMAZULUTWEAKS
-   if (opts->ncurses_compact == 1)
-@@ -2462,13 +2424,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
-       #endif
-       #ifdef AERO_BUILD
--      if (i == 5) printw (" %s ", "Aero Build");
--      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 5) printw (" %s ", "G Build");
-+      if (i == 6) printw (" AW (20240601) \n");
-       #elif ZDEV_BUILD
--      if (i == 5) printw (" %s ", "AW ");
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
--      #else
--      if (i == 5) printw (" %s ", "AW ");
-+      #else 
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-       #endif
-       else printw ("\n");
-@@ -4426,7 +4388,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (c == 112) //'p' key - stop all per call wav files
-   {
-     //hope this one doesn't cause random crashing or garbage writing
--    closeWavOutFile (opts, state);
-+    // closeWavOutFile (opts, state);
-     closeWavOutFileL (opts, state);
-     closeWavOutFileR (opts, state);
-     sprintf (opts->wav_out_file, "%s", "");

patch/moto_type2_starter_pack.patch

@@ -1,257 +0,0 @@
-diff --git a/include/dsd.h b/include/dsd.h
-index 4a75702..355837f 100644
---- a/include/dsd.h
-+++ b/include/dsd.h
-@@ -357,6 +357,8 @@ typedef struct
-   int frame_m17;
-   int inverted_m17;
- 
-+  int frame_typeii;
-+
-   FILE *symbolfile;
-   int call_alert;
- 
-@@ -989,6 +991,10 @@ typedef struct
- #define INV_DPMR_FRAME_SYNC_3 "311313111133"
- #define INV_DPMR_FRAME_SYNC_4 "111333331133131131111313"
- 
-+//Motorola Type II Sync Pattern 0xAC binary 1010 1100
-+#define TYPE_II_SYNC "13131133" //baesd on what getDibit returns
-+#define TYPE_II_SINV "31313311" //baesd on what getDibit returns
-+
- /*
-  * function prototypes
-  */
-@@ -1357,6 +1363,9 @@ void edacs(dsd_opts * opts, dsd_state * state);
- unsigned long long int edacs_bch (unsigned long long int message);
- void eot_cc(dsd_opts * opts, dsd_state * state); //end of TX return to CC
- 
-+//Type II
-+void type_ii(dsd_opts * opts, dsd_state * state);
-+
- //Generic Tuning Functions
- void return_to_cc (dsd_opts * opts, dsd_state * state);
- 
-diff --git a/src/dsd_dibit.c b/src/dsd_dibit.c
-index 5424f7a..9b403cf 100644
---- a/src/dsd_dibit.c
-+++ b/src/dsd_dibit.c
-@@ -222,13 +222,14 @@ invert_dibit(int dibit)
- int digitize (dsd_opts* opts, dsd_state* state, int symbol)
- {
-   // determine dibit state
--  if ((state->synctype == 6) || (state->synctype == 14)|| (state->synctype == 18) || (state->synctype == 37))
-+  if ((state->synctype == 6) || (state->synctype == 14)|| (state->synctype == 18) || (state->synctype == 37) || (state->synctype == 40))
- 
-     {
-       //  6 +D-STAR
-       // 14 +ProVoice
-       // 18 +D-STAR_HD
-       // 37 +EDACS
-+      // 41 +TypeII
- 
-       if (symbol > state->center)
-         {
-@@ -243,12 +244,13 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
-           return (1);               // +3
-         }
-     }
--  else if ((state->synctype == 7) || (state->synctype == 15)|| (state->synctype == 19) || (state->synctype == 38))
-+  else if ((state->synctype == 7) || (state->synctype == 15)|| (state->synctype == 19) || (state->synctype == 38) || (state->synctype == 41))
-     {
-       //  7 -D-STAR
-       // 15 -ProVoice
-       // 19 -D-STAR_HD
-       // 38 -EDACS
-+      // 41 -TypeII
- 
-       if (symbol > state->center)
-         {
-diff --git a/src/dsd_frame.c b/src/dsd_frame.c
-index 577169c..58fa07c 100644
---- a/src/dsd_frame.c
-+++ b/src/dsd_frame.c
-@@ -269,6 +269,12 @@ processFrame (dsd_opts * opts, dsd_state * state)
-       processYSF(opts, state);
-       return;
-     }
-+    //TypeII
-+    else if (state->synctype == 40 || state->synctype == 41)
-+    {
-+      type_ii(opts, state);
-+      return;
-+    }
-     //M17
-     else if ((state->synctype == 16) || (state->synctype == 9)  || (state->synctype == 17) || (state->synctype == 8)  || 
-              (state->synctype == 76) || (state->synctype == 77) || (state->synctype == 86) || (state->synctype == 87) ||
-diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
-index e10f3cc..7f5fbf5 100644
---- a/src/dsd_frame_sync.c
-+++ b/src/dsd_frame_sync.c
-@@ -117,6 +117,8 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-    * 36 = -P25 P2
-    * 37 = +EDACS
-    * 38 = -EDACS
-+   * 40 = +Type2
-+   * 41 = -Type2
-    */
- 
- 
-@@ -205,7 +207,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-   {
-     t_max = 12; //based on Frame_Sync_2 pattern
-   }
--  else if (opts->frame_m17 == 1)
-+  else if (opts->frame_m17 == 1 || opts->frame_typeii == 1)
-   {
-     t_max = 8;
-   }
-@@ -581,6 +583,40 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
-           }
-           //end YSF sync
- 
-+          //Motorola Type II
-+          strncpy(synctest8, (synctest_p - 7), 8);
-+          if (opts->frame_typeii == 1)
-+          {
-+            if (strcmp(synctest8, TYPE_II_SYNC) == 0)
-+            {
-+              if (state->lastsynctype == 40)
-+              {
-+                printFrameSync (opts, state, "+Type II", synctest_pos + 1, modulation);
-+                state->carrier = 1;
-+                state->offset = synctest_pos;
-+                state->max = ((state->max) + lmax) / 2;
-+                state->min = ((state->min) + lmin) / 2;
-+                state->lastsynctype = 40;
-+                return (40);
-+              }
-+              else state->lastsynctype = 40;
-+            }
-+            else if (strcmp(synctest8, TYPE_II_SINV) == 0)
-+            {
-+              if (state->lastsynctype == 41)
-+              {
-+                printFrameSync (opts, state, "-Type II", synctest_pos + 1, modulation);
-+                state->carrier = 1;
-+                state->offset = synctest_pos;
-+                state->max = ((state->max) + lmax) / 2;
-+                state->min = ((state->min) + lmin) / 2;
-+                state->lastsynctype = 41;
-+                return (41);
-+              }
-+              else state->lastsynctype = 41;
-+            }
-+          }
-+
-           //M17 Sync -- Just STR and LSF for now
-           strncpy(synctest16, (synctest_p - 15), 16);
-           strncpy(synctest8, (synctest_p - 7), 8);
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index ca878e9..c5a3e95 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -622,6 +622,7 @@ initOpts (dsd_opts * opts)
-   opts->frame_provoice = 0;
-   opts->frame_ysf = 1;
-   opts->frame_m17 = 0;
-+  opts->frame_typeii = 0;
-   opts->mod_c4fm = 1;
-   opts->mod_qpsk = 0;
-   opts->mod_gfsk = 0;
-@@ -1377,6 +1378,7 @@ usage ()
-   printf ("  -fe             Decode only EDACS EA/ProVoice*\n");
-   printf ("  -fE             Decode only EDACS EA/ProVoice with ESK 0xA0*\n");
-   printf ("  -fm             Decode only dPMR*\n");
-+  printf ("  -fT             Decode only Type II (Smartnet/Smartzone)*\n");
-   printf ("  -l            Disable DMR, dPMR, NXDN, M17 input filtering\n");
-   printf ("  -u <num>      Unvoiced speech quality (default=3)\n");
-   printf ("  -xx           Expect non-inverted X2-TDMA signal\n");
-@@ -2431,6 +2433,39 @@ main (int argc, char **argv)
-             opts.rtl_bandwidth = 24;
-             // opts.rtl_gain_value = 36;
-           }
-+          else if (optarg[0] == 'T') //Motorola Type II
-+          {
-+            opts.frame_dstar = 0;
-+            opts.frame_x2tdma = 0;
-+            opts.frame_p25p1 = 0;
-+            opts.frame_p25p2 = 0;
-+            opts.frame_nxdn48 = 0;
-+            opts.frame_nxdn96 = 0;
-+            opts.frame_dmr = 0;
-+            opts.frame_dpmr = 0;
-+            opts.frame_provoice = 0;
-+            opts.frame_ysf = 0;
-+            opts.frame_m17 = 0;
-+            opts.frame_typeii = 1;
-+            ////to maintain 10/4 sample per symbol rate, we need to run at 36000 
-+            //to hit TypeII's 3600 bps rating. BW values in rtl_fm are also modified
-+            //similarly, but testing will need to be done, this MAY NOT be viable in DSD-FME.
-+            opts.pulse_digi_rate_in = 36000;
-+            opts.wav_sample_rate = 36000;
-+            opts.mod_c4fm = 1;
-+            opts.mod_qpsk = 0;
-+            opts.mod_gfsk = 0; //might still be better as gfsk
-+            state.rf_mod = 2;
-+            opts.pulse_digi_rate_out = 8000;
-+            opts.pulse_digi_out_channels = 1;
-+            opts.dmr_stereo = 0;
-+            opts.dmr_mono = 0;
-+            state.dmr_stereo = 0;
-+            // opts.setmod_bw = 12500;
-+            sprintf (opts.output_name, "Type II");
-+            // fprintf (stderr,"Setting symbol rate to 4800 / second\n");
-+            fprintf (stderr,"Decoding Motorola Type II frames.\n");
-+          }
-           else if (optarg[0] == '1')
-           {
-             opts.frame_dstar = 0;
-diff --git a/src/rtl_sdr_fm.cpp b/src/rtl_sdr_fm.cpp
-index ad04667..954c6dc 100644
---- a/src/rtl_sdr_fm.cpp
-+++ b/src/rtl_sdr_fm.cpp
-@@ -1025,6 +1025,7 @@ void rtlsdr_sighandler()
- void open_rtlsdr_stream(dsd_opts *opts)
- {
-   int r;
-+	if (opts->frame_typeii == 1) bandwidth_divisor = 36000;
- 	rtl_bandwidth =  opts->rtl_bandwidth * 1000; //reverted back to straight value
- 	bandwidth_multiplier = (bandwidth_divisor / rtl_bandwidth);
- 	volume_multiplier = 1; //moved to external handling to be more dynamic
-diff --git a/src/typeII.c b/src/typeII.c
-new file mode 100644
-index 0000000..eb0cd56
---- /dev/null
-+++ b/src/typeII.c
-@@ -0,0 +1,29 @@
-+/*-------------------------------------------------------------------------------
-+ * typeII.c
-+ * Motorola Type II Decoder (WIP)
-+ * 
-+ * 
-+ * 
-+ *
-+ * LWVMOBILE
-+ * 2024-03 DSD-FME Florida Man Edition
-+ *-----------------------------------------------------------------------------*/
-+
-+#include "dsd.h"
-+
-+//Type II
-+void type_ii(dsd_opts * opts, dsd_state * state)
-+{
-+  int i;
-+  uint8_t t2[80]; memset(t2, 0, sizeof(t2));
-+
-+  for (i = 0; i < 76; i++)
-+    t2[i] = getDibit(opts, state);
-+
-+  //debug dump collected bits
-+  fprintf (stderr, "Frame:");
-+  for (i = 0; i < 10; i++)
-+    fprintf (stderr, " %02X", (uint8_t)ConvertBitIntoBytes(&t2[i*8], 8));
-+
-+  fprintf (stderr, "\n");
-+}
-\ No newline at end of file

rebuild.sh

@@ -1,8 +1,8 @@
 #! /bin/bash
-#
 clear
-printf "DSD-FME Digital Speech Decoder - Florida Man Edition
-Automatic Git Pull and Rebuild\n\n"
+echo DSD-FME Digital Speech Decoder - Florida Man Edition
+echo Automatic Git Pull and Rebuild
+echo 
 sleep 1
 ##Open your clone folder##
 git pull
@@ -10,6 +10,7 @@ sleep 2
 ##cd into your build folder##
 cd build
 cmake ..
-make -j $(nproc)
+make -j `nproc`
 sudo make install
-sudo ldconfig
+sudo ldconfig
+

src/1.c

@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 1.c
- * Placeholder File 1 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/

src/2.c

@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 2.c
- * Placeholder File 2 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/

src/3.c

@@ -1,594 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 3.c
- * Placeholder File 3 -- This file is for temporary code storage
- *
- * Multiple 1/2 Rate Convolutional Decoders for NXDN/M17/YSF
- * Used as a secondary decoder in case convolutional decoder fails (second opinion)
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-
-static const int PARITY[] = {0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1};
-
-// trellis_1_2 encode: source is in bits, result in bits
-void trellis_encode(uint8_t result[], const uint8_t source[], int result_len, int reg)
-{
-	for (int i=0; i<result_len; i+=2) {
-		reg = (reg << 1) | source[i>>1];
-		result[i] = PARITY[reg & 0x19];
-		result[i+1] = PARITY[reg & 0x17];
-	}
-}
-
-// simplified trellis 2:1 decode; source and result in bits
-// assumes that encoding was done with NTEST trailing zero bits
-// result_len should be set to the actual number of data bits
-// in the original unencoded message (excl. these trailing bits)
-void trellis_decode(uint8_t result[], const uint8_t source[], int result_len)
-{
-	int reg = 0;
-	int min_d;
-	int min_bt;
-	static const int NTEST = 4;
-	static const int NTESTC = 1 << NTEST;
-	uint8_t bt[NTEST];
-	uint8_t tt[NTEST*2];
-	int dstats[4];
-	int sum;
-	for (int p=0; p < 4; p++)
-		dstats[p] = 0;
-	for (int p=0; p < result_len; p++) {
-		for (int i=0; i<NTESTC; i++) {
-			bt[0] = (i&8)>>3;
-			bt[1] = (i&4)>>2;
-			bt[2] = (i&2)>>1;
-			bt[3] = (i&1);
-			trellis_encode(tt, bt, NTEST*2, reg);
-			sum=0;
-			for (int j=0; j<NTEST*2; j++) {
-				sum += tt[j] ^ source[p*2+j];
-			}
-			if (i == 0 || sum < min_d) {
-				min_d = sum;
-				min_bt = bt[0];
-			}
-		}
-		result[p] = min_bt;
-		reg = (reg << 1) | min_bt;
-		dstats[(min_d > 3) ? 3 : min_d] += 1;
-	}
-	
-	//debug output
-	// fprintf (stderr, "\n stats\t%d %d %d %d\n", dstats[0], dstats[1], dstats[2], dstats[3]);
-}
-
-//Original Copyright/License
-
-/* -*- c++ -*- */
-/* 
- * NXDN Encoder/Decoder (C) Copyright 2019 Max H. Parke KA1RBI
- * 
- * This file is part of OP25
- * 
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-//Ripped from libM17
-#define K	5                       //constraint length
-#define NUM_STATES (1 << (K - 1)) //number of states
-
-static uint32_t prevMetrics[NUM_STATES];
-static uint32_t currMetrics[NUM_STATES];
-static uint32_t prevMetricsData[NUM_STATES];
-static uint32_t currMetricsData[NUM_STATES];
-static uint16_t viterbi_history[244];
-
-/**
-* @brief Decode unpunctured convolutionally encoded data.
-*
-* @param out Destination array where decoded data is written.
-* @param in Input data.
-* @param len Input length in bits.
-* @return Number of bit errors corrected.
-*/
-uint32_t viterbi_decode(uint8_t* out, const uint16_t* in, const uint16_t len)
-{
-	if(len > 244*2)
-		fprintf(stderr, "Input size exceeds max history\n");
-
-	viterbi_reset();
-
-	size_t pos = 0;
-	for(size_t i = 0; i < len; i += 2)
-	{
-		uint16_t s0 = in[i];
-		uint16_t s1 = in[i + 1];
-
-		viterbi_decode_bit(s0, s1, pos);
-		pos++;
-	}
-	uint32_t err = viterbi_chainback(out, pos, len/2);
-
-	//debug
-	// fprintf (stderr, "\n vcb: \n");
-	// for (size_t i = 0; i < len; i++)
-	// 	fprintf (stderr, "%02X", out[i]);
-
-	return err;
-}
-
-/**
-* @brief Decode punctured convolutionally encoded data.
-*
-* @param out Destination array where decoded data is written.
-* @param in Input data.
-* @param punct Puncturing matrix.
-* @param in_len Input data length.
-* @param p_len Puncturing matrix length (entries).
-* @return Number of bit errors corrected.
-*/
-uint32_t viterbi_decode_punctured(uint8_t* out, const uint16_t* in, const uint8_t* punct, const uint16_t in_len, const uint16_t p_len)
-{
-	if(in_len > 244*2)
-	fprintf(stderr, "Input size exceeds max history\n");
-
-	uint16_t umsg[244*2]; //unpunctured message
-	uint8_t p=0;		      //puncturer matrix entry
-	uint16_t u=0;		      //bits count - unpunctured message
-	uint16_t i=0;         //bits read from the input message
-
-	while(i<in_len)
-	{
-		if(punct[p])
-		{
-			umsg[u]=in[i];
-			i++;
-		}
-		else
-		{
-			umsg[u]=0x7FFF;
-		}
-
-		u++;
-		p++;
-		p%=p_len;
-	}
-
-	//debug
-	// fprintf (stderr, " p: %d, u: %d; p_len: %d; len: %d;", p, u, p_len, (u-in_len)*0x7FFF);
-
-	return viterbi_decode(out, umsg, u) - (u-in_len)*0x7FFF;
-}
-
-/**
-* @brief Decode one bit and update trellis.
-*
-* @param s0 Cost of the first symbol.
-* @param s1 Cost of the second symbol.
-* @param pos Bit position in history.
-*/
-void viterbi_decode_bit(uint16_t s0, uint16_t s1, const size_t pos)
-{
-	static const uint16_t COST_TABLE_0[] = {0, 0, 0, 0, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
-	static const uint16_t COST_TABLE_1[] = {0, 0xFFFF, 0xFFFF, 0, 0, 0xFFFF, 0xFFFF, 0};
-
-	for(uint8_t i = 0; i < NUM_STATES/2; i++)
-	{
-		uint32_t metric = q_abs_diff(COST_TABLE_0[i], s0)
-										+ q_abs_diff(COST_TABLE_1[i], s1);
-
-
-		uint32_t m0 = prevMetrics[i] + metric;
-		uint32_t m1 = prevMetrics[i + NUM_STATES/2] + (0x1FFFE - metric);
-
-		uint32_t m2 = prevMetrics[i] + (0x1FFFE - metric);
-		uint32_t m3 = prevMetrics[i + NUM_STATES/2] + metric;
-
-		uint8_t i0 = 2 * i;
-		uint8_t i1 = i0 + 1;
-
-		if(m0 >= m1)
-		{
-				viterbi_history[pos]|=(1<<i0);
-				currMetrics[i0] = m1;
-		}
-		else
-		{
-				viterbi_history[pos]&=~(1<<i0);
-				currMetrics[i0] = m0;
-		}
-
-		if(m2 >= m3)
-		{
-				viterbi_history[pos]|=(1<<i1);
-				currMetrics[i1] = m3;
-		}
-		else
-		{
-				viterbi_history[pos]&=~(1<<i1);
-				currMetrics[i1] = m2;
-		}
-	}
-
-	//swap
-	uint32_t tmp[NUM_STATES];
-	for(uint8_t i=0; i<NUM_STATES; i++)
-	{
-		tmp[i]=currMetrics[i];
-	}
-	for(uint8_t i=0; i<NUM_STATES; i++)
-	{
-		currMetrics[i]=prevMetrics[i];
-		prevMetrics[i]=tmp[i];
-	}
-}
-
-/**
-* @brief History chainback to obtain final byte array.
-*
-* @param out Destination byte array for decoded data.
-* @param pos Starting position for the chainback.
-* @param len Length of the output in bits.
-* @return Minimum Viterbi cost at the end of the decode sequence.
-*/
-uint32_t viterbi_chainback(uint8_t* out, size_t pos, uint16_t len)
-{
-	uint8_t state = 0;
-	size_t bitPos = len+4;
-
-	memset(out, 0, (len-1)/8+1);
-
-	while(pos > 0)
-	{
-		bitPos--;
-		pos--;
-		uint16_t bit = viterbi_history[pos]&((1<<(state>>4)));
-		state >>= 1;
-		if(bit)
-		{
-			state |= 0x80;
-			out[bitPos/8]|=1<<(7-(bitPos%8));
-		}
-	}
-
-	uint32_t cost = prevMetrics[0];
-
-	for(size_t i = 0; i < NUM_STATES; i++)
-	{
-		uint32_t m = prevMetrics[i];
-		if(m < cost) cost = m;
-	}
-
-	//debug
-	// fprintf (stderr, "\n cb: \n");
-	// for (size_t i = 0; i < len; i++)
-	// 	fprintf (stderr, "%02X", out[i]);
-
-	return cost;
-}
-
-/**
- * @brief Reset the decoder state. No args.
- *
- */
-void viterbi_reset(void)
-{
-	memset((uint8_t*)viterbi_history, 0, 2*244);
-	memset((uint8_t*)currMetrics, 0, 4*NUM_STATES);
-	memset((uint8_t*)prevMetrics, 0, 4*NUM_STATES);
-	memset((uint8_t*)currMetricsData, 0, 4*NUM_STATES);
-	memset((uint8_t*)prevMetricsData, 0, 4*NUM_STATES);
-}
-
-uint16_t q_abs_diff(const uint16_t v1, const uint16_t v2)
-{
-	if(v2 > v1) return v2 - v1;
-	return v1 - v2;
-}
-
-//original sources
-//--------------------------------------------------------------------
-// M17 C library - decode/viterbi.c
-//
-// This file contains:
-// - the Viterbi decoder
-//
-// Wojciech Kaczmarski, SP5WWP
-// M17 Project, 29 December 2023
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-// M17 C library - math/math.c
-//
-// This file contains:
-// - absolute difference value
-// - Euclidean norm (L2) calculation for n-dimensional vectors (float)
-// - soft-valued arrays to integer conversion (and vice-versa)
-// - fixed-valued multiplication and division
-//
-// Wojciech Kaczmarski, SP5WWP
-// M17 Project, 29 December 2023
-//--------------------------------------------------------------------
-
-
-//audio filter stuff sourced from: https://github.com/NedSimao/FilteringLibrary
-//no license / information provided in source code
-#define PI 3.141592653
-
-//do we need this for test input sthit?
-// #define PLOT_POINTS     100
-// #define SAMPLE_TIME_S   0.001
-// #define CUTOFFFREQ_HZ   50
-// #define sine_freq       40
-// #define sine_freq_1     500
-// #define HFC 50
-// #define LFC 100
-
-
-void LPFilter_Init(LPFilter *filter, float cutoffFreqHz, float sampleTimeS)
-{
-
-	float RC=0.0;
-	RC=1.0/(2*PI*cutoffFreqHz);
-	filter->coef[0]=sampleTimeS/(sampleTimeS+RC);
-	filter->coef[1]=RC/(sampleTimeS+RC);
-
-	filter->v_out[0]=0.0;
-	filter->v_out[1]=0.0;
-
-}
-
-
-float LPFilter_Update(LPFilter *filter, float v_in)
-{
-
-	filter->v_out[1]=filter->v_out[0];
-	filter->v_out[0]=(filter->coef[0]*v_in) + (filter->coef[1]*filter->v_out[1]);
-
-	return (filter->v_out[0]);
-
-}
-
-
-/********************************************************************************************************
- *                              HIGH PASS FILTER
-********************************************************************************************************/
-void HPFilter_Init(HPFilter *filter, float cutoffFreqHz, float sampleTimeS)
-{
-
-	float RC=0.0;
-	RC=1.0/(2*PI*cutoffFreqHz);
-
-	filter->coef=RC/(sampleTimeS+RC);
-
-	filter->v_in[0]=0.0;
-	filter->v_in[1]=0.0;
-
-	filter->v_out[0]=0.0;
-	filter->v_out[1]=0.0;
-
-}
-
-
-float HPFilter_Update(HPFilter *filter, float v_in)
-{
-    
-	filter->v_in[1]=filter->v_in[0];
-	filter->v_in[0]=v_in;
-
-	filter->v_out[1]=filter->v_out[0];
-	filter->v_out[0]=filter->coef * (filter->v_in[0] - filter->v_in[1]+filter->v_out[1]);
-
-	return (filter->v_out[0]);
-
-}
-
-/********************************************************************************************************
- *                              BAND PASS FILTER
-********************************************************************************************************/
-
-
-void PBFilter_Init(PBFilter *filter, float HPF_cutoffFreqHz, float LPF_cutoffFreqHz, float sampleTimeS)
-{
-
-	LPFilter_Init(&filter->lpf, LPF_cutoffFreqHz, sampleTimeS);
-	HPFilter_Init(&filter->hpf, HPF_cutoffFreqHz, sampleTimeS);
-
-	filter->out_in=0.0;
-
-}
-
-float PBFilter_Update(PBFilter *filter, float v_in)
-{
-
-	filter->out_in=HPFilter_Update(&filter->hpf, v_in);
-
-	filter->out_in=LPFilter_Update(&filter->lpf, filter->out_in);
-
-	return (filter->out_in);
-
-}
-
-/********************************************************************************************************
- *                              NOTCH FILTER
-********************************************************************************************************/
-
-
-void NOTCHFilter_Init(NOTCHFilter *filter, float centerFreqHz, float notchWidthHz, float sampleTimeS)
-{
-
-	//filter frequency to angular (rad/s)
-	float w0_rps=2.0 * PI *centerFreqHz;
-	float ww_rps=2.0 * PI *notchWidthHz;
-
-	//pre warp center frequency
-	float w0_pw_rps=(2.0/sampleTimeS) * tanf(0.5 * w0_rps * sampleTimeS);
-
-	//computing filter coefficients
-
-	filter->alpha=4.0 + w0_rps*w0_pw_rps*sampleTimeS*sampleTimeS;
-	filter->beta=2.0*ww_rps*sampleTimeS;
-
-	//clearing input and output  buffers
-
-	for (uint8_t n=0; n<3; n++)
-	{
-		filter->vin[n]=0;
-		filter->vout[n]=0;
-	}
-
-}
-
-float NOTCHFilter_Update(NOTCHFilter *filter, float vin)
-{
-
-	//shifting samples
-	filter->vin[2]=filter->vin[1];
-	filter->vin[1]=filter->vin[0];
-
-	filter->vout[2]=filter->vout[1];
-	filter->vout[1]=filter->vout[0];
-
-	filter->vin[0]=vin;
-
-	//compute new output
-	filter->vout[0]=(filter->alpha*filter->vin[0] + 2.0 *(filter->alpha -8.0)*filter->vin[1] + filter->alpha*filter->vin[2]
-	-(2.0f*(filter->alpha-8.0)*filter->vout[1]+(filter->alpha-filter->beta)*filter->vout[2]))/(filter->alpha+filter->beta);
-
-
-	return (filter->vout[0]);
-}
-
-void init_audio_filters (dsd_state * state)
-{
-	//still not sure if this is even correct or not, but 48k sounds good now
-  LPFilter_Init(&state->RCFilter, 960, (float)1/(float)48000);
-  HPFilter_Init(&state->HRCFilter, 960, (float)1/(float)48000);
-
-	//left and right variants for stereo output testing on digital voice samples
-  LPFilter_Init(&state->RCFilterL, 960, (float)1/(float)16000);
-  HPFilter_Init(&state->HRCFilterL, 960, (float)1/(float)16000);
-  LPFilter_Init(&state->RCFilterR, 960, (float)1/(float)16000);
-  HPFilter_Init(&state->HRCFilterR, 960, (float)1/(float)16000);
-
-	//PBFilter_Init(PBFilter *filter, float HPF_cutoffFreqHz, float LPF_cutoffFreqHz, float sampleTimeS);
-	//NOTCHFilter_Init(NOTCHFilter *filter, float centerFreqHz, float notchWidthHz, float sampleTimeS);
-
-	//NOTE: PBFilter_init also inits a LPF and HPF, but on another set of filters, might be worth
-	//testing just using the PBFilter by itself and see how it does without the hpf used
-
-	//passband filter working (seems to be), notch filter unsure which values to use, doesn't have any appreciable affect when used as is
-	PBFilter_Init(&state->PBF, 8000, 12000, (float)1/(float)1536000); //RTL Sampling at 1536000 S/s.
-	NOTCHFilter_Init(&state->NF, 1000, 4000, (float)1/(float)1536000);
-	
-}
-
-//FUNCTIONS for handing use of above filters
-
-//lpf
-void lpf(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = LPFilter_Update(&state->RCFilter, input[i]);
-		// fprintf (stderr, "\n out: %05d", input[i]);
-	}
-}
-
-//hpf
-void hpf(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = HPFilter_Update(&state->HRCFilter, input[i]);
-		// fprintf (stderr, "\n out: %05d", input[i]);
-	}
-}
-
-//hpf digital left
-void hpf_dL(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = HPFilter_Update(&state->HRCFilterL, input[i]);
-		// fprintf (stderr, "\n out: %05d", input[i]);
-	}
-}
-
-//hpf digital right
-void hpf_dR(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = HPFilter_Update(&state->HRCFilterR, input[i]);
-		// fprintf (stderr, "\n out: %05d", input[i]);
-	}
-}
-
-//nf
-void nf(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = NOTCHFilter_Update(&state->NF, input[i]);
-		// fprintf (stderr, "\n out: %05d", input[i]);
-	}
-}
-
-//pbf
-void pbf(dsd_state * state, short * input, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-	{
-		// fprintf (stderr, "\n in: %05d", input[i]);
-		input[i] = PBFilter_Update(&state->PBF, input[i]);
-	}
-}
-
-//Generic RMS function derived from RTL_FM (RTL_SDR) RMS code (doesnt' really work correctly outside of RTL)
-long int raw_rms(int16_t *samples, int len, int step) //use samplespersymbol as len
-{
-  
-  int i;
-  long int rms;
-  long p, t, s;
-  double dc, err;
-
-  p = t = 0L;
-  for (i=0; i<len; i+=step) {
-    s = (long)samples[i];
-    t += s;
-    p += s * s;
-  }
-  /* correct for dc offset in squares */
-  dc = (double)(t*step) / (double)len;
-  err = t * 2 * dc - dc * dc * len;
-
-  rms = (long int)sqrt((p-err) / len);
-  if (rms < 0) rms = 150;
-  return rms;
-}

src/4.c

@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 4.c
- * Placeholder File 4 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/

src/5.c

@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 5.c
- * Placeholder File 5 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/

src/dmr_34.c

@@ -1,9 +1,9 @@
 /*-------------------------------------------------------------------------------
  * dmr_34.c
- * DMR (and P25) 3/4 Rate Simple Trellis Decoder
+ * DMR 3/4 Rate Simple Trellis Decoder
  *
  * LWVMOBILE
- * 2023-12 DSD-FME Florida Man Edition
+ * 2023-08 DSD-FME Florida Man Edition
  *-----------------------------------------------------------------------------*/
 
 #include "dsd.h"
@@ -14,7 +14,7 @@ uint8_t interleave[98] = {
 4, 5, 12, 13, 20, 21, 28, 29, 36, 37, 44, 45, 52, 53, 60, 61, 68, 69, 76, 77, 84, 85, 92, 93,
 6, 7, 14, 15, 22, 23, 30, 31, 38, 39, 46, 47, 54, 55, 62, 63, 70, 71, 78, 79, 86, 87, 94, 95};
 
-//this is a convertion table for converting the dibit pairs into constellation points
+//this is a convertion table for converting the dibit pairs into contellation points
 uint8_t constellation_map[16] = {
 11, 12, 0, 7, 14, 9, 5, 2, 10, 13, 1, 6, 15, 8, 4, 3
 };
@@ -34,92 +34,10 @@ uint8_t fsm[64] = {
 2, 10, 6, 14, 0,  8, 4, 12,
 6, 14, 0,  8, 4, 12, 2, 10};
 
-//attempt to find the surviving path, or the 'best' path available (most positions gained)
-uint8_t fix_34(uint8_t * p, uint8_t state, int position)
-{
-  int i, j, k, counter, best_p, best_v, survivors;
-  uint8_t temp_s, tri, t;
-
-  //status of surviving paths -- debug
-  int s[8];
-  memset (s, 0, 8*sizeof(int));
-
-  //assign all potentially correct points to temporary storage
-  uint8_t temp_p[8];
-  temp_p[0] = (p[position] ^  1) & 0xF;
-  temp_p[1] = (p[position] ^  3) & 0xF;
-  temp_p[2] = (p[position] ^  5) & 0xF;
-  temp_p[3] = (p[position] ^  7) & 0xF;
-  temp_p[4] = (p[position] ^  9) & 0xF;
-  temp_p[5] = (p[position] ^ 11) & 0xF;
-  temp_p[6] = (p[position] ^ 13) & 0xF;
-  temp_p[7] = (p[position] ^ 15) & 0xF;
-
-  best_p = 0; //best position
-  best_v = 0; //best path value
-
-  for (k = 0; k < 8; k++)
-  {
-    temp_s = state;
-    counter = 0;
-    tri = 0;
-    for (i = position; i < 49; i++)
-    {
-      //assign temp t either as our temp_p, or next point of i
-      if (i == position) t = temp_p[k];
-      else t = p[i];
-
-      if (tri != 0xFF) //while the path survives
-      {
-        tri = 0xFF;
-        for (j = 0; j < 8; j++)
-        {
-          if ( fsm[(temp_s*8)+j] == t )
-          {
-            //return our tribit value and state for the next point
-            tri = temp_s = (uint8_t)j;
-            counter++;
-            break;
-          }
-          
-        }
-
-        if (counter > best_p)
-        {
-          best_p = counter;
-          best_v = k; //if we make it further on current path, assign as best path
-        }
-
-        // surviving path -- made it to 49
-        if (i == 48) s[k] = 1;
-
-      }
-    }
-
-  }
-
-  //NOTE: If there are no surviving paths, then that means there is another bit/point err
-  //Ideally, at the end of a single or multiple fixes, there should only be one survivor, but in practice,
-  //I've seen up to 4 surviving paths and somehow, get a good CRC and a good LRRP or LOCN decode
-  //multiple survivors seems common when the starting err position is very close to 49
-
-  //tally number of surviving paths
-  survivors = 0;
-  for (k = 0; k < 8; k++)
-  {
-    if (s[k] == 1) survivors++;
-  }
-
-  //debug
-  // fprintf (stderr, "START: %d; BEST_P: %d; BEST_V: %d; Survivors: %d; Point: %d; ", position, best_p, best_v, survivors, temp_p[best_v]);
-
-  return temp_p[best_v]; //return the point value of the best path's starting point value
-}
-
 uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
 {
   int i, j;
-  uint32_t irr_err = 0; //irrecoverable errors
+  uint32_t irr_err = 0;
 
   uint8_t deinterleaved_dibits[98];
   memset (deinterleaved_dibits, 0, sizeof(deinterleaved_dibits));
@@ -142,11 +60,14 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
   for (i = 0; i < 49; i++) 
     point[i] = constellation_map[nibs[i]];
 
-  //debug view points
+  //debug view points -- point[0] should be zero
   // fprintf (stderr, "\n P =");
   // for (i = 0; i < 49; i++) 
   //   fprintf (stderr, " %02d", point[i]);
 
+  //free-bee on err correction, point[0] should always be zero (flush bits)
+  point[0] = 0;
+
   //convert constellation points into tribit values using the FSM
   uint8_t state = 0;
   uint32_t tribits[49];
@@ -170,17 +91,17 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
     {
       irr_err++; //tally number of errors
 
-      //debug point, position of error, and state value
-      // fprintf (stderr, "\n P: %d, %d:%d; ", point[i], i, state);
-
-      //attempt to fix point by looking for the best path from here
-      point[i] = fix_34(point, state, i);
+      //debug position of error and state value
+      // fprintf (stderr, " %d:%d;", i, state);
 
       //Make a hard decision and flip point to fit in current state
-      // point[i] ^= 7; //lucky number 7 (0111) //fallback
+      point[i] ^= 7; //lucky number 7 (0111)
 
-      //decrement one and resume decoding
-      i--;
+      //NOTE: Ideally, a full path metric to find the surviving path
+      //is the best way to correct this, but it is also complex and no garauntee to fix errs
+
+      //decrement one and try again
+      if (i != 0) i--;
      
     }
 
@@ -193,22 +114,23 @@ uint32_t dmr_34(uint8_t * input, uint8_t treturn[18])
 
   //convert tribits into a return payload
   uint32_t temp = 0;
-
-  //break into chunks of 24 bit values and shuffle into 8-bit (byte) treturn values
-  for (i = 0; i < 6; i++)
+  if (1 == 1) //irr_err == 0
   {
-    temp = (tribits[(i*8)+0] << 21) + (tribits[(i*8)+1] << 18) + (tribits[(i*8)+2] << 15) + (tribits[(i*8)+3] << 12) + 
-            (tribits[(i*8)+4] << 9) + (tribits[(i*8)+5] << 6)  + (tribits[(i*8)+6] << 3)  + (tribits[(i*8)+7] << 0);
+    //break into chunks of 24 bit values and shuffle into 8-bit (byte) treturn values
+    for (i = 0; i < 6; i++)
+    {
+      temp = (tribits[(i*8)+0] << 21) + (tribits[(i*8)+1] << 18) + (tribits[(i*8)+2] << 15) + (tribits[(i*8)+3] << 12) + (tribits[(i*8)+4] << 9) + (tribits[(i*8)+5] << 6) + (tribits[(i*8)+6] << 3) + (tribits[(i*8)+7] << 0);
 
-    treturn[(i*3)+0] = (temp >> 16) & 0xFF;
-    treturn[(i*3)+1] = (temp >>  8) & 0xFF;
-    treturn[(i*3)+2] = (temp >>  0) & 0xFF;
+      treturn[(i*3)+0] = (temp >> 16) & 0xFF;
+      treturn[(i*3)+1] = (temp >>  8) & 0xFF;
+      treturn[(i*3)+2] = (temp >>  0) & 0xFF;
+    }
   }
 
   //trellis point/state err tally
-  // if (irr_err != 0)
-  //   fprintf (stderr, " P_ERR = %d", irr_err);
+  if (irr_err != 0)
+    fprintf (stderr, " ERR = %d", irr_err);
 
-  return (0);
+  return (irr_err);
 }
 

src/dmr_block.c

@@ -12,11 +12,11 @@
 void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t dheader_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors)
 {
   
-  int i;
+  uint32_t i, j, k;
   uint8_t slot = state->currentslot;
 
   //clear out unified pdu 'superframe' slot
-  for (int i = 0; i < 24*127; i++) state->dmr_pdu_sf[slot][i] = 0;
+  for (short int i = 0; i < 288; i++) state->dmr_pdu_sf[slot][i] = 0;
 
   //reset block counter to 1
   state->data_block_counter[slot] = 1;
@@ -29,10 +29,8 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
     uint8_t ab = (uint8_t)ConvertBitIntoBytes(&dheader_bits[2], 2); //appended blocks
     uint8_t dpf = (uint8_t)ConvertBitIntoBytes(&dheader_bits[4], 4); //data packet format
     uint8_t sap = (uint8_t)ConvertBitIntoBytes(&dheader_bits[8], 4); //service access point
-    uint8_t mpoc = dheader_bits[3]; //most significant bit of the 5-bit Pad Octet Count
-    uint8_t poc = (uint8_t)ConvertBitIntoBytes(&dheader_bits[12], 4) + (mpoc << 4); //padding octets
-    UNUSED(ab);
-
+    uint8_t poc = (uint8_t)ConvertBitIntoBytes(&dheader_bits[8], 4); //padding octets
+    
     uint32_t target = (uint32_t)ConvertBitIntoBytes(&dheader_bits[16], 24); //destination llid 
     uint32_t source = (uint32_t)ConvertBitIntoBytes(&dheader_bits[40], 24); //source llid
 
@@ -119,21 +117,10 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
     uint8_t udt_pf = dheader_bits[73];
     uint8_t udt_op = (uint8_t)ConvertBitIntoBytes(&dheader_bits[74], 6);
 
-    //ETSI TS 102 361-4 V1.12.1 (2023-07) p281 
-    udt_uab += 1; //add 1 internally, up to 4 appended blocks are carried, min is 1
-
-    //NMEA Specific Fix for unspecified MFID format w/ 2 appended blocks (UAB 2) p291
-    if (udt_uab == 0x5 && udt_uab == 3)
-      udt_uab = 2; //set to two if long unspecified format
-
-    //Note: NMEA Reserved value UAB 3 is not referenced in ETSI, so unknown number of 
-    //appended blocks but we will assume it is supposed to be 4 appended blocks
-
     //p_head
     uint8_t p_sap  = (uint8_t)ConvertBitIntoBytes(&dheader_bits[0], 4);
     uint8_t p_mfid = (uint8_t)ConvertBitIntoBytes(&dheader_bits[8], 8);
     uint8_t p_pot  = (uint8_t)ConvertBitIntoBytes(&dheader_bits[3], 5); //looking for LRRP pot_report
-    UNUSED(p_pot);
 
     fprintf (stderr, "%s ", KGRN);
     fprintf (stderr, "\n");
@@ -195,7 +182,6 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
       else if (udt_format == 0x08) sprintf (udtf_string, "%s", "Manu Spec"); //Manufacturer Specific
       else if (udt_format == 0x09) sprintf (udtf_string, "%s", "Manu Spec"); //Manufacturer Specific
       else if (udt_format == 0x0A) sprintf (udtf_string, "%s", "Mixed UTF"); //Appended block contains addr and 16-bit UTF-16BE
-      else if (udt_format == 0x0B) sprintf (udtf_string, "%s", "LIP LOCN");
       else                         sprintf (udtf_string, "%s", "Reserved");
     }
 
@@ -242,9 +228,6 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
       //set data header to valid
       state->data_header_valid[slot] = 1;
 
-      //reset block counter to zero
-      state->data_block_counter[slot] = 0;
-
       //send to assembler as type 3, rearrange into CSBK type PDU (to verify), and send to dmr_cspdu
       dmr_block_assembler (opts, state, dheader, 12, 0x0B, 3);
 
@@ -315,46 +298,27 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
     {
       fprintf (stderr, " - P_SAP %02d [%s] - MFID %02X [%s]", p_sap, sap_string, p_mfid, mfid_string);
 
-      //p_sap 1 on mfid 10 (moto) is a pain, and doesn't assemble correctly for some reason
-      //two extra duplicate blocks are transmitted at the end for some reason -- system unique error?
-      if (p_sap != 1)
+      //look for LRRP potential report 0x1F (may be others as well)
+      //this could just be a sap == 1, which is 'reserved', unsure (or maybe no actual correlation?)
+      if (p_sap != 1) state->data_header_blocks[slot]--; //decrement the blocks to follow count in order to pass CRC32 and properly assemble blocks
+      else //add block to start of the dmr_pdu_sf since it probably contains vital LRRP data (0x1F report) -- won't pass CRC32 either way
       {
-        //sanity check to prevent segfault (this happened when the regular header was not received beforehand)
-        if (state->data_header_blocks[slot] > 1)
-          state->data_header_blocks[slot]--;
-      }
-      else
-      {
-        //this method will assemble with the duplicate blocks and include the header as well
-        // state->data_header_blocks[slot]++;
-        // state->data_header_blocks[slot]++;
-        // int blocks = state->data_header_blocks[slot]-1;
-        // if (blocks > 127) blocks = 127;
-        // if (blocks < 1) blocks = 4; //safety value
-        // for(i = 0; i < 12; i++)
-        //   state->dmr_pdu_sf[slot][i+(blocks*12)] = dheader[i];
-        // state->data_block_counter[slot]++;
-
-        //this method will just include the prop_pdu header as a data block and assemble the data blocks as a message, excluding duplicates
         int blocks = state->data_header_blocks[slot]-1;
-        if (blocks > 127) blocks = 127;
-        if (blocks < 1) blocks = 4;
-        for(i = 0; i < 12; i++)
-          state->dmr_pdu_sf[slot][i+(blocks*12)] = dheader[i];
+        if (blocks < 1) blocks = 4; //safety value
+        if (blocks > 9) blocks = 9;
+        for(i = 0; i < 12; i++) state->dmr_pdu_sf[slot][i+(blocks*12)] = dheader[i];
         state->data_block_counter[slot]++;
-
-        //this method will NOT include the prop_pdu header as a data block and assemble the data blocks as a message, excluding duplicates
-        // state->data_header_blocks[slot]--; UNUSED(i);
-
-        //no matter how you assemble this, with or without the p_head block(s) or extra blocks, there is ALWAYS a CRC32 Failure
+        //no matter how you assemble this, with or without the p_head block(s), there is ALWAYS a CRC32 Failure
         //even when it continues to pass on other SAP values, SAP 1 must have a different checksum?
         //Users trying to get this will want to enable -F to bypass the CRC32 failure
+
+        //a recent discovery on a few systems and samples show the existence of multiple Prop Head Packets (how does that work)
       }
 
     }
 
     //block storage sanity
-    if (state->data_header_blocks[slot] > 127) state->data_header_blocks[slot] = 127;
+    if (state->data_header_blocks[slot] > 9) state->data_header_blocks[slot] = 9;
     //assuming we didn't receive the initial data header block on a p_head and then decremented it
     //3 or 4 seems to be the average safe value
     if (state->data_header_blocks[slot] < 1) state->data_header_blocks[slot] = 4; 
@@ -364,7 +328,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
     //REMUS! Uncomment these lines if desired
     if (dpf != 15 && dpf != 1)
     {
-      sprintf (state->dmr_lrrp_gps[slot], "Data Call - %s TGT: %d SRC: %d ", sap_string, target, source);
+      sprintf (state->dmr_lrrp_gps[slot], "Data Call - %s SRC [%d] DST [%d] ", sap_string, source, target);
       if (a == 1) strcat (state->dmr_lrrp_gps[slot], "- RSP REQ ");
     }
 
@@ -400,257 +364,46 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
 
 }
 
-void dmr_udt_decoder (dsd_opts * opts, dsd_state * state, uint8_t * block_bytes, uint32_t CRCCorrect)
+//convert UDT to a CSBK friendly PDU format
+void dmr_udt_cspdu_converter (dsd_opts * opts, dsd_state * state, uint8_t block_bytes[], uint8_t block_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors)
 {
-  //TODO: double check end rep values to Text Format Modes vs padnibs/uab values
-  //TODO: Make Text Format Modes seperate function to be used more generically by other things
-  //TODO: LIP Format (make seperate functions, LIP also used by USBD)
   int i, j;
-  UNUSED(CRCCorrect);
-  UNUSED(opts);
-  int slot = state->currentslot;
 
-  uint8_t cs_bits[8*12*5]; //maximum of 1 header and 4 blocks at 96 bits
-  UNUSED(cs_bits);
+  //rearrange UDT data to a CSBK message format
+  uint8_t cs_byte[48]; //12 x 4, 2 bit AB should mean only 3 total appended blocks, so 4 all together (minus rearrangement)
+  memset (cs_byte, 0, sizeof (cs_byte));
+  uint8_t cs_bits[48*8];
+  memset (cs_bits, 0, sizeof (cs_bits));
+
+  cs_byte[0] = (uint8_t)ConvertBitIntoBytes(&block_bits[73], 7); //lb, pf and opcode byte
+  uint8_t udt_opcode = (uint8_t)ConvertBitIntoBytes(&block_bits[74], 6); //for observation testing
+  cs_byte[1] = 0; //set mfid to zero for now (may use custom value if needed later)
+  uint8_t udt_mfid = 0; //setting to zero
+
+  //should be 34 total (maximum) after removing tailing CRC16 (initial and last block)
+  for (i = 0; i < 34; i++) cs_byte[2+i] = block_bytes[12+i];
 
   //bytes to bits
-  for(i = 0, j = 0; i < 36; i++, j+=8)
+  for(i = 0, j = 0; i < 36; i++, j+=8) //4 blocks max?
   {
-    cs_bits[j + 0] = (block_bytes[i] >> 7) & 0x01;
-    cs_bits[j + 1] = (block_bytes[i] >> 6) & 0x01;
-    cs_bits[j + 2] = (block_bytes[i] >> 5) & 0x01;
-    cs_bits[j + 3] = (block_bytes[i] >> 4) & 0x01;
-    cs_bits[j + 4] = (block_bytes[i] >> 3) & 0x01;
-    cs_bits[j + 5] = (block_bytes[i] >> 2) & 0x01;
-    cs_bits[j + 6] = (block_bytes[i] >> 1) & 0x01;
-    cs_bits[j + 7] = (block_bytes[i] >> 0) & 0x01;
+    cs_bits[j + 0] = (cs_byte[i] >> 7) & 0x01;
+    cs_bits[j + 1] = (cs_byte[i] >> 6) & 0x01;
+    cs_bits[j + 2] = (cs_byte[i] >> 5) & 0x01;
+    cs_bits[j + 3] = (cs_byte[i] >> 4) & 0x01;
+    cs_bits[j + 4] = (cs_byte[i] >> 3) & 0x01;
+    cs_bits[j + 5] = (cs_byte[i] >> 2) & 0x01;
+    cs_bits[j + 6] = (cs_byte[i] >> 1) & 0x01;
+    cs_bits[j + 7] = (cs_byte[i] >> 0) & 0x01;
   }
 
-  //Unified Data Transport (UDT) -- already checked, but may need a few of these here as well
-  uint8_t udt_ig = cs_bits[0]; //group or individual data
-  uint8_t udt_a  = cs_bits[1]; //response required
-  uint8_t udt_res = (uint8_t)ConvertBitIntoBytes(&cs_bits[2], 2);
-  uint8_t udt_format1 = (uint8_t)ConvertBitIntoBytes(&cs_bits[4], 4); //header format of UDT
-  uint8_t udt_sap = (uint8_t)ConvertBitIntoBytes(&cs_bits[8], 4);
-  uint8_t udt_format2 = (uint8_t)ConvertBitIntoBytes(&cs_bits[12], 4); //UDT Format referenced below
-  uint32_t udt_target = (uint32_t)ConvertBitIntoBytes(&cs_bits[16], 24);
-  uint32_t udt_source = (uint32_t)ConvertBitIntoBytes(&cs_bits[40], 24);
-  uint8_t udt_padnib = (uint8_t)ConvertBitIntoBytes(&cs_bits[64], 5);
-  uint8_t udt_zero = cs_bits[69]; //should always be zero?
-  uint8_t udt_uab = (uint8_t)ConvertBitIntoBytes(&cs_bits[70], 2) + 1; //udt appended blocks
-  uint8_t udt_sf = cs_bits[72];
-  uint8_t udt_pf = cs_bits[73];
-  uint8_t udt_op = (uint8_t)ConvertBitIntoBytes(&cs_bits[74], 6);
-  UNUSED4(udt_ig, udt_a, udt_res, udt_format1);
-  UNUSED4(udt_sap, udt_format2, udt_target, udt_source);
-  UNUSED4(udt_padnib, udt_zero, udt_sf, udt_pf);
-  UNUSED(udt_op);
-
-  //number of repititions required in various bit grabs
-  int end = 3; UNUSED(end);
-
-  //char strings
-  uint8_t iso7c;
-  uint8_t iso8c;
-  uint16_t utf16c;
-
-  //appended addresses -- max is 15 across 4 blocks
-  uint32_t address[16]; memset (address, 0, sizeof(address)); UNUSED(address);
-  uint8_t add_res = (uint8_t)ConvertBitIntoBytes(&cs_bits[96], 7); UNUSED(add_res);
-  uint8_t add_ok = cs_bits[103];
-
-  //BCD Format (Dialer Digits) -- max is 92 digits
-  uint8_t bcd_digits[93]; memset (bcd_digits, 0, sizeof(bcd_digits)); UNUSED(bcd_digits);
-
-  //NMEA Debug Testing (need real world samples)
-  // udt_format2 = 0x5;
-  // for (int i = 0; i < 8; i++) cs_bits[184+i] = 0; //spare bits to zero
-  // cs_bits[96] = 0; //enc bit to zero
-  // uint8_t test[96*4]; memset (test, 1, sizeof(test)); // all ones test vector
-  // nmea_iec_61162_1 (opts, state, test, udt_source, 1);
-  // nmea_iec_61162_1 (opts, state, cs_bits+96, udt_source, 2);
-
-  //LIP Debug Testing (need real world samples)
-  // udt_format2 = 0x0B;
-
-  //initial linebreak
-  fprintf (stderr, "%s", KCYN);
-  fprintf (stderr, "\n ");
-  fprintf (stderr, "Slot %d - SRC: %d; TGT: %d; UDT ", slot+1, udt_source, udt_target);
-
-  if (udt_format2 == 0x00)
-  {
-    fprintf (stderr, "Binary Data;"); 
-  }
-  else if (udt_format2 == 0x01) //appended addresses
-  {
-    fprintf (stderr, "Appended Addressing;\n ");
-    if (udt_uab == 1) end = 3;
-    if (udt_uab == 2) end = 7;
-    if (udt_uab == 3) end = 11;
-    if (udt_uab == 4) end = 15;
-    if (add_res) fprintf (stderr, "RES: %d; ", add_res);
-    fprintf (stderr, "OK: %d; ", add_ok); 
-    fprintf (stderr, "ADDR:");
-    for (i = 0; i < end; i++)
-    {
-      fprintf (stderr, " %d;", (uint32_t)ConvertBitIntoBytes(&cs_bits[(i*24)+104], 24));
-    }
-  }
-  else if (udt_format2 == 0x02) //BCD 4-bit Dialer Digits
-  {
-    if (udt_uab == 1) end = 20;
-    if (udt_uab == 2) end = 44;
-    if (udt_uab == 3) end = 95;
-    if (udt_uab == 4) end = 92;
-    end -= udt_padnib; //subtract padnib since its also 4 bits
-
-    fprintf (stderr, "Dialer BCD: ");
-    for (i = 0; i < end; i++)
-    {
-      //dialer digits 7.2.9
-      int digit = (int)ConvertBitIntoBytes(&cs_bits[(i*4)+96], 4);
-      if (digit <  10) fprintf (stderr, "%d", digit); //numbers 0-9
-      else if (digit == 10) fprintf (stderr, "*"); //asterisk/star
-      else if (digit == 11) fprintf (stderr, "#"); //pound/hash
-      else if (digit == 15) fprintf (stderr, " "); //null character
-      else fprintf (stderr, "R:%X", digit); //reserved values on 12,13, and 14
-    }
-  }
-  else if (udt_format2 == 0x03) //ISO7 format
-  {
-    if (udt_uab == 1) end = 11;
-    if (udt_uab == 2) end = 25;
-    if (udt_uab == 3) end = 38;
-    if (udt_uab == 4) end = 52;
-    end -= udt_padnib/7; //is this correct?
-    fprintf (stderr, "ISO7 Text: "  );
-    for (i = 0; i < end; i++) //max 368/7 = 52 character max?
-    {
-      iso7c = (uint8_t)ConvertBitIntoBytes(&cs_bits[(i*7)+96], 7);
-      if (iso7c >= 0x20 && iso7c <= 0x7E) //Standard ASCII Set
-        fprintf (stderr, "%c", iso7c);
-      else fprintf (stderr, " ");
-    }
-  }
-  else if (udt_format2 == 0x04) //ISO8 format
-  {
-    fprintf (stderr, "ISO8 Text: "  );
-    if (udt_uab == 1) end = 10;
-    if (udt_uab == 2) end = 22;
-    if (udt_uab == 3) end = 34;
-    if (udt_uab == 4) end = 46;
-    end -= udt_padnib/8; //is this correct?
-    for (i = 0; i < end; i++)
-    {
-      iso8c = (uint8_t)ConvertBitIntoBytes(&cs_bits[(i*8)+96], 8);
-      if (iso8c >= 0x20 && iso8c <= 0x7E) //Standard ASCII Set
-        fprintf (stderr, "%c", iso8c);
-      // else if (iso8c >= 0x81 && iso8c <= 0xFE) //Extended ASCII Set
-      //   fprintf (stderr, "%c", iso8c);
-      else fprintf (stderr, " ");
-    }
-  }
-  else if (udt_format2 == 0x07) //UTF-16BE format
-  {
-    if (udt_uab == 1) end = 5;
-    if (udt_uab == 2) end = 11;
-    if (udt_uab == 3) end = 17;
-    if (udt_uab == 4) end = 23;
-    end -= udt_padnib/4; //example, 4 blocks sets 23 - (20nibs/4bits) = 18 chars, may need to check this again
-    fprintf (stderr, "UTF16 Text: "  );
-    for (i = 0; i < end; i++) //368/16 = 23 character max?
-    {
-      utf16c = (uint16_t)ConvertBitIntoBytes(&cs_bits[(i*16)+96], 16);
-      if (utf16c >= 0x20 && utf16c != 0x7F) //avoid control chars
-        fprintf (stderr, "%lc", utf16c); //will using lc work here? May depend on console locale settings?
-      else fprintf (stderr, " ");
-    }
-  }
-  else if (udt_format2 == 0x06) //IP
-  {
-    if (udt_uab == 1) //IP4
-    {
-      fprintf (stderr, "IP4: ");
-      fprintf (stderr, "%d.",(uint8_t)ConvertBitIntoBytes(&cs_bits[96+0], 8));
-      fprintf (stderr, "%d.",(uint8_t)ConvertBitIntoBytes(&cs_bits[96+8], 8));
-      fprintf (stderr, "%d.",(uint8_t)ConvertBitIntoBytes(&cs_bits[96+16], 8));
-      fprintf (stderr, "%d", (uint8_t)ConvertBitIntoBytes(&cs_bits[96+24], 8));
-    }
-    else //IP6
-    {
-      fprintf (stderr, "IP6: ");
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+0], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+16], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+32], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+48], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+56], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+72], 16));
-      fprintf (stderr, "%04X:",(uint16_t)ConvertBitIntoBytes(&cs_bits[96+88], 16));
-      fprintf (stderr, "%04X", (uint16_t)ConvertBitIntoBytes(&cs_bits[96+104], 16));
-    }
-  }
-  else if (udt_format2 == 0x0A) //Mixed Address/UTF-16BE
-  {
-    if (udt_uab == 1) end = 3;
-    if (udt_uab == 2) end = 9;
-    if (udt_uab == 3) end = 15;
-    if (udt_uab == 4) end = 21;
-    end -= udt_padnib/4; //is this correct?
-    fprintf (stderr, "Address: %d", (uint32_t)ConvertBitIntoBytes(&cs_bits[96+8], 24));
-    fprintf (stderr, "Text: "  );
-    for (i = 0; i < end; i++) //368/16 = 21 character max
-    {
-      utf16c = (uint16_t)ConvertBitIntoBytes(&cs_bits[(i*16)+96], 16);
-      if (utf16c >= 0x20 && utf16c != 0x7F) //avoid control chars
-        fprintf (stderr, "%lc", utf16c);
-      else fprintf (stderr, " ");
-    }
-  }
-  else if (udt_format2 == 0x05)
-  {
-    //Would be nice to be able to test these all out to make sure the conditions are okay, etc
-    fprintf (stderr, "NMEA"  );
-    if (cs_bits[96] == 1) //check if its encrypted first
-      fprintf (stderr, " Encrypted Format :("  ); //sad face
-    else if (udt_uab == 1)
-      nmea_iec_61162_1 (opts, state, cs_bits+96, udt_source, 1); //short format w/ 1 appended block
-    else if (udt_uab == 2) 
-      nmea_iec_61162_1 (opts, state, cs_bits+96, udt_source, 2); //standard long format w/ 2 appended blocks
-    //check the 'spare' bits from 184 to 192 to see if this is a manufacturer specific nmea format
-    else if (udt_uab == 3) //mfid format w/ 2 appended blocks -- format unspecified
-      fprintf  (stderr, " Unspecified MFID Format: %02X;", (uint8_t)ConvertBitIntoBytes(&cs_bits[184], 8));
-    else
-      fprintf (stderr, " Reserved Format; ");
-  }
-  else if (udt_format2 == 0x0B)
-  {
-    //unsure of how this is structured for UDT Blocks, would assume one appended block of same format
-    //but could also be full blown LIP protocol that is also found in tetra that would require the PDU
-    //type bit to be read and then to decode accordingly, this assumes its the modified Short PDU that USBD uses
-    fprintf (stderr, "\n");
-    lip_protocol_decoder (opts, state, cs_bits+96); //start on first appended block, and not header
-
-  }
-  else if (udt_format2 == 0x08 || udt_format2 == 0x09)
-  {
-    fprintf (stderr, "MFID SPEC %02X: ", udt_format2);
-    //use -Z to expose this
-  }
-  else
-  {
-    fprintf (stderr, "Reserved %02X: ", udt_format2);
-    //use -Z to expose this
-  }
-  fprintf (stderr, "%s", KNRM);
+  dmr_cspdu (opts, state, cs_bits, cs_byte, CRCCorrect, IrrecoverableErrors);
+  
 }
 
 //assemble the blocks as they come in, shuffle them into the unified dmr_pdu_sf
 void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_bytes[], uint8_t block_len, uint8_t databurst, uint8_t type)
 {
-  UNUSED(databurst);
-
-  int i, j;
+  int i, j, k;
   uint8_t lb = 0; //mbc last block
   uint8_t pf = 0; //mbc protect flag
 
@@ -664,7 +417,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
   uint32_t CRCExtracted = 0;
   uint32_t IrrecoverableErrors = 0; 
 
-  uint8_t dmr_pdu_sf_bits[8*24*129]; //give plenty of space so we don't go oob
+  uint8_t dmr_pdu_sf_bits[8*24*50]; //give plenty of space so we don't go oob
 
   //MBC Header and Block CRC
   uint8_t mbc_crc_good[2]; //header and blocks crc pass/fail local storage
@@ -677,14 +430,14 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
   uint8_t is_udt = 0;
   if (type == 3)
   {
-    blocks = state->data_header_blocks[slot];
+    blocks = state->data_block_counter[slot];
     is_udt = 1;
     type = 2;
   }
 
   //sanity check, setting block_len and block values to sane numbers in case of missing header, else could overload array (crash) or print out
   if (blocks < 1) blocks = 1; //changed blocks from uint8_t to int
-  if (blocks > 127) blocks = 127;
+  if (blocks > 9) blocks = 9;
   if (block_len == 0) block_len = 18;
   if (block_len > 24) block_len = 24;
 
@@ -791,62 +544,36 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
         fprintf (stderr, "\n Slot %d - Multi Block PDU Message\n  ", slot+1);
         for (i = 0; i < ((blocks+1)*block_len); i++) 
         {
-          if ( (i != 0) && (i % 12 == 0) ) fprintf (stderr, "\n  "); 
           fprintf (stderr, "[%02X]", state->dmr_pdu_sf[slot][i]);
+          if (i == 11 || i == 23 || i == 35 || i == 47 || i == 59 || i == 71 || i == 83 || i == 95) 
+          {
+            fprintf (stderr, "\n  "); 
+          }
         }
 
         //debug print
         // fprintf (stderr, " CRC - EXT %X CMP %X", CRCExtracted, CRCComputed);
 
+        if (state->data_header_format[slot] == 13 || state->data_header_format[slot] == 14 || state->data_header_sap[slot] == 10)
+        {
+          fprintf (stderr, "%s", KCYN);
+          fprintf (stderr, "\n Short Data: ASCII \n"  );
+          for (i = 0; i < ((blocks+1)*block_len); i++)
+          {
+            if (state->dmr_pdu_sf[slot][i] <= 0x7E && state->dmr_pdu_sf[slot][i] >=0x20)
+            {
+              fprintf (stderr, "%c", state->dmr_pdu_sf[slot][i]);
+            }
+            else fprintf (stderr, " ");
+
+            if (i == 47 || i == 95) fprintf (stderr, "\n  ");
+          }
+            
+        }
+
         fprintf (stderr, "%s ", KNRM);
       }
 
-      // #define DMR_ASCII_TEST
-      #ifdef DMR_ASCII_TEST
-      // if (state->data_header_format[slot] == 13 || state->data_header_format[slot] == 14 || state->data_header_sap[slot] == 10)
-      {
-        fprintf (stderr, "%s", KCYN);
-        fprintf (stderr, "\n DMR PDU ASCII: \n"  );
-        for (i = 0; i < ((blocks+1)*block_len); i++)
-        {
-          if (state->dmr_pdu_sf[slot][i] <= 0x7E && state->dmr_pdu_sf[slot][i] >=0x20)
-          {
-            fprintf (stderr, "%c", state->dmr_pdu_sf[slot][i]);
-          }
-          else fprintf (stderr, " ");
-
-          if (i == 47 || i == 95) fprintf (stderr, "\n  ");
-        }
-          
-      }
-      #endif
-
-      // #define DMR_UTF16_TEST
-      #ifdef DMR_UTF16_TEST
-      //utf-16 text messaging (debug)
-      // if (utf-16)
-      {
-        fprintf (stderr, "%s", KCYN);
-        fprintf (stderr, "\n DMR PDU UTF16: ");
-        uint16_t ch16 = 0;
-        for (i = 25; i < ((blocks+1)*block_len)-4;) //at least one system seems to put out utf-16 at the offset of 25 from testing
-        {
-          ch16 = (uint16_t)state->dmr_pdu_sf[slot][i+0];
-          ch16 <<= 8;
-          ch16 |= (uint16_t)state->dmr_pdu_sf[slot][i+1];
-          // fprintf (stderr, " %04X; ", ch16); //debug for raw values to check grouping for offset
-
-          if (ch16 >= 0x20) //if not a linebreak or terminal commmands
-            fprintf (stderr, "%lc", ch16);
-          else if (ch16 == 0) //if padding
-            fprintf (stderr, "_");
-          else fprintf (stderr, " ");
-
-          i += 2;
-        }
-      }
-      #endif
-
       //reset data header format storage
       state->data_header_format[slot] = 7;
       //flag off data header validity 
@@ -878,18 +605,15 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
 
     if (is_udt)
     {
-      lb = 0; //set to zero, data header may erroneously the lb flag check above (IG)
-      pf = 0; //set to zero, data header may erroneously the pf flag check above (A)
-      if (blocks == blockcounter) lb = 1; //seems to work now with the +1 on udt_uab
-      
-      //debug -- evaluate current block count vs the number of expected blocks
-      // fprintf (stderr, " BL: %d; BC: %d; ", blocks, blockcounter);
+      blocks = state->data_header_blocks[slot];
+      if (blocks == blockcounter) lb = 1; //double check
+      pf = 0; //flag off is set from bit in error
     }
 
     //last block arrived and we have a valid data header, time to send to cspdu decoder
     if (lb == 1 && state->data_header_valid[slot] == 1) 
     {
-      for(i = 0, j = 0; i < 12*6; i++, j+=8) //4 blocks max?
+      for(i = 0, j = 0; i < 12*4; i++, j+=8) //4 blocks max?
       {
         dmr_pdu_sf_bits[j + 0] = (state->dmr_pdu_sf[slot][i] >> 7) & 0x01;
         dmr_pdu_sf_bits[j + 1] = (state->dmr_pdu_sf[slot][i] >> 6) & 0x01;
@@ -919,23 +643,14 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
         CRCExtracted = CRCExtracted | (uint32_t)(dmr_pdu_sf_bits[i + 96*(1+blocks) - 16] & 1); 
       }
 
-      uint8_t mbc_block_bits[12*8*6]; //needed more room
+      uint8_t mbc_block_bits[12*8*3];
       memset (mbc_block_bits, 0, sizeof(mbc_block_bits));
       //shift continuation blocks and last block into seperate array for crc check
-      for (i = 0; i < 12*8*3; i++) //only doing 3 blocks (4 minus the header), probably need to re-evalutate this
+      for (i = 0; i < 12*8*3; i++) //only doing 3 blocks (4 minus the header)
       {
         mbc_block_bits[i] = dmr_pdu_sf_bits[i+96]; //skip mbc header
       }
 
-      if (is_udt)
-      {
-        memset (mbc_block_bits, 0, sizeof(mbc_block_bits));
-        for (i = 0; i < 12*8*blocks; i++)
-        {
-          mbc_block_bits[i] = dmr_pdu_sf_bits[i+96]; //skip udt header
-        }
-      }
-
       CRCComputed = ComputeCrcCCITT16d (mbc_block_bits, ((blocks+0)*96)-16 );
 
       if (CRCComputed == CRCExtracted) mbc_crc_good[1] = 1;
@@ -963,8 +678,8 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
       //cspdu will only act on any fid/opcodes if good CRC to prevent falsing on control signalling
       if (!is_udt && !pf) dmr_cspdu (opts, state, dmr_pdu_sf_bits, state->dmr_pdu_sf[slot], CRCCorrect, IrrecoverableErrors);
 
-      //send to udt decoder for handling
-      if (is_udt && !pf) dmr_udt_decoder (opts, state, state->dmr_pdu_sf[slot], CRCCorrect);
+      //will need to reassemble partially before sending to dmr_pdu or dmr_cspdu for handling -- needs testing
+      if (is_udt && !pf) dmr_udt_cspdu_converter (opts, state, state->dmr_pdu_sf[slot], dmr_pdu_sf_bits, CRCCorrect, IrrecoverableErrors);
 
       //Full Super Frame MBC/UDT - Debug Output
       if (opts->payload == 1)
@@ -985,6 +700,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
         if (pf) fprintf (stderr, "MBC/UDT Header/Blocks Protected ");
         fprintf (stderr, "%s ", KNRM);
       }
+
     } //end last block flag on MBC
 
   } //end type 2 (MBC Header and Continuation)
@@ -998,7 +714,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
   {
 
     //clear out unified pdu 'superframe' slot
-    for (int i = 0; i < 24*127; i++)
+    for (short int i = 0; i < 288; i++)
     {
       state->dmr_pdu_sf[slot][i] = 0;
     }
@@ -1021,7 +737,7 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
   {
 
     //clear out unified pdu 'superframe' slot
-    for (int i = 0; i < 24*127; i++)
+    for (short int i = 0; i < 288; i++)
     {
       state->dmr_pdu_sf[slot][i] = 0;
     }
@@ -1048,8 +764,6 @@ void dmr_block_assembler (dsd_opts * opts, dsd_state * state, uint8_t block_byte
 //or tuning away and we can no longer verify accurate data block reporting
 void dmr_reset_blocks (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
   memset (state->data_p_head, 0, sizeof(state->data_p_head));
   memset (state->data_conf_data, 0, sizeof(state->data_conf_data));
   memset (state->dmr_pdu_sf, 0, sizeof(state->dmr_pdu_sf));

src/dmr_bs.c

@@ -13,9 +13,9 @@
 //processing voice and/or data on both BS slots (channels) simultaneously
 void dmrBS (dsd_opts * opts, dsd_state * state)
 {
-  char * timestr = NULL;
+  int i, j, k, l, dibit;
+  int *dibit_p;
   
-  int i, dibit;
   char ambe_fr[4][24];
   char ambe_fr2[4][24];
   char ambe_fr3[4][24];
@@ -25,22 +25,18 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   char redundancyB[36];
 
   //memcpy of ambe_fr for late entry
-  uint8_t m1[4][24];
-  uint8_t m2[4][24];
-  uint8_t m3[4][24];
+  char m1[4][24];
+  char m2[4][24];
+  char m3[4][24];
   
   const int *w, *x, *y, *z;
   char sync[25];
-  uint8_t syncdata[48];
-  memset (syncdata, 0, sizeof(syncdata));
-
-  uint8_t emb_pdu[16];
-  memset (emb_pdu, 0, sizeof(emb_pdu));
+  char syncdata[48];
+  char EmbeddedSignalling[16];
 
   uint8_t emb_ok = 0;
   uint8_t tact_okay = 0;
   uint8_t cach_err = 0;
-  UNUSED(cach_err);
 
   uint8_t internalslot;
   uint8_t vc1;
@@ -50,12 +46,28 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   uint8_t cc = 25;
   uint8_t power = 9; //power and pre-emption indicator
   uint8_t lcss = 9;
-  UNUSED2(cc, lcss);
   
   //would be ideal to grab all dibits and break them into bits to pass to new data handler?
   uint8_t dummy_bits[196]; 
   memset (dummy_bits, 0, sizeof(dummy_bits));
   
+  //add time to mirror printFrameSync
+  time_t now;
+  char * getTime(void) //get pretty hh:mm:ss timestamp
+  {
+    time_t t = time(NULL);
+
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  }
+
   //Init slot lights
   sprintf (state->slot1light, " slot1 ");
   sprintf (state->slot2light, " slot2 ");
@@ -63,24 +75,14 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   //Init the color code status
   state->color_code_ok = 0;
 
-  //if coming from the bootsrap, then the slot will still be assigned the last value
-  //we want to set only that vc value to 2, the other to 7
-  if (state->currentslot == 0)
-  {
-    vc1 = 2;
-    vc2 = 7;
-  }
-  if (state->currentslot == 1)
-  {
-    vc1 = 7;
-    vc2 = 2;
-  }
+  vc1 = 2;
+  vc2 = 2;
 
   short int loop = 1;
   short int skipcount = 0;
 
   //cach
-  uint8_t cachdata[25];
+  char cachdata[25]; 
   int cachInterleave[24] =
   {0, 7, 8, 9, 1, 10,
    11, 12, 2, 13, 14,
@@ -94,18 +96,9 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   //Run Loop while the getting is good
   while (loop == 1) {
 
-  if (exitflag == 1)
-  {
-    cleanupAndExit (opts, state);
-  }
-
-  timestr = getTimeC();
-
   memset (ambe_fr, 0, sizeof(ambe_fr));
   memset (ambe_fr2, 0, sizeof(ambe_fr2));
   memset (ambe_fr3, 0, sizeof(ambe_fr3));
-  memset (emb_pdu, 0, sizeof(emb_pdu));
-  memset (syncdata, 0, sizeof(syncdata));
 
   internalslot = -1; //reset here so we know if this value is being set properly
   for(i = 0; i < 12; i++)
@@ -194,19 +187,19 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   {
     dibit = getDibit(opts, state);
     state->dmr_stereo_payload[i+66] = dibit;
-    sync[i] = (dibit | 1) + 48; //Sync Burst String as ones and threes
+    sync[i] = (dibit | 1) + 48; //how does this work again?
 
     syncdata[(2*i)]   = (1 & (dibit >> 1));  // bit 1
     syncdata[(2*i)+1] = (1 & dibit);         // bit 0
 
     //embedded link control
-    if(internalslot == 0 && vc1 > 1 && vc1 < 7) //grab on vc1 values 2-5 B C D E, and F
+    if(internalslot == 0 && vc1 > 1 && vc1 < 7) //grab on vc1 values 2-5 B C D and E
     {
       state->dmr_embedded_signalling[internalslot][vc1-1][i*2]   = (1 & (dibit >> 1)); // bit 1
       state->dmr_embedded_signalling[internalslot][vc1-1][i*2+1] = (1 & dibit); // bit 0
     }
 
-    if(internalslot == 1 && vc2 > 1 && vc2 < 7) //grab on vc2 values 2-5 B C D E, and F
+    if(internalslot == 1 && vc2 > 1 && vc2 < 7) //grab on vc2 values 2-5 B C D and E
     {
       state->dmr_embedded_signalling[internalslot][vc2-1][i*2]   = (1 & (dibit >> 1)); // bit 1
       state->dmr_embedded_signalling[internalslot][vc2-1][i*2+1] = (1 & dibit); // bit 0
@@ -215,8 +208,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   }
   sync[24] = 0;
 
-  for(i = 0; i < 8; i++) emb_pdu[i + 0] = syncdata[i];
-  for(i = 0; i < 8; i++) emb_pdu[i + 8] = syncdata[i + 40];
+  for(i = 0; i < 8; i++) EmbeddedSignalling[i] = syncdata[i];
+  for(i = 0; i < 8; i++) EmbeddedSignalling[i + 8] = syncdata[i + 40];
 
   //Continue Second AMBE Frame, 18 after Sync or EmbeddedSignalling
   for(i = 0; i < 18; i++)
@@ -266,7 +259,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   if ( strcmp (sync, DMR_BS_DATA_SYNC) == 0 )
   {
     
-    fprintf (stderr,"%s ", timestr);
+    fprintf (stderr,"%s ", getTime());
     if (internalslot == 0)
     {
       if (opts->inverted_dmr == 0)
@@ -275,7 +268,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
       }
       else fprintf (stderr,"Sync: -DMR  ");
       
-      vc1 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
+      vc1 = 1;
 
       //close MBEout file - slot 1
       if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state); 
@@ -288,7 +281,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
       }
       else fprintf (stderr,"Sync: -DMR  ");
 
-      vc2 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
+      vc2 = 1;
 
       //close MBEout file - slot 2
       if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
@@ -299,103 +292,26 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
     goto SKIP;
   }
 
-  //ETSI TS 102 361-1 V2.6.1 Table E.2 and E.4
-  //check for a rc burst with bptc or 34 rate data in it (testing only)
-  // #define RC_TESTING //disable if not in use
-  #ifdef RC_TESTING
-  if ( (strcmp (sync, DMR_BS_DATA_SYNC) != 0) && (strcmp (sync, DMR_BS_VOICE_SYNC) != 0) && 
-       ( (internalslot == 0 && vc1 == 6) ||  (internalslot == 1 && vc2 == 6) )              )
-  {
-
-    //if the QR FEC is good, and the P/PI bit is on for RC
-    if (QR_16_7_6_decode(emb_pdu) && emb_pdu[4])
-    {
-      fprintf (stderr,"%s ", timestr);
-
-      if (opts->inverted_dmr == 0)
-        fprintf (stderr,"Sync: +RC   ");
-      else fprintf (stderr,"Sync: -RC   ");
-
-      dmr_data_sync (opts, state);
-
-      dmr_data_burst_handler(opts, state, (uint8_t *)dummy_bits, 0xEB);
-
-      dmr_sbrc (opts, state, emb_pdu[4]);
-
-      if (internalslot == 0)
-        vc1 = 7;
-      else vc2 = 7;
-
-      goto SKIP;
-
-    }
-
-  }
-  #endif //RC_TESTING
-
-  //check to see if we are expecting a VC at this point vc > 7
-  if (strcmp (sync, DMR_BS_DATA_SYNC) != 0 && internalslot == 0 && vc1 > 6)
-  {
-    fprintf (stderr,"%s ", timestr);
-
-    //simplifying things
-    // char polarity[3];
-    char light[18];
-
-    sprintf (light, "%s", " [SLOT1]  slot2  ");
-    fprintf (stderr,"Sync:  DMR %s", light);
-    fprintf (stderr, "%s", KCYN);
-    fprintf (stderr, "| Frame Sync Err: %d", vc1);
-    fprintf (stderr, "%s", KNRM);
-    fprintf (stderr, "\n");
-    vc1++;
-    //this should give it enough time to find the next frame sync pattern, if it exists, if not, then trigger a resync
-    if ( vc1 > 13 ) goto END;
-    else goto SKIP;
-  }
-
-  //check to see if we are expecting a VC at this point vc > 7
-  if (strcmp (sync, DMR_BS_DATA_SYNC) != 0 && internalslot == 1 && vc2 > 6)
-  {
-    fprintf (stderr,"%s ", timestr);
-
-    //simplifying things
-    // char polarity[3];
-    char light[18];
-
-    sprintf (light, "%s", "  slot1  [SLOT2] ");
-    fprintf (stderr,"Sync:  DMR %s", light);
-    fprintf (stderr, "%s", KCYN);
-    fprintf (stderr, "| Frame Sync Err: %d", vc2);
-    fprintf (stderr, "%s", KNRM);
-    fprintf (stderr, "\n");
-    vc2++;
-    //this should give it enough time to find the next frame sync pattern, if it exists, if not, then trigger a resync
-    if ( vc2 > 13 ) goto END;
-    else goto SKIP;
-  }
-
-  //only play voice on no data sync, and VC values are within expected values 1-6
+  //only play voice on no data sync
   if (strcmp (sync, DMR_BS_DATA_SYNC) != 0) //we already have a tact ecc check, so we won't get here without that, see if there is any other eccs we can run just to make sure 
   {
 
     //check the embedded signalling, if bad at this point, we probably aren't quite in sync 
-    if(QR_16_7_6_decode(emb_pdu)) emb_ok = 1;
+    if(QR_16_7_6_decode(EmbeddedSignalling)) emb_ok = 1;
     else emb_ok = 0;
 
     //disable the goto END; if this causes more problems than fixing on late entry dual voices i.e., lots of forced resyncs
     if ( (strcmp (sync, DMR_BS_VOICE_SYNC) != 0) && emb_ok == 0) goto END; //fprintf (stderr, "EMB BAD? ");
     else if (emb_ok == 1)
     {
-      cc = ((emb_pdu[0] << 3) + (emb_pdu[1] << 2) + (emb_pdu[2] << 1) + emb_pdu[3]);
-      power = emb_pdu[4];
-      lcss = ((emb_pdu[5] << 1) + emb_pdu[6]);
-      state->dmr_color_code = state->color_code = cc;
+      cc = ((EmbeddedSignalling[0] << 3) + (EmbeddedSignalling[1] << 2) + (EmbeddedSignalling[2] << 1) + EmbeddedSignalling[3]);
+      power = EmbeddedSignalling[4];
+      lcss = ((EmbeddedSignalling[5] << 1) + EmbeddedSignalling[6]);
     }
 
 
     skipcount = 0; //reset skip count if processing voice frames
-    fprintf (stderr,"%s ", timestr);
+    fprintf (stderr,"%s ", getTime());
 
     //simplifying things
     char polarity[3];
@@ -419,9 +335,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
     } 
     if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
     else sprintf (polarity, "%s", "-");
-    if (state->dmr_color_code != 16)
-      fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC%d ", polarity, light, state->dmr_color_code, vc);
-    else fprintf (stderr,"Sync: %sDMR %s| Color Code=XX | VC%d ", polarity, light, vc);
+
+    fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC%d ", polarity, light, state->dmr_color_code, vc);
  
     if (internalslot == 0 && vc1 == 6) 
     {
@@ -453,53 +368,34 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
     memcpy (m3, ambe_fr3, sizeof(m3));
 
     processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-    if(internalslot == 0)
-    {
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    }
-      
-    else
-    {
-      memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-      memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
-      memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
-    }
-      
-    
     processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-    if(internalslot == 0)
+    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);    
+
+    //run sbrc here to look for the late entry key and alg after we observe potential errors in VC6
+    if (internalslot == 0 && vc1 == 6) dmr_sbrc (opts, state, power);
+    if (internalslot == 1 && vc2 == 6) dmr_sbrc (opts, state, power);
+
+    cach_err = dmr_cach (opts, state, cachdata); 
+    if (opts->payload == 0) fprintf (stderr, "\n");
+
+    // run alg refresh after vc6 ambe processing
+    if (internalslot == 0 && vc1 == 6) dmr_alg_refresh (opts, state);
+    if (internalslot == 1 && vc2 == 6) dmr_alg_refresh (opts, state);
+
+    dmr_late_entry_mi_fragment (opts, state, vc, m1, m2, m3);
+
+    //increment the vc counters
+    if (internalslot == 0) vc1++;
+    if (internalslot == 1) vc2++;
+
+    //update cc amd vc sync time for trunking purposes (particularly Con+)
+    if (opts->p25_is_tuned == 1)
     {
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    }
-      
-    else
-    {
-      memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-      memcpy(state->s_r4[1], state->s_r, sizeof(state->s_r));
-      memcpy(state->s_r4u[1], state->s_ru, sizeof(state->s_ru));
+      state->last_vc_sync_time = time(NULL);
+      state->last_cc_sync_time = time(NULL);
     }
 
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-    if(internalslot == 0)
-    {
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-    }
-      
-    else
-    {
-      memcpy(state->f_r4[2], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-      memcpy(state->s_r4[2], state->s_r, sizeof(state->s_r));
-      memcpy(state->s_r4u[2], state->s_ru, sizeof(state->s_ru));
-    }
-
-
-    //'DSP' output to file -- run before sbrc
+    //'DSP' output to file
     if (opts->use_dsp_output == 1)
     {
       FILE * pFile; //file pointer
@@ -517,31 +413,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
         fprintf (pFile, "%X", dsp_byte);
       }
       fclose (pFile);
-    }
-
-    //run sbrc here to look for the late entry key and alg after we observe potential errors in VC6
-    if (internalslot == 0 && vc1 == 6) dmr_sbrc (opts, state, power);
-    if (internalslot == 1 && vc2 == 6) dmr_sbrc (opts, state, power);
-
-    cach_err = dmr_cach (opts, state, cachdata); 
-    if (opts->payload == 0) fprintf (stderr, "\n");
-
-    // run alg refresh after vc6 ambe processing
-    if (internalslot == 0 && vc1 == 6) dmr_alg_refresh (opts, state);
-    if (internalslot == 1 && vc2 == 6) dmr_alg_refresh (opts, state);
-
-    dmr_late_entry_mi_fragment (opts, state, vc%7, m1, m2, m3);
-
-    //increment the vc counters
-    if (internalslot == 0) vc1++;
-    if (internalslot == 1) vc2++;
-
-    //update cc amd vc sync time for trunking purposes (particularly Con+)
-    if (opts->p25_is_tuned == 1)
-    {
-      state->last_vc_sync_time = time(NULL);
-      state->last_cc_sync_time = time(NULL);
-    }
+    } 
 
     //reset err checks
     cach_err = 1;
@@ -560,15 +432,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
   }
 
   SKIP:
-
-  //both working now, will need support added for ENC audio and no key
-  //NOTE: We want this to play regardless of whether the slot is voice or data, to play silence in one slot and voice in the second, or voices in both
-  if (internalslot == 1 && opts->floating_point == 1 && opts->pulse_digi_rate_out == 8000)
-    playSynthesizedVoiceFS3 (opts, state); //Float Stereo Mix 3v2
-  if (internalslot == 1 && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000)
-    playSynthesizedVoiceSS3 (opts, state); //Short Stereo Mix 3v2
-
-  if (skipcount > 3) //after 3 onsecutive data frames, drop back to getFrameSync and process with dmr_data_sync (need one more in order to push last voice on slot 2 only voice)
+  if (skipcount > 2) //after 2 consecutive data frames, drop back to getFrameSync and process with dmr_data_sync
   {
     //set tests to all good so we don't get a bogus/redundant voice error 
     cach_err = 0;
@@ -583,13 +447,6 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
     ncursesPrinter(opts, state);
   }
 
-  //
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
-
  } // while loop
 
  END:
@@ -603,17 +460,11 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
  if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
  if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
 
- //clear out any stale audio storage buffers
- memset (state->f_l4, 0.0f, sizeof(state->f_l4));
- memset (state->f_r4, 0.0f, sizeof(state->f_r4));
- memset (state->s_l4, 0, sizeof(state->s_l4));
- memset (state->s_r4, 0, sizeof(state->s_r4));
-
  //if we have a tact or emb err, then produce sync pattern/err message
  if (tact_okay != 1 || emb_ok != 1)
  {
 
-  fprintf (stderr,"%s ", timestr);
+  fprintf (stderr,"%s ", getTime());
   fprintf (stderr,"Sync:  DMR                  ");
   fprintf (stderr, "%s", KRED);
   fprintf (stderr, "| VOICE CACH/EMB ERR");
@@ -636,19 +487,12 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
    
  }
 
- //
- if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
-
 }
 
 //Process buffered half frame and 2nd half and then jump to full BS decoding
 void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
 {
-  int i, dibit;
+  int i, j, k, l, dibit;
   int *dibit_p;
   char ambe_fr[4][24];
   char ambe_fr2[4][24];
@@ -659,28 +503,41 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   memset (ambe_fr3, 0, sizeof(ambe_fr3));
 
   //memcpy of ambe_fr for late entry
-  uint8_t m1[4][24];
-  uint8_t m2[4][24];
-  uint8_t m3[4][24];
+  char m1[4][24];
+  char m2[4][24];
+  char m3[4][24];
 
   const int *w, *x, *y, *z;
   char sync[25];
   uint8_t tact_okay = 0;
   uint8_t cach_err = 0;
   uint8_t sync_okay = 1;
-  UNUSED(cach_err);
 
   uint8_t internalslot;
 
-  uint8_t cachdata[25];
+  char cachdata[25]; 
   int cachInterleave[24] =
   {0, 7, 8, 9, 1, 10,
   11, 12, 2, 13, 14,
   15, 3, 16, 4, 17, 18,
   19, 5, 20, 21, 22, 6, 23
-  };
+  }; 
+  //add time to mirror printFrameSync
+  time_t now;
+  char * getTime(void) //get pretty hh:mm:ss timestamp
+  {
+    time_t t = time(NULL);
 
-  char * timestr = getTimeC();
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  }
 
   //payload buffer
   //CACH + First Half Payload + Sync = 12 + 54 + 24
@@ -829,7 +686,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
     fclose (pFile);
   }
 
-  fprintf (stderr,"%s ", timestr);
+  fprintf (stderr,"%s ", getTime());
   char polarity[3];
   char light[18];
 
@@ -847,9 +704,8 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   } 
   if (opts->inverted_dmr == 0) sprintf (polarity, "%s", "+");
   else sprintf (polarity, "%s", "-");
-  if (state->dmr_color_code != 16)
-    fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC1*", polarity, light, state->dmr_color_code);
-  else fprintf (stderr,"Sync: %sDMR %s| Color Code=XX | VC1*", polarity, light);
+
+  fprintf (stderr,"Sync: %sDMR %s| Color Code=%02d | VC1*", polarity, light, state->dmr_color_code);
 
   dmr_alg_reset (opts, state);
 
@@ -861,55 +717,9 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   memcpy (m3, ambe_fr3, sizeof(m3));
 
   if (opts->payload == 1) fprintf (stderr, "\n"); //extra line break necessary here
-  // processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-  // processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-  // processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-
   processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-  if(internalslot == 0)
-  {
-    memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-    memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-    memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-  }
-    
-  else
-  {
-    memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-    memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
-    memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
-  }
-    
-
   processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-  if(internalslot == 0)
-  {
-    memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-    memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-    memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-  }
-    
-  else
-  {
-    memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-    memcpy(state->s_r4[1], state->s_r, sizeof(state->s_r));
-    memcpy(state->s_r4u[1], state->s_ru, sizeof(state->s_ru));
-  }
-
   processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-  if(internalslot == 0)
-  {
-    memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-    memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-    memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-  }
-    
-  else
-  {
-    memcpy(state->f_r4[2], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-    memcpy(state->s_r4[2], state->s_r, sizeof(state->s_r));
-    memcpy(state->s_r4u[2], state->s_ru, sizeof(state->s_ru));
-  }
 
   //collect the mi fragment
   dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);
@@ -920,18 +730,12 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   //update voice sync time for trunking purposes (particularly Con+)
   if (opts->p25_is_tuned == 1) state->last_vc_sync_time = time(NULL);
 
-  //NOTE: Only play on slot 1, if slot 0, then it'll play after the next TDMA frame in the BS loop instead
-  if (internalslot == 1 && opts->floating_point == 1 && opts->pulse_digi_rate_out == 8000)
-    playSynthesizedVoiceFS3 (opts, state); //Float Stereo Mix 3v2
-  if (internalslot == 1 && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000)
-    playSynthesizedVoiceSS3 (opts, state); //Short Stereo Mix 3v2
-
   dmrBS (opts, state); //bootstrap into full TDMA frame for BS mode
   END:
   //if we have a tact err, then produce sync pattern/err message
   if (tact_okay != 1 || sync_okay != 1)
   {
-    fprintf (stderr,"%s ", timestr);
+    fprintf (stderr,"%s ", getTime());
     fprintf (stderr,"Sync:  DMR                  ");
     fprintf (stderr, "%s", KRED);
     fprintf (stderr, "| VOICE CACH/SYNC ERR");
@@ -953,10 +757,5 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
     dmr_reset_blocks (opts, state); 
   }
 
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
 
 }

src/dmr_data.c

@@ -25,15 +25,14 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
   int *dibit_p;
   char sync[25];
   char syncdata[48];
-  uint8_t cachdata[25];
-  UNUSED(syncdata);
+  char cachdata[25];
 
+  char bursttype[5];
   uint8_t burst;
   char info[196];
   unsigned char SlotType[20]; 
   unsigned int SlotTypeOk;
   uint8_t cach_err = 0;
-  UNUSED(cach_err);
 
   int cachInterleave[24] = 
   {0, 7, 8, 9, 1, 10,
@@ -293,8 +292,8 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
     info[(2*i) + 99] = (1 & dibit);         // bit 0
   }
   
-  //
-  dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
+  //don't run on MS Reverse Channel Data
+  if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
 
   //don't run cach on simplex or mono
   if (state->dmr_ms_mode == 0 && opts->dmr_mono == 0)
@@ -321,25 +320,33 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
     skipDibit (opts, state, 12 + 49 + 5);
   }
 
-  #define CON_TUNEAWAY //disable if any unlock issues noted on the logic
-
-  #ifdef CON_TUNEAWAY
-  //simplified, if IDLE condition, drop cc and vc sync time so when RF channel tears down, we go back much quicker
-  //NOTE: This was adopted, because going back to the CC early and then to be sent back to the channel grant, 
-  //only for it to tear down and being sent back to the CC again isn't very efficient for trunk tracking
-  //NOTE: This will still leave the tuner in the 'locked' state when tuning a voice channel grant on the CC,
-  //and will remain locked until a new voice channel grant is received, but its just asthetic, trying to fix it
-  //is too much of a hassle and causes other issues like CC hunting, etc.
+  //if using con+ trunking and last voice observed more than x seconds ago, snap back to con+ cc
+  //con+ voice channels can have extremely long idle periods without properly tearing down
   if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && state->is_con_plus == 1)
   {
-    int clear = 0;
-    //IF both slots currently signalling IDLE
-    if (state->dmrburstL == 9 && state->dmrburstR == 9) clear = 1;
-    if (clear == 1)
+    //bug fixed that caused hopping from CC to VC; decreased to 2 seconds.
+    if ( (time(NULL) - state->last_vc_sync_time > 2) ) 
     {
-      state->last_cc_sync_time = 0;
-      state->last_vc_sync_time = 0;
+      if (opts->use_rigctl == 1) //rigctl tuning
+      {
+        if (opts->setmod_bw != 0) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
+        SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
+      }
+
+      else if (opts->audio_in_type == 3) //rtl_fm tuning
+      {
+        #ifdef USE_RTLSDR
+        rtl_dev_tune(opts, state->p25_cc_freq);
+        #endif
+      }
+      opts->p25_is_tuned = 0;
+      //zero out vc frequencies
+      state->p25_vc_freq[0] = 0;
+      state->p25_vc_freq[1] = 0;
+      memset (state->active_channel, 0, sizeof(state->active_channel));
+      state->last_cc_sync_time = time(NULL);
+      state->is_con_plus = 0; //con+ flag off
     }
   }
-  #endif
+
 } 

src/dmr_dburst.c

@@ -6,14 +6,14 @@
  * Source: https://github.com/LouisErigHerve/dsd/blob/master/src/dmr_sync.c
  *
  * LWVMOBILE
- * 2023-12 DSD-FME Florida Man Edition
+ * 2022-12 DSD-FME Florida Man Edition
  *-----------------------------------------------------------------------------*/
 
-//TODO: Test USBD LIP Decoder with Real World Samples (if/when available)
-//TODO: Test UDT NMEA and LIP Decoders with Real World Samples (if/when available)
-//WIP:  Move all extra decoders for location, etc, to a new file and add prototypes to dsd.h  
-//TODO: Test CRC9/CRC32 on Rate 1 Data with Real World Samples (if/when available)
-//TODO: Address areas that require reading of ISO7, ISO8, and UTF-16 string formats
+//WIP:  Unified Single Block Data - USBD -- TODO: USBD LIP Protocol Handling
+//WIP:  UDT Header and Blocks (coded - need samples)
+//WIP:  CRC9/CRC32 on Rate 1 Data (need samples)
+//WIP:  Reverse Channel Signalling - RC single burst BPTC/7-bit CRC (rc interleave) and when to run RC and not SB
+//WIP:  Single Burst Embedded LC - Non-RC single burst LC - Look for Late Entry Alg/Key
 
 #include "dsd.h"
 
@@ -26,13 +26,13 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
   uint32_t CRCCorrect       = 0;
   uint32_t IrrecoverableErrors = 0;
   uint8_t slot = state->currentslot;
+  uint8_t block = state->data_block_counter[slot];
 
   //confirmed data 
   uint8_t dbsn = 0; //data block serial number for confirmed data blocks
   uint8_t blockcounter = 0; //local block count
   uint8_t confdatabits[250]; //array to reshuffle conf data block bits into sequence for crc9 check
   memset (confdatabits, 0, sizeof(confdatabits));
-  UNUSED(dbsn);
 
   //BPTC 196x96 Specific
   uint8_t  BPTCDeInteleavedData[196];
@@ -207,12 +207,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
 
   if (databurst != 0xEB)
   {
-    if (state->dmr_ms_mode == 0)
-    { 
-      if (state->dmr_color_code != 16)
-        fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
-      else fprintf(stderr, "| Color Code=XX ");
-    }
+    if (state->dmr_ms_mode == 0) fprintf(stderr, "| Color Code=%02d ", state->dmr_color_code);
     fprintf(stderr, "|%s", state->fsubtype);
 
     //'DSP' output to file
@@ -502,18 +497,20 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
 
   }
 
-  if (is_full) //Rate 1 Data
+  if (is_full) //Rate 1 Data -- todo: fix padding bits, the four padding bits are on bit 96,97,98,99
   {
     CRCExtracted = 0;
     CRCComputed = 0;
     IrrecoverableErrors = 0; //implicit, since there is no encoding
 
-    for (i = 0; i < 12; i++)
+    for (i = 0; i < 24; i++)
+    {
       DMR_PDU[i] = (uint8_t)ConvertBitIntoBytes(&info[i*8], 8);
-
-    //Skip Padding Bits (96,97,98,99)
-    for (i = 0; i < 12; i++)
-      DMR_PDU[i+12] = (uint8_t)ConvertBitIntoBytes(&info[(i*8)+100], 8);
+    }
+    //leftover 4 bits, manual doesn't say which 4 so assuming last 4
+    //pushing last 4 to 25 and shifting it
+    DMR_PDU[25] = (uint8_t)ConvertBitIntoBytes(&info[192], 4);
+    DMR_PDU[25] = DMR_PDU[25] << 4;
 
     //set CRC to correct on unconfirmed 1 rate data blocks (for reporting due to no CRC available on these)
     if (state->data_conf_data[slot] == 0) CRCCorrect = 1;
@@ -580,8 +577,8 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
     //TODO: provide more robust handling at a later date -- ETSI TS 102 361-4 V1.11.1 (2021-01) 6.6.11.3
     usbd_st = (uint8_t)ConvertBitIntoBytes(&DMR_PDU_bits[0], 4);
     fprintf (stderr, "%s\n", KYEL);
-    fprintf (stderr, " USBD - ");
-    if (usbd_st == 0) lip_protocol_decoder (opts, state, DMR_PDU_bits);
+    fprintf (stderr, " Unified Single Block Data - ");
+    if (usbd_st == 0) fprintf (stderr, "Location Information Protocol");
     else if (usbd_st > 8) fprintf (stderr, "Manufacturer Specific Service %d ", usbd_st);
     else fprintf (stderr, "Reserved %d ", usbd_st);
   }
@@ -590,7 +587,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
   if (is_ras == 1) CRCCorrect = crc_original_validity;
 
   //start printing relevant fec/crc/ras messages, don't print on idle or MBC continuation blocks (handled in dmr_block.c)
-  // if (IrrecoverableErrors == 0 && CRCCorrect == 1 && databurst != 0x09 && databurst != 0x05) fprintf(stderr, "(CRC OK)");
+  if (IrrecoverableErrors == 0 && CRCCorrect == 1 && databurst != 0x09 && databurst != 0x05) ; //fprintf(stderr, "(CRC OK)");
 
   // if (IrrecoverableErrors == 0 && CRCCorrect == 0 && databurst != 0x09 && databurst != 0x05)
   // {

src/dmr_flco.c

@@ -14,7 +14,6 @@
 //combined flco handler (vlc, tlc, emb), minus the superfluous structs and strings
 void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors, uint8_t type)
 {
-  UNUSED(CRCCorrect);
 
   //force slot to 0 if using dmr mono handling
   if (opts->dmr_mono == 1) state->currentslot = 0;
@@ -31,7 +30,6 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
   int is_cap_plus = 0;
   int is_alias = 0;
   int is_gps = 0;
-  UNUSED(capsite);
 
   //XPT 'Things'
   int is_xpt = 0;
@@ -43,7 +41,6 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
   uint8_t xpt_res_c = 0; //unknown values of other bits of the XPT LC
   uint8_t target_hash[24]; //for XPT (and others if desired, get the hash and compare against SLC or XPT Status CSBKs)
   uint8_t tg_hash = 0; //value of the hashed TG
-  UNUSED3(xpt_res_a, xpt_res_b, xpt_res_c);
 
   uint8_t slot = state->currentslot;
   uint8_t unk = 0; //flag for unknown FLCO + FID combo
@@ -334,9 +331,6 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
         state->payload_algid = 0;
         state->payload_mi = 0;
         state->payload_keyid = 0;
-        //reset gain
-        if (opts->floating_point == 1)
-          state->aout_gain = opts->audio_gain;
       }
       if (state->currentslot == 1)
       {
@@ -347,25 +341,19 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
         state->payload_algidR = 0;
         state->payload_miR = 0;
         state->payload_keyidR = 0;
-        //reset gain
-        if (opts->floating_point == 1)
-          state->aout_gainR = opts->audio_gain; 
       }
       
     }
     
-    //only assign this value here if not trunking
-    // if (opts->p25_trunk == 0) //may be safe to always do this now with code changes, will want to test at some point (tg hold w/ dual voice / slco may optimally need this set)
+
+    if (restchannel != state->dmr_rest_channel && restchannel != -1)
     {
-      if (restchannel != state->dmr_rest_channel && restchannel != -1)
+      state->dmr_rest_channel = restchannel;
+      //assign to cc freq
+      if (state->trunk_chan_map[restchannel] != 0)
       {
-        state->dmr_rest_channel = restchannel;
-        //assign to cc freq
-        // if (state->trunk_chan_map[restchannel] != 0)
-        // {
-        //   state->p25_cc_freq = state->trunk_chan_map[restchannel];
-        // } 
-      }
+        state->p25_cc_freq = state->trunk_chan_map[restchannel];
+      } 
     }
 
     if (type == 1) fprintf (stderr, "%s \n", KGRN);
@@ -387,19 +375,16 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
 
     else if (flco == 0x4 || flco == 0x5 || flco == 0x7 || flco == 0x23) //Cap+ Things
     {
-      // sprintf (state->call_string[slot], " Cap+");
-      sprintf (state->call_string[slot], "%s","");
+      sprintf (state->call_string[slot], " Cap+");
       fprintf (stderr, "Cap+ ");
       if (flco == 0x4)
       {
-        // strcat (state->call_string[slot], " Grp");
-        sprintf (state->call_string[slot], "   Group ");
+        strcat (state->call_string[slot], " Grp");
         fprintf (stderr, "Group ");
       }
       else
       {
-        // strcat (state->call_string[slot], " Pri");
-        sprintf (state->call_string[slot], " Private ");
+        strcat (state->call_string[slot], " Pri");
         fprintf (stderr, "Private ");
       } 
     }
@@ -428,60 +413,21 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
       // strcat (state->call_string[slot], " Encrypted");
       fprintf (stderr, "%s", KRED);
       fprintf(stderr, "Encrypted ");
-
-      //experimental TG LO/B if ENC trunked following disabled //DMR -- LO Trunked Enc Calls WIP; #121
-      if (opts->p25_trunk == 1 && opts->trunk_tune_enc_calls == 0) //&& type != 2
-      {
-        int i, lo = 0;
-        uint32_t t = 0; char gm[8]; char gn[50];
-
-        //check to see if this group already exists, or has already been locked out, or is allowed
-        for (i = 0; i <= state->group_tally; i++)
-        {
-          t = (uint32_t)state->group_array[i].groupNumber;
-          if (target == t && t != 0)
-          {
-            lo = 1;
-            //write current mode and name to temp strings
-            sprintf (gm, "%s", state->group_array[i].groupMode);
-            sprintf (gn, "%s", state->group_array[i].groupName);
-            break;
-          }
-        }
-
-        //if group doesn't exist, or isn't locked out, then do so now.
-        if (lo == 0)
-        { //changing from DE to B to fit the rest of the lockout logic ("Buzzer Fix")
-          state->group_array[state->group_tally].groupNumber = target;
-          sprintf (state->group_array[state->group_tally].groupMode, "%s", "B");
-          sprintf (state->group_array[state->group_tally].groupName, "%s", "ENC LO");
-          sprintf (gm, "%s", "B");
-          sprintf (gn, "%s", "ENC LO");
-          state->group_tally++;
-        }
-
-        //Craft a fake CSBK pdu send it to run as a p_clear to return to CC if available
-        uint8_t dummy[12]; uint8_t* dbits; memset (dummy, 0, sizeof(dummy)); dummy[0] = 46; dummy[1] = 255;
-        if ( (strcmp(gm, "B") == 0) && (strcmp(gn, "ENC LO") == 0)  ) //&& (opts->trunk_tune_data_calls == 0)
-          dmr_cspdu (opts, state, dbits, dummy, 1, 0);
-
-      }
-      
     }
     //REMUS! Uncomment Line Below if desired
     // else strcat (state->call_string[slot], "          ");
 
-    
-    if (1 == 1) //fid == 0x10
+    //Motorola FID 0x10 Only
+    if (fid == 0x10)
     {
       /* Check the "Service Option" bits */ 
-      if( (fid == 0x10) && (so & 0x20) ) //Motorola FID 0x10 Only
+      if(so & 0x20)
       {
         //REMUS! Uncomment Line Below if desired
         // strcat (state->call_string[slot], " TXI");
         fprintf(stderr, "TXI ");
       }
-      if ( (fid == 0x10) && (so & 0x10) ) //Motorola FID 0x10 Only
+      if (so & 0x10)
       {
         //REMUS! Uncomment Line Below if desired
         // strcat (state->call_string[slot], " RPT");
@@ -644,7 +590,7 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
   int i, j;
   uint8_t err = 0;
   uint8_t tact_valid = 0; 
-  UNUSED(tact_valid);
+  uint8_t cach_valid = 0;
 
   bool h1, h2, h3, crc; 
 
@@ -657,7 +603,6 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
   uint8_t at = 0; //access type, set to 1 during continuous transmission mode 
   uint8_t slot = 2; //tdma time slot
   uint8_t lcss = 0; //link control start stop (9.3.3) NOTE: There is no Single fragment LC defined for CACH signalling
-  UNUSED2(at, slot);
 
   //cach_bits are already de-interleaved upon initial collection (still needs secodary slco de-interleave)
   for (i = 0; i < 7; i++)
@@ -793,17 +738,10 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
     if (h1 && h2 && h3 && crc) dmr_slco (opts, state, slco_bits);
     else
     {
-      //this line break issue is wracking on my OCD for clean line breaks
-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) ; //no line break if current slot is voice with payload enabled
-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) ; //no line break if current slot is voice with payload enabled
-      else fprintf (stderr, "\n");
+      fprintf (stderr, "\n");
       fprintf (stderr, "%s", KRED);
       fprintf (stderr, " SLCO CRC ERR");
       fprintf (stderr, "%s", KNRM);
-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
-        fprintf (stderr, "\n");
-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
-        fprintf (stderr, "\n");
     } 
     
   }
@@ -826,8 +764,6 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
   uint16_t netsite = (uint16_t)ConvertBitIntoBytes(&slco_bits[6], 12);
   uint8_t reg = slco_bits[18]; //registration required/not required or normalchanneltype/composite cch
   uint8_t csc = (uint16_t)ConvertBitIntoBytes(&slco_bits[19], 9); //common slot counter, 0-511
-  UNUSED(netsite);
-
   uint16_t net = 0;
 	uint16_t site = 0;
   char model_str[8];
@@ -838,32 +774,9 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
   uint8_t ts1_hash = (uint8_t)ConvertBitIntoBytes(&slco_bits[12], 8); //ts1 address hash (crc8) //361-1 B.3.7
   uint8_t ts2_hash = (uint8_t)ConvertBitIntoBytes(&slco_bits[20], 8); //ts2 address hash (crc8) //361-1 B.3.7
 
-  char ts1_str[25]; sprintf (ts1_str, "%s", "");
-  char ts2_str[25]; sprintf (ts2_str, "%s", "");
-
-  if      (ts1_act == 0b0000) sprintf (ts1_str, "%s", "Idle");
-  else if (ts1_act == 0b0010) sprintf (ts1_str, "%s", "Group CSBK");
-  else if (ts1_act == 0b0011) sprintf (ts1_str, "%s", "Ind CSBK");
-  else if (ts1_act == 0b1000) sprintf (ts1_str, "%s", "Group Voice");
-  else if (ts1_act == 0b1001) sprintf (ts1_str, "%s", "Ind Voice");
-  else if (ts1_act == 0b1010) sprintf (ts1_str, "%s", "Ind Data");
-  else if (ts1_act == 0b1011) sprintf (ts1_str, "%s", "Group Data");
-  else if (ts1_act == 0b1100) sprintf (ts1_str, "%s", "Group Emergency");
-  else if (ts1_act == 0b1101) sprintf (ts1_str, "%s", "Ind Emergency");
-  else                        sprintf (ts1_str, "Res %X", ts1_act);
-
-  if      (ts2_act == 0b0000) sprintf (ts2_str, "%s", "Idle");
-  else if (ts2_act == 0b0010) sprintf (ts2_str, "%s", "Group CSBK");
-  else if (ts2_act == 0b0011) sprintf (ts2_str, "%s", "Ind CSBK");
-  else if (ts2_act == 0b1000) sprintf (ts2_str, "%s", "Group Voice");
-  else if (ts2_act == 0b1001) sprintf (ts2_str, "%s", "Ind Voice");
-  else if (ts2_act == 0b1010) sprintf (ts2_str, "%s", "Ind Data");
-  else if (ts2_act == 0b1011) sprintf (ts2_str, "%s", "Group Data");
-  else if (ts2_act == 0b1100) sprintf (ts2_str, "%s", "Group Emergency");
-  else if (ts2_act == 0b1101) sprintf (ts2_str, "%s", "Ind Emergency");
-  else                        sprintf (ts2_str, "Res %X", ts1_act);
-
   //DMR Location Area - DMRLA - should probably be state variables so we can use this in both slc and csbk
+  uint16_t sys_area = 0;
+  uint16_t sub_area = 0;
   uint16_t sub_mask = 0x1;
   //tiny n 1-3; small 1-5; large 1-8; huge 1-10
   uint16_t n = 1; //The minimum value of DMRLA is normally ≥ 1, 0 is reserved
@@ -940,16 +853,12 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
 
   if (slco == 0x2) //C_SYS_Parms
   {
-    uint16_t syscode = (uint16_t)ConvertBitIntoBytes(&slco_bits[4], 14);
-    if (n != 0) fprintf (stderr, " SLC_C_SYS_PARMS: %s; Net ID: %d; Site ID: %d.%d; Reg Req: %d; CSC: %d;", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg, csc);
-    else fprintf (stderr, " SLC_C_SYS_PARMS: %s; Net ID: %d; Site ID: %d; Reg Req: %d;", model_str, net, site, reg);
-    fprintf (stderr, " SYS: %04X;", syscode); //#192
+    if (n != 0) fprintf (stderr, " SLC_C_SYS_PARMS - %s - Net ID: %d Site ID: %d.%d - Reg Req: %d - CSC: %d ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg, csc);
+    else fprintf (stderr, " SLC_C_SYS_PARMS - %s - Net ID: %d Site ID: %d - Reg Req: %d - Capacity Max ", model_str, net, site, reg);
 
     //add string for ncurses terminal display
-    // if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode );
-    // else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode);
-    if (n != 0) sprintf (state->dmr_site_parms, "TIII %s:%d-%d.%d;%04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode );
-    else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode);
+    if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1 );
+    else sprintf (state->dmr_site_parms, "TIII - %s %d-%d ", model_str, net, site);
 
     //if using rigctl we can set an unknown cc frequency by polling rigctl for the current frequency
     if (opts->use_rigctl == 1 && state->p25_cc_freq == 0) //if not set from channel map 0
@@ -958,31 +867,34 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
       if (ccfreq != 0) state->p25_cc_freq = ccfreq;
     }
 
+    //debug print
+    uint16_t syscode = (uint16_t)ConvertBitIntoBytes(&slco_bits[4], 14);
+    //fprintf (stderr, "\n  SYSCODE: %014b", syscode);
+    //fprintf (stderr, "\n  SYSCODE: %02b.%b.%b", model, net, site); //won't show leading zeroes, but may not be required
+
   }
   else if (slco == 0x3) //P_SYS_Parms
   {
-    uint16_t syscode = (uint16_t)ConvertBitIntoBytes(&slco_bits[4], 14);
-    if (n != 0) fprintf (stderr, " SLC_P_SYS_PARMS: %s; Net ID: %d; Site ID: %d.%d; Comp CC: %d;", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg); 
-    else fprintf (stderr, " SLC_P_SYS_PARMS: %s; Net ID: %d; Site ID: %d;", model_str, net, site);
-    fprintf (stderr, " SYS: %04X;", syscode); //#192
+    if (n != 0) fprintf (stderr, " SLC_P_SYS_PARMS - %s - Net ID: %d Site ID: %d.%d - Comp CC: %d ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, reg); 
+    else fprintf (stderr, " SLC_P_SYS_PARMS - %s - Net ID: %d Site ID: %d - Capacity Max", model_str, net, site);
 
     //add string for ncurses terminal display
-    // if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d; SYS: %04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode );
-    // else sprintf (state->dmr_site_parms, "TIII - %s %d-%d; SYS: %04X; ", model_str, net, site, syscode);
-    if (n != 0) sprintf (state->dmr_site_parms, "TIII %s:%d-%d.%d;%04X; ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1, syscode );
-    else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode);
+    if (n != 0) sprintf (state->dmr_site_parms, "TIII - %s %d-%d.%d ", model_str, net+1, (site>>n)+1, (site & sub_mask)+1 );
+    else sprintf (state->dmr_site_parms, "TIII - %s %d-%d ", model_str, net, site);
+
+    //debug print
+    uint16_t syscode = (uint16_t)ConvertBitIntoBytes(&slco_bits[4], 14);
+    //fprintf (stderr, "\n  SYSCODE: %014b", syscode);
+    //fprintf (stderr, "\n  SYSCODE: %02b.%b.%b", model, net, site); //won't show leading zeroes, but may not be required
+
   }
   else if (slco == 0x0) //null
     fprintf (stderr, " SLCO NULL ");
   else if (slco == 0x1)
-  {
-    fprintf (stderr, " Activity Update"); //102 361-2 7.1.3.2
-    fprintf (stderr, " TS1: %s; Hash: %d;", ts1_str, ts1_hash);
-    fprintf (stderr, " TS2: %s; Hash: %d;", ts2_str, ts2_hash);
-  } 
+    fprintf (stderr, " SLCO Activity Update TS1: %X Hash: %02X TS2: %X Hash: %02X", ts1_act, ts1_hash, ts2_act, ts2_hash); //102 361-2 7.1.3.2 
   else if (slco == 0x9)
   {
-    fprintf (stderr, " SLCO Connect Plus Traffic Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
+    fprintf (stderr, " SLCO Connect Plus Voice Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
     sprintf (state->dmr_site_parms, "%d-%d ", con_netid, con_siteid);
   }
     
@@ -992,81 +904,20 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
     sprintf (state->dmr_site_parms, "%d-%d ", con_netid, con_siteid);
 
     //if using rigctl we can set an unknown cc frequency by polling rigctl for the current frequency
-    if (opts->use_rigctl == 1 && opts->p25_is_tuned == 0)
+    if (opts->use_rigctl == 1 && state->p25_cc_freq == 0) //if not set from channel map 0
     {
       ccfreq = GetCurrentFreq (opts->rigctl_sockfd);
       if (ccfreq != 0) state->p25_cc_freq = ccfreq;
     }
-
-    //if using rtl input, we can ask for the current frequency tuned
-    if (opts->audio_in_type == 3 && opts->p25_is_tuned == 0)
-    {
-      ccfreq = (long int)opts->rtlsdr_center_freq;
-      if (ccfreq != 0) state->p25_cc_freq = ccfreq;
-    }
-    
   }
    
   else if (slco == 0xF)
   {
-    fprintf (stderr, " SLCO Capacity Plus Site: %d - Rest LSN: %d - RS: %02X", capsite, restchannel, cap_reserved);
-
-    //extra handling for TG hold while trunking enabled
-    if (state->tg_hold != 0 && opts->p25_trunk == 1) //logic seems to be fixed now for new rest lsn logic and other considerations
+    fprintf (stderr, " SLCO Capacity Plus Site: %d - Rest Channel %d - RS: %02X", capsite, restchannel, cap_reserved);
+    //assign to cc freq if available
+    if (state->trunk_chan_map[restchannel] != 0)
     {
-      //debug
-      // fprintf (stderr, " TG HOLD Both Slots Busy Check; ");
-
-      //if both slots have some cobination of vlc, pi, voice, or tlc
-      int busy = 0;
-      if ( (state->dmrburstL == 16 || state->dmrburstL == 0 || state->dmrburstL == 1 || state->dmrburstL == 2) && 
-           (state->dmrburstR == 16 || state->dmrburstR == 0 || state->dmrburstR == 1 || state->dmrburstR == 2)) busy = 1;
-      if (busy)
-      {
-
-        //debug
-        // fprintf (stderr, " Busy; ");
-
-        //but nether is the TG on hold
-        if ( (state->tg_hold != state->lasttg) && (state->tg_hold != state->lasttgR) )
-        {
-          //debug
-          // fprintf (stderr, " Neither Slot is TG on Hold; ");
-
-          //assign to cc freq if available -- move to right before needed for new logic on rest lsn
-          if (state->trunk_chan_map[restchannel] != 0)
-          {
-            state->p25_cc_freq = state->trunk_chan_map[restchannel];
-          }
-
-          //tune to the current rest channel so we can observe its channel status csbks for the TG on hold
-          if (state->p25_cc_freq != 0)
-          {
-            //RIGCTL
-            if (opts->use_rigctl == 1)
-            {
-              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
-              SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-              opts->p25_is_tuned = 0;
-              state->last_cc_sync_time = time(NULL);
-              dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
-            }
-
-            //rtl
-            else if (opts->audio_in_type == 3)
-            {
-              #ifdef USE_RTLSDR
-              rtl_dev_tune (opts, state->p25_cc_freq);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-              opts->p25_is_tuned = 0;
-              state->last_cc_sync_time = time(NULL);
-              dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
-              #endif
-            }
-          }
-        }
-      }
+      state->p25_cc_freq = state->trunk_chan_map[restchannel];
     }
 
   }
@@ -1080,60 +931,6 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
 
     //add string for ncurses terminal display
     sprintf (state->dmr_site_parms, "Free LCN - %d ", xpt_free);
-
-    //extra handling for TG hold while trunking enabled
-    if (state->tg_hold != 0 && opts->p25_trunk == 1)
-    {
-      //if both slots are voice,
-      if (state->dmrburstL == 16 && state->dmrburstR == 16)
-      {
-        //but nether is the TG on hold
-        if ( (state->tg_hold != state->lasttg) && (state->tg_hold != state->lasttgR) )
-        {
-          //convert xpt_free from lcn to lsn -- up to 8 voice repeaters
-          if      (xpt_free == 2) xpt_free = 3;
-          else if (xpt_free == 3) xpt_free = 5;
-          else if (xpt_free == 4) xpt_free = 7;
-          else if (xpt_free == 5) xpt_free = 9;
-          else if (xpt_free == 6) xpt_free = 11;
-          else if (xpt_free == 7) xpt_free = 13;
-          else if (xpt_free == 8) xpt_free = 15;
-
-          //check to see if the XPT free channel converted to lsn is available in the map
-          if (state->trunk_chan_map[xpt_free] != 0)
-          {
-            state->p25_cc_freq = state->trunk_chan_map[xpt_free];
-          }
-
-          //tune to the current rest channel so we can observe its channel status csbks for the TG on hold
-          if (state->p25_cc_freq != 0)
-          {
-            //RIGCTL
-            if (opts->use_rigctl == 1)
-            {
-              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw); 
-              SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-              opts->p25_is_tuned = 0;
-              state->last_cc_sync_time = time(NULL);
-              dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
-            }
-
-            //rtl
-            else if (opts->audio_in_type == 3)
-            {
-              #ifdef USE_RTLSDR
-              rtl_dev_tune (opts, state->p25_cc_freq);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-              opts->p25_is_tuned = 0;
-              state->last_cc_sync_time = time(NULL);
-              dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away
-              #endif
-            }
-          }
-        }
-      }
-    }
   }
     
   else fprintf (stderr, " SLCO Unknown - %d ", slco);
@@ -1155,9 +952,10 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
 //externalize embedded alias to keep the flco function relatively clean
 void dmr_embedded_alias_header (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
 {
-  UNUSED(opts);
   
   uint8_t slot = state->currentslot;
+  uint8_t pf; 
+  uint8_t res;
   uint8_t format = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 2); 
   uint8_t len;
 
@@ -1177,8 +975,6 @@ void dmr_embedded_alias_header (dsd_opts * opts, dsd_state * state, uint8_t lc_b
 
 void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
 {
-  UNUSED(opts);
-
   fprintf (stderr, "%s", KYEL);
   fprintf (stderr, " Embedded Alias: ");
   uint8_t slot = state->currentslot;
@@ -1186,7 +982,6 @@ void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_b
   uint8_t format = state->dmr_alias_format[slot]; //0=7-bit; 1=ISO8; 2=UTF-8; 3=UTF16BE
   uint8_t len =  state->dmr_alias_len[slot];
   uint8_t start; //starting position depends on context of block and format
-  UNUSED(format);
 
   //Cap Max Variation
   uint8_t fid = (uint8_t)ConvertBitIntoBytes(&lc_bits[8], 8);
@@ -1243,3 +1038,73 @@ void dmr_embedded_alias_blocks (dsd_opts * opts, dsd_state * state, uint8_t lc_b
   fprintf (stderr, "%s", KNRM);
   
 }
+
+//externalize embedded GPS - Needs samples to test/fix function
+void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
+{
+  fprintf (stderr, "%s", KYEL);
+  fprintf (stderr, " Embedded GPS:");
+  uint8_t slot = state->currentslot;
+  uint8_t pf = lc_bits[0];
+  uint8_t res_a = lc_bits[1];
+  uint8_t res_b = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 4);
+  uint8_t pos_err = (uint8_t)ConvertBitIntoBytes(&lc_bits[20], 3);
+  
+  uint32_t lon_sign = lc_bits[23]; 
+  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[24], 24); 
+  uint32_t lat_sign = lc_bits[48]; 
+  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23); 
+
+  double lat_unit = (double)180/ pow (2.0, 24); //180 divided by 2^24
+  double lon_unit = (double)360/ pow (2.0, 25); //360 divided by 2^25
+
+  char latstr[3];
+  char lonstr[3];
+  sprintf (latstr, "%s", "N");
+  sprintf (lonstr, "%s", "E");
+
+  //run calculations and print (still cannot verify as accurate)
+  //7.2.16 and 7.2.17 (two's compliment)
+
+  double latitude = 0;  
+  double longitude = 0; 
+
+  if (pf) fprintf (stderr, " Protected");
+  else
+  {
+    if (lat_sign)
+    {
+      lat = 0x800001 - lat;
+      sprintf (latstr, "%s", "S");
+    } 
+    latitude = ((double)lat * lat_unit);
+
+    if (lon_sign)
+    {
+      lon = 0x1000001 - lon;
+      sprintf (lonstr, "%s", "W");
+    } 
+    longitude = ((double)lon * lon_unit);
+
+    //sanity check
+    if (abs (latitude) < 90 && abs(longitude) < 180)
+    {
+      fprintf (stderr, " Lat: %.5lf %s Lon: %.5lf %s", latitude, latstr, longitude, lonstr);
+
+      //7.2.15 Position Error
+      uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err 
+      if (pos_err == 0x7 ) fprintf (stderr, " Position Error: Unknown or Invalid");
+      else fprintf (stderr, " Position Error: Less than %dm", position_error);
+
+      //save to array for ncurses
+      if (pos_err != 0x7)
+      {
+        sprintf (state->dmr_embedded_gps[slot], "E-GPS (%lf %s %lf %s) Err: %dm", latitude, latstr, longitude, lonstr, position_error);
+      }
+
+    }
+
+  }
+
+  fprintf (stderr, "%s", KNRM);
+}

src/dmr_le.c

@@ -9,7 +9,7 @@
 #include "dsd.h"
 
 //gather ambe_fr mi fragments for processing
-void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc, uint8_t ambe_fr[4][24], uint8_t ambe_fr2[4][24], uint8_t ambe_fr3[4][24])
+void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc, char ambe_fr[4][24], char ambe_fr2[4][24], char ambe_fr3[4][24])
 {
   
   uint8_t slot = state->currentslot;
@@ -42,8 +42,6 @@ void dmr_late_entry_mi_fragment (dsd_opts * opts, dsd_state * state, uint8_t vc,
 
 void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
   uint8_t slot = state->currentslot;
   int i, j;
   int g[3]; 
@@ -109,7 +107,7 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
       {
         fprintf (stderr, "%s", KCYN);
         fprintf (stderr, " Slot 1 PI/LFSR and Late Entry MI Mismatch - %08X : %08X ", state->payload_mi, mi_final);
-        if (mi_crc_ok == 1) state->payload_mi = mi_final;
+        state->payload_mi = mi_final;
         if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
         else fprintf (stderr, "(CRC ERR)");
         fprintf (stderr, "\n");
@@ -128,7 +126,7 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
       {
         fprintf (stderr, "%s", KCYN);
         fprintf (stderr, " Slot 2 PI/LFSR and Late Entry MI Mismatch - %08X : %08X ", state->payload_miR, mi_final);
-        if (mi_crc_ok == 1) state->payload_miR = mi_final;
+        state->payload_miR = mi_final;
         if (mi_crc_ok == 1) fprintf (stderr, "(CRC OK)");
         else fprintf (stderr, "(CRC ERR)");
         fprintf (stderr, "\n");
@@ -148,8 +146,6 @@ void dmr_late_entry_mi (dsd_opts * opts, dsd_state * state)
 
 void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
   if (state->currentslot == 0)
   {
     state->dropL = 256;
@@ -189,8 +185,6 @@ void dmr_alg_refresh (dsd_opts * opts, dsd_state * state)
 
 void dmr_alg_reset (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
   state->dropL = 256;
   state->dropR = 256;
   state->DMRvcL = 0;
@@ -217,7 +211,6 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
   uint8_t crc7_okay = 0; //RC
   uint8_t crc3_okay = 0; //TXI
   uint8_t txi = 0; //SEE: https://patents.google.com/patent/US8271009B2
-  UNUSED(txi);
   
   //NOTE: Any previous mentions to Cap+ in this area may have been in error,
   //The signalling observed here was actually TXI information, not Cap+ Specifically
@@ -252,7 +245,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
       crc_extracted = crc_extracted | sbrc_return[i+4];
     }
     crc_extracted = crc_extracted ^ 0x7A;
-    crc_computed = crc7((uint8_t *) sbrc_return, 4); //#187 fix
+    crc_computed = crc7((uint8_t *) sbrc_return, 7);
     if (crc_extracted == crc_computed) crc7_okay = 1;
   }
   else //if (txi == 1) //if TXI -- but TXI systems also carry the non-crc protected ENC identifiers
@@ -307,23 +300,12 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
   //NOTE: on above, I belive that we need to check by opcode as well, as a CRC3 can have multiple collisions
   //so we need to exclude op/alg 0 and 3 from the check (does algID 0x03/0x23 even exist?)
 
-  if (opts->dmr_le == 1)
+  if (opts->dmr_le == 1) //this will now require a user to switch it on or off until more testing/figuring can be done
   {
-    if (irr_err != 0)
-    {
-      uint32_t sbrcpl = 0;
-      for(i = 0; i < 32; i++)
-      {
-        sbrcpl = sbrcpl << 1;
-        sbrcpl |= sbrc_interleaved[i] & 1;
-      }
-      if (opts->payload == 0) fprintf (stderr, "\n");
-      fprintf (stderr, "%s SLOT %d SB/RC (FEC ERR) E:%d; I:%08X D:%03X; %s ", KRED, slot+1, irr_err, sbrcpl, sbrc_hex, KNRM);
-      if (opts->payload == 1) fprintf (stderr, "\n");
-    }
+    if (irr_err != 0) fprintf (stderr, "\n%s SLOT %d SB/RC (FEC ERR) %d %s \n", KRED, slot, irr_err, KNRM);
     if (irr_err == 0)
     {
-      if (sbrc_hex == 0 && crc7_okay == 0) ; //NULL Single Burst, do nothing (changed to allow the 0 value of RC below to trigger)
+      if (sbrc_hex == 0) ; //NULL, do nothing
 
       //else if (placeholder for future conditions)
       // {
@@ -332,19 +314,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
 
       else if (crc7_okay == 1)
       {
-        //decode the reverse channel information ETSI TS 102 361-4 V1.12.1 (2023-07) p 103 Table 6.32: MS Reverse Channel (RC) Command Information Elements
-        if (opts->payload == 0) fprintf (stderr, "\n");
-        fprintf (stderr, "%s", KCYN);
-        sbrc_hex = sbrc_hex >> 7; //set value to its 4-bit form
-        if (sbrc_hex == 0)      fprintf (stderr, " RC: Increase Power By One Step;");
-        else if (sbrc_hex == 1) fprintf (stderr, " RC: Decrease Power By One Step;");
-        else if (sbrc_hex == 2) fprintf (stderr, " RC: Set Power To Highest;");
-        else if (sbrc_hex == 3) fprintf (stderr, " RC: Set Power To Lowest;");
-        else if (sbrc_hex == 4) fprintf (stderr, " RC: Cease Transmission Command;");
-        else if (sbrc_hex == 5) fprintf (stderr, " RC: Cease Transmission Request;");
-        else                    fprintf (stderr, " RC: Reserved %02X;", sbrc_hex);
-        fprintf (stderr, "%s", KNRM);
-        if (opts->payload == 1) fprintf (stderr, "\n");
+        //do something with the reverse channel information
       }
 
       //if the call is interruptable (TXI) and the crc3 is okay and TXI Opcode
@@ -379,7 +349,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
 
         if (slot == 0) //may not need the state->errs anymore //&& state->errs < 3
         {
-          if (state->dmr_so & 0x40 && key != 0 && alg != 0)
+          if (state->dmr_so & 0x40 && key != 0 && state->payload_keyid == 0)
           {
             //if we aren't forcing a particular alg or privacy key set
             if (state->M == 0)
@@ -390,10 +360,8 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
               fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key);
               fprintf (stderr, "%s ", KNRM);
               if (opts->payload == 1) fprintf (stderr, "\n");
-              if (state->payload_keyid != key)
-                state->payload_keyid = key;
-              if (state->payload_algid != alg)
-                state->payload_algid = alg + 0x20; //assuming DMRA approved alg values (moto patent)
+              state->payload_keyid = key;
+              state->payload_algid = alg + 0x20; //assuming DMRA approved alg values (moto patent)
             }
 
           }
@@ -401,7 +369,7 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
 
         if (slot == 1) //may not need the state->errs anymore //&& state->errsR < 3
         {
-          if (state->dmr_soR & 0x40 && key != 0 && alg != 0)
+          if (state->dmr_soR & 0x40 && key != 0 && state->payload_keyidR == 0)
           {
             //if we aren't forcing a particular alg or privacy key set
             if (state->M == 0)
@@ -412,10 +380,8 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
               fprintf (stderr, " DMR LE SB ALG ID: 0x%02X KEY ID: 0x%02X", alg + 0x20, key);
               fprintf (stderr, "%s ", KNRM);
               if (opts->payload == 1) fprintf (stderr, "\n");
-              if (state->payload_keyidR != key)
-                state->payload_keyidR = key;
-              if (state->payload_algidR != alg)
-                state->payload_algidR = alg + 0x20; //assuming DMRA approved alg values (moto patent)
+              state->payload_keyidR = key;
+              state->payload_algidR = alg + 0x20; //assuming DMRA approved alg values (moto patent)
             }
 
           }
@@ -428,20 +394,21 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
 
   SBRC_END:
 
-  //'DSP' output to file -- SB and RC
-  if (opts->use_dsp_output == 1)
+  //'DSP' output to file -- only RC, or RC and SB?
+  if (power == 1 && opts->use_dsp_output == 1 && sbrc_hex != 0) //if not NULL
   {
     FILE * pFile; //file pointer
     pFile = fopen (opts->dsp_out_file, "a");
-    fprintf (pFile, "\n%d 99 ", slot+1); //'99' is SB and RC designation value
-    for (i = 0; i < 12; i++) //48 bits (includes CC, PPI, LCSS, and QR)
-    // for (i = 2; i < 10; i++) //32 bits (only SB/RC Data and its PC/H)
+    fprintf (pFile, "\n%d 99 ", slot+1); //'99' is RC designation value
+    int k = 0;
+    for (i = 0; i < 24; i++) //12 bytes, SB or RC
     {
-      uint8_t sbrc_nib = (state->dmr_embedded_signalling[slot][5][(i*4)+0] << 3) | (state->dmr_embedded_signalling[slot][5][(i*4)+1] << 2) | (state->dmr_embedded_signalling[slot][5][(i*4)+2] << 1) | (state->dmr_embedded_signalling[slot][5][(i*4)+3] << 0);
+      //check to see if k++ starts at zero, or at 1
+      int sbrc_nib = (state->dmr_embedded_signalling[slot][5][k++] << 3) | (state->dmr_embedded_signalling[slot][5][k++] << 2) | (state->dmr_embedded_signalling[slot][5][k++] << 1) | (state->dmr_embedded_signalling[slot][5][k++] << 0);
       fprintf (pFile, "%X", sbrc_nib);
     }
     fclose (pFile);
-  }
+  } 
 
 }
 

src/dmr_ms.c

@@ -13,36 +13,39 @@
 void dmrMS (dsd_opts * opts, dsd_state * state)
 {
 
-  char * timestr = getTimeC();
-
-  int i, j, dibit;
+  int i, j, k, l, dibit;
+  int *dibit_p;
   char ambe_fr[4][24];
   char ambe_fr2[4][24];
   char ambe_fr3[4][24];
   char ambe_fr4[4][24];
 
   //memcpy of ambe_fr for late entry
-  uint8_t m1[4][24];
-  uint8_t m2[4][24];
-  uint8_t m3[4][24];
+  char m1[4][24];
+  char m2[4][24];
+  char m3[4][24];
 
   const int *w, *x, *y, *z;
-
-  uint8_t syncdata[48];
-  memset (syncdata, 0, sizeof(syncdata));
-
-  uint8_t emb_pdu[16];
-  memset (emb_pdu, 0, sizeof(emb_pdu));
+  char sync[25];
+  char syncdata[48];
+  char EmbeddedSignalling[16];
 
   //cach
   char cachdata[25]; 
+  int cachInterleave[24] =
+  {0, 7, 8, 9, 1, 10,
+   11, 12, 2, 13, 14,
+   15, 3, 16, 4, 17, 18,
+   19, 5, 20, 21, 22, 6, 23
+  }; 
 
   //cach tact bits
   uint8_t tact_bits[7];
 
-  uint8_t tact_okay = 0;
   uint8_t emb_ok = 0;
-  UNUSED(emb_ok);
+  uint8_t tact_okay = 0;
+  uint8_t cach_err = 0;
+  uint8_t EmbeddedSignallingOk = 0;
 
   uint8_t internalslot;
   uint8_t vc;
@@ -51,14 +54,32 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
   uint8_t cc = 25;
   uint8_t power = 9; //power and pre-emption indicator
   uint8_t lcss = 9;
-  UNUSED2(cc, lcss);
 
   //dummy bits to pass to dburst for link control
   uint8_t dummy_bits[196];
   memset (dummy_bits, 0, sizeof (dummy_bits));
 
+  //add time to mirror printFrameSync
+  time_t now;
+  char * getTime(void) //get pretty hh:mm:ss timestamp
+  {
+    time_t t = time(NULL);
+
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  }
+
   vc = 2;
 
+  short int skipcount = 0;
+
   //Hardset variables for MS/Mono
   state->currentslot = 0; //0
 
@@ -156,8 +177,10 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
     syncdata[(2*i)]   = (1 & (dibit >> 1));  // bit 1
     syncdata[(2*i)+1] = (1 & dibit);         // bit 0
 
+    sync[i] = (dibit | 1) + 48;
+
     // load the superframe to do embedded signal processing
-    if(vc > 1) //grab on vc2 values 2-5 B C D E, and F
+    if(vc > 1) //grab on vc1 values 2-5 B C D and E
     {
       state->dmr_embedded_signalling[internalslot][vc-1][i*2]   = (1 & (dibit >> 1)); // bit 1
       state->dmr_embedded_signalling[internalslot][vc-1][i*2+1] = (1 & dibit); // bit 0
@@ -165,17 +188,35 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
 
   }
 
-  for(i = 0; i < 8; i++) emb_pdu[i + 0] = syncdata[i];
-  for(i = 0; i < 8; i++) emb_pdu[i + 8] = syncdata[i + 40];
-  
-  emb_ok = -1;
-  if(QR_16_7_6_decode(emb_pdu))
+  sync[24] = 0;
+
+  //test for RC sync pattern in MS sourced audio
+  if ( strcmp (sync, DMR_RC_DATA_SYNC) == 0)
   {
-    emb_ok = 1;
-    cc = ((emb_pdu[0] << 3) + (emb_pdu[1] << 2) + (emb_pdu[2] << 1) + emb_pdu[3]);
-    power = emb_pdu[4];
-    lcss = ((emb_pdu[5] << 1) + emb_pdu[6]);
-    state->dmr_color_code = state->color_code = cc;
+    state->dmr_ms_rc = 1;
+    fprintf (stderr, "%s ", getTime());
+    if (opts->inverted_dmr == 0)
+    {
+      fprintf (stderr,"Sync: +DMR MS/DM MODE/MONO ");
+    }
+    else fprintf (stderr,"Sync: -DMR MS/DM MODE/MONO ");
+
+    fprintf (stderr, "| RC ");
+    fprintf (stderr, "\n");
+
+  }
+
+  for(i = 0; i < 8; i++) EmbeddedSignalling[i] = syncdata[i];
+  for(i = 0; i < 8; i++) EmbeddedSignalling[i + 8] = syncdata[i + 40];
+  
+  EmbeddedSignallingOk = -1;
+  if(QR_16_7_6_decode(EmbeddedSignalling))
+  {
+    EmbeddedSignallingOk = 1;
+    cc = ((EmbeddedSignalling[0] << 3) + (EmbeddedSignalling[1] << 2) + (EmbeddedSignalling[2] << 1) + EmbeddedSignalling[3]);
+    power = EmbeddedSignalling[4];
+    lcss = ((EmbeddedSignalling[5] << 1) + EmbeddedSignalling[6]);
+
   }
 
   //Continue Second AMBE Frame, 18 after Sync or EmbeddedSignalling
@@ -244,50 +285,20 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
   memcpy (m2, ambe_fr2, sizeof(m2));
   memcpy (m3, ambe_fr3, sizeof(m3));
 
-  if (state->directmode == 0)
+  if (state->dmr_ms_rc == 0)
   {
-    processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-  }
-  else
-  {
-    processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio on tdma direct
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-    processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-  }
-
-  //TODO: Consider copying f_l to f_r for left and right channel saturation on MS mode
-  if (opts->floating_point == 0)
-  {
-    // memcpy (state->s_r4, state->s_l4, sizeof(state->s_l4));
-    if(opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceSS3(opts, state);
-  }
-
-  if (opts->floating_point == 1) 
-  {
-    // memcpy (state->f_r4, state->f_l4, sizeof(state->f_l4));
-    if(opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceFS3(opts, state);
+    if (state->directmode == 0)
+    {
+      processMbeFrame (opts, state, NULL, ambe_fr, NULL);
+      processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
+      processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
+    }
+    else
+    {
+      processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio on tdma direct
+      processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
+      processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
+    }
   }
 
   if (vc == 6)
@@ -320,6 +331,7 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
   if (vc > 6) goto END; 
 
   skipDibit (opts, state, 144); //skip to next tdma channel
+  state->dmr_ms_rc = 0;
 
   //since we are in a loop, run ncursesPrinter here
   if (opts->use_ncurses_terminal == 1)
@@ -347,23 +359,16 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
 
  state->dmr_stereo = 0;
  state->dmr_ms_mode = 0;
+ state->dmr_ms_rc = 0;
  state->directmode = 0; //flag off
-
- if (timestr != NULL)
- {
-  free (timestr);
-  timestr = NULL;
- }
+  
 
 }
 
 //collect buffered 1st half and get 2nd half voice payload and then jump to full MS Voice decoding.
 void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
 {
-
-  char * timestr = getTimeC();
-
-  int i, dibit;
+  int i, j, k, l, dibit;
   int *dibit_p;
 
   char ambe_fr[4][24];
@@ -376,15 +381,49 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
   memset (ambe_fr3, 0, sizeof(ambe_fr3));
 
   //memcpy of ambe_fr for late entry
-  uint8_t m1[4][24];
-  uint8_t m2[4][24];
-  uint8_t m3[4][24];
+  char m1[4][24];
+  char m2[4][24];
+  char m3[4][24];
 
   const int *w, *x, *y, *z;
+  char sync[25];
+  char syncdata[48];
 
   //cach
   char cachdata[25]; 
-  UNUSED(cachdata);
+  int cachInterleave[24] =
+  {0, 7, 8, 9, 1, 10,
+   11, 12, 2, 13, 14,
+   15, 3, 16, 4, 17, 18,
+   19, 5, 20, 21, 22, 6, 23
+  };
+
+  int mutecurrentslot;
+  int msMode;
+  char cc[4];
+  char EmbeddedSignalling[16];
+
+  uint8_t emb_ok = 0;
+  uint8_t tact_okay = 0;
+  uint8_t cach_err = 0;
+  uint8_t EmbeddedSignallingOk = 0;
+
+  //add time to mirror sync
+  time_t now;
+  char * getTime(void) //get pretty hh:mm:ss timestamp
+  {
+    time_t t = time(NULL);
+
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  }
 
   state->dmrburstL = 16; 
   state->currentslot = 0; //force to slot 0
@@ -521,15 +560,13 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
     fclose (pFile);
   }
 
-  fprintf (stderr, "%s ", timestr);
+  fprintf (stderr, "%s ", getTime());
   if (opts->inverted_dmr == 0)
   {
     fprintf (stderr,"Sync: +DMR MS/DM MODE/MONO ");
   }
   else fprintf (stderr,"Sync: -DMR MS/DM MODE/MONO ");
-  if (state->dmr_color_code != 16)
-    fprintf (stderr, "| Color Code=%02d ", state->dmr_color_code);
-  else fprintf (stderr, "| Color Code=XX ");
+
   fprintf (stderr, "| VC* ");
   fprintf (stderr, "\n");
 
@@ -548,48 +585,14 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
   if (state->directmode == 0)
   {
     processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
     processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
     processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
   }
   else
   {
-    processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio on tdma direct
-      memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
+    processMbeFrame (opts, state, NULL, ambe_fr4, NULL); //play duplicate of 2 here to smooth audio
     processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-      memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
     processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-      memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-      memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-      memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-  }
-
-
-  //TODO: Consider copying f_l to f_r for left and right channel saturation on MS mode
-  if (opts->floating_point == 0)
-  {
-    // memcpy (state->s_r4, state->s_l4, sizeof(state->s_l4));
-    if(opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceSS3(opts, state);
-  }
-
-  if (opts->floating_point == 1) 
-  {
-    // memcpy (state->f_r4, state->f_l4, sizeof(state->f_l4));
-    if(opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceFS3(opts, state);
   }
 
   //collect the mi fragment
@@ -597,11 +600,6 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
 
   //errors due to skipping other slot
   // cach_err = dmr_cach (opts, state, cachdata);
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
 
   skipDibit (opts, state, 144); //skip to next TDMA slot
   dmrMS (opts, state); //bootstrap into full TDMA frame
@@ -611,13 +609,28 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
 //simplied to a simple data collector, and then passed on to dmr_data_sync for the usual processing
 void dmrMSData (dsd_opts * opts, dsd_state * state)
 {
-
-  char * timestr = getTimeC();
-
-  int i;
+  int i, b, c;
   int dibit;
   int *dibit_p;
 
+  //add time to mirror sync
+  time_t now;
+  char * getTime(void) //get pretty hh:mm:ss timestamp
+  {
+    time_t t = time(NULL);
+
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  }
+
+
   //CACH + First Half Payload + Sync = 12 + 54 + 24
   dibit_p = state->dmr_payload_p - 90;
   for (i = 0; i < 90; i++) //90
@@ -626,6 +639,7 @@ void dmrMSData (dsd_opts * opts, dsd_state * state)
     dibit_p++;
     if(opts->inverted_dmr == 1) dibit = (dibit ^ 2) & 3;
     state->dmr_stereo_payload[i] = dibit;
+
   }
 
   for (i = 0; i < 54; i++)
@@ -633,17 +647,16 @@ void dmrMSData (dsd_opts * opts, dsd_state * state)
     dibit = getDibit(opts, state);
     if(opts->inverted_dmr == 1) dibit = (dibit ^ 2) & 3;
     state->dmr_stereo_payload[i+90] = dibit;
+
   }
 
-  fprintf (stderr, "%s ", timestr);
+  fprintf (stderr, "%s ", getTime());
   if (opts->inverted_dmr == 0)
   {
     fprintf (stderr,"Sync: +DMR MS/DM MODE/MONO ");
   }
   else fprintf (stderr,"Sync: -DMR MS/DM MODE/MONO ");
-  if (state->dmr_color_code != 16)
-    fprintf (stderr, "| Color Code=%02d ", state->dmr_color_code);
-  else fprintf (stderr, "| Color Code=XX ");
+
 
   sprintf(state->slot1light, "%s", "");
   sprintf(state->slot2light, "%s", "");
@@ -659,23 +672,16 @@ void dmrMSData (dsd_opts * opts, dsd_state * state)
   state->directmode = 0; //flag off
 
   //should just be loaded in the dmr_payload_buffer instead now
-  //but we want to run getDibit so the buffer has actual good values in it
   for (i = 0; i < 144; i++) //66
   {
     dibit = getDibit(opts, state);
-    state->dmr_stereo_payload[i] = 1; //set to one so first frame will fail intentionally instead of zero fill
+    state->dmr_stereo_payload[i] = dibit;
   }
   //CACH + First Half Payload = 12 + 54
   for (i = 0; i < 66; i++) //66
   {
     dibit = getDibit(opts, state);
-    state->dmr_stereo_payload[i+66] = 1; ////set to one so first frame will fail intentionally instead of zero fill
-  }
-
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
+    state->dmr_stereo_payload[i] = dibit;
   }
 
 }

src/dmr_pdu.c

@@ -8,10 +8,41 @@
 
 #include "dsd.h"
 
+char * getTimeL(void) //get pretty hh:mm:ss timestamp
+{
+  time_t t = time(NULL);
+
+  char * curr;
+  char * stamp = asctime(localtime( & t));
+
+  curr = strtok(stamp, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+
+  return curr;
+}
+
+char * getDateL(void) {
+  char datename[120]; 
+  char * curr2;
+  struct tm * to;
+  time_t t;
+  t = time(NULL);
+  to = localtime( & t);
+  strftime(datename, sizeof(datename), "%Y/%m/%d", to);
+  curr2 = strtok(datename, " ");
+  return curr2;
+}
+
 void dmr_pdu (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[])
 {
 
+  uint8_t message_len = 0;
   uint8_t slot = state->currentslot;
+  uint8_t blocks  = state->data_header_blocks[slot]; 
+  uint8_t padding = state->data_header_padding[slot];
+  uint8_t lrrp_conf = 0;
 
   //check for more available flag info, etc on these prior to running
   if (DMR_PDU[0] == 0x01) dmr_locn (opts, state, block_len, DMR_PDU);
@@ -28,7 +59,7 @@ void dmr_pdu (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR
 //this is by no means an extensive LRRP list and is prone to error (unless somebody has the manual or something)
 void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[])
 {
-  int i;
+  int i, j;
   uint16_t message_len = 0;
   uint8_t slot = state->currentslot;
   uint8_t blocks = state->data_header_blocks[slot];
@@ -61,11 +92,10 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
   int lat_sign = 1; //positive 1, or negative 1
   int lon_sign = 1; //positive 1, or negative 1
 
-  //speed -- NOTE: Velocity is Speed + Direction
+  //speed/velocity
   uint16_t vel = 0;
   double velocity = 0;
   uint8_t vel_set = 0;
-  UNUSED(vel);
 
   //track, direction, degrees
   uint8_t degrees = 0;
@@ -210,8 +240,8 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
       case 0x6C: //speed-hor
         if (message_len > 0 && vel_set == 0)
         {
-          vel = (DMR_PDU[i+1] << 8) + DMR_PDU[i+2]; //raw value
-          velocity = ( ((double)( (DMR_PDU[i+1] << 8) + DMR_PDU[i+2] )) / ( (double)255.0f)); //mps
+          vel = (DMR_PDU[i+1] << 8) + DMR_PDU[i+2]; //don't think this is meant to be shifted, but doing it anyways for comparison
+          velocity = ( ((double)( (DMR_PDU[i+1] ) + DMR_PDU[i+2] )) / ( (double)128));
           vel_set = 1;
           i += 2;
           lrrp_confidence++;
@@ -247,29 +277,16 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
       FILE * pFile; //file pointer
       if (opts->lrrp_file_output == 1)
       {
-        char * timestr  = getTime();
-        char * datestr  = getDate();
-
         //open file by name that is supplied in the ncurses terminal, or cli
         pFile = fopen (opts->lrrp_out_file, "a");
         //write current date/time if not present in LRRP data
-        if (!year) fprintf (pFile, "%s\t", datestr ); //current date, only add this IF no included timestamp in LRRP data?
-        if (!year) fprintf (pFile, "%s\t", timestr ); //current timestamp, only add this IF no included timestamp in LRRP data?
+        if (!year) fprintf (pFile, "%s\t", getDateL() ); //current date, only add this IF no included timestamp in LRRP data?
+        if (!year) fprintf (pFile, "%s\t", getTimeL() ); //current timestamp, only add this IF no included timestamp in LRRP data?
         if (year) fprintf (pFile, "%04d/%02d/%02d\t%02d:%02d:%02d\t", year, month, day, hour, minute, second); //add timestamp from decoded audio if available
         //write data header source if not available in lrrp data
         if (!source) fprintf (pFile, "%08lld\t", state->dmr_lrrp_source[state->currentslot]); //source address from data header
         if (source) fprintf (pFile, "%08d\t", source); //add source form decoded audio if available, else its from the header
-        
-        if (timestr != NULL)
-        {
-          free (timestr);
-          timestr = NULL;
-        }
-        if (datestr != NULL)
-        {
-          free (datestr);
-          datestr = NULL;
-        }
+
       }
 
       if (pot_report)
@@ -332,20 +349,12 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
         fprintf (stderr, "  Lon: %.5lf", lon_fin);
         fprintf (stderr, " (%.5lf, %.5lf)", lat_fin , lon_fin);
 
-        // if (opts->lrrp_file_output == 1)
-        // {
-        //   fprintf (pFile, "%.5lf\t", lat_fin);
-        //   fprintf (pFile, "%.5lf\t", lon_fin);
-        // }
+        if (opts->lrrp_file_output == 1)
+        {
+          fprintf (pFile, "%.5lf\t", lat_fin);
+          fprintf (pFile, "%.5lf\t", lon_fin);
+        }
 
-      }
-       //always print into the lrrp file, even if zeroes, keep alignment correct
-      if (opts->lrrp_file_output == 1)
-      {
-        fprintf (pFile, "%.5lf\t", lat_fin);
-        fprintf (pFile, "%.5lf\t", lon_fin);
-        //
-        //
       }
       if (rad)
       {
@@ -360,19 +369,15 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
       if (vel_set)
       {
         fprintf (stderr, "\n");
-        fprintf (stderr, "  LRRP - Speed: %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity));
-        // if (opts->lrrp_file_output == 1) fprintf (pFile, "%.3lf\t ", (velocity * 3.6) );
+        fprintf (stderr, "  LRRP - Velocity: %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity));
+        if (opts->lrrp_file_output == 1) fprintf (pFile, "%.3lf\t ", (velocity * 3.6) );
       }
-      //always print into the lrrp file, even if zeroes, keep alignment correct
-      if (opts->lrrp_file_output == 1) fprintf (pFile, "%.3lf\t ", (velocity * 3.6) );
       if (deg_set)
       {
         fprintf (stderr, "\n");
         fprintf (stderr, "  LRRP - Track: %d%s", degrees, deg_glyph);
-        // if (opts->lrrp_file_output == 1) fprintf (pFile, "%d\t",degrees);
+        if (opts->lrrp_file_output == 1) fprintf (pFile, "%d\t",degrees);
       }
-      //always print into the lrrp file, even if zeroes, keep alignment correct
-      if (opts->lrrp_file_output == 1) fprintf (pFile, "%d\t",degrees);
 
       //close open file
       if (opts->lrrp_file_output == 1)
@@ -404,15 +409,15 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
     fprintf (stderr, "  Potential ARRP/LRRP Report (Debug): 0x%02X", report);
   }
 
+  LRRP_END:
+
   fprintf (stderr, "%s", KNRM);
   
 }
 
 void dmr_locn (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DMR_PDU[])
 {
-  UNUSED(opts);
-
-  int i;
+  int i, j;
   uint8_t slot = state->currentslot;
   uint8_t blocks = state->data_header_blocks[slot];
   uint8_t padding = state->data_header_padding[slot];
@@ -462,7 +467,8 @@ void dmr_locn (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t DM
   //N is positive, E is positive?? Assuming its like a 2D plane
   int lat_sign = 1; //positive 1 or negative 1
   int lon_sign = 1; //positive 1 or negative 1
-  UNUSED2(lat_sign, lon_sign);
+  double lat_fin = 0;
+  double lon_fin = 0;
 
   //start looking for specific bytes corresponding to 'letters' A (time), NSEW (ordinal directions), etc
   for (i = 0; i < ( (blocks*block_len) - (padding+4) ); i++)

src/dmr_pi.c

@@ -12,18 +12,10 @@
 
 void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors)
 {
-  UNUSED2(opts, CRCCorrect);
 
   if((IrrecoverableErrors == 0)) 
   {
 
-    //update cc amd vc sync time for trunking purposes (particularly Con+)
-    if (opts->p25_is_tuned == 1)
-    {
-      state->last_vc_sync_time = time(NULL);
-      state->last_cc_sync_time = time(NULL);
-    } 
-
     if (state->currentslot == 0)
     {
       state->payload_algid = PI_BYTE[0];

src/dpmr_voice.c

@@ -53,10 +53,15 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
   uint32_t CCH_EmergencyPriority[NB_OF_DPMR_VOICE_FRAME_TO_DECODE];
   uint32_t CCH_Reserved[NB_OF_DPMR_VOICE_FRAME_TO_DECODE];
   uint32_t CCH_SlowData[NB_OF_DPMR_VOICE_FRAME_TO_DECODE];
+  uint32_t *errs;
+  uint32_t *errs2;
+  uint8_t AmbeBitDescrambled[49] = {0};
+  uint32_t ScramblerKey = 0;
   uint32_t PartOfSuperFrame = 0;
+  uint32_t VoiceFrameFlag = 1; /* We consider the current frame as a voice frame */
+  uint32_t AttachedDataFlag = 0;
   uint8_t CalledID[8] = {0};
   uint8_t CallingID[8] = {0};
-  UNUSED(PartOfSuperFrame);
 
   /* First CCH (Control CHannel) - 72 bit */
   k = 0;
@@ -472,19 +477,11 @@ void processdPMRvoice (dsd_opts * opts, dsd_state * state)
       
       //flag back off if key is provided
       if (state->R != 0) state->dmr_encL = 0;
-
-      //print Current Frame Number if payload verbosity enabled
-      if (opts->payload == 1)
-        fprintf (stderr, "\n FN %d/4", state->dPMRVoiceFS2Frame.FrameNumbering[o]+1);
       
       //There are 4 AMBE voice frames per TCH
       for(i = start; i < end; i++)
       {
         processMbeFrame (opts, state, NULL, ambe_fr[i], NULL);
-        if (opts->floating_point == 0)
-          playSynthesizedVoiceMS(opts, state);
-        if (opts->floating_point == 1)
-          playSynthesizedVoiceFM(opts, state);
       } 
 
       //set the correct sync type again and flag off the cipher

src/dsd_audio.c

@@ -21,16 +21,16 @@ pa_sample_spec ss;
 pa_sample_spec tt;
 pa_sample_spec zz;
 pa_sample_spec cc;
-pa_sample_spec ff; //float
-
-//pulse audio buffer attributes (input latency)
-pa_buffer_attr lt;
 
 void closePulseOutput (dsd_opts * opts)
 {
   pa_simple_free (opts->pulse_digi_dev_out);
+  if (opts->dmr_stereo == 1)
+    pa_simple_free (opts->pulse_digi_dev_outR);
+
   if (opts->frame_provoice == 1 || opts->monitor_input_audio == 1) //EDACS analog calls and/or monitoring source analog audio
     pa_simple_free (opts->pulse_raw_dev_out);
+
 }
 
 void closePulseInput (dsd_opts * opts)
@@ -41,66 +41,32 @@ void closePulseInput (dsd_opts * opts)
 void openPulseOutput(dsd_opts * opts)
 {
 
-  char * dev = NULL;
-  if (opts->pa_output_idx[0] != 0)
-    dev = opts->pa_output_idx;
-
-  int err = 0;
-
   ss.format = PA_SAMPLE_S16NE;
-  ss.channels = opts->pulse_raw_out_channels;
-  ss.rate = opts->pulse_raw_rate_out;
+  ss.channels = opts->pulse_raw_out_channels; //doing tests with 2 channels at 22050 for 44100 audio default in pulse
+  ss.rate = opts->pulse_raw_rate_out; //48000
 
   tt.format = PA_SAMPLE_S16NE;
-  tt.channels = opts->pulse_digi_out_channels;
-  tt.rate = opts->pulse_digi_rate_out;
-
-  ff.format = PA_SAMPLE_FLOAT32NE;
-  ff.channels = opts->pulse_digi_out_channels;
-  ff.rate = opts->pulse_digi_rate_out;
+  tt.channels = opts->pulse_digi_out_channels; //doing tests with 2 channels at 22050 for 44100 audio default in pulse
+  tt.rate = opts->pulse_digi_rate_out; //48000, switches to 8000 when using RTL dongle
 
   //reconfigured to open when using edacs or raw analog monitor so we can have a analog audio out that runs at 48k1 and not 8k1 float/short
   if (opts->frame_provoice == 1 || opts->monitor_input_audio == 1)
-    opts->pulse_raw_dev_out  = pa_simple_new(NULL, "DSD-FME3", PA_STREAM_PLAYBACK, dev, "Analog", &ss, 0, NULL, &err);
+    opts->pulse_raw_dev_out  = pa_simple_new(NULL, "DSD-FME3", PA_STREAM_PLAYBACK, NULL, "Analog", &ss, 0, NULL, NULL);
 
-  if (err != 0)
+//tt
+  pa_channel_map* left = 0; //NULL and 0 are same in this context
+  pa_channel_map* right = 0; //NULL and 0 are same in this context
+
+  if (opts->dmr_stereo == 0)
   {
-    fprintf (stderr, "Err: %d; %s; ", err, pa_strerror(err));
-    #ifdef __CYGWIN__
-    fprintf (stderr, "Please make sure the Pulse Audio Server Backend is running first.");
-    #endif
-    exit(0);
+    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, NULL, opts->output_name, &tt, left, NULL, NULL);
+
   }
 
-  pa_channel_map* fl = 0; //NULL and 0 are same in this context
-  pa_channel_map* ss = 0; //NULL and 0 are same in this context
-
-  if (opts->floating_point == 0)
+  if (opts->dmr_stereo == 1)
   {
-    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, dev, opts->output_name, &tt, ss, NULL, &err);
-
-    if (err != 0)
-    {
-      fprintf (stderr, "Err: %d; %s; ", err, pa_strerror(err));
-      #ifdef __CYGWIN__
-      fprintf (stderr, "Please make sure the Pulse Audio Server Backend is running first.");
-      #endif
-      exit(0);
-    }
-  }
-
-  if (opts->floating_point == 1)
-  {
-    opts->pulse_digi_dev_out = pa_simple_new(NULL, "DSD-FME", PA_STREAM_PLAYBACK, dev, opts->output_name, &ff, fl, NULL, &err);
-
-    if (err != 0)
-    {
-      fprintf (stderr, "Err: %d; %s; ", err, pa_strerror(err));
-      #ifdef __CYGWIN__
-      fprintf (stderr, "Please make sure the Pulse Audio Server Backend is running first.");
-      #endif
-      exit(0);
-    }
+    opts->pulse_digi_dev_out  = pa_simple_new(NULL, "DSD-FME1", PA_STREAM_PLAYBACK, NULL, "XDMA SLOT 1", &tt, left, NULL, NULL);
+    opts->pulse_digi_dev_outR = pa_simple_new(NULL, "DSD-FME2", PA_STREAM_PLAYBACK, NULL, "XDMA SLOT 2", &tt, right, NULL, NULL);
   }
 
 }
@@ -108,198 +74,12 @@ void openPulseOutput(dsd_opts * opts)
 void openPulseInput(dsd_opts * opts)
 {
 
-  char * dev = NULL;
-  if (opts->pa_input_idx[0] != 0)
-    dev = opts->pa_input_idx;
-
-  int err = 0;
-
   cc.format = PA_SAMPLE_S16NE;
   cc.channels = opts->pulse_digi_in_channels;
   cc.rate = opts->pulse_digi_rate_in; //48000
 
-  //adjust input latency settings (defaults are all -1 to let server set these automatically, but without pavucontrol open, this is approx 2s)
-  //setting fragsize to 960 for 48000 input seems to do the trick to allow a much faster latency without underrun, may need adjusting if
-  //modifying the input rate (will only apply IF using pulse audio input, and not any other input method)
+  opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME", PA_STREAM_RECORD, NULL, opts->output_name, &cc, NULL, NULL, NULL);
 
-  //TODO: set fragsize vs expected input rate if required in the future
-  //NOTE: If users report any underrun conditions, then either change 960 back to -1, or pass NULL instead of &lt
-
-  //https://freedesktop.org/software/pulseaudio/doxygen/structpa__buffer__attr.html
-
-  //for now, only going to modify the fragsize if using the encoder, else, let the pa server set it automatically
-  // if (opts->m17encoder == 1)
-  //   lt.fragsize = 960*5;
-  // else lt.fragsize = -1;
-
-  //test doing it universally, fall back to above if needed
-  lt.fragsize = 960*5;
-  lt.maxlength = -1;
-  lt.prebuf = -1;
-  lt.tlength = -1;
-  if (opts->m17encoder == 1)
-    opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME4", PA_STREAM_RECORD, dev, "M17 Voice Input", &cc, NULL, &lt, &err);
-  else opts->pulse_digi_dev_in  = pa_simple_new(NULL, "DSD-FME", PA_STREAM_RECORD, dev, opts->output_name, &cc, NULL, &lt, &err);
-
-  if (err != 0)
-  {
-    fprintf (stderr, "Err: %d; %s; ", err, pa_strerror(err));
-    #ifdef __CYGWIN__
-    fprintf (stderr, "Please make sure the Pulse Audio Server Backend is running first.");
-    #endif
-    exit(0);
-  }
-
-  //debug
-  // if (opts->m17encoder == 1)
-  // {
-  //   unsigned long long int latency = pa_simple_get_latency (opts->pulse_digi_dev_in, NULL);
-  //   fprintf (stderr, "Pulse Audio Input Latency: %05lld;", latency);
-  // }
-
-}
-
-void parse_pulse_input_string  (dsd_opts * opts, char * input)
-{
-  char * curr;
-  curr = strtok(input, ":");
-  if (curr != NULL)
-  {
-    strncpy (opts->pa_input_idx, curr, 99);
-    opts->pa_input_idx[99] = 0;
-    fprintf (stderr, "\n");
-    fprintf (stderr, "Pulse Input Device: %s; ", opts->pa_input_idx);
-    fprintf (stderr, "\n");
-  }
-}
-
-void parse_pulse_output_string (dsd_opts * opts, char * input)
-{
-  char * curr;
-  curr = strtok(input, ":");
-  if (curr != NULL)
-  {
-    strncpy (opts->pa_output_idx, curr, 99);
-    opts->pa_output_idx[99] = 0;
-    fprintf (stderr, "\n");
-    fprintf (stderr, "Pulse Output Device: %s; ", opts->pa_output_idx);
-    fprintf (stderr, "\n");
-  }
-}
-
-void openOSSOutput (dsd_opts * opts)
-{
-  int fmt; 
-  int speed = 48000;
-  if (opts->audio_in_type == 5) //if((strncmp(opts->audio_in_dev, "/dev/dsp", 8) == 0)) or 'split' == 0
-  {
-
-    if((strncmp(opts->audio_out_dev, "/dev/dsp", 8) == 0))
-    {
-      fprintf (stderr, "OSS Output %s.\n", opts->audio_out_dev);
-      opts->audio_out_fd = open (opts->audio_out_dev, O_RDWR);
-      if (opts->audio_out_fd == -1)
-      {
-        fprintf (stderr, "Error, couldn't open #1 %s\n", opts->audio_out_dev);
-        opts->audio_out = 0;
-        exit(1);
-      }
-
-      fmt = 0;
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_RESET) < 0)
-      {
-        fprintf (stderr, "ioctl reset error \n");
-      }
-
-      fmt = speed;
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_SPEED, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl speed error \n");
-      }
-
-      fmt = 0; //this seems okay to be 1 or 0, not sure what the difference really is (works in stereo on 0)
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_STEREO, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl stereo error \n");
-      }
-
-      fmt = AFMT_S16_LE;
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_SETFMT, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl setfmt error \n");
-      }
-
-      opts->audio_out_type = 5; //5 for 1 channel - 48k OSS 16-bit short output (matching with input) 
-      opts->pulse_digi_rate_out = 48000; //this is used to force to upsample and also allow source audio monitor conditional check
-      opts->pulse_digi_out_channels = 1; //this is used to allow source audio monitor conditional check
-      opts->audio_gain = 0;
-    }
-  }
-
-  if (opts->audio_in_type != 5) //split == 1
-  {
-
-    if((strncmp(opts->audio_out_dev, "/dev/dsp", 8) == 0))
-    {
-      fprintf (stderr, "OSS Output %s.\n", opts->audio_out_dev);
-      opts->audio_out_fd = open (opts->audio_out_dev, O_WRONLY);
-      if (opts->audio_out_fd == -1)
-      {
-        fprintf (stderr, "Error, couldn't open %s\n", opts->audio_out_dev);
-        opts->audio_out = 0;
-        exit(1);
-      }
-
-      //Setup the device. Note that it's important to set the sample format, number of channels and sample rate exactly in this order. Some devices depend on the order. 
-
-      fmt = 0;
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_RESET) < 0)
-      {
-        fprintf (stderr, "ioctl reset error \n");
-      }
-
-      fmt = AFMT_S16_LE; //Sample Format
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_SETFMT, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl setfmt error \n");
-      }
-
-      fmt = opts->pulse_digi_out_channels; //number of channels //was 2
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_CHANNELS, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl channel error \n");
-      }
-
-      //if using split with OSS output, and using EDACS w/ Analog, we have to use 48k
-      if (opts->frame_provoice == 1)
-        opts->pulse_digi_rate_out = 48000;
-
-      speed = opts->pulse_digi_rate_out; //since we have split input/output, we want to mirror pulse rate out
-      fmt = speed; //output rate
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_SPEED, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl speed error \n");
-      }
-      if (opts->pulse_digi_out_channels == 2)
-        fmt = 1;
-      else fmt = 0; 
-
-      if (ioctl (opts->audio_out_fd, SNDCTL_DSP_STEREO, &fmt) < 0)
-      {
-        fprintf (stderr, "ioctl stereo error \n");
-      }
-
-      //TODO: Multiple output returns based on 8k/1, 8k/2, or maybe 48k/1? (2,3,5)??
-      if (opts->pulse_digi_out_channels == 2)
-        opts->audio_out_type = 2; //2 for 2 channel 8k OSS 16-bit short output
-      else if (opts->frame_m17 == 1)
-        opts->audio_out_type = 2;
-      else opts->audio_out_type = 5;
-
-      //debug 
-      fprintf (stderr, "Using OSS Output with %dk/%d channel configuration.\n", opts->pulse_digi_rate_out, opts->pulse_digi_out_channels);
-    }
-  }
 }
 
 void
@@ -393,7 +173,8 @@ processAudio (dsd_opts * opts, dsd_state * state)
 
   // copy audio data to output buffer and upsample if necessary
   state->audio_out_temp_buf_p = state->audio_out_temp_buf;
-  //we only want to upsample when using sample rates greater than 8k for output
+  //we only want to upsample when using sample rates greater than 8k for output,
+  //hard set to 8k for RTL mono and MBE playback, otherwise crackling may occur.
   if (opts->pulse_digi_rate_out > 8000)
     {
       for (n = 0; n < 160; n++)
@@ -417,8 +198,6 @@ processAudio (dsd_opts * opts, dsd_state * state)
               *state->audio_out_float_buf_p = -32768.0F;
             }
           *state->audio_out_buf_p = (short) *state->audio_out_float_buf_p;
-          //tap the pointer here and store the short upsample buffer samples
-          state->s_lu[n] = (short) *state->audio_out_float_buf_p;
           state->audio_out_buf_p++;
           state->audio_out_float_buf_p++;
         }
@@ -437,10 +216,6 @@ processAudio (dsd_opts * opts, dsd_state * state)
               *state->audio_out_temp_buf_p = -32768.0F;
             }
           *state->audio_out_buf_p = (short) *state->audio_out_temp_buf_p;
-          //tap the pointer here and store the short buffer samples
-          state->s_l[n] = (short) *state->audio_out_temp_buf_p;
-          //debug
-          // fprintf (stderr, " %d", state->s_l[n]);
           state->audio_out_buf_p++;
           state->audio_out_temp_buf_p++;
           state->audio_out_idx++;
@@ -541,6 +316,7 @@ processAudioR (dsd_opts * opts, dsd_state * state)
   // copy audio data to output buffer and upsample if necessary
   state->audio_out_temp_buf_pR = state->audio_out_temp_bufR;
   //we only want to upsample when using sample rates greater than 8k for output,
+  //hard set to 8k for RTL mono and MBE playback, otherwise crackling may occur.
   if (opts->pulse_digi_rate_out > 8000)
     {
       for (n = 0; n < 160; n++)
@@ -564,8 +340,6 @@ processAudioR (dsd_opts * opts, dsd_state * state)
               *state->audio_out_float_buf_pR = -32768.0F;
             }
           *state->audio_out_buf_pR = (short) *state->audio_out_float_buf_pR;
-          //tap the pointer here and store the short upsample buffer samples
-          state->s_ru[n] = (short) *state->audio_out_float_buf_pR;
           state->audio_out_buf_pR++;
           state->audio_out_float_buf_pR++;
         }
@@ -584,8 +358,6 @@ processAudioR (dsd_opts * opts, dsd_state * state)
               *state->audio_out_temp_buf_pR = -32768.0F;
             }
           *state->audio_out_buf_pR = (short) *state->audio_out_temp_buf_pR;
-          //tap the pointer here and store the short buffer samples
-          state->s_r[n] = (short) *state->audio_out_temp_buf_pR;
           state->audio_out_buf_pR++;
           state->audio_out_temp_buf_pR++;
           state->audio_out_idxR++;
@@ -652,9 +424,10 @@ void writeSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
 
 void writeRawSample (dsd_opts * opts, dsd_state * state, short sample)
 {
-  UNUSED(state);
+  int n;
+  short aout_buf[160];
+  short *aout_buf_p;
 
-  //short aout_buf[160];
   //sf_write_short(opts->wav_out_raw, aout_buf, 160);
 
   //only write if actual audio, truncate silence
@@ -669,26 +442,12 @@ void
 playSynthesizedVoice (dsd_opts * opts, dsd_state * state)
 {
   ssize_t result;
-  UNUSED(result);
-
-  //don't synthesize voice if slot is turned off
-  if (opts->slot1_on == 0)
-  {
-    //clear any previously buffered audio
-    state->audio_out_float_buf_p = state->audio_out_float_buf + 100;
-    state->audio_out_buf_p = state->audio_out_buf + 100;
-    memset (state->audio_out_float_buf, 0, 100 * sizeof (float));
-    memset (state->audio_out_buf, 0, 100 * sizeof (short));
-    state->audio_out_idx2 = 0;
-    state->audio_out_idx = 0;
-    goto end_psv;
-  } 
 
   if (state->audio_out_idx > opts->delay)
   {
-    if (opts->audio_out_type == 5 || opts->audio_out_type == 1) //OSS
+    if (opts->audio_out_type == 5) //OSS
     {
-      //OSS 48k/1
+      //OSS
       result = write (opts->audio_out_fd, (state->audio_out_buf_p - state->audio_out_idx), (state->audio_out_idx * 2));
       state->audio_out_idx = 0;
     }
@@ -697,18 +456,11 @@ playSynthesizedVoice (dsd_opts * opts, dsd_state * state)
       pa_simple_write(opts->pulse_digi_dev_out, (state->audio_out_buf_p - state->audio_out_idx), (state->audio_out_idx * 2), NULL); 
       state->audio_out_idx = 0;
     }
-    else if (opts->audio_out_type == 8) //UDP Audio Out -- Forgot some things still use this for now
-    {
-      udp_socket_blaster (opts, state, (state->audio_out_idx * 2), (state->audio_out_buf_p - state->audio_out_idx));
-      state->audio_out_idx = 0;
-    }
     else state->audio_out_idx = 0; //failsafe for audio_out == 0
 
 
   }
 
-  end_psv:
-
   if (state->audio_out_idx2 >= 800000)
   {
     state->audio_out_float_buf_p = state->audio_out_float_buf + 100;
@@ -724,15 +476,14 @@ void
 playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
 {
   ssize_t result;
-  UNUSED(result);
 
   if (state->audio_out_idxR > opts->delay)
   {
     // output synthesized speech to sound card
 		if (opts->audio_out_type == 5) //OSS
     {
-      //OSS 48k/1
-      result = write (opts->audio_out_fd, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2));
+      //OSS
+      result = write (opts->audio_out_fdR, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2));
       state->audio_out_idxR = 0;
     }
 		else if (opts->audio_out_type == 0)
@@ -740,11 +491,6 @@ playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
       pa_simple_write(opts->pulse_digi_dev_outR, (state->audio_out_buf_pR - state->audio_out_idxR), (state->audio_out_idxR * 2), NULL); 
       state->audio_out_idxR = 0;
     }
-    else if (opts->audio_out_type == 8) //UDP Audio Out -- Not sure how this would handle, but R never gets called anymore, so just here for symmetry
-    {
-      udp_socket_blaster (opts, state, (state->audio_out_idxR * 2), (state->audio_out_buf_pR - state->audio_out_idxR));
-      state->audio_out_idxR = 0;
-    }
     else state->audio_out_idxR = 0; //failsafe for audio_out == 0
 
   }
@@ -762,8 +508,6 @@ playSynthesizedVoiceR (dsd_opts * opts, dsd_state * state)
 void
 openAudioOutDevice (dsd_opts * opts, int speed)
 {
-  UNUSED(speed);
-
   //converted to handle any calls to use portaudio
 	if(strncmp(opts->audio_out_dev, "pa:", 3) == 0)
 	{
@@ -778,7 +522,7 @@ openAudioOutDevice (dsd_opts * opts, int speed)
   }
 	else
 	{
-  // struct stat stat_buf;
+		struct stat stat_buf;
   // if(stat(opts->audio_out_dev, &stat_buf) != 0 && strncmp(opts->audio_out_dev, "pulse", 5 != 0)) //HERE
   //   {
   //     fprintf (stderr,"Error, couldn't open %s\n", opts->audio_out_dev);
@@ -823,11 +567,6 @@ openAudioInDevice (dsd_opts * opts)
     }
 	}
 
-  else if (strncmp(opts->audio_in_dev, "m17udp", 6) == 0)
-  {
-    opts->audio_in_type = 9; //NULL audio device
-  }
-
   else if (strncmp(opts->audio_in_dev, "tcp", 3) == 0)
   {
     opts->audio_in_type = 8;
@@ -844,23 +583,22 @@ openAudioInDevice (dsd_opts * opts)
     }
   }
 
-  // else if (strncmp(opts->audio_in_dev, "udp", 3) == 0)
-  // {
-  //   opts->audio_in_type = 6;
-  //   opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
-  //   opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
-  //   opts->audio_in_file_info->channels=1;
-  //   opts->audio_in_file_info->seekable=0;
-  //   opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
-  //   opts->udp_file_in = sf_open_fd(opts->udp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
-
-  //   if(opts->udp_file_in == NULL)
-  //   {
-  //     fprintf(stderr, "Error, couldn't open UDP with libsndfile: %s\n", sf_strerror(NULL));
-  //     exit(1);
-  //   }
-  // }
+  else if (strncmp(opts->audio_in_dev, "udp", 3) == 0)
+  {
+    opts->audio_in_type = 6;
+    opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
+    opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
+    opts->audio_in_file_info->channels=1;
+    opts->audio_in_file_info->seekable=0;
+    opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
+    opts->udp_file_in = sf_open_fd(opts->udp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
 
+    if(opts->udp_file_in == NULL)
+    {
+      fprintf(stderr, "Error, couldn't open UDP with libsndfile: %s\n", sf_strerror(NULL));
+      exit(1);
+    }
+  }
   else if(strncmp(opts->audio_in_dev, "rtl", 3) == 0)
   {
     #ifdef USE_RTLSDR

src/dsd_dibit.c

@@ -118,8 +118,6 @@ print_datascope(dsd_opts* opts, dsd_state* state, int* sbuf2)
 static void
 use_symbol (dsd_opts* opts, dsd_state* state, int symbol)
 {
-  UNUSED(symbol);
-
   int i;
   int sbuf2[128];
   int lmin, lmax, lsum;
@@ -219,7 +217,8 @@ invert_dibit(int dibit)
     return -1;
 }
 
-int digitize (dsd_opts* opts, dsd_state* state, int symbol)
+static int digitize (dsd_opts* opts, dsd_state* state, int symbol)
+//int digitize (dsd_opts* opts, dsd_state* state, int symbol)
 {
   // determine dibit state
   if ((state->synctype == 6) || (state->synctype == 14)|| (state->synctype == 18) || (state->synctype == 37))
@@ -267,8 +266,7 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
   else if ((state->synctype == 1) || (state->synctype == 3)  || (state->synctype == 5)  ||
           (state->synctype == 9)  || (state->synctype == 11) || (state->synctype == 13) ||
           (state->synctype == 17) || (state->synctype == 29) || (state->synctype == 31) ||
-          (state->synctype == 77) || (state->synctype == 87) ||(state->synctype == 36) || 
-          (state->synctype == 99)                              )
+          (state->synctype == 36) || (state->synctype == 99)                              )
 
     {
       //  1 -P25p1
@@ -281,8 +279,6 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
       // 29 -NXDN (inverted FSW)
       // 31 -YSF 
       // 36 -P25p2 
-      // 77 -M17 BRT
-      // 87 -M17 PKT
       // 99 -M17 Preamble
 
       int valid;
@@ -290,11 +286,8 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
 
       valid = 0;
 
-      UNUSED(opts);
-
       //testing again, either on Voice channels only (when tuned) or with trunk disabled
-      // if (state->synctype == 1 && (opts->p25_is_tuned == 1 || opts->p25_trunk == 0) && opts->use_heuristics == 1)
-      if (state->synctype == 1 && opts->use_heuristics == 1)
+      if (state->synctype == 1 && (opts->p25_is_tuned == 1 || opts->p25_trunk == 0) && opts->use_heuristics == 1)
       {
         // Use the P25p1 heuristics if available
         valid = estimate_symbol(state->rf_mod, &(state->inv_p25_heuristics), state->last_dibit, symbol, &dibit);
@@ -352,8 +345,6 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
       // 28 +NXND (FSW)
       // 30 +YSF
       // 35 +p25p2
-      // 76 +M17 BRT
-      // 86 +M17 PKT
       // 98 +M17 Preamble
 
       int valid;
@@ -362,8 +353,7 @@ int digitize (dsd_opts* opts, dsd_state* state, int symbol)
       valid = 0;
 
       //testing again, either on Voice channels only (when tuned) or with trunk disabled
-      // if (state->synctype == 0 && (opts->p25_is_tuned == 1 || opts->p25_trunk == 0) && opts->use_heuristics == 1)
-      if (state->synctype == 0 && opts->use_heuristics == 1)
+      if (state->synctype == 0 && (opts->p25_is_tuned == 1 || opts->p25_trunk == 0) && opts->use_heuristics == 1)
       {
         // Use the P25p1 heuristics if available
         valid = estimate_symbol(state->rf_mod, &(state->p25_heuristics), state->last_dibit, symbol, &dibit);
@@ -460,7 +450,7 @@ get_dibit_and_analog_signal (dsd_opts* opts, dsd_state* state, int* out_analog_s
   }
 
   //symbol/dibit file capture/writing
-  if (opts->symbol_out_f)
+  if (opts->symbol_out == 1)
   {
     //fprintf (stderr, "%d", dibit);
     fputc (dibit, opts->symbol_out_f);
@@ -497,7 +487,6 @@ skipDibit (dsd_opts * opts, dsd_state * state, int count)
 
   short sample;
   int i;
-  UNUSED(sample);
 
   for (i = 0; i < (count); i++)
     {

src/dsd_file.c

@@ -17,6 +17,38 @@
 
 #include "dsd.h"
 
+time_t nowF;
+char * getTimeF(void) //get pretty hh:mm:ss timestamp
+{
+  time_t t = time(NULL);
+
+  char * curr;
+  char * stamp = asctime(localtime( & t));
+
+  curr = strtok(stamp, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+
+  return curr;
+}
+
+char * getDateF(void) {
+  #ifdef AERO_BUILD
+  char datename[80];
+  #else
+  char datename[99];
+  #endif
+  char * curr2;
+  struct tm * to;
+  time_t t;
+  t = time(NULL);
+  to = localtime( & t);
+  strftime(datename, sizeof(datename), "%Y-%m-%d", to);
+  curr2 = strtok(datename, " ");
+  return curr2;
+}
+
 void saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
 {
   int i, j, k;
@@ -96,42 +128,84 @@ void saveAmbe2450DataR (dsd_opts * opts, dsd_state * state, char *ambe_d)
 
 void PrintIMBEData (dsd_opts * opts, dsd_state * state, char *imbe_d) //for P25P1 and ProVoice
 {
-  fprintf(stderr, "\n IMBE ");
-  uint8_t imbe[88];
-  for (int i = 0; i < 11; i++)
-  {
-    imbe[i] =  convert_bits_into_output((uint8_t *)imbe_d+(i*8), 8);
-    fprintf(stderr, "%02X", imbe[i]);
-  }
-    
+  int i, j, k;
+  unsigned char b;
+  unsigned char err;
 
-  fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
-  UNUSED(opts);
+  err = (unsigned char) state->errs2;
+  k = 0;
+  if (opts->payload == 1) //print IMBE info
+  {
+    fprintf(stderr, "\n IMBE ");
+  }
+  for (i = 0; i < 11; i++)
+  {
+    b = 0;
+    for (j = 0; j < 8; j++)
+    {
+      b = b << 1;
+      b = b + imbe_d[k];
+      k++;
+    }
+    if (opts->payload == 1)
+    {
+      fprintf (stderr, "%02X", b);
+    }
+  }
+
+  if (opts->payload == 1)
+  {
+    fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
+  }
+
+  //fprintf (stderr, "\n");
 }
 
 void PrintAMBEData (dsd_opts * opts, dsd_state * state, char *ambe_d) 
 {
+  int i, j, k;
+  unsigned char b;
+  unsigned char err;
 
-  //cast as unsigned long long int and not uint64_t 
-  //to avoid the %lx vs %llx warning on 32 or 64 bit
-  unsigned long long int ambe = 0;
-
-  //preceeding line break, if required
+  err = (unsigned char) state->errs2;
+  k = 0;
   if (opts->dmr_stereo == 0 && opts->dmr_mono == 0)
+  {
     fprintf (stderr, "\n");
+  }
+  if (opts->payload == 1) //print AMBE info from DMR Stereo method
+  {
+    fprintf(stderr, " AMBE ");
+  }
 
-  ambe = convert_bits_into_output ((uint8_t *)ambe_d, 49);
-  ambe = ambe << 7; //shift to final position
-
-  fprintf(stderr, " AMBE %014llX", ambe);
-
-  if (state->currentslot == 0)
-    fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
-  else fprintf(stderr, " err = [%X] [%X] ", state->errsR, state->errs2R);
-
-  //trailing line break, if required
-  if (opts->dmr_stereo == 1 || opts->dmr_mono == 1)
+  for (i = 0; i < 7; i++) 
+    {
+      b = 0;
+      for (j = 0; j < 8; j++)
+        {
+          b = b << 1;
+          b = b + ambe_d[k];
+          k++;
+        }
+        if (opts->payload == 1 && i < 6) 
+        {
+          fprintf (stderr, "%02X", b);
+        }
+        if (opts->payload == 1 && i == 6) 
+        {
+          fprintf (stderr, "%02X", b & 0x80); 
+        }
+    }
+    if (state->currentslot == 0)
+    {
+      fprintf(stderr, " err = [%X] [%X] ", state->errs, state->errs2);
+    }
+    else fprintf(stderr, " err = [%X] [%X] ", state->errsR, state->errs2R);
+  b = ambe_d[48];
+  if (opts->dmr_stereo == 1 || opts->dmr_mono == 1) //need to fix the printouts again
+  {
     fprintf (stderr, "\n");
+  }
 
 }
 
@@ -280,8 +354,6 @@ openMbeInFile (dsd_opts * opts, dsd_state * state)
 //slot 1
 void closeMbeOutFile (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   if (opts->mbe_out == 1)
   {
     if (opts->mbe_out_f != NULL)
@@ -299,8 +371,6 @@ void closeMbeOutFile (dsd_opts * opts, dsd_state * state)
 //slot 2
 void closeMbeOutFileR (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   if (opts->mbe_outR == 1)
   {
     if (opts->mbe_out_fR != NULL)
@@ -320,11 +390,6 @@ void openMbeOutFile (dsd_opts * opts, dsd_state * state)
 
   int i, j;
   char ext[5];
-  char * timestr; //add timestr here, so we can assign it and also free it to prevent memory leak
-  char * datestr;
-
-  timestr = getTime();
-  datestr = getDate();
 
   //phase 1 and provoice
   if ( (state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15) )
@@ -350,7 +415,7 @@ void openMbeOutFile (dsd_opts * opts, dsd_state * state)
 
   state->tgcount = 0;
 
-  sprintf (opts->mbe_out_file, "%s %s S1%s", datestr, timestr, ext);
+  sprintf (opts->mbe_out_file, "%s %s S1%s", getDateF(), getTimeF(), ext);
 
   sprintf (opts->mbe_out_path, "%s%s", opts->mbe_out_dir, opts->mbe_out_file);
 
@@ -365,16 +430,6 @@ void openMbeOutFile (dsd_opts * opts, dsd_state * state)
   fprintf (opts->mbe_out_f, "%s", ext);
 
   fflush (opts->mbe_out_f);
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
-  if (datestr != NULL)
-  {
-    free (datestr);
-    datestr = NULL;
-  }
 }
 
 void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
@@ -382,11 +437,6 @@ void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
 
   int i, j;
   char ext[5];
-  char * timestr; //add timestr here, so we can assign it and also free it to prevent memory leak
-  char * datestr;
-
-  timestr = getTime();
-  datestr = getDate();
 
   //phase 1 and provoice
   if ( (state->synctype == 0) || (state->synctype == 1) || (state->synctype == 14) || (state->synctype == 15) )
@@ -412,7 +462,7 @@ void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
 
   state->tgcount = 0;
 
-  sprintf (opts->mbe_out_fileR, "%s %s S2%s", datestr, timestr, ext);
+  sprintf (opts->mbe_out_fileR, "%s %s S2%s", getDateF(), getTimeF(), ext);
 
   sprintf (opts->mbe_out_path, "%s%s", opts->mbe_out_dir, opts->mbe_out_fileR);
 
@@ -427,21 +477,10 @@ void openMbeOutFileR (dsd_opts * opts, dsd_state * state)
   fprintf (opts->mbe_out_fR, "%s", ext);
 
   fflush (opts->mbe_out_fR);
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
-  if (datestr != NULL)
-  {
-    free (datestr);
-    datestr = NULL;
-  }
 }
 
 void openWavOutFile (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
 
   SF_INFO info;
   info.samplerate = 8000; //8000
@@ -458,7 +497,6 @@ void openWavOutFile (dsd_opts * opts, dsd_state * state)
 
 void openWavOutFileL (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
 
   SF_INFO info;
   info.samplerate = 8000; 
@@ -475,7 +513,6 @@ void openWavOutFileL (dsd_opts * opts, dsd_state * state)
 
 void openWavOutFileR (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
 
   SF_INFO info;
   info.samplerate = 8000; //8000
@@ -492,13 +529,12 @@ void openWavOutFileR (dsd_opts * opts, dsd_state * state)
 
 void openWavOutFileRaw (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
 
   SF_INFO info;
   info.samplerate = 48000; //8000
   info.channels = 1;
   info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
-  opts->wav_out_raw = sf_open (opts->wav_out_file_raw, SFM_WRITE, &info);
+  opts->wav_out_raw = sf_open (opts->wav_out_file_raw, SFM_RDWR, &info);
   if (opts->wav_out_raw == NULL)
   {
     fprintf (stderr,"Error - could not open raw wav output file %s\n", opts->wav_out_file_raw);
@@ -508,128 +544,48 @@ void openWavOutFileRaw (dsd_opts * opts, dsd_state * state)
 
 void closeWavOutFile (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   sf_close(opts->wav_out_f);
 }
 
 void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   sf_close(opts->wav_out_f);
 }
 
 void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   sf_close(opts->wav_out_fR);
 }
 
 void closeWavOutFileRaw (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
   sf_close(opts->wav_out_raw);
 }
 
 void openSymbolOutFile (dsd_opts * opts, dsd_state * state)
 {
-  closeSymbolOutFile(opts, state);
+  //Do something
   opts->symbol_out_f = fopen (opts->symbol_out_file, "w");
 }
 
+void writeSymbolOutFile (dsd_opts * opts, dsd_state * state)
+{
+  //Do something
+
+}
+
 void closeSymbolOutFile (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
-
-  if (opts->symbol_out_f)
+  //Do something
+  if (opts->symbol_out == 1)
   {
-    fclose(opts->symbol_out_f);
-    opts->symbol_out_f = NULL;
-  }
-}
+    if (opts->symbol_out_file != NULL) 
+    {
+      fclose(opts->symbol_out_f); 
+    }
 
-//input bit array, return output as up to a 64-bit value
-uint64_t convert_bits_into_output(uint8_t * input, int len)
-{
-  int i;
-  uint64_t output = 0;
-  for(i = 0; i < len; i++)
-  {
-    output <<= 1;
-    output |= (uint64_t)(input[i] & 1);
-  }
-  return output;
-}
+    opts->symbol_out = 0; //set flag to 1
 
-void pack_bit_array_into_byte_array (uint8_t * input, uint8_t * output, int len)
-{
-  int i;
-  for (i = 0; i < len; i++)
-    output[i] = (uint8_t)convert_bits_into_output(&input[i*8], 8);
-}
-
-//take len amount of bits and pack into x amount of bytes (asymmetrical)
-void pack_bit_array_into_byte_array_asym (uint8_t * input, uint8_t * output, int len)
-{
-  int i = 0; int k = len % 8;
-  for (i = 0; i < len; i++)
-  {
-    output[i/8] <<= 1;
-    output[i/8] |= input[i];
   }
-  //if any leftover bits that don't flush the last byte fully packed, shift them over left
-  if (k)
-    output[i/8] <<= 8-k;
-}
 
-//take len amount of bytes and unpack back into a bit array
-void unpack_byte_array_into_bit_array (uint8_t * input, uint8_t * output, int len)
-{
-  int i = 0, k = 0;
-  for (i = 0; i < len; i++)
-  {
-    output[k++] = (input[i] >> 7) & 1;
-    output[k++] = (input[i] >> 6) & 1;
-    output[k++] = (input[i] >> 5) & 1;
-    output[k++] = (input[i] >> 4) & 1;
-    output[k++] = (input[i] >> 3) & 1;
-    output[k++] = (input[i] >> 2) & 1;
-    output[k++] = (input[i] >> 1) & 1;
-    output[k++] = (input[i] >> 0) & 1;
-  }
 }
-
-//take len amount of bits and pack into x amount of bytes (asymmetrical)
-void pack_ambe (char * input, uint8_t * output, int len)
-{
-  int i = 0; int k = len % 8;
-  for (i = 0; i < len; i++)
-  {
-    output[i/8] <<= 1;
-    output[i/8] |= (uint8_t)input[i];
-  }
-  //if any leftover bits that don't flush the last byte fully packed, shift them over left
-  if (k)
-    output[i/8] <<= 8-k;
-}
-
-//unpack byte array with ambe data into a 49-bit bitwise array
-void unpack_ambe (uint8_t * input, char * ambe)
-{
-  int i = 0, k = 0;
-  for (i = 0; i < 6; i++)
-  {
-    ambe[k++] = (input[i] >> 7) & 1;
-    ambe[k++] = (input[i] >> 6) & 1;
-    ambe[k++] = (input[i] >> 5) & 1;
-    ambe[k++] = (input[i] >> 4) & 1;
-    ambe[k++] = (input[i] >> 3) & 1;
-    ambe[k++] = (input[i] >> 2) & 1;
-    ambe[k++] = (input[i] >> 1) & 1;
-    ambe[k++] = (input[i] >> 0) & 1;
-  }
-  ambe[48] = input[6] >> 7;
-}

src/dsd_filters.c

@@ -1,41 +1,29 @@
-#include "dsd.h"
-
 //M17 Filter -- RRC Alpha = 0.5 S/s 48000 with 81 taps
-#define M17ZEROS 80 
-float m17gain = 3.16227766f; //sqrt of 10.0f
-static float m17xv[81];
-
-//sample RRC filter for 48kHz sample rate
-//alpha=0.5, span=8, sps=10, gain=sqrt(sps)
-float m17coeffs[81] = //replaced old ones with ones from libm17
+#define M17ZEROS 80 //ONLY SEE 79 THOUGH
+float m17gain = 10.0f;
+static float m17xv[M17ZEROS+1];
+float m17coeffs[81] =
 {
-	-0.003195702904062073f, -0.002930279157647190f, -0.001940667871554463f,
-	-0.000356087678023658f,  0.001547011339077758f,  0.003389554791179751f,
-	 0.004761898604225673f,  0.005310860846138910f,  0.004824746306020221f,
-	 0.003297923526848786f,  0.000958710871218619f, -0.001749908029791816f,
-	-0.004238694106631223f, -0.005881783042101693f, -0.006150256456781309f,
-	-0.004745376707651645f, -0.001704189656473565f,  0.002547854551539951f,
-	 0.007215575568844704f,  0.011231038205363532f,  0.013421952197060707f,
-	 0.012730475385624438f,  0.008449554307303753f,  0.000436744366018287f,
-	-0.010735380379191660f, -0.023726883538258272f, -0.036498030780605324f,
-	-0.046500883189991064f, -0.050979050575999614f, -0.047340680079891187f,
-	-0.033554880492651755f, -0.008513823955725943f,  0.027696543159614194f,
-	 0.073664520037517042f,  0.126689053778116234f,  0.182990955139333916f,
-	 0.238080025892859704f,  0.287235637987091563f,  0.326040247765297220f,
-	 0.350895727088112619f,  0.359452932027607974f,  0.350895727088112619f,
-	 0.326040247765297220f,  0.287235637987091563f,  0.238080025892859704f,
-	 0.182990955139333916f,  0.126689053778116234f,  0.073664520037517042f,
-	 0.027696543159614194f, -0.008513823955725943f, -0.033554880492651755f,
-	-0.047340680079891187f, -0.050979050575999614f, -0.046500883189991064f,
-	-0.036498030780605324f, -0.023726883538258272f, -0.010735380379191660f,
-	 0.000436744366018287f,  0.008449554307303753f,  0.012730475385624438f,
-	 0.013421952197060707f,  0.011231038205363532f,  0.007215575568844704f,
-	 0.002547854551539951f, -0.001704189656473565f, -0.004745376707651645f,
-	-0.006150256456781309f, -0.005881783042101693f, -0.004238694106631223f,
-	-0.001749908029791816f,  0.000958710871218619f,  0.003297923526848786f,
-	 0.004824746306020221f,  0.005310860846138910f,  0.004761898604225673f,
-	 0.003389554791179751f,  0.001547011339077758f, -0.000356087678023658f,
-	-0.001940667871554463f, -0.002930279157647190f, -0.003195702904062073f
+-0.009265784007800534, -0.006136551625729697, -0.001125978562075172, 0.004891777252042491,
+0.01071805138282269, 0.01505751553351295, 0.01679337935001369, 0.015256245142156299,
+0.01042830577908502, 0.003031522725559901,  -0.0055333532968188165, -0.013403099825723372,
+-0.018598682349642525, -0.01944761739590459, -0.015005271935951746, -0.0053887880354343935,
+0.008056525910253532, 0.022816244158307273, 0.035513467692208076, 0.04244131815783876,
+0.04025481153629372, 0.02671818654865632, 0.0013810216516704976, -0.03394615682795165,
+-0.07502635967975885, -0.11540977897637611, -0.14703962203941534, -0.16119995609538576,
+-0.14969512896336504, -0.10610329539459686, -0.026921412469634916, 0.08757875030779196,
+0.23293327870303457, 0.4006012210123992, 0.5786324696325503, 0.7528286479934068,
+0.908262741447522, 1.0309661131633199, 1.1095611856548013, 1.1366197723675815,
+1.1095611856548013, 1.0309661131633199, 0.908262741447522, 0.7528286479934068,
+0.5786324696325503,  0.4006012210123992, 0.23293327870303457, 0.08757875030779196,
+-0.026921412469634916, -0.10610329539459686, -0.14969512896336504, -0.16119995609538576,
+-0.14703962203941534, -0.11540977897637611, -0.07502635967975885, -0.03394615682795165,
+0.0013810216516704976, 0.02671818654865632, 0.04025481153629372,  0.04244131815783876,
+0.035513467692208076, 0.022816244158307273, 0.008056525910253532, -0.0053887880354343935,
+-0.015005271935951746, -0.01944761739590459, -0.018598682349642525, -0.013403099825723372,
+-0.0055333532968188165, 0.003031522725559901, 0.01042830577908502, 0.015256245142156299,
+0.01679337935001369, 0.01505751553351295, 0.01071805138282269, 0.004891777252042491,
+-0.001125978562075172, -0.006136551625729697, -0.009265784007800534
 };
 
 // Original DMR filter
@@ -187,7 +175,7 @@ dmr_filter(short sample)
 short
 nxdn_filter(short sample)
 {
-    return dsd_input_filter(sample, 4);
+    return dsd_input_filter(sample, 2); 
 }
 
 short
@@ -256,13 +244,4 @@ dsd_input_filter(short sample, int mode)
     sum += (coeffs[i] * v[i]);
 
   return (short)(sum / gain); // filtered sample out
-}
-
-void init_rrc_filter_memory()
-{
-  memset (m17xv, 0, 81*sizeof(float));
-  memset (xv, 0, 61*sizeof(float));
-  memset (dxv, 0, 61*sizeof(float));
-  memset (nxv, 0, 135*sizeof(float));
-  memset (dpmrxv, 0, 135*sizeof(float));
 }

src/dsd_frame.c

@@ -31,8 +31,7 @@ printFrameInfo (dsd_opts * opts, dsd_state * state)
   level = (int) state->max / 164;
   if (opts->verbose > 0)
     {
-      // fprintf (stderr,"inlvl: %2i%% ", level);
-      UNUSED(level);
+      //fprintf (stderr,"inlvl: %2i%% ", level);
     }
   if (state->nac != 0)
     {
@@ -60,10 +59,8 @@ processFrame (dsd_opts * opts, dsd_state * state)
   char duid[3];
   char nac[13];
   int level;
-  UNUSED2(nac, level);
 
   char status_0;
-  UNUSED(status_0);
   char bch_code[63];
   int index_bch_code;
   unsigned char parity;
@@ -94,26 +91,52 @@ processFrame (dsd_opts * opts, dsd_state * state)
     nxdn_frame (opts, state); 
     return;
   }
-
-  //DSTAR
   else if ((state->synctype == 6) || (state->synctype == 7))
-  {
-    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      openMbeOutFile (opts, state);
-    sprintf (state->fsubtype, " VOICE        ");
-    processDSTAR (opts, state);
-    return;
-  }
+    {
+      state->nac = 0;
+      state->lastsrc = 0;
+      state->lasttg = 0;
+      if (opts->errorbars == 1)
+        {
+          if (opts->verbose > 0)
+            {
+              level = (int) state->max / 164;
+              //fprintf (stderr,"inlvl: %2i%% ", level);
+            }
+        }
+      state->nac = 0;
+      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
+        {
+          openMbeOutFile (opts, state); //dstar ambe files are read back incorrectly, need to change file extension to differentiate when doing a playback
+        }
+      sprintf (state->fsubtype, " VOICE        ");
+      processDSTAR (opts, state);
+      return;
+    }
   else if ((state->synctype == 18) || (state->synctype == 19))
-  {
-    if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
-      openMbeOutFile (opts, state);
-    sprintf (state->fsubtype, " DATA         ");
-    processDSTAR_HD (opts, state);
-    return;
-  }
+    {
+      state->nac = 0;
+      state->lastsrc = 0;
+      state->lasttg = 0;
+      if (opts->errorbars == 1)
+        {
+          if (opts->verbose > 0)
+            {
+              level = (int) state->max / 164;
+              //fprintf (stderr,"inlvl: %2i%% ", level);
+            }
+        }
+      state->nac = 0;
+      if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL))
+      {
+        openMbeOutFile (opts, state); //dstar ambe files are read back incorrectly, need to change file extension to differentiate when doing a playback
+      }
+      sprintf (state->fsubtype, " DATA         ");
+      processDSTAR_HD (opts, state);
+      return;
+    }
     //Start DMR Types
-    else if ((state->synctype >= 10 && state->synctype <= 13) || (state->synctype == 32) || (state->synctype == 33) || (state->synctype == 34) ) //32-34 DMR MS and RC
+    else if ((state->synctype >= 10) && (state->synctype <= 13) || (state->synctype == 32) || (state->synctype == 33) || (state->synctype == 34) ) //32-34 DMR MS and RC
     {
 
       //print manufacturer strings to branding, disabled 0x10 moto other systems can use that fid set
@@ -270,18 +293,12 @@ processFrame (dsd_opts * opts, dsd_state * state)
       return;
     }
     //M17
-    else if ((state->synctype == 16) || (state->synctype == 9)  || (state->synctype == 17) || (state->synctype == 8)  || 
-             (state->synctype == 76) || (state->synctype == 77) || (state->synctype == 86) || (state->synctype == 87) ||
-             (state->synctype == 99) || (state->synctype == 98) )
+    else if ((state->synctype == 16) || (state->synctype == 9) || (state->synctype == 17) || (state->synctype == 8) || (state->synctype == 99) || (state->synctype == 98))
     {
       if (state->synctype == 98 || state->synctype == 99) //preamble only
         skipDibit(opts, state, 8); //skip dibits to prime the demodulator
       else if (state->synctype == 16 || state->synctype == 17)
         processM17STR(opts, state);
-      else if (state->synctype == 76 || state->synctype == 77) {} //Not available yet
-      //   processM17BRT(opts, state); //Not available yet
-      else if (state->synctype == 86 || state->synctype == 87)
-        processM17PKT(opts, state);
       else 
         processM17LSF(opts, state);
       return;
@@ -410,8 +427,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
           if (new_nac != state->nac) {
               // NAC fixed by error correction
               state->nac = new_nac;
-              //apparently, both 0 and 0xFFF can the BCH code on signal drop
-              if (state->p2_hardset == 0 && new_nac != 0 && new_nac != 0xFFF)
+              if (state->p2_hardset == 0 && new_nac != 0)
               {
                 state->p2_cc = new_nac;
               }
@@ -591,7 +607,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
       if (opts->errorbars == 1)
       {
         printFrameInfo (opts, state);
-        fprintf (stderr," MPDU\n"); //multi block format PDU
+        fprintf (stderr," MBF\n"); //multi block format PDU
       }
       if (opts->mbe_out_dir[0] != 0)
       {
@@ -603,7 +619,7 @@ processFrame (dsd_opts * opts, dsd_state * state)
         resumeScan (opts, state);
       }
       state->lastp25type = 4;
-      sprintf (state->fsubtype, " MPDU         ");
+      sprintf (state->fsubtype, " MBF          ");
 
       processMPDU(opts, state);
     }

src/dsd_frame_sync.c

@@ -18,33 +18,58 @@
 #include "dsd.h"
 #include <locale.h>
 
+char * getTime(void) //get pretty hh:mm:ss timestamp
+{
+  time_t t = time(NULL);
+
+  char * curr;
+  char * stamp = asctime(localtime( & t));
+
+  curr = strtok(stamp, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+  curr = strtok(NULL, " ");
+
+  return curr;
+}
+
+char * getDate(void) {
+  #ifdef AERO_BUILD
+  char datename[80];
+  #else
+  char datename[99];
+  #endif
+  char * curr2;
+  struct tm * to;
+  time_t t;
+  t = time(NULL);
+  to = localtime( & t);
+  strftime(datename, sizeof(datename), "%Y-%m-%d", to);
+  curr2 = strtok(datename, " ");
+  return curr2;
+}
+
 void
 printFrameSync (dsd_opts * opts, dsd_state * state, char *frametype, int offset, char *modulation)
 {
-  UNUSED3(state, offset, modulation);
 
-  char * timestr = getTimeC();
   if (opts->verbose > 0)
-  {
-    fprintf (stderr,"%s ", timestr);
-    fprintf (stderr,"Sync: %s ", frametype);
-  }
-
-  //oops, that made a nested if-if-if-if statement,
-  //causing a memory leak
-  
-  // if (opts->verbose > 2)
-    //fprintf (stderr,"o: %4i ", offset);
-  // if (opts->verbose > 1)
-    //fprintf (stderr,"mod: %s ", modulation); 
-  // if (opts->verbose > 2)
-    //fprintf (stderr,"g: %f ", state->aout_gain);
-
-  if (timestr != NULL)
-  {
-    free (timestr);
-    timestr = NULL;
-  }
+    {
+      fprintf (stderr,"%s ", getTime());
+      fprintf (stderr,"Sync: %s ", frametype);
+    }
+  if (opts->verbose > 2)
+    {
+      //fprintf (stderr,"o: %4i ", offset);
+    }
+  if (opts->verbose > 1)
+    {
+      //fprintf (stderr,"mod: %s ", modulation); 
+    }
+  if (opts->verbose > 2)
+    {
+      //fprintf (stderr,"g: %f ", state->aout_gain);
+    }
 
 }
 
@@ -99,14 +124,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
   if (state->dmr_rest_channel == -1 && opts->p25_is_tuned == 0 && opts->p25_trunk == 1 && ( (time(NULL) - state->last_cc_sync_time) > (opts->trunk_hangtime + 0) ) ) //was 3, go to hangtime value
   {
 
-    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
-    if (state->p25_cc_is_tdma == 0)
+    //test to switch back to 10/4 P1 QPSK for P25 FDMA CC
+    if (opts->mod_qpsk == 1 && state->p25_cc_is_tdma == 0)
     {
       state->samplesPerSymbol = 10;
       state->symbolCenter = 4;
-      //re-enable both slots
-      opts->slot1_on = 1;
-      opts->slot2_on = 1;
     }
 
     //start going through the lcn/frequencies CC/signal hunting
@@ -154,22 +176,26 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
     state->last_cc_sync_time = time(NULL); //set again to give another x seconds
   }
 
-  int i, t, dibit, sync, symbol, synctest_pos, lastt;
+  int i, j, t, o, dibit, sync, symbol, synctest_pos, lastt;
   char synctest[25];
   char synctest12[13]; //dPMR
   char synctest10[11]; //NXDN FSW only
+  char synctest18[19];
   char synctest32[33];
   char synctest20[21]; //YSF
+  char synctest21[22]; //P25 S-OEMI (SACCH)
   char synctest48[49]; //EDACS
   char synctest8[9];   //M17
   char synctest16[17]; //M17 Preamble
   char modulation[8];
   char *synctest_p;
+  int symboltest_pos; //symbol test position, match to synctest_pos
+  int symboltest_p[10240]; //make this an array instead
   char synctest_buf[10240]; //what actually is assigned to this, can't find its use anywhere?
   int lmin, lmax, lidx;
-
+  
   //assign t_max value based on decoding type expected (all non-auto decodes first)
-  int t_max = 24; //initialize as an actual value to prevent any overflow related issues
+  int t_max; //maximum values allowed for t will depend on decoding type - NXDN will be 10, others will be more
   if (opts->frame_nxdn48 == 1 || opts->frame_nxdn96 == 1)
   {
     t_max = 10;
@@ -192,14 +218,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
   {
     t_max = 19; //Phase 2 S-ISCH is only 19
   }
-  else if (opts->analog_only == 1) //shim to make sure this is set to a reasonable value
-  {
-    t_max = 24;
-  }
   else t_max = 24; //24 for everything else
 
   int lbuf[48], lbuf2[48]; //if we use t_max in these arrays, and t >=  t_max in condition below, then it can overflow those checks in there if t exceeds t_max
   int lsum;
+  char spectrum[64];
   //init the lbuf
   memset (lbuf, 0, sizeof(lbuf));
   memset (lbuf2, 0, sizeof(lbuf2));
@@ -208,13 +231,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
   t = 0;
   synctest10[10] = 0; 
   synctest[24] = 0;
-  synctest8[8] = 0;   //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
   synctest12[12] = 0;
-  synctest16[16] = 0; //M17, wasn't initialized or terminated (source of much pain and frustration in Cygwin)
+  synctest18[18] = 0;
   synctest48[48] = 0;
   synctest32[32] = 0;
   synctest20[20] = 0;
-  modulation[7] = 0;  //not initialized or terminated (unsure if this would be an issue or not)
   synctest_pos = 0;
   synctest_p = synctest_buf + 10;
   sync = 0;
@@ -311,7 +332,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
           dibit = 51;               // '3'
         }
 
-      if (opts->symbol_out_f && dibit != 0)
+      if (opts->symbol_out == 1 && dibit != 0) 
       {
         int csymbol = 0;
         if (dibit == 49)
@@ -590,39 +611,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                 return (99);
               }
             }
-            else if (strcmp(synctest8, M17_PKT) == 0)
-            {
-              if (opts->inverted_m17 == 0)
-              {
-                printFrameSync (opts, state, "+M17 PKT", synctest_pos + 1, modulation);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                if (state->lastsynctype == 86 || state->lastsynctype == 8)
-                {
-                  state->lastsynctype = 86;
-                  return (86);
-                }
-                state->lastsynctype = 86;
-                fprintf (stderr, "\n");
-              }
-              // else //unknown, -BRT?
-              // {
-              //   printFrameSync (opts, state, "-M17 BRT", synctest_pos + 1, modulation);
-              //   state->carrier = 1;
-              //   state->offset = synctest_pos;
-              //   state->max = ((state->max) + lmax) / 2;
-              //   state->min = ((state->min) + lmin) / 2;
-              //   if (state->lastsynctype == 77)
-              //   {
-              //     state->lastsynctype = 77;
-              //     return (77);
-              //   }
-              //   state->lastsynctype = 77;
-              //   fprintf (stderr, "\n");
-              // }
-            }
             else if (strcmp(synctest8, M17_STR) == 0)
             {
               if (opts->inverted_m17 == 0)
@@ -867,6 +855,32 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                 return (32);
               }
             }
+            //not sure if this should be here, RC data should only be present in vc6?
+            if(strcmp (synctest, DMR_RC_DATA_SYNC) == 0)
+            {
+              state->carrier = 1;
+              state->offset = synctest_pos;
+              state->max = ((state->max) + lmax) / 2;
+              state->min = ((state->min) + lmin) / 2;
+              //state->directmode = 0;
+              //fprintf (stderr, "DMR RC DATA\n");
+              state->dmr_ms_rc == 1; //set flag for RC data, then process accordingly and reset back to 0 afterwards
+              if (0 == 0) //opts->inverted_dmr
+              {
+                // voice frame
+                sprintf(state->ftype, "DMR RC");
+                if (opts->errorbars == 1)
+                {
+                  //printFrameSync (opts, state, "+DMR RC Data", synctest_pos + 1, modulation);
+                }
+                if (state->lastsynctype != 34)
+                {
+                  //state->firstframe = 1;
+                }
+                state->lastsynctype = 34;
+                return (34);
+              }
+            }
 
             if(strcmp (synctest, DMR_MS_VOICE_SYNC) == 0)
             {
@@ -1128,65 +1142,56 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
 
           //ProVoice and EDACS sync
           if (opts->frame_provoice == 1)
-          {
-            strncpy (synctest32, (synctest_p - 31), 32);
-            strncpy (synctest48, (synctest_p - 47), 48);
-            if ((strcmp (synctest32, PROVOICE_SYNC) == 0) || (strcmp (synctest32, PROVOICE_EA_SYNC) == 0))
             {
-                state->last_cc_sync_time = time(NULL);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                sprintf (state->ftype, "ProVoice ");
-                if (opts->errorbars == 1)
-                printFrameSync (opts, state, "+PV   ", synctest_pos + 1, modulation);
-                state->lastsynctype = 14;
-                return (14);
-            }
-            else if ((strcmp (synctest32, INV_PROVOICE_SYNC) == 0) || (strcmp (synctest32, INV_PROVOICE_EA_SYNC) == 0))
-            {
-                state->last_cc_sync_time = time(NULL);
-                state->carrier = 1;
-                state->offset = synctest_pos;
-                state->max = ((state->max) + lmax) / 2;
-                state->min = ((state->min) + lmin) / 2;
-                sprintf (state->ftype, "ProVoice ");
-                printFrameSync (opts, state, "-PV   ", synctest_pos + 1, modulation);
-                state->lastsynctype = 15;
-                return (15);
-            }
-            else if ( strcmp (synctest48, EDACS_SYNC) == 0)
-            {
-              state->last_cc_sync_time = time(NULL);
-              state->carrier = 1;
-              state->offset = synctest_pos;
-              state->max = ((state->max) + lmax) / 2;
-              state->min = ((state->min) + lmin) / 2;
-              printFrameSync (opts, state, "-EDACS", synctest_pos + 1, modulation);
-              state->lastsynctype = 38; 
-              return (38);
-            }
-            else if ( strcmp (synctest48, INV_EDACS_SYNC) == 0)
-            {
-              state->last_cc_sync_time = time(NULL);
-              state->carrier = 1;
-              state->offset = synctest_pos;
-              state->max = ((state->max) + lmax) / 2;
-              state->min = ((state->min) + lmin) / 2;
-              printFrameSync (opts, state, "+EDACS", synctest_pos + 1, modulation);
-              state->lastsynctype = 37; 
-              return (37);
-            }
-            else if ((strcmp (synctest48, DOTTING_SEQUENCE_A) == 0) || (strcmp (synctest48, DOTTING_SEQUENCE_B) == 0))
-            {
-              //only print and execute Dotting Sequence if Trunking and Tuned so we don't get multiple prints on this
-              if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1)
+              strncpy (synctest32, (synctest_p - 31), 32);
+              strncpy (synctest48, (synctest_p - 47), 48);
+              if ((strcmp (synctest32, PROVOICE_SYNC) == 0) || (strcmp (synctest32, PROVOICE_EA_SYNC) == 0))
               {
-                printFrameSync (opts, state, " EDACS  DOTTING SEQUENCE: ", synctest_pos + 1, modulation);
-                eot_cc (opts, state);
+                  state->last_cc_sync_time = time(NULL);
+                  state->carrier = 1;
+                  state->offset = synctest_pos;
+                  state->max = ((state->max) + lmax) / 2;
+                  state->min = ((state->min) + lmin) / 2;
+                  sprintf (state->ftype, "ProVoice ");
+                  if (opts->errorbars == 1)
+                  printFrameSync (opts, state, "+PV   ", synctest_pos + 1, modulation);
+                  state->lastsynctype = 14;
+                  return (14);
+              }
+              else if ((strcmp (synctest32, INV_PROVOICE_SYNC) == 0) || (strcmp (synctest32, INV_PROVOICE_EA_SYNC) == 0))
+              {
+                  state->last_cc_sync_time = time(NULL);
+                  state->carrier = 1;
+                  state->offset = synctest_pos;
+                  state->max = ((state->max) + lmax) / 2;
+                  state->min = ((state->min) + lmin) / 2;
+                  sprintf (state->ftype, "ProVoice ");
+                  printFrameSync (opts, state, "-PV   ", synctest_pos + 1, modulation);
+                  state->lastsynctype = 15;
+                  return (15);
+              }
+              else if ( strcmp (synctest48, EDACS_SYNC) == 0)
+              {
+                state->last_cc_sync_time = time(NULL);
+                state->carrier = 1;
+                state->offset = synctest_pos;
+                state->max = ((state->max) + lmax) / 2;
+                state->min = ((state->min) + lmin) / 2;
+                printFrameSync (opts, state, "-EDACS", synctest_pos + 1, modulation);
+                state->lastsynctype = 38; 
+                return (38);
+              }
+              else if ( strcmp (synctest48, INV_EDACS_SYNC) == 0)
+              {
+                state->last_cc_sync_time = time(NULL);
+                state->carrier = 1;
+                state->offset = synctest_pos;
+                state->max = ((state->max) + lmax) / 2;
+                state->min = ((state->min) + lmin) / 2;
+                printFrameSync (opts, state, "+EDACS", synctest_pos + 1, modulation);
+                state->lastsynctype = 37; 
+                return (37);
               }
-            }
 
           }
          
@@ -1198,10 +1203,10 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                   state->offset = synctest_pos;
                   state->max = ((state->max) + lmax) / 2;
                   state->min = ((state->min) + lmin) / 2;
-                  sprintf (state->ftype, "DSTAR ");
+                  sprintf (state->ftype, "D-STAR ");
                   if (opts->errorbars == 1)
                     {
-                      printFrameSync (opts, state, "+DSTAR VOICE ", synctest_pos + 1, modulation);
+                      printFrameSync (opts, state, "+D-STAR ", synctest_pos + 1, modulation);
                     }
                   state->lastsynctype = 6;
                   return (6);
@@ -1212,10 +1217,10 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                   state->offset = synctest_pos;
                   state->max = ((state->max) + lmax) / 2;
                   state->min = ((state->min) + lmin) / 2;
-                  sprintf (state->ftype, "DSTAR ");
+                  sprintf (state->ftype, "D-STAR ");
                   if (opts->errorbars == 1)
                     {
-                      printFrameSync (opts, state, "-DSTAR VOICE ", synctest_pos + 1, modulation);
+                      printFrameSync (opts, state, "-D-STAR ", synctest_pos + 1, modulation);
                     }
                   state->lastsynctype = 7;
                   return (7);
@@ -1226,10 +1231,10 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                    state->offset = synctest_pos;
                    state->max = ((state->max) + lmax) / 2;
                    state->min = ((state->min) + lmin) / 2;
-                   sprintf (state->ftype, "DSTAR_HD ");
+                   sprintf (state->ftype, "D-STAR_HD ");
                    if (opts->errorbars == 1)
                      {
-                       printFrameSync (opts, state, "+DSTAR HEADER", synctest_pos + 1, modulation);
+                       printFrameSync (opts, state, "+D-STAR_HD ", synctest_pos + 1, modulation);
                      }
                    state->lastsynctype = 18;
                    return (18);
@@ -1240,10 +1245,10 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
                    state->offset = synctest_pos;
                    state->max = ((state->max) + lmax) / 2;
                    state->min = ((state->min) + lmin) / 2;
-                   sprintf (state->ftype, " DSTAR_HD");
+                   sprintf (state->ftype, " D-STAR_HD");
                    if (opts->errorbars == 1)
                      {
-                       printFrameSync (opts, state, "-DSTAR HEADER", synctest_pos + 1, modulation);
+                       printFrameSync (opts, state, "-D-STAR_HD ", synctest_pos + 1, modulation);
                      }
                    state->lastsynctype = 19;
                    return (19);

src/dsd_gps.c

@@ -1,766 +0,0 @@
-/*-------------------------------------------------------------------------------
- * dsd_gps.c
- * GPS Handling Functions for Various Protocols
- *
- * LWVMOBILE
- * 2023-12 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-
-void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
-{
-  //NOTE: This is defined in ETSI TS 102 361-4 V1.12.1 (2023-07) p208
-  //6.6.11.3.2 USBD Polling Service Poll Response PDU for LIP (That's a mouthful)
-
-  int slot = state->currentslot;
-
-  //NOTE: This format is pretty much the same as DMR EMB GPS, but has a few extra elements,
-  //so I got lazy and just lifted most of the code from there, also assuming same lat/lon calcs
-  //since those have been tested to work in DMR EMB GPS and units are same in LIP
-
-  fprintf (stderr, "Location Information Protocol; ");
-
-  // uint8_t service_type = (uint8_t)ConvertBitIntoBytes(&input[0], 4); //checked before arrival here
-  uint8_t time_elapsed = (uint8_t)ConvertBitIntoBytes(&input[6], 2);
-  uint8_t lon_sign = input[8];
-  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&input[9], 24); //8, 25
-  uint8_t lat_sign = input[33];
-  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&input[34], 23); //33, 24
-  uint8_t pos_err = (uint8_t)ConvertBitIntoBytes(&input[57], 2);
-  uint8_t hor_vel = (uint8_t)ConvertBitIntoBytes(&input[59], 7);
-  uint8_t dir_tra = (uint8_t)ConvertBitIntoBytes(&input[66], 4);
-  uint8_t reason = (uint8_t)ConvertBitIntoBytes(&input[70], 3);
-  uint8_t add_hash = (uint8_t)ConvertBitIntoBytes(&input[73], 8); //MS Source Address Hash
-
-  //NOTE: May need to use double instead of float to avoid rounding errors
-  double latitude, longitude = 0.0f;
-  double lat_unit = (double)180/ pow (2.0, 24); //180 divided by 2^24 -- 6.3.30
-  double lon_unit = (double)360/ pow (2.0, 25); //360 divided by 2^25 -- 6.3.50
-  double lon_sf = 1.0f; //float value we can multiple longitude with
-  double lat_sf = 1.0f; //float value we can multiple latitude with
-
-  char latstr[3];
-  char lonstr[3];
-  sprintf (latstr, "%s", "N");
-  sprintf (lonstr, "%s", "E");
-
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-
-  //lat and lon calculations
-  if (lat_sign)
-  {
-    lat = 0x800001 - lat;
-    sprintf (latstr, "%s", "S");
-    lat_sf = -1.0f;
-  } 
-  latitude = ((double)lat * lat_unit);
-
-  if (lon_sign)
-  {
-    lon = 0x1000001 - lon;
-    sprintf (lonstr, "%s", "W");
-    lon_sf = -1.0f;
-  } 
-  longitude = ((double)lon * lon_unit);
-
-  //6.3.63 Position Error
-  //6.3.17 Horizontal velocity
-  /*
-    Horizontal velocity shall be encoded for speeds 0 km/h to 28 km/h in 1 km/h steps and 
-    from 28 km/h onwards using equation: v = C × (1 + x)^(K-A) + B where:
-  */
-  float v = 0.0f;
-  float C = 16.0f;
-  float x = 0.038f;
-  float A = 13.0f;
-  float K = (float)hor_vel;
-  float B = 0.0f;
-
-  if (hor_vel > 28)
-    v = C * (pow(1+x, K-A)) + B; //I think this pow function is set up correctly
-  else v = (float)hor_vel;
-
-  float dir = (((float)dir_tra + 11.25f)/22.5f); //page 68, Table 6.45
-
-  //truncated and rounded forms
-  int vt = (int)v;
-  int dt = (int)dir;
-
-  //sanity check
-  if (abs (latitude) < 90 && abs(longitude) < 180)
-  {
-    fprintf (stderr, "Src(Hash); %03d;  Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf); Spd: %d km/h; Dir: %d%s",add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude, vt, dt, deg_glyph);
-
-    //6.3.63 Position Error
-    uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err 
-    if (pos_err == 0x7 ) fprintf (stderr, "\n  Position Error: Unknown or Invalid;");
-    else fprintf (stderr, "\n  Position Error: Less than %dm;", position_error);
-
-    //Reason For Sending 6.6.11.3.3 Table 6.80
-    if (reason) fprintf (stderr, " Reserved: %d;", reason);
-    else fprintf (stderr, " Request Response; ");
-
-    //6.3.78 Time elapsed
-    if (time_elapsed == 0) fprintf (stderr, " TE: < 5s;");
-    if (time_elapsed == 1) fprintf (stderr, " TE: < 5m;");
-    if (time_elapsed == 2) fprintf (stderr, " TE: < 30m;");
-    if (time_elapsed == 3) fprintf (stderr, " TE: NA or UNK;"); //not applicable or unknown
-
-    //save to array for ncurses
-    if (pos_err != 0x7)
-    {
-      sprintf (state->dmr_embedded_gps[slot], "%03d; LIP: %.5lf%s%s %.5lf%s%s; Err: %dm; Spd: %d km/h; Dir: %d%s", add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, position_error, vt, dt, deg_glyph);
-    }
-    else sprintf (state->dmr_embedded_gps[slot], "%03d; LIP: %.5lf%s%s %.5lf%s%s Unknown Pos Err; Spd: %d km/h; Dir %d%s", add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, vt, dt, deg_glyph);
-
-    //save to LRRP report for mapping/logging
-    FILE * pFile; //file pointer
-    if (opts->lrrp_file_output == 1)
-    {
-
-      char * datestr = getDate();
-      char * timestr = getTime();
-
-      //open file by name that is supplied in the ncurses terminal, or cli
-      pFile = fopen (opts->lrrp_out_file, "a");
-      fprintf (pFile, "%s\t", datestr );
-      fprintf (pFile, "%s\t", timestr );
-      fprintf (pFile, "%08d\t", add_hash);
-      fprintf (pFile, "%.5lf\t", latitude);
-      fprintf (pFile, "%.5lf\t", longitude);
-      fprintf (pFile, "%d\t", vt); //speed in km/h
-      fprintf (pFile, "%d\t", dt); //direction of travel
-      fprintf (pFile, "\n");
-      fclose (pFile);
-
-      if (timestr != NULL)
-      {
-        free (timestr);
-        timestr = NULL;
-      }
-      if (datestr != NULL)
-      {
-        free (datestr);
-        datestr = NULL;
-      }
-
-    }
-
-  }
-  else fprintf (stderr, " Position Calculation Error;");
-
-}
-
-void nmea_iec_61162_1 (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int type)
-{
-  int slot = state->currentslot;
-
-  //NOTE: The Only difference between Short (type == 1) and Long Format (type == 2) 
-  //is the utc_ss3 on short vs utc_ss6 and inclusion of COG value on long
-
-  //NOTE: MFID Specific Formats are not handled here, unknown, could be added if worked out
-  //they could share most of the same elements and use the large spare bits in block 2 for extra
-  // uint8_t mfid = (uint8_t)ConvertBitIntoBytes(&input[88], 8); //on type 3, last octet of first block carries MFID
-
-  // uint8_t nmea_c = input[0];  //encrypted -- checked before we get here
-  uint8_t nmea_ns = input[1]; //north/south (lat sign)
-  uint8_t nmea_ew = input[2]; //east/west (lon sign)
-  uint8_t nmea_q = input[3]; //Quality Indicator (no fix or fix valid)
-  uint8_t nmea_speed = (uint8_t)ConvertBitIntoBytes(&input[4], 7); //speed in knots (127 = greater than 126 knots)
-
-  //Latitude Bits
-  uint8_t nmea_ndeg = (uint8_t)ConvertBitIntoBytes(&input[11], 7); //Latitude Degrees
-  uint8_t nmea_nmin = (uint8_t)ConvertBitIntoBytes(&input[18], 6); //Latitude Minutes
-  uint16_t nmea_nminf = (uint16_t)ConvertBitIntoBytes(&input[24], 14); //Latitude Fractions of Minutes
-
-  //Longitude Bits
-  uint8_t nmea_edeg = (uint8_t)ConvertBitIntoBytes(&input[38], 8); //Longitude Degrees
-  uint8_t nmea_emin = (uint8_t)ConvertBitIntoBytes(&input[46], 6); //Longitude Minutes
-  uint16_t nmea_eminf = (uint16_t)ConvertBitIntoBytes(&input[52], 14); //Longitude Fractions of Minutes
-
-  //UTC Time and COG
-  uint8_t nmea_utc_hh  = (uint8_t)ConvertBitIntoBytes(&input[66], 5);
-  uint8_t nmea_utc_mm  = (uint8_t)ConvertBitIntoBytes(&input[71], 6);
-  //seconds and the addition of COG is the difference between short and long formats
-  uint8_t nmea_utc_ss3 = (uint8_t)ConvertBitIntoBytes(&input[77], 3); //seconds in 10s
-  uint8_t nmea_utc_ss6 = (uint8_t)ConvertBitIntoBytes(&input[77], 6); //seconds in 1s
-  uint16_t nmea_cog = (uint16_t)ConvertBitIntoBytes(&input[103], 9); //course over ground in degrees
-
-  //lat and lon conversion
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-  float latitude = 0.0f;
-  float longitude = 0.0f;
-  // float m_unit = 1.0f / 60.0f;     //unit to convert min into decimal value - (1/60)*60 minutes = 1 degree
-  // float mm_unit = 1.0f / 10000.0f;  //unit to convert minf into decimal value - (0000 - 9999) 0.0001×9999 = .9999 minutes, so its sub 1 minute decimal
-
-  //testing w/ Harris NMEA like values (ran tests over there with this code, this seems to work on those values)
-  float m_unit = 1.0f / 60.0f;     //unit to convert min into decimal value - (1/60)*60 minutes = 1 degree
-  float mm_unit = 1.0f / 600000.0f;  //unit to convert minf into decimal value - (0000 - 9999) 0.0001×9999 = .9999 minutes, so its sub 1 minute decimal
-
-  //speed conversion
-  float fmps, fmph, fkph = 0.0f; //conversion of knots to mps, kph, and mph values
-  fmps = (float)nmea_speed * 0.514444; UNUSED(fmps);
-  fmph = (float)nmea_speed * 1.15078f; UNUSED(fmph);
-  fkph = (float)nmea_speed * 1.852f;
-
-  //calculate decimal representation of latidude and longitude (need some samples to test)
-  latitude  = ( (float)nmea_ndeg + ((float)nmea_nmin*m_unit) + ((float)nmea_nminf*mm_unit) );
-  longitude = ( (float)nmea_edeg + ((float)nmea_emin*m_unit) + ((float)nmea_eminf*mm_unit) );
-
-  if (!nmea_ns) latitude  *= -1.0f; //0 is South, 1 is North
-  if (!nmea_ew) longitude *= -1.0f; //0 is West, 1 is East
-
-  fprintf (stderr, " GPS: %f%s, %f%s;", latitude, deg_glyph, longitude, deg_glyph);
-
-  //Speed in Knots
-  if (nmea_speed > 126)
-    fprintf (stderr, " SPD > 126 knots or %f kph;", fkph);
-  else
-    fprintf (stderr, " SPD: %d knots; %f kph;", nmea_speed, fkph);
-
-  //Print UTC Time and COG according to Format Type
-  if (type == 1)
-    fprintf (stderr, " FIX: %d; %02d:%02d:%02d UTC; Short Format;", nmea_q, nmea_utc_hh, nmea_utc_mm, nmea_utc_ss3);
-  if (type == 2)
-    fprintf (stderr, " FIX: %d; %02d:%02d:%02d UTC; COG: %d%s; Long Format;", nmea_q, nmea_utc_hh, nmea_utc_mm, nmea_utc_ss6, nmea_cog, deg_glyph);
-
-  //save to ncurses string
-  sprintf (state->dmr_embedded_gps[slot], "GPS: (%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);
-
-  //save to LRRP report for mapping/logging
-  FILE * pFile; //file pointer
-  if (opts->lrrp_file_output == 1)
-  {
-
-    char * datestr = getDate();
-    char * timestr = getTime();
-
-    int s = (int)fkph; //rounded interger format for the log report
-    int a = 0;
-    if (type == 2)
-      a = nmea_cog; //long format only
-    //open file by name that is supplied in the ncurses terminal, or cli
-    pFile = fopen (opts->lrrp_out_file, "a");
-    fprintf (pFile, "%s\t", datestr );
-    fprintf (pFile, "%s\t", timestr ); //could switch to UTC time if desired, but would require local user offset
-    fprintf (pFile, "%08d\t", src);
-    fprintf (pFile, "%.6lf\t", latitude);
-    fprintf (pFile, "%.6lf\t", longitude);
-    fprintf (pFile, "%d\t ", s);
-    fprintf (pFile, "%d\t ", a);
-    fprintf (pFile, "\n");
-    fclose (pFile);
-
-    if (timestr != NULL)
-    {
-      free (timestr);
-      timestr = NULL;
-    }
-    if (datestr != NULL)
-    {
-      free (datestr);
-      datestr = NULL;
-    }
-
-  }
-
-}
-
-//restructured the Harris GPS to flow more like the DMR UDT NMEA Format when possible
-void nmea_harris (dsd_opts * opts, dsd_state * state, uint8_t * input, uint32_t src, int slot)
-{
-
-  //GPS working, Time Working (old method), COG and Speed are logical on due west sample
-  //TODO: Fiddle/Test various ns and ew bits for proper signs in case its located elsewhere
-  //UPDATE: Found two contiguous bits that always work on all my accumulated samples
-  //the bits also place it with the 'lone' flagged bit observed prior
-
-  uint8_t nmea_ns = input[88]; //north/south (lat sign) //72 previously used bit
-  uint8_t nmea_ew = input[89]; //east/west (lon sign)  //88 previously used bit
-  uint8_t nmea_q = input[147]; //Quality Indicator (last fix or current fix)
-  // uint8_t nmea_speed = (uint8_t)ConvertBitIntoBytes(&input[129], 7); //129,7
-  uint8_t nmea_speed = (uint8_t)ConvertBitIntoBytes(&input[129], 6); //this is one bit shorter than called for, but I believe it works
-
-  //Latitude Bits
-  uint8_t nmea_ndeg = (uint8_t)ConvertBitIntoBytes(&input[65], 7); //Latitude Degrees
-  uint8_t nmea_nmin = (uint8_t)ConvertBitIntoBytes(&input[58], 6); //Latitude Minutes
-  uint16_t nmea_nminf = (uint16_t)ConvertBitIntoBytes(&input[42], 14); //Latitude Fractions of Minutes
-
-  //Longitude Bits
-  uint8_t nmea_edeg = (uint8_t)ConvertBitIntoBytes(&input[96], 8); //Longitude Degrees
-  uint8_t nmea_emin = (uint8_t)ConvertBitIntoBytes(&input[90], 6); //Longitude Minutes
-  uint16_t nmea_eminf = (uint16_t)ConvertBitIntoBytes(&input[74], 14); //Longitude Fractions of Minutes
-
-  //NOTE: Removed UTC hh.mm.ss6 format found in DMR UDT, could not make it work
-  //with bits already established for time and it works extremely well as is
-
-  //Course Over Ground in Degrees (0-360)
-  uint16_t nmea_cog = (uint16_t)ConvertBitIntoBytes(&input[135], 9) % 360; //course over ground in degrees //working on due west sample without %360
-
-  //timestamp (16-bit value w/ appended 17th bit to MSB)
-  uint32_t rtime = (uint32_t)ConvertBitIntoBytes(&input[104], 16);
-  rtime |= input[144] << 16; //this bit is flagged on after 0xFFFF rollover in the late afternoon
-  uint32_t thour = rtime / 3600;
-  uint32_t tmin  = (rtime % 3600) / 60;
-  uint32_t tsec  = (rtime % 3600) % 60;
-
-  //lat and lon conversion
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-  float latitude = 0.0f;
-  float longitude = 0.0f;
-  float m_unit = 1.0f / 60.0f;
-  float mm_unit = 1.0f / 600000.0f;
-
-  //speed conversion
-  float fmps, fmph, fkph = 0.0f; //conversion of knots to mps, kph, and mph values
-  fmps = (float)nmea_speed * 0.514444; UNUSED(fmps);
-  fmph = (float)nmea_speed * 1.15078f; UNUSED(fmph);
-  fkph = (float)nmea_speed * 1.852f;   UNUSED(fkph);
-
-  //calculate decimal representation of latidude and longitude (need some samples to test)
-  latitude  = ( (float)nmea_ndeg + ((float)nmea_nmin*m_unit) + ((float)nmea_nminf*mm_unit) );
-  longitude = ( (float)nmea_edeg + ((float)nmea_emin*m_unit) + ((float)nmea_eminf*mm_unit) );
-
-  //This is opposite (seemingly) compared to the version specified by DMR UDT NMEA, could still be different bits involved (to be tested)
-  // if (nmea_ns) latitude  *= -1.0f; //1 is South, 0 is North
-  // if (nmea_ew) longitude *= -1.0f; //1 is West, 0 is East
-
-  //DMR UDT NMEA original version (working now with new bit selection 88 and 89 like how DMR UDT NMEA format specifies)
-  if (!nmea_ns) latitude  *= -1.0f; //0 is South, 1 is North
-  if (!nmea_ew) longitude *= -1.0f; //0 is West, 1 is East
-
-  fprintf (stderr, "\n");
-
-  fprintf (stderr, " VCH: %d - SRC: %08d;", slot, src);
-  fprintf (stderr, " GPS: %f%s, %f%s;", latitude, deg_glyph, longitude, deg_glyph);
-
-  //Speed in Knots (assuming in knots, and not in mps, or kph)
-  if (nmea_speed > 126)
-    fprintf (stderr, " SPD > 126 knots or %f MPH;", fmph); //using MPH here, its Harris, they're in the U.S.
-  else
-    fprintf (stderr, " SPD: %d knots; %f MPH;", nmea_speed, fmph);
-
-  //Course Over Ground (COG)
-  fprintf (stderr, " COG: %03d%s;", nmea_cog, deg_glyph); //%360
-
-  //debug speed
-  // fprintf (stderr, " RSPD: %02X;", nmea_speed);
-
-  //debug cog
-  // fprintf (stderr, " RCOG: %03X;", nmea_cog >> 0);
-
-  //UTC Time
-  fprintf (stderr, " T: %02d:%02d:%02d UTC;", thour, tmin, tsec);
-
-  //Fix Indicator
-  if (nmea_q) fprintf (stderr, " Current Fix;");
-  else fprintf (stderr, " Last Fix;");
-
-  //save to ncurses string
-  sprintf (state->dmr_embedded_gps[slot], "GPS: (%f%s, %f%s)", latitude, deg_glyph, longitude, deg_glyph);
-
-  //save to LRRP report for mapping/logging
-  FILE * pFile; //file pointer
-  if (opts->lrrp_file_output == 1)
-  {
-
-    char * datestr = getDate();
-    char * timestr = getTime();
-
-    //rounded interger formats for the log report
-    int s = (int)fkph;
-    int a = nmea_cog;
-
-    //open file by name that is supplied in the ncurses terminal, or cli
-    pFile = fopen (opts->lrrp_out_file, "a");
-    fprintf (pFile, "%s\t", datestr );
-    fprintf (pFile, "%s\t", timestr ); //could switch to UTC time on PDU if desired
-    fprintf (pFile, "%08d\t", src);
-    fprintf (pFile, "%.6lf\t", latitude);
-    fprintf (pFile, "%.6lf\t", longitude);
-    fprintf (pFile, "%d\t ", s);
-    fprintf (pFile, "%d\t ", a);
-    fprintf (pFile, "\n");
-    fclose (pFile);
-
-    if (timestr != NULL)
-    {
-      free (timestr);
-      timestr = NULL;
-    }
-    if (datestr != NULL)
-    {
-      free (datestr);
-      datestr = NULL;
-    }
-
-  }
-
-  //NOTE: There seems to be a few more octets left undecoded in this PDU
-  //not including the CRC obviously, unsure of their meaning, could relate
-  //to other GPS functions like precision, etc, unknown.
-
-  //NOTE2: All these values are just best effort based on observation and 
-  //making map points match using logic and distance over time for speed and course
-  //without any documentation, any of these values may still be wrong
-
-}
-
-//fallback version (if desired/required)
-void harris_gps(dsd_opts * opts, dsd_state * state, int slot, uint8_t * input)
-{
-
-  uint8_t lat_sign, lat_deg, lat_min = 0;
-  uint8_t lon_sign, lon_deg, lon_min = 0;
-  uint16_t lat_mmin = 0;
-  uint16_t lon_mmin = 0;
-
-  //potentially in this PDU, but unverifiable without documentation or reasonable 
-  //mathematical proof vs map points and direction of travel / distance over time (assuming the radio is facing that direction)
-  uint16_t rspeed = (uint16_t)ConvertBitIntoBytes(&input[136], 8); //MSB //136
-  rspeed = (rspeed << 8) + (uint16_t)ConvertBitIntoBytes(&input[128], 8); //LSB //128
-
-  //this works okay for example of driver driving due west at the speed limit of the road (fluke?)
-  uint16_t rangle = (uint16_t)ConvertBitIntoBytes(&input[120], 8); //120,8
-  float fspeed = (float)rspeed;
-  float fangle = (float)rangle;
-
-  fspeed /= 255.0f; //unit value of 1 bit
-  fspeed *= 1.56f; //this is based on an observation of a driver moving approx 210 meters in about 8 seconds and this makes it just under the speed limit on the road there
-  // fangle *= 360.0f/255.0f; //unit value of 1 bit
-  fangle *= 2.0f; //may exceed 360 degrees as is (use %)
-
-  int s, a = 0;
-  s = (int)fspeed * 3.6;
-  a = (int)fangle % 360;
-
-  //fix and quality indicators?
-  uint8_t fix = input[147]; UNUSED(fix);
-  uint8_t quality = (uint16_t)ConvertBitIntoBytes(&input[148], 3); UNUSED(quality);
-
-  //timestamp (16-bit value w/ appended 17th bit to MSB)
-  uint32_t rtime = (uint32_t)ConvertBitIntoBytes(&input[104], 16); //seconds since midnight since last GPS fix (whatever the radio has as internal time)
-  rtime |= input[144] << 16; //test appending this as bit 17 (observed this bit set after the afternoon 0xFFFF rollover)
-  uint32_t thour = rtime / 3600;
-  uint32_t tmin  = (rtime % 3600) / 60;
-  uint32_t tsec  = (rtime % 3600) % 60;
-
-  float lat_dec = 0.0f;
-  float lon_dec = 0.0f;
-
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-
-  //This appears to be similar to the NMEA GPGGA format (DDmm.mm) but 
-  //octets are ordered in least significant to most significant value
-  lat_mmin = (uint16_t)ConvertBitIntoBytes(&input[40], 16); //? bits required, but grabbing two octets
-  lat_min  = (uint8_t)ConvertBitIntoBytes(&input[58], 6);  //6 bits required to get 60
-  lat_deg  = (uint8_t)ConvertBitIntoBytes(&input[65], 7); //7 bits required to get 90
-  lat_sign = input[72]; //64
-
-  lon_mmin = (uint16_t)ConvertBitIntoBytes(&input[72], 16); //? bits required, but grabbing two octets
-  lon_min  = (uint8_t)ConvertBitIntoBytes(&input[90], 6);  //6 bits required to get 60
-  lon_deg  = (uint8_t)ConvertBitIntoBytes(&input[96], 8); //8 bits required to get 180 
-  lon_sign = input[88]; //88, unsure of a correct location, but on the sample with 0 minutes, this lonely bit was flagged on
-
-  int src = 0;
-  if (slot == 0) src = state->lastsrc;
-  if (slot == 1) src = state->lastsrcR;
-
-  //calculate decimal representation (was a pain to figure out the sub minute values)
-  lat_dec = ( (float)lat_deg + ((float)lat_min/60.0f) + ((float)lat_mmin/600000.0f) );
-  lon_dec = ( (float)lon_deg + ((float)lon_min/60.0f) + ((float)lon_mmin/600000.0f) );
-
-  if (lat_sign)
-    lat_dec *= -1.0f;
-
-  if (lon_sign) 
-    lon_dec *= -1.0f;
-
-  //line break
-  fprintf (stderr, "\n");
-  fprintf (stderr, " GPS: %f%s, %f%s;", lat_dec, deg_glyph, lon_dec, deg_glyph);
-
-  //gps fix time
-  // fprintf (stderr, " RT: %05X;", rtime); //debug
-  fprintf (stderr, " LTS: %02d:%02d:%02d UTC;", thour, tmin, tsec);  //last time synced to GPS
-
-  //speed and direction
-  // fprintf (stderr, " RSPD: %04X;", rspeed); //debug
-  // fprintf (stderr, " RANG: %02X;", rangle); //debug
-  // fprintf (stderr, " MPS: %06.02f;", fspeed);
-  // fprintf (stderr, " KPH: %06.02f;", fspeed * 3.6f);
-  // fprintf (stderr, " MPH: %06.02f;", fspeed * 2.2369f);
-  fprintf (stderr, " DIR: %03d%s;", a, deg_glyph);
-
-  // fprintf (stderr, " FIX: %d", fix);
-  // fprintf (stderr, " QLT: %02d", quality);
-
-  // fprintf (stderr, " SRC: %08d;", src);
-
-  //save to array for ncurses
-  sprintf (state->dmr_embedded_gps[slot], "GPS: (%f%s, %f%s)", lat_dec, deg_glyph, lon_dec, deg_glyph);
-
-  //save to LRRP report for mapping/logging
-  FILE * pFile; //file pointer
-  if (opts->lrrp_file_output == 1)
-  {
-
-    char * datestr = getDate();
-    char * timestr = getTime();
-
-    //open file by name that is supplied in the ncurses terminal, or cli
-    pFile = fopen (opts->lrrp_out_file, "a");
-    fprintf (pFile, "%s\t", datestr );
-    fprintf (pFile, "%s\t", timestr );
-    fprintf (pFile, "%08d\t", src);
-    fprintf (pFile, "%.6lf\t", lat_dec);
-    fprintf (pFile, "%.6lf\t", lon_dec);
-    fprintf (pFile, "%d\t ", s);
-    fprintf (pFile, "%d\t ", a);
-    fprintf (pFile, "\n");
-    fclose (pFile);
-
-    if (timestr != NULL)
-    {
-      free (timestr);
-      timestr = NULL;
-    }
-    if (datestr != NULL)
-    {
-      free (datestr);
-      datestr = NULL;
-    }
-
-  }
-
-  //NOTE: Thanks to DSheirer (SDRTrunk) for helping me work out a few of the things in here
-  //not entirely convinced on some of these calcs (speed, angle, and TS) but sure these bits
-  //are actual speed/direction/timestamps judging from what the coordinates show on a map
-}
-
-//externalize embedded GPS - Confirmed working now on NE, NW, SE, and SW coordinates
-void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
-{
-  UNUSED(opts);
-
-  fprintf (stderr, "%s", KYEL);
-  fprintf (stderr, " Embedded GPS:");
-  uint8_t slot = state->currentslot;
-  uint8_t pf = lc_bits[0];
-  uint8_t res_a = lc_bits[1];
-  uint8_t res_b = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 4);
-  uint8_t pos_err = (uint8_t)ConvertBitIntoBytes(&lc_bits[20], 3);
-  UNUSED2(res_a, res_b);
-
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-
-  uint32_t lon_sign = lc_bits[23]; 
-  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[24], 24); 
-  uint32_t lat_sign = lc_bits[48]; 
-  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23); 
-  double lon_sf = 1.0f; //float value we can multiple longitude with
-  double lat_sf = 1.0f; //float value we can multiple latitude with
-
-  double lat_unit = (double)180/ pow (2.0, 24); //180 divided by 2^24
-  double lon_unit = (double)360/ pow (2.0, 25); //360 divided by 2^25
-
-  char latstr[3];
-  char lonstr[3];
-  sprintf (latstr, "%s", "N");
-  sprintf (lonstr, "%s", "E");
-
-  //run calculations and print
-  //7.2.16 and 7.2.17 (two's compliment)
-
-  double latitude = 0;  
-  double longitude = 0; 
-
-  if (pf) fprintf (stderr, " Protected");
-  else
-  {
-    if (lat_sign)
-    {
-      lat = 0x800001 - lat;
-      sprintf (latstr, "%s", "S");
-      lat_sf = -1.0f;
-    } 
-    latitude = ((double)lat * lat_unit);
-
-    if (lon_sign)
-    {
-      lon = 0x1000001 - lon;
-      sprintf (lonstr, "%s", "W");
-      lon_sf = -1.0f;
-    } 
-    longitude = ((double)lon * lon_unit);
-
-    //sanity check
-    if (abs (latitude) < 90 && abs(longitude) < 180)
-    {
-      fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf)", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude);
-
-      //7.2.15 Position Error
-      uint16_t position_error = 2 * pow(10, pos_err); //2 * 10^pos_err 
-      if (pos_err == 0x7 ) fprintf (stderr, "\n  Position Error: Unknown or Invalid");
-      else fprintf (stderr, "\n  Position Error: Less than %dm", position_error);
-
-      //save to array for ncurses
-      if (pos_err != 0x7)
-      {
-        sprintf (state->dmr_embedded_gps[slot], "GPS: %.5lf%s%s %.5lf%s%s Err: %dm", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, position_error);
-      }
-      else sprintf (state->dmr_embedded_gps[slot], "GPS: %.5lf%s%s %.5lf%s%s Unknown Pos Err", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr);
-
-      //save to LRRP report for mapping/logging
-      FILE * pFile; //file pointer
-      if (opts->lrrp_file_output == 1)
-      {
-
-        char * datestr = getDate();
-        char * timestr = getTime();
-
-        int src = 0;
-        if (slot == 0) src = state->lasttg;
-        if (slot == 1) src = state->lasttgR;
-
-        //open file by name that is supplied in the ncurses terminal, or cli
-        pFile = fopen (opts->lrrp_out_file, "a");
-        fprintf (pFile, "%s\t", datestr );
-        fprintf (pFile, "%s\t", timestr );
-        fprintf (pFile, "%08d\t", src);
-        fprintf (pFile, "%.5lf\t", latitude);
-        fprintf (pFile, "%.5lf\t", longitude);
-        fprintf (pFile, "0\t " ); //zero for velocity
-        fprintf (pFile, "0\t " ); //zero for azimuth
-        fprintf (pFile, "\n");
-        fclose (pFile);
-
-      }
-    }
-  }
-
-  fprintf (stderr, "%s", KNRM);
-}
-
-//This Function has been redone and variables fixed to mirror SDRTrunk 
-//my earlier assumption that this was the same format as DMR Embedded GPS was incorrect
-void apx_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
-{
-
-  fprintf (stderr, "%s", KYEL);
-  fprintf (stderr, " GPS:");
-  uint8_t slot = state->currentslot;
-  uint8_t pf = lc_bits[0];
-  uint8_t res_a = lc_bits[1];
-  uint8_t res_b = (uint8_t)ConvertBitIntoBytes(&lc_bits[16], 7);
-  uint8_t expired = lc_bits[23]; //this bit seems to indicate that the GPS coordinates are out of date or fresh
-
-  char deg_glyph[4];
-  sprintf (deg_glyph, "%s", "°");
-
-  uint32_t lon_sign = lc_bits[48]; 
-  uint32_t lon = (uint32_t)ConvertBitIntoBytes(&lc_bits[49], 23); 
-  uint32_t lat_sign = lc_bits[24];
-  uint32_t lat = (uint32_t)ConvertBitIntoBytes(&lc_bits[25], 23); 
-  //todo: acquire more samples for additional validation
-  double lat_unit = 90.0f / 0x7FFFFF;
-  double lon_unit = 180.0f / 0x7FFFFF;
-  double lon_sf = 1.0f; //float value we can multiple longitude with
-  double lat_sf = 1.0f; //float value we can multiple latitude with
-
-  char latstr[3];
-  char lonstr[3];
-  char valid[9];
-  sprintf (latstr, "%s", "N");
-  sprintf (lonstr, "%s", "E");
-  sprintf (valid, "%s", "Current");
-
-  double latitude = 0;  
-  double longitude = 0; 
-
-  if (pf) fprintf (stderr, " Protected");
-  else
-  {
-    if (lat_sign)
-    {
-      sprintf (latstr, "%s", "S");
-      lat_sf = -1.0f;
-    }
-    latitude = ((double)lat * lat_unit);
-
-    if (lon_sign)
-    {
-      sprintf (lonstr, "%s", "W");
-      lon_sf = -1.0f;
-    }
-    longitude = ((double)lon * lon_unit);
-
-    //sanity check
-    if (abs (latitude) < 90 && abs(longitude) < 180)
-    {
-      fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf) ", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, latitude * lat_sf, longitude * lon_sf);
-
-      if (expired)
-      {
-        fprintf (stderr, "Expired; ");
-        sprintf (valid, "%s", "Expired");
-      }
-      else if (!expired)
-        fprintf (stderr, "Current; ");
-
-      if (res_a)
-        fprintf (stderr, "RES_A: %d; ", res_a);
-
-      if (res_b)
-        fprintf (stderr, "RES_B: %02X; ", res_b);
-
-      //save to array for ncurses
-      sprintf (state->dmr_embedded_gps[slot], "GPS: %lf%s%s %lf%s%s %s", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, valid);
-
-      //save to LRRP report for mapping/logging
-      FILE * pFile; //file pointer
-      if (opts->lrrp_file_output == 1)
-      {
-        int src = 0;
-        if (slot == 0) src = state->lastsrc;
-        if (slot == 1) src = state->lastsrcR;
-
-        char * datestr = getDate();
-        char * timestr = getTime();
-
-        //open file by name that is supplied in the ncurses terminal, or cli
-        pFile = fopen (opts->lrrp_out_file, "a");
-        fprintf (pFile, "%s\t", datestr );
-        fprintf (pFile, "%s\t", timestr );
-        fprintf (pFile, "%08d\t", src);
-        fprintf (pFile, "%.5lf\t", latitude);
-        fprintf (pFile, "%.5lf\t", longitude);
-        fprintf (pFile, "0\t " ); //zero for velocity
-        fprintf (pFile, "0\t " ); //zero for azimuth
-        fprintf (pFile, "\n");
-        fclose (pFile);
-
-        if (timestr != NULL)
-        {
-          free (timestr);
-          timestr = NULL;
-        }
-        if (datestr != NULL)
-        {
-          free (datestr);
-          datestr = NULL;
-        }
-
-      }
-
-    }
-  }
-
-  fprintf (stderr, "%s", KNRM);
-}

src/dsd_import.c

@@ -18,7 +18,6 @@ int csvGroupImport(dsd_opts * opts, dsd_state * state)
   int row_count = 0;
   int field_count = 0;
   long int group_number = 0; //local group number for array index value
-  UNUSED(group_number);
   int i = 0;
   while (fgets(buffer, BSIZE, fp)) {
     field_count = 0;

src/dsd_ks.c

@@ -1,7 +0,0 @@
-/*-------------------------------------------------------------------------------
- * dsd_ks.c
- * Placeholder File 6 -- This file is for temporary code storage
- *
- * 
- * 
- *-----------------------------------------------------------------------------*/

src/dsd_mbe.c

@@ -17,18 +17,17 @@
 
 #include "dsd.h"
 
-//NOTE: This set of functions will be reorganized and simplified (hopefully) or at least
-//a more logical flow will be established to jive with the new audio handling
+//NOTE: I attempted to fix the atrocious tab/space alignnment issues that happened in this file,
+//it looks fine in VSCodium, but no telling how it will translate when pushed to Github or another editor
 
 void keyring(dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
 
-  if (state->currentslot == 0)
-    state->R = state->rkey_array[state->payload_keyid];
+    if (state->currentslot == 0)
+      state->R = state->rkey_array[state->payload_keyid];
 
-  if (state->currentslot == 1)
-    state->RR = state->rkey_array[state->payload_keyidR];
+    if (state->currentslot == 1)
+      state->RR = state->rkey_array[state->payload_keyidR];
 }
 
 void RC4(int drop, uint8_t keylength, uint8_t messagelength, uint8_t key[], uint8_t cipher[], uint8_t plain[])
@@ -79,7 +78,7 @@ int Pr[256] = {
 0x6D30, 0x7230, 0x8E30, 0x9130, 0x4833, 0x5733, 0xAB33, 0xB433,
 0x2735, 0x3835, 0xC435, 0xDB35, 0x0236, 0x1D36, 0xE136, 0xFE36, //63
 0x2B49, 0x3449, 0xC849, 0xD749, 0x0E4A, 0x114A, 0xED4A, 0xF24A,
-0x614C, 0x7E4C, 0x824C, 0x9D4C, 0x444F, 0x5B4F, 0xA74F, 0xB84F,
+0x614C, 0xAE4C, 0x824C, 0x9D4C, 0x444F, 0x5B4F, 0xA74F, 0xB84F,
 0x0D51, 0x1251, 0xEE51, 0xF151, 0x2852, 0x3752, 0xCB52, 0xD452,
 0x4754, 0x5854, 0xA454, 0xBB54, 0x6257, 0x7D57, 0x8157, 0x9E57, //95
 0x6061, 0x7F61, 0x8361, 0x9C61, 0x4562, 0x5A62, 0xA662, 0xB962,
@@ -123,7 +122,7 @@ void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
       {
         readImbe4400Data (opts, state, imbe_d);
         mbe_processImbe4400Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, imbe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-        if (opts->audio_out == 1 && opts->floating_point == 0)
+        if (opts->audio_out == 1)
         {
           processAudio(opts, state);
         }
@@ -132,20 +131,15 @@ void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
           writeSynthesizedVoice (opts, state);
         }
 
-        if (opts->audio_out == 1 && opts->floating_point == 0)
+        if (opts->audio_out == 1)
         {
-          playSynthesizedVoiceMS (opts, state);
-        }
-        if (opts->floating_point == 1)
-        {
-          memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-          playSynthesizedVoiceFM (opts, state);
+          playSynthesizedVoice (opts, state);
         }
       }
       else if (state->mbe_file_type > 0) //ambe files
       {
         readAmbe2450Data (opts, state, ambe_d);
-        int x;
+        int j, x;
         unsigned long long int k;
         if (state->K != 0) //apply Pr key
         {
@@ -163,7 +157,7 @@ void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
         //dstar ambe
         if (state->mbe_file_type == 2) mbe_processAmbe2400Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
 
-        if (opts->audio_out == 1 && opts->floating_point == 0)
+        if (opts->audio_out == 1)
         {
           processAudio(opts, state);
         }
@@ -171,15 +165,9 @@ void playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
         {
           writeSynthesizedVoice (opts, state);
         }
-
-        if (opts->audio_out == 1 && opts->floating_point == 0)
+        if (opts->audio_out == 1)
         {
-          playSynthesizedVoiceMS (opts, state);
-        }
-        if (opts->floating_point == 1)
-        {
-          memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-          playSynthesizedVoiceFM (opts, state);
+          playSynthesizedVoice (opts, state);
         }
       }
       if (exitflag == 1)
@@ -197,14 +185,15 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
   int i;
   char imbe_d[88];
   char ambe_d[49];
+  char ambe_d_str[50];
   unsigned long long int k;
   int x;
 
   //these conditions should ensure no clashing with the BP/HBP/Scrambler key loading machanisms already coded in
-  if (state->currentslot == 0 && state->payload_algid != 0 && state->payload_algid != 0x80 && state->keyloader == 1)
+  if (state->currentslot == 0 && state->payload_algid != 0 && state->payload_algid != 0x80 && state->payload_keyid != 0 && state->keyloader == 1)
     keyring (opts, state);
 
-  if (state->currentslot == 1 && state->payload_algidR != 0 && state->payload_algidR != 0x80 && state->keyloader == 1)
+  if (state->currentslot == 1 && state->payload_algidR != 0 && state->payload_algidR != 0x80 && state->payload_keyidR != 0 && state->keyloader == 1)
     keyring (opts, state);
 
   //24-bit TG to 16-bit hash
@@ -227,7 +216,6 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
 
   //set playback mode for this frame
   char mode[8];
-  sprintf (mode, "%s", "");
 
   //if we are using allow/whitelist mode, then write 'B' to mode for block
   //comparison below will look for an 'A' to write to mode if it is allowed
@@ -243,12 +231,11 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     if (state->group_array[i].groupNumber == groupNumber)
     {
       strcpy (mode, state->group_array[i].groupMode);
-      break;
     }
   }
 
-  //set flag to not play audio this time, but won't prevent writing to wav files -- disabled for now
-  // if (strcmp(mode, "B") == 0) opts->audio_out = 0; //causes a buzzing now (probably due to not running processAudio before the SS3 or SS4)
+  //set flag to not play audio this time, but won't prevent writing to wav files
+  if (strcmp(mode, "B") == 0) opts->audio_out = 0;
 
   //end set playback mode for this frame
 
@@ -257,9 +244,9 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     //  0 +P25p1
     //  1 -P25p1
     state->errs = mbe_eccImbe7200x4400C0 (imbe_fr);
-    state->errs2 = state->errs;
+    //state->errs2 = state->errs;
     mbe_demodulateImbe7200x4400Data (imbe_fr);
-    state->errs2 += mbe_eccImbe7200x4400Data (imbe_fr, imbe_d);
+    state->errs2 = mbe_eccImbe7200x4400Data (imbe_fr, imbe_d);
 
     //P25p1 RC4 Handling
     if (state->payload_algid == 0xAA && state->R != 0)
@@ -350,9 +337,9 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
   {
 
     state->errs = mbe_eccImbe7100x4400C0 (imbe7100_fr);
-    state->errs2 = state->errs;
+    //state->errs2 = state->errs;
     mbe_demodulateImbe7100x4400Data (imbe7100_fr);
-    state->errs2 += mbe_eccImbe7100x4400Data (imbe7100_fr, imbe_d);
+    state->errs2 = mbe_eccImbe7100x4400Data (imbe7100_fr, imbe_d);
 
     if (opts->payload == 1)
     {
@@ -384,9 +371,9 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
   {
 
     state->errs = mbe_eccAmbe3600x2450C0 (ambe_fr);
-    state->errs2 = state->errs;
+    //state->errs2 = state->errs;
     mbe_demodulateAmbe3600x2450Data (ambe_fr);
-    state->errs2 += mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
+    state->errs2 = mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
 
     if ( (state->nxdn_cipher_type == 0x01 && state->R > 0) ||
           (state->M == 1 && state->R > 0) )
@@ -428,9 +415,9 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     {
 
       state->errs = mbe_eccAmbe3600x2450C0 (ambe_fr);
-      state->errs2 = state->errs;
+      //state->errs2 = state->errs;
       mbe_demodulateAmbe3600x2450Data (ambe_fr);
-      state->errs2 += mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
+      state->errs2 = mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
 
       //EXPERIMENTAL!!
       //load basic privacy key number from array by the tg value (if not forced)
@@ -541,7 +528,7 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         uint8_t cipher[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t plain[7]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t rckey[9]  = {0x00, 0x00, 0x00, 0x00, 0x00, // <- RC4 Key
-                             0x00, 0x00, 0x00, 0x00}; // <- MI
+                              0x00, 0x00, 0x00, 0x00}; // <- MI
 
         //easier to manually load up rather than make a loop
         rckey[0] = ((state->R & 0xFF00000000) >> 32);
@@ -554,8 +541,35 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         rckey[7] = ((state->payload_mi & 0xFF00) >> 8);
         rckey[8] = ((state->payload_mi & 0xFF) >> 0);
 
-        //pack cipher byte array from ambe_d bit array
-        pack_ambe(ambe_d, cipher, 49);
+        // if (opts->payload == 1)
+        // {
+        // 	fprintf (stderr, "%s", KYEL);
+        // 	fprintf (stderr, " RC4K ");
+        // 	for (short o = 0; o < 9; o++)
+        // 	{
+        // 		fprintf (stderr, "%02X", rckey[o]);
+        // 	}
+        // 	fprintf (stderr, "%s", KNRM);
+        // 	fprintf (stderr, "\n");
+        // }
+
+        short k = 0;
+        for (short o = 0; o < 7; o++)
+        {
+          short b = 0;
+          for (short p = 0; p < 8; p++)
+          {
+            b = b << 1;
+            b = b + ambe_d[k];
+            k++;
+            if (k == 49)
+            {
+              cipher[6] = ((b << 3) & 0x80); //set 7th octet/bit 49 accordingly
+              break;
+            }
+          }
+          cipher[o] = b;
+        }
 
         //only run keystream application if errs < 3 -- this is a fix to the pop sound
         //that may occur on some systems that preempt VC6 voice for a RC opportuninity (TXI)
@@ -567,10 +581,23 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
 
         state->dropL += 7;
 
-        //unpack deciphered plain array back into ambe_d bit array
-        memset (ambe_d, 0, 49*sizeof(char));
-        unpack_ambe(plain, ambe_d);
-
+        short z = 0;
+        for (short p = 0; p <= 6; p++)
+        {
+          //convert bytes back to bits and load into ambe_d array.
+          short b = 0; //reset b to use again
+          for (short o = 0; o < 8; o++)
+          {
+            b = (( (plain[p] << o) & 0x80) >> 7);
+            ambe_d[z] = b;
+            z++;
+            if (z == 49)
+            {
+              ambe_d[48] = ( (plain[p] << o) & 0x80);
+              break;
+            }
+          }
+        }
       }
 
       //P25p2 RC4 Handling, VCH 0
@@ -579,8 +606,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         uint8_t cipher[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t plain[7]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t rckey[13] = {0x00, 0x00, 0x00, 0x00, 0x00, // <- RC4 Key
-                             0x00, 0x00, 0x00, 0x00, 0x00, // <- MI
-                             0x00, 0x00, 0x00}; // <- MI cont.
+                              0x00, 0x00, 0x00, 0x00, 0x00, // <- MI
+                              0x00, 0x00, 0x00}; // <- MI cont.
 
         //easier to manually load up rather than make a loop
         rckey[0] = ((state->R & 0xFF00000000) >> 32);
@@ -599,16 +626,56 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         rckey[11] = ((state->payload_miP & 0xFF00) >> 8);
         rckey[12] = ((state->payload_miP & 0xFF) >> 0);
 
-        //pack cipher byte array from ambe_d bit array
-        pack_ambe(ambe_d, cipher, 49);
+        // if (opts->payload == 1)
+        // {
+        // 	fprintf (stderr, "%s", KYEL);
+        // 	fprintf (stderr, " RC4K ");
+        // 	for (short o = 0; o < 13; o++)
+        // 	{
+        // 		fprintf (stderr, "%02X", rckey[o]);
+        // 	}
+        // 	fprintf (stderr, "%s", KNRM);
+        // 	fprintf (stderr, "\n");
+        // }
+
+        short k = 0;
+        for (short o = 0; o < 7; o++)
+        {
+          short b = 0;
+          for (short p = 0; p < 8; p++)
+          {
+            b = b << 1;
+            b = b + ambe_d[k];
+            k++;
+            if (k == 49)
+            {
+              cipher[6] = ((b << 3) & 0x80); //set 7th octet/bit 49 accordingly
+              break;
+            }
+          }
+          cipher[o] = b;
+        }
 
         RC4(state->dropL, 13, 7, rckey, cipher, plain);
         state->dropL += 7;
 
-        //unpack deciphered plain array back into ambe_d bit array
-        memset (ambe_d, 0, 49*sizeof(char));
-        unpack_ambe(plain, ambe_d);
-
+        short z = 0;
+        for (short p = 0; p <= 6; p++)
+        {
+          //convert bytes back to bits and load into ambe_d array.
+          short b = 0; //reset b to use again
+          for (short o = 0; o < 8; o++)
+          {
+            b = (( (plain[p] << o) & 0x80) >> 7);
+            ambe_d[z] = b;
+            z++;
+            if (z == 49)
+            {
+              ambe_d[48] = ( (plain[p] << o) & 0x80);
+              break;
+            }
+          }
+        }
       }
 
       mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, 
@@ -634,9 +701,9 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     {
 
       state->errsR = mbe_eccAmbe3600x2450C0 (ambe_fr);
-      state->errs2R = state->errsR;
+      //state->errs2R = state->errsR;
       mbe_demodulateAmbe3600x2450Data (ambe_fr);
-      state->errs2R += mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
+      state->errs2R = mbe_eccAmbe3600x2450Data (ambe_fr, ambe_d);
 
       //EXPERIMENTAL!!
       //load basic privacy key number from array by the tg value (if not forced)
@@ -744,24 +811,51 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
       //DMR RC4, Slot 2
       if (state->currentslot == 1 && state->payload_algidR == 0x21 && state->RR != 0)
       {
-        uint8_t cipher[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-        uint8_t plain[7]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-        uint8_t rckey[9]  = {0x00, 0x00, 0x00, 0x00, 0x00, // <- RC4 Key
-                             0x00, 0x00, 0x00, 0x00}; // <- MI
+      uint8_t cipher[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+      uint8_t plain[7]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+      uint8_t rckey[9]  = {0x00, 0x00, 0x00, 0x00, 0x00, // <- RC4 Key
+                            0x00, 0x00, 0x00, 0x00}; // <- MI
 
-        //easier to manually load up rather than make a loop
-        rckey[0] = ((state->RR & 0xFF00000000) >> 32);
-        rckey[1] = ((state->RR & 0xFF000000) >> 24);
-        rckey[2] = ((state->RR & 0xFF0000) >> 16);
-        rckey[3] = ((state->RR & 0xFF00) >> 8);
-        rckey[4] = ((state->RR & 0xFF) >> 0);
-        rckey[5] = ((state->payload_miR & 0xFF000000) >> 24);
-        rckey[6] = ((state->payload_miR & 0xFF0000) >> 16);
-        rckey[7] = ((state->payload_miR & 0xFF00) >> 8);
-        rckey[8] = ((state->payload_miR & 0xFF) >> 0);
+      //easier to manually load up rather than make a loop
+      rckey[0] = ((state->RR & 0xFF00000000) >> 32);
+      rckey[1] = ((state->RR & 0xFF000000) >> 24);
+      rckey[2] = ((state->RR & 0xFF0000) >> 16);
+      rckey[3] = ((state->RR & 0xFF00) >> 8);
+      rckey[4] = ((state->RR & 0xFF) >> 0);
+      rckey[5] = ((state->payload_miR & 0xFF000000) >> 24);
+      rckey[6] = ((state->payload_miR & 0xFF0000) >> 16);
+      rckey[7] = ((state->payload_miR & 0xFF00) >> 8);
+      rckey[8] = ((state->payload_miR & 0xFF) >> 0);
 
-        //pack cipher byte array from ambe_d bit array
-        pack_ambe(ambe_d, cipher, 49);
+        // if (opts->payload == 1)
+        // {
+        // 	fprintf (stderr, "%s", KYEL);
+        // 	fprintf (stderr, " RC4K ");
+        // 	for (short o = 0; o < 9; o++)
+        // 	{
+        // 		fprintf (stderr, "%02X", rckey[o]);
+        // 	}
+        // 	fprintf (stderr, "%s", KNRM);
+        // 	fprintf (stderr, "\n");
+        // }
+
+        short k = 0;
+        for (short o = 0; o < 7; o++)
+        {
+          short b = 0;
+          for (short p = 0; p < 8; p++)
+          {
+            b = b << 1;
+            b = b + ambe_d[k];
+            k++;
+            if (k == 49)
+            {
+              cipher[6] = ((b << 3) & 0x80); //set 7th octet/bit 49 accordingly
+              break;
+            }
+          }
+          cipher[o] = b;
+        }
 
         //only run keystream application if errs < 3 -- this is a fix to the pop sound
         //that may occur on some systems that preempt VC6 voice for a RC opportuninity (TXI)
@@ -772,10 +866,23 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         else memcpy (plain, cipher, sizeof(plain));
         state->dropR += 7;
 
-        //unpack deciphered plain array back into ambe_d bit array
-        memset (ambe_d, 0, 49*sizeof(char));
-        unpack_ambe(plain, ambe_d);
-
+        short z = 0;
+        for (short p = 0; p <= 6; p++)
+        {
+          //convert bytes back to bits and load into ambe_d array.
+          short b = 0; //reset b to use again
+          for (short o = 0; o < 8; o++)
+          {
+            b = (( (plain[p] << o) & 0x80) >> 7);
+            ambe_d[z] = b;
+            z++;
+            if (z == 49)
+            {
+              ambe_d[48] = ( (plain[p] << o) & 0x80);
+              break;
+            }
+          }
+        }
       }
 
       //P25p2 RC4 Handling, VCH 1
@@ -784,8 +891,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         uint8_t cipher[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t plain[7]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
         uint8_t rckey[13] = {0x00, 0x00, 0x00, 0x00, 0x00, // <- RC4 Key
-                             0x00, 0x00, 0x00, 0x00, 0x00, // <- MI
-                             0x00, 0x00, 0x00}; // <- MI cont.
+                              0x00, 0x00, 0x00, 0x00, 0x00, // <- MI
+                              0x00, 0x00, 0x00}; // <- MI cont.
 
         //easier to manually load up rather than make a loop
         rckey[0] = ((state->RR & 0xFF00000000) >> 32);
@@ -804,16 +911,56 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
         rckey[11] = ((state->payload_miN & 0xFF00) >> 8);
         rckey[12] = ((state->payload_miN & 0xFF) >> 0);
 
-        //pack cipher byte array from ambe_d bit array
-        pack_ambe(ambe_d, cipher, 49);
+        // if (opts->payload == 1)
+        // {
+        // 	fprintf (stderr, "%s", KYEL);
+        // 	fprintf (stderr, " RC4K ");
+        // 	for (short o = 0; o < 13; o++)
+        // 	{
+        // 		fprintf (stderr, "%02X", rckey[o]);
+        // 	}
+        // 	fprintf (stderr, "%s", KNRM);
+        // 	fprintf (stderr, "\n");
+        // }
+
+        short k = 0;
+        for (short o = 0; o < 7; o++)
+        {
+          short b = 0;
+          for (short p = 0; p < 8; p++)
+          {
+            b = b << 1;
+            b = b + ambe_d[k];
+            k++;
+            if (k == 49)
+            {
+              cipher[6] = ((b << 3) & 0x80); //set 7th octet/bit 49 accordingly
+              break;
+            }
+          }
+          cipher[o] = b;
+        }
 
         RC4(state->dropR, 13, 7, rckey, cipher, plain);
         state->dropR += 7;
 
-        //unpack deciphered plain array back into ambe_d bit array
-        memset (ambe_d, 0, 49*sizeof(char));
-        unpack_ambe(plain, ambe_d);
-
+        short z = 0;
+        for (short p = 0; p <= 6; p++)
+        {
+          //convert bytes back to bits and load into ambe_d array.
+          short b = 0; //reset b to use again
+          for (short o = 0; o < 8; o++)
+          {
+            b = (( (plain[p] << o) & 0x80) >> 7);
+            ambe_d[z] = b;
+            z++;
+            if (z == 49)
+            {
+              ambe_d[48] = ( (plain[p] << o) & 0x80);
+              break;
+            }
+          }
+        }
       }
 
       mbe_processAmbe2450Dataf (state->audio_out_temp_bufR, &state->errsR, &state->errs2R, state->err_strR, 
@@ -900,36 +1047,30 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     }
     //end reverse mute test
 
-    //OSS 48k/1 Specific Voice Preemption if dual voices on TDMA and one slot has preference over the other
+    #ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
+    //OSS Specific Voice Preemption if dual voices on TDMA and one slot has preference over the other
     if (opts->slot_preference == 1 && opts->audio_out_type == 5 && opts->audio_out == 1 && (state->dmrburstR == 16 || state->dmrburstR == 21) ) 
     {
       opts->audio_out = 0;
       preempt = 1;
-      if (opts->payload == 0 && opts->slot1_on == 1) 
+      if (opts->payload == 0)
         fprintf (stderr, " *MUTED*"); 
-      else if (opts->payload == 0 && opts->slot1_on == 0) 
-        fprintf (stderr, " *OFF*"); 
     }
+    #endif
 
-    state->debug_audio_errors += state->errs2;
+    state->debug_audio_errors += state->errs2 + state->errs;
 
     if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0)
     {
-      if ( opts->floating_point == 0 ) //opts->audio_out == 1 && //needed to remove for AERO OSS so we could still save wav files during dual voices
+      if (opts->audio_out == 1)
       {
-        #ifdef AERO_BUILD
-        if(opts->audio_out == 1 && opts->slot1_on == 1) //add conditional check here, otherwise some lag occurs on dual voices with OSS48k/1 input due to buffered audio
-        #endif
         processAudio(opts, state);
       }
-      if (opts->audio_out == 1 && opts->floating_point == 0 && opts->audio_out_type == 5 && opts->slot1_on == 1) //for OSS 48k 1 channel configs -- relocate later if possible
+      if (opts->audio_out == 1)
       {
-        playSynthesizedVoiceMS (opts, state); //it may be more beneficial to move this to each individual decoding type to handle, but ultimately, let's just simpifly mbe handling instead 
+        playSynthesizedVoice (opts, state);
       }
     }
-
-    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l)); //these are for mono or FDMA where we don't need to buffer and wait for a stereo mix 
-
   }
 
   if (opts->dmr_stereo == 1 && state->currentslot == 1) 
@@ -977,52 +1118,44 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     }
     //end reverse mute test
 
-    //OSS 48k/1 Specific Voice Preemption if dual voices on TDMA and one slot has preference over the other
+    #ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
+    //OSS Specific Voice Preemption if dual voices on TDMA and one slot has preference over the other
     if (opts->slot_preference == 0 && opts->audio_out_type == 5 && opts->audio_out == 1 && (state->dmrburstL == 16 || state->dmrburstL == 21) ) 
     {
       opts->audio_out = 0;
       preempt = 1;
-      if (opts->payload == 0 && opts->slot2_on == 1) 
+      if (opts->payload == 0) 
         fprintf (stderr, " *MUTED*"); 
-      else if (opts->payload == 0 && opts->slot2_on == 0) 
-        fprintf (stderr, " *OFF*");
     }
+    #endif
 
-    state->debug_audio_errorsR += state->errs2R;
+    state->debug_audio_errorsR += state->errs2R + state->errsR;
 
     if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0)
     {
-      if ( opts->floating_point == 0) //opts->audio_out == 1 && //needed to remove for AERO OSS so we could still save wav files during dual voices
+      if (opts->audio_out == 1)
       {
-        #ifdef AERO_BUILD
-        if(opts->audio_out == 1 && opts->slot2_on == 1) //add conditional check here, otherwise some lag occurs on dual voices with OSS48k/1 input due to buffered audio
-        #endif
         processAudioR(opts, state);
       }
-      if (opts->audio_out == 1 && opts->floating_point == 0 && opts->audio_out_type == 5 && opts->slot2_on == 1) //for OSS 48k 1 channel configs -- relocate later if possible
+      if (opts->audio_out == 1)
       {
-        playSynthesizedVoiceMSR (opts, state);
+        playSynthesizedVoiceR (opts, state);
       }
     }
-
-    memcpy (state->f_r, state->audio_out_temp_bufR, sizeof(state->f_r));
-
   }
 
   //if using anything but DMR Stereo, borrowing state->dmr_encL to signal enc or clear for other types
   if (opts->dmr_mono == 0 && opts->dmr_stereo == 0 && (opts->unmute_encrypted_p25 == 1 || state->dmr_encL == 0) )
   {
-    state->debug_audio_errors += state->errs2;
-    if (opts->audio_out == 1 && opts->floating_point == 0 ) //&& opts->pulse_digi_rate_out == 8000
+    state->debug_audio_errors += state->errs2 + state->errs;
+    if (opts->audio_out == 1)
     {
       processAudio(opts, state);
     }
-  //   if (opts->audio_out == 1)
-  //   {
-  //     playSynthesizedVoice (opts, state);
-  //   }
-
-      memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l)); //P25p1 FDMA 8k/1 channel -f1 switch
+    if (opts->audio_out == 1)
+    {
+      playSynthesizedVoice (opts, state);
+    }
   }
 
   //if using anything but DMR Stereo, borrowing state->dmr_encL to signal enc or clear for other types
@@ -1057,9 +1190,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
     preempt = 0; 
   }
 
-  //reset audio out flag for next repitition --disabled for now
-  // if (strcmp(mode, "B") == 0) opts->audio_out = 1;
-
+  //reset audio out flag for next repitition
+  if (strcmp(mode, "B") == 0) opts->audio_out = 1;
   //restore flag for null output type
   if (opts->audio_out_type == 9) opts->audio_out = 0;
 }

src/dsd_mbe2.c

@@ -1,177 +0,0 @@
-/*-------------------------------------------------------------------------------
- * 
- * 
- *
- * TODO: Fill me in'
- * 
- *
- * LWVMOBILE
- * 2023-07 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
- 
-//new and simplified/organized ambe and imbe handling
-//moving all audio handling and decryption to seperate files for simplicity (eventually)
-
-#include "dsd.h"
-
-//the initial functions will ONLY return demodulated ambe or imbe frames, THAT'S IT!
-//decryption and audio handling etc will be handled at a different area
-
-//using soft_demod will also allow for not compiling mbelib and also using a DVstick in the future
-
-//P25p1 IMBE 7200 or AMBE+2 EFR
-void soft_demod_imbe7200 (dsd_state * state, char imbe_fr7200[8][23], char imbe_d[88])
-{
-  state->errs = mbe_eccImbe7200x4400C0 (imbe_fr7200);
-  state->errs2 = state->errs;
-  mbe_demodulateImbe7200x4400Data (imbe_fr7200);
-  state->errs2 += mbe_eccImbe7200x4400Data (imbe_fr7200, imbe_d);
-  state->debug_audio_errors += state->errs2;
-
-}
-
-//ProVoice IMBE 7100
-void soft_demod_imbe7100 (dsd_state * state, char imbe_fr7100[7][24], char imbe_d[88])
-{
-  state->errs = mbe_eccImbe7100x4400C0 (imbe_fr7100);
-  state->errs2 = state->errs;
-  mbe_demodulateImbe7100x4400Data (imbe_fr7100);
-  state->errs2 += mbe_eccImbe7100x4400Data (imbe_fr7100, imbe_d);
-  state->debug_audio_errors += state->errs2;
-
-}
-
-//AMBE+2 EHR
-void soft_demod_ambe2_ehr(dsd_state * state, char ambe2_ehr[4][24], char ambe_d[49])
-{
-  state->errs = mbe_eccAmbe3600x2450C0 (ambe2_ehr);
-  state->errs2 = state->errs;
-  mbe_demodulateAmbe3600x2450Data (ambe2_ehr);
-  state->errs2 += mbe_eccAmbe3600x2450Data (ambe2_ehr, ambe_d);
-
-}
-
-//AMBE One Shot (DSTAR)
-void soft_demod_ambe_dstar(dsd_opts * opts, dsd_state * state, char ambe_fr[4][24], char ambe_d[49])
-{
-  mbe_processAmbe3600x2400Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, 
-    state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-  if (opts->floating_point == 1)
-    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-  else processAudio(opts, state);
-}
-
-//AMBE+2 One Shot (X2-TDMA)
-void soft_demod_ambe_x2(dsd_opts * opts, dsd_state * state, char ambe_fr[4][24], char ambe_d[49])
-{
-  mbe_processAmbe3600x2450Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, 
-    state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-  if (opts->floating_point == 1)
-    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-  else processAudio(opts, state);
-}
-
-void soft_mbe (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char ambe_fr[4][24], char imbe7100_fr[7][24])
-{
-  int i; 
-  char ambe_d[49];
-  char imbe_d[88];
-  int slot = state->currentslot;
-  memset (ambe_d, 0, sizeof(ambe_d));
-  memset (imbe_d, 0, sizeof(imbe_d));
-
-  UNUSED(i);
-
-  //P25p1, YSF FR, NXDN EFR
-  if (state->synctype == 0 || state->synctype == 1)
-  {
-    soft_demod_imbe7200(state, imbe_fr, imbe_d);
-    //handle decryption here
-    //print IMBE frame
-    mbe_processImbe4400Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str,
-      imbe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-    //send to playback here
-  }
-    
-  //ProVoice
-  else if (state->synctype == 14 || state->synctype == 15)
-  {
-    soft_demod_imbe7100(state, imbe7100_fr, imbe_d);
-    //nothing to do
-
-    //convert to 7200
-    mbe_convertImbe7100to7200(imbe_d);
-    mbe_processImbe4400Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str,
-      imbe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-    //send to playback here
-
-  }
-    
-  //D-STAR AMBE
-  else if (state->synctype == 6 || state->synctype == 7)
-  {
-    soft_demod_ambe_dstar(opts, state, ambe_fr, ambe_d);
-    if(opts->payload == 1)
-      PrintAMBEData (opts, state, ambe_d);
-
-    if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-      playSynthesizedVoiceMS(opts, state);
-    if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-      playSynthesizedVoiceFM(opts, state);
-    if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceSS(opts, state);
-    if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceFS(opts, state);
-
-    if (opts->wav_out_f != NULL)
-      writeSynthesizedVoice (opts, state);
-
-    if (opts->mbe_out_f != NULL)
-      saveAmbe2450Data (opts, state, ambe_d);
-  }
-
-  //X2-TDMA AMBE
-  else if (state->synctype >= 2 && state->synctype <= 5)
-  {
-    soft_demod_ambe_x2(opts, state, ambe_fr, ambe_d);
-    if(opts->payload == 1)
-      PrintAMBEData (opts, state, ambe_d);
-
-    if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-      playSynthesizedVoiceMS(opts, state);
-    if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-      playSynthesizedVoiceFM(opts, state);
-    if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceSS(opts, state);
-    if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-      playSynthesizedVoiceFS(opts, state);
-
-    if (opts->wav_out_f != NULL)
-      writeSynthesizedVoice (opts, state);
-
-    if (opts->mbe_out_f != NULL)
-      saveAmbe2450Data (opts, state, ambe_d);
-  }
-
-  //AMBE+2 EHR (NXDN, DMR, P25p2, YSF VD/1)
-  else
-  {
-    soft_demod_ambe2_ehr (state, ambe_fr, ambe_d);
-    //decrypt here
-    if(opts->payload == 1)
-      PrintAMBEData (opts, state, ambe_d);
-    //make left or right channel decision
-    if (slot == 0)
-    {
-      mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, 
-        ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
-    }
-    if (slot == 1)
-    {
-      mbe_processAmbe2450Dataf (state->audio_out_temp_bufR, &state->errsR, &state->errs2R, state->err_strR, 
-        ambe_d, state->cur_mp2, state->prev_mp2, state->prev_mp_enhanced2, opts->uvquality);
-    }
-    
-  }
-}
-

src/dsd_reset.c

@@ -6,7 +6,7 @@
 void resetState (dsd_state * state)
 {
 
-  int i;
+  int i, j;
 
   //Dibit Buffer -- Free Allocated Memory
   // free (state->dibit_buf);

src/dsd_rigctl.c

@@ -30,16 +30,12 @@ void error(char *msg) {
     exit(0);
 }
 
-struct sockaddr_in address;
-struct sockaddr_in addressA;
-struct sockaddr_in addressM17;
-
 //
 // Connect
 //
 int Connect (char *hostname, int portno)
 {
-    int sockfd;
+    int sockfd, n;
     struct sockaddr_in serveraddr;
     struct hostent *server;
 
@@ -135,7 +131,7 @@ bool SetFreq(int sockfd, long int freq)
     Send(sockfd, buf);
     Recv(sockfd, buf);
 
-    if (strcmp(buf, "RPRT 1\n") == 0 ) //sdr++ has a linebreak here, is that in all versions of the protocol?
+    if (strcmp(buf, "RPRT 1") == 0 )
         return false;
 
     return true;
@@ -145,19 +141,11 @@ bool SetModulation(int sockfd, int bandwidth)
 {
     char buf[BUFSIZE];
     //the bandwidth is now a user/system based configurable variable
-    sprintf (buf, "M NFM %d\n", bandwidth); //SDR++ has changed the token from FM to NFM, even if Ryzerth fixes it later, users may still have an older version
+    sprintf (buf, "M FM %d\n", bandwidth); 
     Send(sockfd, buf);
     Recv(sockfd, buf);
 
-    //if it fails the first time, send the other token instead
-    if (strcmp(buf, "RPRT 1\n") == 0 ) //sdr++ has a linebreak here, is that in all versions of the protocol?
-    {
-        sprintf (buf, "M FM %d\n", bandwidth); //anything not SDR++
-        Send(sockfd, buf);
-        Recv(sockfd, buf);
-    }
-
-    if (strcmp(buf, "RPRT 1\n") == 0 )
+    if (strcmp(buf, "RPRT 1") == 0 )
         return false;
 
     return true;
@@ -234,10 +222,9 @@ bool GetSignalLevelEx(int sockfd, double *dBFS, int n_samp)
 //shoe in UDP input connection here...still having issues that I don't know how to resolve
 int UDPBind (char *hostname, int portno)
 {
-    UNUSED(hostname);
-
-    int sockfd;
-    struct sockaddr_in serveraddr;
+    int sockfd, n;
+    struct sockaddr_in serveraddr, client_addr;
+    struct hostent *server;
 
     /* socket: create the socket */
     //UDP socket
@@ -260,20 +247,12 @@ int UDPBind (char *hostname, int portno)
 		perror("ERROR on binding UDP Port");
 	}
 
-    //set these for non blocking when no samples to read
-    struct timeval read_timeout;
-    read_timeout.tv_sec = 0;
-    read_timeout.tv_usec = 10;
-    setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &read_timeout, sizeof read_timeout);
-
     return sockfd;
 }
 
 //going to leave this function available, even if completely switched over to rtl_dev_tune now, may be useful in the future
 void rtl_udp_tune(dsd_opts * opts, dsd_state * state, long int frequency) 
 {
-    UNUSED(state);
-
     int handle; 
     unsigned short udp_port = opts->rtl_udp_port; 
     char data[5] = {0}; //data buffer size is 5 for UDP frequency tuning
@@ -297,251 +276,4 @@ void rtl_udp_tune(dsd_opts * opts, dsd_state * state, long int frequency)
     sendto(handle, data, 5, 0, (const struct sockaddr * ) & address, sizeof(struct sockaddr_in));
 
     close (handle); //close socket after sending.
-}
-
-void udp_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data)
-{
-    UNUSED(state);
-    size_t err = 0;
-
-    //listen with:
-
-    //short 8k/2
-    //socat stdio udp-listen:23456 | play --buffer 640 -q -b 16 -r 8000 -c2 -t s16 -
-
-    //short 8k/1
-    //socat stdio udp-listen:23456 | play --buffer 320 -q -b 16 -r 8000 -c1 -t s16 -
-
-    //float 8k/2
-    //socat stdio udp-listen:23456 | play --buffer 1280 -q -e float -b 32 -r 8000 -c2 -t f32 -
-
-    //float 8k/1
-    //socat stdio udp-listen:23456 | play --buffer 640 -q -e float -b 32 -r 8000 -c1 -t f32 -
-
-    //send audio or data to socket
-    err = sendto(opts->udp_sockfd, data, nsam, 0, (const struct sockaddr * ) & address, sizeof(struct sockaddr_in));
-    if (err < 0) fprintf (stderr, "\n UDP SENDTO ERR %ld", err); //return value here is size_t number of characters sent, or -1 for failure
-    if (err < nsam) fprintf (stderr, "\n UDP Underflow %ld", err); //I'm not even sure if this is possible
-}
-
-int m17_socket_receiver(dsd_opts * opts, void * data)
-{
-    size_t err = 0;
-    struct sockaddr_in cliaddr; 
-    socklen_t len = sizeof(cliaddr); 
-
-    //receive data from socket
-    err = recvfrom(opts->udp_sockfd, data, 1000, 0, (struct sockaddr * ) & address, &len); //was MSG_WAITALL, but that seems to be = 256
-
-    return err;
-}
-
-//Analog UDP port on +2 of normal open socket
-void udp_socket_blasterA(dsd_opts * opts, dsd_state * state, size_t nsam, void * data)
-{
-    UNUSED(state);
-    size_t err = 0;
-
-    //listen with:
-
-    //short 48k/1
-    //socat stdio udp-listen:23456 | play --buffer 1920 -q -b 16 -r 48000 -c1 -t s16 -
-
-    //send audio or data to socket
-    err = sendto(opts->udp_sockfdA, data, nsam, 0, (const struct sockaddr * ) & addressA, sizeof(struct sockaddr_in));
-    if (err < 0) fprintf (stderr, "\n UDP SENDTO ERR %ld", err); //return value here is size_t number of characters sent, or -1 for failure
-    if (err < nsam) fprintf (stderr, "\n UDP Underflow %ld", err); //I'm not even sure if this is possible
-}
-
-int m17_socket_blaster(dsd_opts * opts, dsd_state * state, size_t nsam, void * data)
-{
-    UNUSED(state);
-    unsigned long long int err = 0;
-
-    //See notes in m17.c on line ~3395 regarding usage
-
-    //send audio or data to socket
-    err = sendto(opts->m17_udp_sock, data, nsam, 0, (const struct sockaddr * ) & addressM17, sizeof(struct sockaddr_in));
-    //RETURN Value should be ACKN or NACK, or PING, or PONG
-
-    return (err);
-}
-
-int udp_socket_connect(dsd_opts * opts, dsd_state * state)
-{
-    UNUSED(state);
-
-    long int err = 0;
-    err = opts->udp_sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Socket Error %ld\n", err);
-        return (err);
-    }
-
-    // Don't think this is needed, but doesn't seem to hurt to keep it here either
-    int broadcastEnable = 1;
-    err = setsockopt(opts->udp_sockfd, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable));
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Broadcast Set Error %ld\n", err);
-        return (err);
-    }
-
-    memset((char * ) & address, 0, sizeof(address));
-    address.sin_family = AF_INET;
-    err = address.sin_addr.s_addr = inet_addr(opts->udp_hostname);
-    if (err < 0) //error in this context reports back 32-bit inet_addr reversed order byte pairs
-    {
-        fprintf (stderr, " UDP inet_addr Error %ld\n", err);
-        return (err);
-    }
-
-    address.sin_port = htons(opts->udp_portno);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP htons Error %ld\n", err);
-        return (err);
-    }
-
-    return 0;
-}
-
-int udp_socket_connectA(dsd_opts * opts, dsd_state * state)
-{
-    UNUSED(state);
-
-    long int err = 0;
-    err = opts->udp_sockfdA = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Socket Error %ld\n", err);
-        return (err);
-    }
-
-    // Don't think this is needed, but doesn't seem to hurt to keep it here either
-    int broadcastEnable = 1;
-    err = setsockopt(opts->udp_sockfdA, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable));
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Broadcast Set Error %ld\n", err);
-        return (err);
-    }
-
-    memset((char * ) & addressA, 0, sizeof(addressA));
-    addressA.sin_family = AF_INET;
-    err = addressA.sin_addr.s_addr = inet_addr(opts->udp_hostname);
-    if (err < 0) //error in this context reports back 32-bit inet_addr reversed order byte pairs
-    {
-        fprintf (stderr, " UDP inet_addr Error %ld\n", err);
-        return (err);
-    }
-
-    addressA.sin_port = htons(opts->udp_portno+2); //plus 2 to current port assignment for the analog port value
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP htons Error %ld\n", err);
-        return (err);
-    }
-
-    return 0;
-}
-
-int udp_socket_connectM17(dsd_opts * opts, dsd_state * state)
-{
-    UNUSED(state);
-
-    long int err = 0;
-    err = opts->m17_udp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Socket Error %ld\n", err);
-        return (err);
-    }
-
-    // Don't think this is needed, but doesn't seem to hurt to keep it here either
-    int broadcastEnable = 1;
-    err = setsockopt(opts->m17_udp_sock, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable));
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP Broadcast Set Error %ld\n", err);
-        return (err);
-    }
-
-    memset((char * ) & addressM17, 0, sizeof(addressM17));
-    addressM17.sin_family = AF_INET;
-    err = addressM17.sin_addr.s_addr = inet_addr(opts->m17_hostname);
-    if (err < 0) //error in this context reports back 32-bit inet_addr reversed order byte pairs
-    {
-        fprintf (stderr, " UDP inet_addr Error %ld\n", err);
-        return (err);
-    }
-
-    addressM17.sin_port = htons(opts->m17_portno);
-    if (err < 0)
-    {
-        fprintf (stderr, " UDP htons Error %ld\n", err);
-        return (err);
-    }
-
-    return 0;
-}
-
-void return_to_cc (dsd_opts * opts, dsd_state * state)
-{
-    //extra safeguards due to sync issues with NXDN
-    memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
-    memset (state->nxdn_sacch_frame_segcrc, 1, sizeof(state->nxdn_sacch_frame_segcrc));
-
-    memset (state->active_channel, 0, sizeof(state->active_channel));
-
-    //reset dmr blocks
-    dmr_reset_blocks (opts, state);
-
-    //zero out additional items
-    state->lasttg = 0;
-    state->lasttgR = 0;
-    state->lastsrc = 0;
-    state->lastsrcR = 0;
-    state->payload_algid = 0;
-    state->payload_algidR = 0;
-    state->payload_keyid = 0;
-    state->payload_keyidR = 0;
-    state->payload_mi = 0;
-    state->payload_miR = 0;
-    state->payload_miP = 0;
-    state->payload_miN = 0;
-    opts->p25_is_tuned = 0;
-    state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-
-    //tune back to the control channel -- NOTE: Doesn't work correctly on EDACS Analog Voice
-    //RIGCTL
-    if (opts->p25_trunk == 1 && opts->use_rigctl == 1)
-    {
-        if (opts->setmod_bw != 0 )  SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
-        SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
-    }
-
-    //rtl
-    #ifdef USE_RTLSDR
-    if (opts->p25_trunk == 1 && opts->audio_in_type == 3) rtl_dev_tune (opts, state->p25_cc_freq);
-    #endif
-
-    state->last_cc_sync_time = time(NULL);
-
-    //if P25p2 VCH and going back to P25p1 CC, flip symbolrate
-    if (state->p25_cc_is_tdma == 0)
-    {
-        state->samplesPerSymbol = 10;
-        state->symbolCenter = 4;
-    }
-
-    //if P25p1 Data Revert on P25p2 TDMA CC, flip symbolrate
-    if (state->p25_cc_is_tdma == 1)
-    {
-        state->samplesPerSymbol = 8;
-        state->symbolCenter = 3;
-    }
-
-    // fprintf (stderr, "\n User Activated Return to CC; \n ");
-}
+}

src/dsd_serial.c

@@ -4,7 +4,6 @@
 void
 openSerial (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(state);
 
   struct termios tty;
   speed_t baud;
@@ -74,7 +73,6 @@ resumeScan (dsd_opts * opts, dsd_state * state)
 
   char cmd[16];
   ssize_t result;
-  UNUSED(result);
 
   if (opts->serial_fd > 0)
     {

src/dsd_symbol.c

@@ -17,10 +17,33 @@
 
 #include "dsd.h"
 
+long int raw_rms(int16_t *samples, int len, int step) //use samplespersymbol as len
+{
+  
+  int i;
+  long int rms;
+  long p, t, s;
+  double dc, err;
+
+  p = t = 0L;
+  for (i=0; i<len; i+=step) {
+    s = (long)samples[i];
+    t += s;
+    p += s * s;
+  }
+  /* correct for dc offset in squares */
+  dc = (double)(t*step) / (double)len;
+  err = t * 2 * dc - dc * dc * len;
+
+  rms = (long int)sqrt((p-err) / len);
+  if (rms < 0) rms = 150;
+  return rms;
+}
+
 int
 getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
 {
-  short sample;
+  short sample, sample2;
   int i, sum, symbol, count;
   ssize_t result;
 
@@ -121,6 +144,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
           //else cleanup and exit
           else
           {
+            if (opts->use_ncurses_terminal == 1) ncursesClose(opts);
             cleanupAndExit(opts, state);     
           }        
         }
@@ -129,11 +153,8 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
       {
 #ifdef USE_RTLSDR
         // Read demodulated stream here
-        if (get_rtlsdr_sample(&sample, opts, state) < 0)
-          cleanupAndExit(opts, state);
-        //update root means square power level
+        get_rtlsdr_sample(&sample, opts, state);
         opts->rtl_rms = rtl_return_rms();
-        sample *= opts->rtl_volume_multiplier;
 
 #endif
       }
@@ -191,6 +212,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
             {
               fprintf (stderr, "Connection to TCP Server Disconnected.\n");
               fprintf (stderr, "Closing DSD-FME.\n");
+              if (opts->use_ncurses_terminal == 1) ncursesClose(opts);
               cleanupAndExit(opts, state);
             }
             
@@ -200,8 +222,6 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
         #else
         result = sf_read_short(opts->tcp_file_in, &sample, 1);
         if(result == 0) {
-          TCP_RETRY:
-          if (exitflag == 1) cleanupAndExit(opts, state); //needed to break the loop on ctrl+c
           fprintf (stderr, "\nConnection to TCP Server Interrupted. Trying again in 3 seconds.\n");
           sample = 0;
           sf_close(opts->tcp_file_in); //close current connection on this end
@@ -226,11 +246,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
             }
             else fprintf (stderr, "TCP Socket Reconnected Successfully.\n");
           }
-          else
-          {
-            fprintf (stderr, "TCP Socket Connection Error.\n");
-            if (opts->frame_m17 == 1) goto TCP_RETRY; //if using m17 encoder/decoder, just keep looping to keep alive
-          }
+          else fprintf (stderr, "TCP Socket Connection Error.\n");          
 
           //now retry reading sample
           result = sf_read_short(opts->tcp_file_in, &sample, 1);
@@ -248,18 +264,9 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
         
       }
 
-      //BUG REPORT: 1. DMR Simplex doesn't work with raw wav files. 2. Using the monitor w/ wav file saving may produce undecodable wav files.
-      //reworked a bit to allow raw audio wav file saving without the monitoring poriton active 
-      if (have_sync == 0)
+      //Source Audio Monitoring
+      if (have_sync == 0 && opts->monitor_input_audio == 1)
       {
-
-        //do an extra checkfor carrier signal so that random raw audio spurts don't play during decoding
-        // if ( (state->carrier == 1) && ((time(NULL) - state->last_vc_sync_time) < 2)) /This probably doesn't work correctly since we update time check when playing raw audio
-        // {
-        //   memset (state->analog_out, 0, sizeof(state->analog_out));
-        //   state->analog_sample_counter = 0;
-        // } //This is the root cause of issue listed above, will evaluate further at a later time for a more elegant solution, or determine if anything is negatively impacted by removing this
-
         //sanity check to prevent an overflow
         if (state->analog_sample_counter > 959)
           state->analog_sample_counter = 959;
@@ -269,104 +276,42 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
         if (state->analog_sample_counter == 960)
         {
           //get an rms value if not using the rtl built in version
-          if (opts->audio_in_type != 3  && opts->monitor_input_audio == 1)
+          if (opts->audio_in_type != 3)
             opts->rtl_rms = raw_rms(state->analog_out, 960, 1);
 
-          //raw wav file saving -- only write when not NXDN, dPMR, or M17 due to noise that can cause tons of false positives when no sync
-          if (opts->wav_out_raw != NULL && opts->frame_nxdn48 == 0 && opts->frame_nxdn96 == 0 && opts->frame_dpmr == 0 && opts->frame_m17 == 0)
-          {
-            sf_write_short(opts->wav_out_raw, state->analog_out, 960);
-            sf_write_sync (opts->wav_out_raw);
-          }
+          //debug
+          // opts->rtl_rms = 101;
 
-          //low pass filter
-          if (opts->use_lpf == 1)
-            lpf(state, state->analog_out, 960);
-
-          //high pass filter
-          if (opts->use_hpf == 1)
-            hpf (state, state->analog_out, 960);
-
-          //pass band filter
-          if (opts->use_pbf == 1)
-            pbf(state, state->analog_out, 960);
-
-          //manual gain control
-          if (opts->audio_gainA > 0.0f)
-            analog_gain (opts, state, state->analog_out, 960);
-
-          //automatic gain control
-          else
-            agsm(opts, state, state->analog_out, 960);
-
-          //Running RMS after filtering does remove the analog spike from the RMS value
-          //but noise floor noise will still produce higher values
-          // if (opts->audio_in_type != 3  && opts->monitor_input_audio == 1)
-          //   opts->rtl_rms = raw_rms(state->analog_out, 960, 1);
+          //make it a little quieter
+          for (int x = 0; x < 960; x++)
+            state->analog_out[x] /= 4;
 
           //seems to be working now, but RMS values are lower on actual analog signal than on no signal but noise
-          if ( (opts->rtl_rms > opts->rtl_squelch_level) && opts->monitor_input_audio == 1 && state->carrier == 0 ) //added carrier check here in lieu of disabling it above
+          if ( opts->rtl_rms > opts->rtl_squelch_level )
           {
             if (opts->audio_out_type == 0)
               pa_simple_write(opts->pulse_raw_dev_out, state->analog_out, 960*2, NULL);
 
-            if (opts->audio_out_type == 8)
-              udp_socket_blasterA (opts, state, 960*2, state->analog_out);
-
-            //NOTE: Worked okay earlier in Cygwin, so should be fine -- can only operate at 48k1, else slow mode lag
-
-            //This one will only operate when OSS 48k1 (when both input and output are OSS audio)
-            if (opts->audio_out_type == 5 && opts->pulse_digi_rate_out == 48000 && opts->pulse_digi_out_channels == 1)
+            //NOTE: Worked okay earlier in Cygwin, so should be fine
+            if (opts->audio_out_type == 5)
               write (opts->audio_out_fd, state->analog_out, 960*2);
 
-            //STDOUT, but only when operating at 48k1 (no go just yet)
-            // if (opts->audio_out_type == 1 && opts->pulse_digi_rate_out == 48000 && opts->pulse_digi_out_channels == 1)
-            //   write (opts->audio_out_fd, state->analog_out, 960*2);
-
-            //OSS 8k1 (no go just yet)
-            // if (opts->audio_out_type == 2 && opts->pulse_digi_rate_out == 48000 && opts->pulse_digi_out_channels == 1)
-            //   write (opts->audio_out_fd, state->analog_out, 960*2);
-
-            //test updating the sync time, so we can hold here while trunking or scanning
+            //test hold on scan/trunking
             state->last_cc_sync_time = time(NULL);
             state->last_vc_sync_time = time(NULL);
           }
 
-          //raw wav file saving -- save the WAV file samples before we apply filtering to them
-          // if (opts->wav_out_raw != NULL && opts->frame_nxdn48 == 0 && opts->frame_nxdn96 == 0 && opts->frame_dpmr == 0 && opts->frame_m17 == 0)
-          // {
-          //   sf_write_short(opts->wav_out_raw, state->analog_out, 960);
-          //   sf_write_sync (opts->wav_out_raw);
-          // }
-
           memset (state->analog_out, 0, sizeof(state->analog_out));
           state->analog_sample_counter = 0;
         }
 
       }
 
-      if (have_sync == 1)
+      if (have_sync == 1 && opts->monitor_input_audio == 1)
       {
-        //sanity check to prevent an overflow
-        if (state->analog_sample_counter > 959)
-          state->analog_sample_counter = 959;
-
-        state->analog_out[state->analog_sample_counter++] = sample; 
-
-        if (state->analog_sample_counter == 960)
-        {
-          //raw wav file saving -- file size on this blimps pretty fast 1 min ~= 6 MB;  1 hour ~= 360 MB;
-          if (opts->wav_out_raw != NULL)
-          {
-            sf_write_short(opts->wav_out_raw, state->analog_out, 960);
-            sf_write_sync (opts->wav_out_raw);
-          }
-
-          //zero out and reset counter
-          memset (state->analog_out, 0, sizeof(state->analog_out));
-          state->analog_sample_counter = 0;
-        }
-
+        //zero out and reset counter
+        memset (state->analog_out, 0, sizeof(state->analog_out));
+        state->analog_sample_counter = 0;
       }
 
       if (opts->use_cosine_filter)
@@ -377,8 +322,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
             sample = dmr_filter(sample);
           }
 
-          else if (state->lastsynctype == 8 || state->lastsynctype == 9 || state->lastsynctype == 16 || state->lastsynctype == 17 || 
-                   state->lastsynctype == 86 || state->lastsynctype == 87 || state->lastsynctype == 98 || state->lastsynctype == 99)
+          else if (state->lastsynctype == 8 || state->lastsynctype == 9 ||state->lastsynctype == 16 || state->lastsynctype == 17)
           {
             sample = m17_filter(sample);
           }
@@ -405,7 +349,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
               {
                 //sample = dmr_filter(sample); //work on filter later
               }
-              else
+              else // the 12.5KHz NXDN filter is the same as the DMR filter...hopefully
               {
                 sample = dmr_filter(sample);
               }
@@ -490,8 +434,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
 
       if (state->samplesPerSymbol == 20) //nxdn 4800 baud 2400 symbol rate
         {
-          // if ((i >= 9) && (i <= 11))
-          if ((i >= 7) && (i <= 13)) //7, 13 working good on multiple nxdn48, fewer random errors
+          if ((i >= 9) && (i <= 11))
             {
               sum += sample;
               count++;
@@ -510,24 +453,12 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
           if (state->rf_mod == 0)
             {
               // 0: C4FM modulation
- 
-              //EXPERIMENTAL: manipulate the left edge depending on sync type
-              //TODO: See if we can manipulate this a bit more based on AFC or similar type function
-              int l_edge = 2;
-              int r_edge = 2;
 
-              if (state->synctype == 30 || state->synctype == 31) l_edge = 1; //YSF (need to test with new recordings at BW:12000)
-              else if ((state->lastsynctype >= 10 && state->lastsynctype <= 13) || state->lastsynctype == 32 || state->lastsynctype == 33) l_edge = 1;
-              else l_edge = 2; //P25 and NXDN96 perform better, DMR doesn't seem to care too much, but may favor 1 and not 2
-
-              if ((i >= state->symbolCenter - l_edge) && (i <= state->symbolCenter + r_edge))
-              {
-                sum += sample;
-                count++;
-              }
-
-              //debug: show what was selected for the left edge
-              // fprintf (stderr, "  L:%d", l_edge);
+              if ((i >= state->symbolCenter - 1) && (i <= state->symbolCenter + 2))
+                {
+                  sum += sample;
+                  count++;
+                }
 
 #ifdef TRACE_DSD
               if (i == state->symbolCenter - 1) {
@@ -538,18 +469,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
               }
 #endif
             }
-            else if (state->rf_mod == 1) //QPSK
-            {
-              //going one left, two on the right for QPSK, local system seems to favor that
-              //with same PPM setting used on C4FM, unsure if that works on other systems, just
-              //testing things now, not like QPSK works well here anyways
-              if ((i == state->symbolCenter - 1) || (i == state->symbolCenter + 2)) //1,2
-              {
-                sum += sample;
-                count++;
-              }
-            }
-          else //GFSK
+          else
             {
               // 1: QPSK modulation
               // 2: GFSK modulation
@@ -558,23 +478,12 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
               // comes one sample too late.
               // This change makes a significant improvement in the BER, at least for
               // this file.
-              // if ((i == state->symbolCenter) || (i == state->symbolCenter + 1))
-              //GFSK should ideally be the same on the left and right, I would think
-              //I have not observed a system that would benefit from this alignment
+              //if ((i == state->symbolCenter) || (i == state->symbolCenter + 1))
               if ((i == state->symbolCenter - 1) || (i == state->symbolCenter + 1))
-              {
-                sum += sample;
-                count++;
-              }
-
-              //MISC Notes: When using RTL input, NXDN96 at BW:16 NXDN48 at BW:12
-              //I am beginning to suspect that RTL input is halfing the bandwidth, which
-              //is my original consclusion back when I was working on it last, unsure
-              //or the best course on that, could just be a rtl_fm flaw
-              //P25 may also work better at 16 as well now, hard to tell the difference since both are good
-              //DMR may not be any different on 12 or 16 
-              //most likely though, this all will just depend on signal stregth more than anything
-              //as to how much BW you should set
+                {
+                  sum += sample;
+                  count++;
+                }
 
 #ifdef TRACE_DSD
               //if (i == state->symbolCenter) {
@@ -646,9 +555,9 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
     state->symbolc = fgetc(opts->symbolfile);
 
     //experimental throttle
+    useconds_t stime = state->symbol_throttle;
     if (state->use_throttle == 1)
     {
-      // useconds_t stime = state->symbol_throttle;
       // usleep(stime);
       usleep(.003); //very environment specific, tuning to cygwin
     }
@@ -658,15 +567,8 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
       // opts->audio_in_type = 0; //switch to pulse after playback, ncurses terminal can initiate replay if wanted
       fclose(opts->symbolfile);
       fprintf (stderr, "\nEnd of %s\n", opts->audio_in_dev);
-      //in debug mode, re-run .bin files over and over (look for memory leaks, etc)
-      if (state->debug_mode == 1)
-      {
-        opts->symbolfile = NULL;
-        opts->symbolfile = fopen(opts->audio_in_dev, "r");
-        opts->audio_in_type = 4; //symbol capture bin files
-      }
       //open pulse input if we are pulse output AND using ncurses terminal
-      else if (opts->audio_out_type == 0 && opts->use_ncurses_terminal == 1)
+      if (opts->audio_out_type == 0 && opts->use_ncurses_terminal == 1)
       {
         opts->audio_in_type = 0; //set input type
         openPulseInput(opts); //open pulse input
@@ -674,6 +576,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
       //else cleanup and exit
       else
       {
+        if (opts->use_ncurses_terminal == 1) ncursesClose(opts);
         cleanupAndExit(opts, state);
       }
     }

src/dsd_time.c

@@ -1,71 +0,0 @@
-/*-------------------------------------------------------------------------------
- * dsd_time.c
- * Time and Date Functions
- *
- * LWVMOBILE
- * 2024-04 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-//TODO: Make sure everything still works as intended, every free(timestr) has a NULL check first,
-//make sure no other loose or random time functions embedded in other files or functions, etc
-
-#include "dsd.h"
-
-//get HHmmss timestamp no colon (file operations)
-char * getTime()
-{
-  char * curr = calloc(7, sizeof(char));
-  time_t t = time(NULL);
-  struct tm * ptm = localtime(& t);
-  sprintf(curr,"%02d%02d%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-  return curr;
-}
-
-//get HH:mm:ss timestamp with colon (Sync/Console Display)
-char * getTimeC()
-{
-  char * curr = calloc(9, sizeof(char));
-  time_t t = time(NULL);
-  struct tm * ptm = localtime(& t);
-  sprintf(curr, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-  return curr;
-}
-
-//get HH:mm:ss timestamp with colon (Ncurses Call History)
-char * getTimeN(time_t t)
-{
-  char * curr = calloc(9, sizeof(char));
-  struct tm * ptm = localtime(& t);
-  sprintf(curr, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-  return curr;
-}
-
-//get YYYYMMDD without hyphen (file operations)
-char * getDate()
-{
-  char * curr = calloc(25, sizeof(char));
-  time_t t = time(NULL);
-  struct tm * ptm = localtime(& t);
-  sprintf(curr,"%04d%02d%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday);
-  return curr;
-}
-
-//get YYYY-MM-DD with hyphen (Sync/Console Display)
-char * getDateH()
-{
-  char * curr = calloc(27, sizeof(char));
-  time_t t = time(NULL);
-  struct tm * ptm = localtime(& t);
-  sprintf(curr, "%04d-%02d-%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday);
-  return curr;
-}
-
-//get YYYY-MM-DD with hyphen (Ncurses Call History)
-char * getDateN(time_t t)
-{
-  char * curr = calloc(27, sizeof(char));
-  struct tm * ptm = localtime(& t);
-  sprintf(curr, "%04d-%02d-%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday);
-  return curr;
-}
-

src/dsd_upsample.c

@@ -1,47 +1,138 @@
-/*-------------------------------------------------------------------------------
- * dsd_upsample.c
- * Simplified 8k to 48k Upsample Functions
- * Goodbye terrible ringing sound
- * 
- * 
+/*
+ * Copyright (C) 2010 DSD Author
+ * GPG Key ID: 0x3F1D7FD0 (74EF 430D F7F2 0A48 FCE6  F630 FAA2 635D 3F1D 7FD0)
  *
- * LWVMOBILE
- * 2024-03 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
 
 #include "dsd.h"
 
-//produce 6 short samples (48k) for every 1 short sample (8k)
-void upsampleS (short invalue, short prev, short outbuf[6])
-{
-  UNUSED(prev);
-  for (int i = 0; i < 6; i++)
-    outbuf[i] = invalue;
-}
-
-//legacy 6x simplified version for the float_buf_p
-void upsample (dsd_state * state, float invalue)
+void
+upsample (dsd_state * state, float invalue)
 {
 
-  float *outbuf1;
+  int i, j, sum;
+  float *outbuf1, c, d;
   if (state->currentslot == 0 && state->dmr_stereo == 1)
+  {
     outbuf1 = state->audio_out_float_buf_p;
-
-  else if (state->currentslot == 1 && state->dmr_stereo == 1)
+  }
+  if (state->currentslot == 1 && state->dmr_stereo == 1)
+  {
     outbuf1 = state->audio_out_float_buf_pR;
-
-  else if (state->dmr_stereo == 0)
+  }
+  if (state->dmr_stereo == 0)
+  {
     outbuf1 = state->audio_out_float_buf_p;
+  }
+  //outbuf1 = state->audio_out_float_buf_p;
+  outbuf1--;
+  c = *outbuf1;
+  d = invalue;
+  // basic triangle interpolation
+  outbuf1++;
+  *outbuf1 = ((invalue * (float) 0.166) + (c * (float) 0.834));
+  outbuf1++;
+  *outbuf1 = ((invalue * (float) 0.332) + (c * (float) 0.668));
+  outbuf1++;
+  *outbuf1 = ((invalue * (float) 0.5) + (c * (float) 0.5));
+  outbuf1++;
+  *outbuf1 = ((invalue * (float) 0.668) + (c * (float) 0.332));
+  outbuf1++;
+  *outbuf1 = ((invalue * (float) 0.834) + (c * (float) 0.166));
+  outbuf1++;
+  *outbuf1 = d;
+  outbuf1++;
 
-  *outbuf1 = invalue;
-  outbuf1++;
-  *outbuf1 = invalue;
-  outbuf1++;
-  *outbuf1 = invalue;
-  outbuf1++;
-  *outbuf1 = invalue;
-  outbuf1++;
-  *outbuf1 = invalue;
-  outbuf1++;
-  *outbuf1 = invalue;
-}
+  //only if enabled, produces crackling/buzzing sounds when input type is not pulse audio (reason still unknown)
+  //also, could be improved to provide better audio in the future
+  if (state->audio_smoothing == 1) 
+  {
+    if (state->currentslot == 1 && state->dmr_stereo == 1)
+    {
+      if (state->audio_out_idx2R > 24)
+      {
+        // smoothing
+        outbuf1 -= 16;
+        for (j = 0; j < 4; j++)
+        {
+            for (i = 0; i < 6; i++)
+            {
+              sum = 0;
+              outbuf1 -= 2;
+              sum += (int)*outbuf1;
+              outbuf1 += 2;
+              sum += (int)*outbuf1;
+              outbuf1 += 2;
+              sum += (int)*outbuf1;
+              outbuf1 -= 2;
+              *outbuf1 = (sum / (float) 3);
+              outbuf1++;
+            }
+          outbuf1 -= 8;
+        }
+      }
+    }
+    if (state->currentslot == 0 && state->dmr_stereo == 1)
+    {
+      if (state->audio_out_idx2 > 24)
+      {
+        // smoothing
+        outbuf1 -= 16;
+        for (j = 0; j < 4; j++)
+          {
+            for (i = 0; i < 6; i++)
+              {
+                sum = 0;
+                outbuf1 -= 2;
+                sum += (int)*outbuf1;
+                outbuf1 += 2;
+                sum += (int)*outbuf1;
+                outbuf1 += 2;
+                sum += (int)*outbuf1;
+                outbuf1 -= 2;
+                *outbuf1 = (sum / (float) 3);
+                outbuf1++;
+              }
+            outbuf1 -= 8;
+          }
+      }
+    }
+    if (state->dmr_stereo == 0)
+    {
+      if (state->audio_out_idx2 > 24)
+      {
+        // smoothing
+        outbuf1 -= 16;
+        for (j = 0; j < 4; j++)
+          {
+            for (i = 0; i < 6; i++)
+              {
+                sum = 0;
+                outbuf1 -= 2;
+                sum += (int)*outbuf1;
+                outbuf1 += 2;
+                sum += (int)*outbuf1;
+                outbuf1 += 2;
+                sum += (int)*outbuf1;
+                outbuf1 -= 2;
+                *outbuf1 = (sum / (float) 3);
+                outbuf1++;
+              }
+            outbuf1 -= 8;
+          }
+      }
+    }
+  }
+
+}

src/dstar.c

@@ -1,397 +1,183 @@
+/*
+ * Copyright (C) 2010 DSD Author
+ * GPG Key ID: 0x3F1D7FD0 (74EF 430D F7F2 0A48 FCE6  F630 FAA2 635D 3F1D 7FD0)
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Note: D-STAR support is fairly complete at this point.
+ * The ambe3600x2450 decoder is similar butnot compatible with D-STAR voice frames.
+ * The dstar interleave pattern is different as well.
+ * GMSK modulation optimizations will also required to get a usable bit error
+ */
+
 #include "dsd.h"
 #include "dstar_const.h"
-#include "fcs.h"
+#include "dstar_header.h"
 
-//simplified DSTAR
-void processDSTAR(dsd_opts * opts, dsd_state * state)
-{
-  uint8_t sd[480];
-  memset (sd, 0, sizeof(sd));
-  int i, j, dibit;
-  char ambe_fr[4][24];
-  const int *w, *x;
-  memset(ambe_fr, 0, sizeof(ambe_fr));
-  w = dW;
-  x = dX;
 
-  //20 voice and 19 slow data frames (20th is frame sync)
-  for (j = 0; j < 21; j++)
-  {
+void processDSTAR(dsd_opts * opts, dsd_state * state) {
+	// extracts AMBE frames from D-STAR voice frame
+	int i, j, dibit;
+	char ambe_fr[4][24];
+	unsigned char data[9];
+	unsigned int bits[4];
+	int framecount;
+	int sync_missed = 0;
+	unsigned char slowdata[4];
+	unsigned int bitbuffer = 0;
+	const int *w, *x;
 
-    memset(ambe_fr, 0, sizeof(ambe_fr));
-    w = dW;
-    x = dX;
+	//set carrier to 1 so ncurses will light up green
+	state->carrier = 1;
 
-    for (i = 0; i < 72; i++)
-    {
-      dibit = getDibit(opts, state);
-      ambe_fr[*w][*x] = dibit & 1;
-      w++;
-      x++;
-    }
+	if (opts->errorbars == 1) {
+		fprintf (stderr, "e:");
+	}
 
-    soft_mbe(opts, state, NULL, ambe_fr, NULL);
+#ifdef DSTAR_DUMP
+	fprintf (stderr, "\n");
+#endif
 
-    if (j != 20)
-    {
-      for (i = 0; i < 24; i++)
-      {
-        //slow data
-        sd[(j*24)+i] = (uint8_t) getDibit(opts, state);
+	if (state->synctype == 18) {
+		framecount = 0;
+		state->synctype = 6;
+	} else if (state->synctype == 19) {
+		framecount = 0;
+		state->synctype = 7;
+	} else {
+		framecount = 1; //just saw a sync frame; there should be 20 not 21 till the next
+	}
+	//why is this running in a loop for?
+	while (sync_missed < 3) {
 
-      }
-    }
+		memset(ambe_fr, 0, 96);
+		// voice frame
+	    w = dW;
+	    x = dX;
 
-    if (j == 20)
-      processDSTAR_SD(opts, state, sd);
+		for (i = 0; i < 72; i++) {
 
-    //since we are in a long loop, use this to improve response time in ncurses
-    if (opts->use_ncurses_terminal == 1)
-      ncursesPrinter(opts, state);
+			dibit = getDibit(opts, state);
 
-  }
+			bitbuffer <<= 1;
+			if (dibit == 1) {
+				bitbuffer |= 0x01;
+			}
+			if ((bitbuffer & 0x00FFFFFF) == 0x00AAB468) {
+				// we're slipping bits
+				fprintf (stderr, "sync in voice after i=%d, restarting\n", i);
+				//ugh just start over
+				i = 0;
+			    w = dW;
+			    x = dX;
+				framecount = 1;
+				continue;
+			}
 
-  fprintf (stderr, "\n");
+			ambe_fr[*w][*x] = (1 & dibit);
+			w++;
+			x++;
 
+		}
+
+
+		processMbeFrame(opts, state, NULL, ambe_fr, NULL);
+
+		//  data frame - 24 bits
+		for (i = 73; i < 97; i++) {
+			dibit = getDibit(opts, state);
+			bitbuffer <<= 1;
+			if (dibit == 1) {
+				bitbuffer |= 0x01;
+			}
+			if ((bitbuffer & 0x00FFFFFF) == 0x00AAB468) {
+				// looking if we're slipping bits
+				if (i != 96) {
+					fprintf (stderr, "sync after i=%d\n", i);
+					i = 96;
+				}
+			}
+		}
+
+		slowdata[0] = (bitbuffer >> 16) & 0x000000FF;
+		slowdata[1] = (bitbuffer >> 8) & 0x000000FF;
+		slowdata[2] = (bitbuffer) & 0x000000FF;
+		slowdata[3] = 0;
+
+		if ((bitbuffer & 0x00FFFFFF) == 0x00AAB468) {
+			//We got sync!
+			//fprintf (stderr, "Sync on framecount = %d\n", framecount);
+			sync_missed = 0;
+		} else if ((bitbuffer & 0x00FFFFFF) == 0xAAAAAA) {
+			//End of transmission
+			fprintf (stderr, "End of transmission\n");
+			goto end;
+		} else if (framecount % 21 == 0) {
+			fprintf (stderr, "Missed sync on framecount = %d, value = %x/%x/%x\n",
+					framecount, slowdata[0], slowdata[1], slowdata[2]);
+			sync_missed++;
+		} else if (framecount != 0 && (bitbuffer & 0x00FFFFFF) != 0x000000) {
+			slowdata[0] ^= 0x70;
+			slowdata[1] ^= 0x4f;
+			slowdata[2] ^= 0x93;
+			//fprintf (stderr, "unscrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
+
+		} else if (framecount == 0) {
+			//fprintf (stderr, "never scrambled-%c\n",slowdata);
+			//fprintf (stderr, "never scrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
+
+			}
+		for (short int i = 0; i < 4; i++)
+		{
+			if (slowdata[i] <= 0x7E && slowdata[i] >=0x20)
+	     {
+	       //fprintf (stderr, "%c", slowdata[i]);
+	     }
+	     //else fprintf (stderr, ".");
+		}
+		//fprintf (stderr, "\n");
+		framecount++;
+
+		//since we are in a while loop, run ncursesPrinter here.
+	  if (opts->use_ncurses_terminal == 1)
+	  {
+	    ncursesPrinter(opts, state);
+	  }
+
+	} //end while loop
+
+	end: if (opts->errorbars == 1) {
+		fprintf (stderr, "\n");
+	}
 }
 
-void processDSTAR_HD(dsd_opts * opts, dsd_state * state)
-{
+void processDSTAR_HD(dsd_opts * opts, dsd_state * state) {
 
-  int i;
-  int radioheaderbuffer[660];
+	int i, j;
+	int radioheaderbuffer[660];
 
-  for (i = 0; i < 660; i++)
-    radioheaderbuffer[i] = getDibit(opts, state);
+	for (j = 0; j < 660; j++) {
+					radioheaderbuffer[j] = getDibit(opts, state);
+			}
 
-  dstar_header_decode(state, radioheaderbuffer);
-  processDSTAR(opts, state);
-
-}
-
-//first 24-bits of the larger scramble table
-uint8_t sd_d[48] = 
-{0,0,0,0, //0
- 1,1,1,0, //E
- 1,1,1,1, //F
- 0,0,1,0, //2
- 1,1,0,0, //C
- 1,0,0,1};//9
-
-//no so simplified Slow Data
-void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
-{
-
-  int i, j, len;
-  uint8_t sd_bytes[60]; //raw slow data packed into bytes
-  uint8_t hd_bytes[60]; //storage for packed bytes sans the header indicator byte (0x55)
-  uint8_t payload[60]; //unchanged copy of sd_bytes for payload printing
-  uint8_t rev[480]; //storage for reversing the bit order
-  memset (sd_bytes, 0, sizeof(sd_bytes));
-  memset (hd_bytes, 0, sizeof(hd_bytes));
-  memset (payload, 0, sizeof(payload));
-
-  //apply the descrambler
-  for (i = 0; i < 480; i++)
-    sd[i] ^= sd_d[i%24];
-
-  //reverse the bit order
-  for (i = 0; i < 480; i++)
-    rev[i] = sd[479-i];
-  for (i = 0; i < 480; i++)
-    sd[i] = rev[i];
-
-  //load bytes by least significant byte to most significant byte
-  //as seen in "The Format of D-Star Slow Data" by Jonathan Naylor
-  for (i = 0; i < 60; i++)
-    sd_bytes[59-i] = (uint8_t)ConvertBitIntoBytes(&sd[i*8+0], 8);
-
-  //make a copy to payload that won't be altered
-  memcpy (payload, sd_bytes, sizeof(payload));
-
-  len = sd_bytes[0] & 0xF;
-  len += 1;
-
-  //load payload bytes without the header indicator byte
-  for (i = 0, j = 0; i < 50; i++)
-  {
-    j++;
-    hd_bytes[i] = sd_bytes[j];
-    if (j == len*1-1)  j++;
-    if (j == len*2-1)  j++;
-    if (j == len*3-1)  j++;
-    if (j == len*4-1)  j++;
-    if (j == len*5-1)  j++;
-    if (j == len*6-1)  j++;
-    if (j == len*7-1)  j++;
-    if (j == len*8-1)  j++;
-    if (j == len*9-1)  j++;
-  }
-
-  //works on header format -- may not work on others
-  uint16_t crc_ext = (hd_bytes[39] << 8) + hd_bytes[40];
-  uint16_t crc_cmp = calc_fcs(hd_bytes, 39);
-
-  char str1[9];
-  char str2[9];
-  char str3[9];
-  char str4[13];
-  char strf[60];
-  char strt[60];
-  memset (strf, 0x20, sizeof(strf));
-  memset (strt, 0x20, sizeof(strf));
-  memcpy (str1, hd_bytes+3,  8);
-  memcpy (str2, hd_bytes+11, 8);
-  memcpy (str3, hd_bytes+19, 8);
-  memcpy (str4, hd_bytes+27, 12);
-  str1[8]  = '\0';
-  str2[8]  = '\0';
-  str3[8]  = '\0';
-  str4[12] = '\0';
-
-  //safety check, don't want to load nasty values into the strings
-  for (i = 1; i < 60; i++)
-  {
-    //substitue non-ascii characters for spaces
-    if (sd_bytes[i] < 0x20)
-      sd_bytes[i] = 0x20;
-    else if (sd_bytes[i] > 0x7E)
-      sd_bytes[i] = 0x20;
-
-    //substitue non-ascii characters for spaces
-    if (hd_bytes[i] < 0x20)
-      hd_bytes[i] = 0x20;
-    else if (hd_bytes[i] > 0x7E)
-      hd_bytes[i] = 0x20;
-
-    //replace terminating ffffffff (repeating 0x66 values) with NULL (0x00)
-    if (i < 59)
-    {
-      if (sd_bytes[i] == 0x66 && sd_bytes[i+1] == 0x66)
-        sd_bytes[i] = 0x00;
-
-      if (hd_bytes[i] == 0x66 && hd_bytes[i+1] == 0x66)
-        hd_bytes[i] = 0x00;
-    }
-
-    if (i == 59 && sd_bytes[i] == 0x66)
-      sd_bytes[i] = 0x00;
-
-    if (i == 59 && hd_bytes[i] == 0x66)
-      hd_bytes[i] = 0x00;
-
-  }
-
-  memcpy (strf, sd_bytes+1, 58); //copy the entire thing as a string -- full
-  memcpy (strt, hd_bytes+1, 48); //copy the entire thing as a string -- truncated
-  strf[59] = '\0';
-  strt[59] = '\0';
-
-  char type[7]; char temp[8]; char tempa[8]; char chungus[80]; UNUSED(chungus);
-  memset (chungus, 0, sizeof(chungus));
-  memset (temp, 0, sizeof(temp));
-  memset (tempa, 0, sizeof(tempa));
-  memset (type, 0, sizeof(type));
-  memcpy (type, sd_bytes+1, 5);
-  type[6] = '\0';
-
-  if (sd_bytes[0] == 0x55) //header format
-  {
-
-    if (crc_cmp == crc_ext)
-    {
-      fprintf (stderr, " RPT 2: %s", str1);
-      fprintf (stderr, " RPT 1: %s", str2);
-      fprintf (stderr, " DST: %s", str3);
-      fprintf (stderr, " SRC: %s", str4);
-
-      //check flags for info
-      if (sd_bytes[1] & 0x80) fprintf (stderr, " DATA");
-      if (sd_bytes[1] & 0x40) fprintf (stderr, " REPEATER");
-      if (sd_bytes[1] & 0x20) fprintf (stderr, " INTERRUPTED");
-      if (sd_bytes[1] & 0x10) fprintf (stderr, " CONTROL SIGNAL");
-      if (sd_bytes[1] & 0x08) fprintf (stderr, " URGENT");
-
-      memcpy (state->dstar_rpt2, str1, sizeof(str1));
-      memcpy (state->dstar_rpt1, str2, sizeof(str2));
-      memcpy (state->dstar_dst, str3, sizeof(str3));
-      memcpy (state->dstar_src, str4, sizeof(str4));
-    }
-    else fprintf (stderr, " SLOW DATA - HEADER FORMAT (CRC ERR)");
-
-  }
-
-  else //any other format (text, aprs, etc)
-  {
-    //fixed-form at 5 bytes, evaluate
-    if (sd_bytes[0] == 0x35)
-    {
-
-      //might as well just dump both of these outputs
-      if (strcmp(type, "$$CRC") == 0) //APRS
-      {
-        memset (strt, 0x20, sizeof(strt)); //space fill
-        fprintf (stderr, " DATA: ");
-        for (i = 1; i < 59; i++)
-        {
-          if (i%6==0) i++;
-          if ( (sd_bytes[i] > 0x19) && (sd_bytes[i] < 0x7F) )
-          {
-            fprintf (stderr, "%c", sd_bytes[i]);
-            // strt[i] = sd_bytes[i];
-          }
-        }
-        // strt[59] = '\0';
-        // memcpy (state->dstar_gps, strt, sizeof(strt));
-      }
-
-      if (strcmp(type, "$$CRC") == 0) //APRS
-      {
-        fprintf (stderr, "\n APRS - ");
-        sprintf (state->dstar_gps, "APRS - ");
-        uint8_t aprs[51];
-        int k = 0;
-        memset (aprs, 0, sizeof(aprs));
-        //reshuffle (yet again) into an easier format to manipulate for aprs
-        for (i = 1; i < 59; i++)
-        {
-          if (i % 6 == 0 ) i++;
-          aprs[k] = sd_bytes[i];
-          if ( (aprs[k] > 0x19) && (aprs[k] < 0x7F) )
-            aprs[i] = 0x20;
-          k++;
-        }
-        //start by looking for the ! exclamation point token
-        int start = -1;
-        for (i = 30; i < 40; i++)
-        {
-          if (aprs[i] == 0x21)
-          {
-            start = i+1;
-            break;
-          }
-        }
-        //if not found, then skip (bad decode)
-        if (start == -1)
-          goto SKIP;
-
-        //debug 
-        // fprintf (stderr, "S: %d; ", start); //38, or 39
-
-        //LAT
-        memcpy (temp, aprs+start, 2);
-        start += 2;
-        fprintf (stderr, "Lat: %sd ", temp);
-        strcat (state->dstar_gps, "Lat: ");
-        strcat (state->dstar_gps, temp);
-        strcat (state->dstar_gps, "d ");
-        memcpy (temp, aprs+start, 2);
-        start += 3;
-        fprintf (stderr, "%sm ", temp);
-        strcat (state->dstar_gps, temp);
-        strcat (state->dstar_gps, "m ");
-        memcpy (temp, aprs+start, 2);
-        start+=1;
-        fprintf (stderr, "%ss ", temp);
-        strcat (state->dstar_gps, temp);
-        strcat (state->dstar_gps, "s ");
-        fprintf (stderr, "%c", aprs[start]);
-        if (sd_bytes[start] == 0x4E)
-          strcat (state->dstar_gps, "N ");
-        else if (sd_bytes[start] == 0x53)
-          strcat (state->dstar_gps, "S ");
-        fprintf (stderr, "; ");
-
-        //LON
-        start += 3;
-        memcpy (tempa, aprs+start, 3);
-        start += 3;
-        fprintf (stderr, "Lon: %sd ", tempa);
-        strcat (state->dstar_gps, "Lon: ");
-        strcat (state->dstar_gps, tempa);
-        strcat (state->dstar_gps, "d ");
-        memcpy (temp, aprs+start, 2);
-        start += 3; //3
-        fprintf (stderr, "%sm ", temp);
-        strcat (state->dstar_gps, temp);
-        strcat (state->dstar_gps, "m ");
-        memcpy (temp, aprs+start, 2);
-        start += 2;
-        fprintf (stderr, "%ss ", temp);
-        strcat (state->dstar_gps, temp);
-        strcat (state->dstar_gps, "s ");
-        fprintf (stderr, "%c", aprs[start]);
-        if (aprs[start] == 0x45)
-          strcat (state->dstar_gps, "E ");
-        else if (aprs[start] == 0x57)
-          strcat (state->dstar_gps, "W ");
-        fprintf (stderr, "; ");
-
-        //Got the feeling nobody will actually ever see this message, but who knows
-        // fprintf(stderr, "\n DEV NOTE: If you see this message, but incorrect lat/lon,\n please submit samples to https://github.com/lwvmobile/dsd-fme/issues/164 ");
-
-        SKIP: ; //do nothing
-
-        //this seems to work okay with a few samples, but wouldn't be surprised if it broke down
-        //randomly on different users, depending on location and what else in in $$CRC
-      }
-      else
-      {
-        // fprintf (stderr, " %s: ", type);
-        memset (strt, 0x20, sizeof(strt)); //space fill
-        fprintf (stderr, " TEXT: ");
-        for (i = 1; i < 59; i++)
-        {
-          if (i%6==0) i++;
-          if ( (sd_bytes[i] > 0x19) && (sd_bytes[i] < 0x7F) )
-          {
-            fprintf (stderr, "%c", sd_bytes[i]);
-            strt[i] = sd_bytes[i];
-          }
-        }
-        strt[59] = '\0';
-        memcpy (state->dstar_txt, strt, sizeof(strt));
-      }
-    }
-
-    //free-form text at 5 bytes, truncate every 6th position
-    else if (sd_bytes[0] == 0x40)
-    {
-      memset (strt, 0x20, sizeof(strt)); //space fill
-      fprintf (stderr, " TEXT: ");
-      for (i = 1; i < 59; i++)
-      {
-        if (i%6==0) i++;
-        if ( (sd_bytes[i] > 0x19) && (sd_bytes[i] < 0x7F) )
-        {
-          fprintf (stderr, "%c", sd_bytes[i]);
-          strt[i] = sd_bytes[i];
-        }
-      }
-      strt[59] = '\0';
-      memcpy (state->dstar_txt, strt, sizeof(strt));
-    }
-    //anything else
-    else //print entire thing
-    {
-      fprintf (stderr, " _UNK:");
-      fprintf (stderr, " %s", strf);
-      // memcpy (state->dstar_txt, strf, sizeof(strf)); //don't copy the unknown garbo strings
-    } 
-
-  }
-
-  if (opts->payload == 1)
-  {
-    fprintf (stderr, "\n SD: ");
-    for (i = 0; i < 60; i++)
-    {
-      fprintf (stderr, "[%02X]", payload[i]);
-      if (i == 29) fprintf (stderr, "\n     ");
-    }
-
-    if (crc_cmp != crc_ext)
-      fprintf (stderr, "CRC - EXT: %04X CMP: %04X", crc_ext, crc_cmp);
-  }
+	// Note: These routines contain GPLed code. Remove if you object to that.
+	// Due to this, they are in a separate source file.
+	dstar_header_decode(state, radioheaderbuffer);
+
+	//We officially have sync now, so just pass on to the above routine:
+
+	processDSTAR(opts, state);
 
 }

src/dstar_header.c

@@ -1,8 +1,8 @@
 /*
-*
-* This code is taken largely from on1arf's GMSK code. Original copyright below:
-*
-*
+ *
+ * This code is taken largely from on1arf's GMSK code. Original copyright below:
+ *
+ *
 * Copyright (C) 2011 by Kristoff Bonne, ON1ARF
 *
 * This program is free software; you can redistribute it and/or modify
@@ -13,84 +13,75 @@
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details.
-*
-*/
+ *
+ */
 
+#include "fcs.h"
 #include "descramble.h"
 #include "dstar_header.h"
 #include "dsd.h"
-// #include "fcs.h" //error:  multiple definition of `calc_fcs'; CMakeFiles/dsd-fme.dir/src/dstar.c.o:dstar.c:(.text+0x0): first defined here
 
-void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660])
-{
+void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660]) {
 	int radioheaderbuffer2[660];
-	char radioheader[41];
+	unsigned char radioheader[41];
 	int octetcount, bitcount, loop;
 	unsigned char bit2octet[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
+	unsigned int FCSinheader;
+	unsigned int FCScalculated;
+	int len;
 
 	scramble(radioheaderbuffer, radioheaderbuffer2);
 	deinterleave(radioheaderbuffer2, radioheaderbuffer);
-	FECdecoder(radioheaderbuffer, radioheaderbuffer2);
+	len = FECdecoder(radioheaderbuffer, radioheaderbuffer2);
 	memset(radioheader, 0, 41);
-
+	//memset(state->dstarradioheader, 0, 41);
 	// note we receive 330 bits, but we only use 328 of them (41 octets)
 	// bits 329 and 330 are unused
 	octetcount = 0;
 	bitcount = 0;
-	for (loop = 0; loop < 328; loop++)
-	{
-		if (radioheaderbuffer2[loop])
+	for (loop = 0; loop < 328; loop++) {
+		if (radioheaderbuffer2[loop]) {
 			radioheader[octetcount] |= bit2octet[bitcount];
+		};
 		bitcount++;
 		// increase octetcounter and reset bitcounter every 8 bits
-		if (bitcount >= 8)
-		{
+		if (bitcount >= 8) {
 			octetcount++;
 			bitcount = 0;
 		}
 	}
+	//state->dstarradioheader = radioheader;
 
-	char str1[9];
-	char str2[9];
-	char str3[9];
-	char str4[13];
+	for (short i = 0; i < 41; i++)
+	{
+		state->dstarradioheader[i] = radioheader[i];
+	}
 
-	memcpy (str1, radioheader+3, 8);
-	memcpy (str2, radioheader+11, 8);
-	memcpy (str3, radioheader+19, 8);
-	memcpy (str4, radioheader+27, 12);
 
-	str1[8] = '\0';
-	str2[8] = '\0';
-	str3[8] = '\0';
-	str4[12] = '\0';
+	// print header
+	fprintf (stderr, "\nDSTAR HEADER: ");
+	//fprintf (stderr, "FLAG1: %02X - FLAG2: %02X - FLAG3: %02X\n", radioheader[0],
+	//		radioheader[1], radioheader[2]);
+	fprintf (stderr, "RPT 2: %c%c%c%c%c%c%c%c ", radioheader[3], radioheader[4],
+			radioheader[5], radioheader[6], radioheader[7], radioheader[8],
+			radioheader[9], radioheader[10]);
+	fprintf (stderr, "RPT 1: %c%c%c%c%c%c%c%c ", radioheader[11], radioheader[12],
+			radioheader[13], radioheader[14], radioheader[15], radioheader[16],
+			radioheader[17], radioheader[18]);
+	fprintf (stderr, "YOUR: %c%c%c%c%c%c%c%c ", radioheader[19], radioheader[20],
+			radioheader[21], radioheader[22], radioheader[23], radioheader[24],
+			radioheader[25], radioheader[26]);
+	fprintf (stderr, "MY: %c%c%c%c%c%c%c%c/%c%c%c%c\n", radioheader[27],
+			radioheader[28], radioheader[29], radioheader[30], radioheader[31],
+			radioheader[32], radioheader[33], radioheader[34], radioheader[35],
+			radioheader[36], radioheader[37], radioheader[38]);
 
-	//TODO: Add fcs_calc to header as well
-	// uint16_t crc_ext = (radioheader[39] << 8) + radioheader[40];
-	// uint16_t crc_cmp = calc_fcs(radioheader, 39);
-
-	//debug
-	// fprintf (stderr, "\n HD: ");
-	// for (int i = 0; i < 40; i++)
-	// 	fprintf (stderr, "%02X ", radioheader[i]);
-	// fprintf (stderr, "\n");
-
-	fprintf (stderr, " RPT 2: %s", str1);
-	fprintf (stderr, " RPT 1: %s", str2);
-	fprintf (stderr, " DST: %s", str3);
-	fprintf (stderr, " SRC: %s", str4);
-
-	//check flags for info
-	if (radioheader[0] & 0x80) fprintf (stderr, " DATA");
-	if (radioheader[0] & 0x40) fprintf (stderr, " REPEATER");
-	if (radioheader[0] & 0x20) fprintf (stderr, " INTERRUPTED");
-	if (radioheader[0] & 0x10) fprintf (stderr, " CONTROL SIGNAL");
-	if (radioheader[0] & 0x08) fprintf (stderr, " URGENT");
-
-	memcpy (state->dstar_rpt2, str1, sizeof(str1));
-	memcpy (state->dstar_rpt1, str2, sizeof(str2));
-	memcpy (state->dstar_dst, str3, sizeof(str3));
-	memcpy (state->dstar_src, str4, sizeof(str4));
-
-	//TODO: Call History for DSTAR
+	//FCSinheader = ((radioheader[39] << 8) | radioheader[40]) & 0xFFFF;
+	//FCScalculated = calc_fcs((unsigned char*) radioheader, 39);
+	//fprintf (stderr, "Check sum = %04X ", FCSinheader);
+	//if (FCSinheader == FCScalculated) {
+	//	fprintf (stderr, "(OK)\n");
+	//} else {
+	//	fprintf (stderr, "(NOT OK- Calculated FCS = %04X)\n", FCScalculated);
+	//}; // end else - if
 }

src/edacs-bch3.c

@@ -332,8 +332,7 @@ decode_bch()
 {
 	register int    i, j, u, q, t2, count = 0, syn_error = 0;
 	int             elp[1026][1024], d[1026], l[1026], u_lu[1026], s[1025];
-	int             root[200], loc[200], reg[201];
-	(void)(root);
+	int             root[200], loc[200], err[1024], reg[201];
 
 	t2 = 2 * t;
 
@@ -436,10 +435,10 @@ decode_bch()
 			    d[u + 1] = alpha_to[s[u + 1]];
 			  else
 			    d[u + 1] = 0;
-			  for (i = 1; i <= l[u + 1]; i++)
-			    if ((s[u + 1 - i] != -1) && (elp[u + 1][i] != 0))
-			      d[u + 1] ^= alpha_to[(s[u + 1 - i]
-			                    + index_of[elp[u + 1][i]]) % n];
+			    for (i = 1; i <= l[u + 1]; i++)
+			      if ((s[u + 1 - i] != -1) && (elp[u + 1][i] != 0))
+			        d[u + 1] ^= alpha_to[(s[u + 1 - i] 
+			                      + index_of[elp[u + 1][i]]) % n];
 			  /* put d[u+1] into index form */
 			  d[u + 1] = index_of[d[u + 1]];	
 			}

src/ez.cpp

@@ -178,8 +178,7 @@ int ez_rs28_sacch (int payload[180], int parity[132])
   return (ec);
 }
 
-//std::map <std::uint64_t, int> isch_map;
-std::map <uint64_t, int> isch_map; //User Noted GCC potential compiler error fix on BB OP25
+std::map <std::uint64_t, int> isch_map;
 void map_isch()
 {
 	isch_map[0x184229d461ULL] = 0;

src/fec.c

@@ -760,82 +760,6 @@ bool Hamming_16_11_4_decode(unsigned char *rxBits, unsigned char *decodedBits, i
 
 // ========================================================================================
 
-void rand_test_20_8() //from dforsi as a pull request to DSDcc
-{
-    unsigned char msg[8];
-    unsigned char codeword[20], xcodeword[20];
-    int idx1, idx2, idx3 = 0;
-    int dataIn, dataOut; UNUSED(dataIn); //don't know why its reporting dataIn as unused for
-    int passCount = 0, failCount = 0, parityFailCount = 0;
-
-    // Run multiple times, to randomly corrupt different bits
-    // Takes about 10 seconds on a fast PC
-    for (int repeat = 0; repeat < 100000/2; repeat++)
-    {
-        // Exhaustively test all 8-bit inputs
-        for (int dataIn = 0; dataIn < 256; dataIn++)
-        {
-            // Convert to array of bits
-            for (int j = 0; j < 8; j++) {
-                msg[j] = (dataIn >> j) & 1;
-            }
-
-            // Encode
-            Golay_20_8_encode(msg, codeword);
-
-            // Save copy of uncorrupted codeword
-            memcpy(xcodeword, codeword, 20*sizeof(unsigned char));
-
-            //change the seed each time, using time(NULL) will only change the seed once every second, otherwise resets it to the same seed
-            srand(dataIn+dataOut);
-
-            // Randomly corrupt up to 3 bits
-            idx1 = rand() % 20;
-            idx2 = rand() % 20;
-            idx3 = rand() % 20;
-            codeword[idx1] ^= codeword[idx1];
-            codeword[idx2] ^= codeword[idx2];
-            codeword[idx3] ^= codeword[idx3];
-
-            //flip the parity bit
-            // codeword[19] ^= 1;
-
-            bool fail = false;
-            // Decode and correct errors
-            dataOut = 0;
-            if (Golay_20_8_decode(codeword))
-            {
-                // Check data is corrected
-                for (int j = 0; j < 8; j++) {
-                    dataOut |= codeword[j] << j;
-                }
-                if (dataIn != dataOut) {
-                    fail = true;
-                }
-
-                // Check also that parity has been corrected, as we previously had a bug with this
-                if (memcmp(codeword, xcodeword, 20)) {
-                    parityFailCount++;
-                }
-            }
-            else
-            {
-                fail = true;
-            }
-            if (fail)
-            {
-                fprintf (stderr, "\n Decode Failed: IN:%05X; OUT:%05X; IDX: %d, %d, %d; ", dataIn, dataOut, idx1, idx2, idx3);
-                failCount++;
-            }
-            else
-            {
-                passCount++;
-                // fprintf (stderr, "\n Decode Passed: IN:%05X; OUT:%05X; IDX: %d, %d, %d; ", dataIn, dataOut, idx1, idx2, idx3);
-            }
-        }
-    }
-    fprintf (stderr, "\n Passcount: %d; Failcount: %d; Parity Fail Count: %d \n", passCount, failCount, parityFailCount);
-}
 
 void Golay_20_8_init()
 {
@@ -882,7 +806,7 @@ void Golay_20_8_init()
                 syndromeIP = syndromeI ^ (1 << (11-ip));
                 Golay_20_8_m_corr[syndromeIP][0] = i1;
                 Golay_20_8_m_corr[syndromeIP][1] = i2;
-                Golay_20_8_m_corr[syndromeIP][2] = 8 + ip;
+                Golay_20_8_m_corr[syndromeIP][2] = 12 + ip;
             }
         }
 
@@ -900,14 +824,14 @@ void Golay_20_8_init()
         {
             syndromeIP1 = syndromeI ^ (1 << (11-ip1));
             Golay_20_8_m_corr[syndromeIP1][0] = i1;
-            Golay_20_8_m_corr[syndromeIP1][1] = 8 + ip1;
+            Golay_20_8_m_corr[syndromeIP1][1] = 12 + ip1;
 
             for (ip2 = ip1+1; ip2 < 12; ip2++) // 1 more bit flip in parity
             {
                 syndromeIP2 = syndromeIP1 ^ (1 << (11-ip2));
                 Golay_20_8_m_corr[syndromeIP2][0] = i1;
-                Golay_20_8_m_corr[syndromeIP2][1] = 8 + ip1;
-                Golay_20_8_m_corr[syndromeIP2][2] = 8 + ip2;
+                Golay_20_8_m_corr[syndromeIP2][1] = 12 + ip1;
+                Golay_20_8_m_corr[syndromeIP2][2] = 12 + ip2;
             }
         }
     }
@@ -916,25 +840,23 @@ void Golay_20_8_init()
     for (ip1 = 0; ip1 < 12; ip1++) // 1 bit flip in parity
     {
         syndromeIP1 =  (1 << (11-ip1));
-        Golay_20_8_m_corr[syndromeIP1][0] = 8 + ip1;
+        Golay_20_8_m_corr[syndromeIP1][0] = 12 + ip1;
 
         for (ip2 = ip1+1; ip2 < 12; ip2++) // 1 more bit flip in parity
         {
             syndromeIP2 = syndromeIP1 ^ (1 << (11-ip2));
-            Golay_20_8_m_corr[syndromeIP2][0] = 8 + ip1;
-            Golay_20_8_m_corr[syndromeIP2][1] = 8 + ip2;
+            Golay_20_8_m_corr[syndromeIP2][0] = 12 + ip1;
+            Golay_20_8_m_corr[syndromeIP2][1] = 12 + ip2;
 
             for (ip3 = ip2+1; ip3 < 12; ip3++) // 1 more bit flip in parity
             {
                 syndromeIP3 = syndromeIP2 ^ (1 << (11-ip3));
-                Golay_20_8_m_corr[syndromeIP3][0] = 8 + ip1;
-                Golay_20_8_m_corr[syndromeIP3][1] = 8 + ip2;
-                Golay_20_8_m_corr[syndromeIP3][2] = 8 + ip3;
+                Golay_20_8_m_corr[syndromeIP3][0] = 12 + ip1;
+                Golay_20_8_m_corr[syndromeIP3][1] = 12 + ip2;
+                Golay_20_8_m_corr[syndromeIP3][2] = 12 + ip3;
             }
         }
     }
-
-    // rand_test_20_8(); //test
 }
 
 // Not very efficient but encode is used for unit testing only
@@ -1308,12 +1230,12 @@ void Golay_24_12_init()
     }
 }
 
-// Not very efficient but encode is used for unit testing only, I think this is wrong for M17
+// Not very efficient but encode is used for unit testing only
 void Golay_24_12_encode(unsigned char *origBits, unsigned char *encodedBits)
 {
     int i = 0, j = 0;
 
-    // memset(encodedBits, 0, 24);
+    memset(encodedBits, 0, 24);
 
     for (i = 0; i < 12; i++)
     {
@@ -1326,7 +1248,7 @@ void Golay_24_12_encode(unsigned char *origBits, unsigned char *encodedBits)
     for (i = 0; i < 24; i++)
     {
         encodedBits[i] %= 2;
-    //     fprintf (stderr, "%b", encodedBits[i]); //disable later on
+        // fprintf (stderr, "%b", encodedBits[i]); //disable later on
     }
 }
 
@@ -1475,11 +1397,10 @@ void QR_16_7_6_encode(unsigned char *origBits, unsigned char *encodedBits)
 
 bool QR_16_7_6_decode(unsigned char *rxBits)
 {
-    //2 bit errors or less
     unsigned int syndromeI = 0; // syndrome index
     int is = 0;
     int i = 0;
-    int corrections = 0;
+
     for (is = 0; is < 9; is++)
     {
         syndromeI += (((rxBits[0]  * QR_16_7_6_m_H[16*is + 0])
@@ -1513,7 +1434,6 @@ bool QR_16_7_6_decode(unsigned char *rxBits)
             else
             {
                 rxBits[QR_16_7_6_m_corr[syndromeI][i]] ^= 1; // flip bit
-                corrections++;
             }
         }
 
@@ -1521,15 +1441,8 @@ bool QR_16_7_6_decode(unsigned char *rxBits)
         {
             return false;
         }
-
     }
 
-    //disabling again for now
-    // if (corrections > 1) //no more than 1-bit error, else consider failure?
-    // {
-    //     return false;
-    // }
-
     return true;
 }
 

src/nxdn_convolution.c

@@ -45,16 +45,17 @@ static const uint8_t CNXDNConvolution_BRANCH_TABLE1[8] = {0U, 0U, 0U, 0U, 2U, 2U
 static const uint8_t CNXDNConvolution_BRANCH_TABLE2[8] = {0U, 2U, 2U, 0U, 0U, 2U, 2U, 0U};
 
 static const unsigned int CNXDNConvolution_NUM_OF_STATES_D2 = 8U;
+static const unsigned int CNXDNConvolution_NUM_OF_STATES = 16U;
 static const uint32_t     CNXDNConvolution_M = 4U;
 static const unsigned int CNXDNConvolution_K = 5U;
 
 //NOTE:
-uint16_t   m_metrics1[16];
-uint16_t   m_metrics2[16];
-uint64_t   m_decisions[8*300];
-uint16_t * m_oldMetrics = NULL;
-uint16_t * m_newMetrics = NULL;
-uint64_t * m_dp = NULL;
+static uint16_t   m_metrics1[16U];
+static uint16_t   m_metrics2[16U];
+static uint64_t   m_decisions[300U]; //300
+static uint16_t * m_oldMetrics = NULL;
+static uint16_t * m_newMetrics = NULL;
+static uint64_t * m_dp = NULL;
 
 /* Functions ----------------------------------------------------------------*/
 
@@ -162,12 +163,10 @@ void CNXDNConvolution_start(void)
   m_newMetrics = m_metrics2;
   m_dp = m_decisions;
 
-}
-
-void CNXDNConvolution_init()
-{
-  memset(m_metrics1, 0x0, 16*sizeof(uint16_t));
-  memset(m_metrics2, 0x0, 16*sizeof(uint16_t));
-  memset(m_decisions,0x0, 8*300*sizeof(uint64_t));
+  memset(m_metrics1, 0x00U, sizeof(m_metrics1));
+  memset(m_metrics2, 0x00U, sizeof(m_metrics2));
+  memset(m_decisions, 0x00U, sizeof(m_decisions));
+
+  for (int x = 0; x < 4; x++) CNXDNConvolution_decode(0U, 0U);
 }
 

src/nxdn_deperm.c

@@ -52,7 +52,7 @@ void nxdn_deperm_facch(dsd_opts * opts, dsd_state * state, uint8_t bits[144])
 	uint8_t deperm[144]; //144
 	uint8_t depunc[192]; //192
 	uint8_t trellis_buf[96]; //96
-	uint16_t crc = 1; //crc calculated by function
+	uint16_t crc = 0; //crc calculated by function
 	uint16_t check = 0; //crc from payload for comparison
 	int out;
 
@@ -111,30 +111,6 @@ void nxdn_deperm_facch(dsd_opts * opts, dsd_state * state, uint8_t bits[144])
 		check = check | trellis_buf[84+i]; //80
 	}
 
-	//debug
-	// if (crc == check)
-		// fprintf (stderr, " Pass 1 ");
-
-	//if the crc fails, attempt again with the other trellis decoder
-	if (crc != check)
-	{
-		//debug
-		// fprintf (stderr, " Pass 2 "); 
-		crc = 1; check = 0;
-		memset (trellis_buf, 0, sizeof(trellis_buf));
-		memset (m_data, 0, sizeof(m_data));
-		trellis_decode(trellis_buf, depunc, 92);
-		//fill m_data bytes with trellis_buf
-		for(int i = 0; i < 12; i++)
-			m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-		crc = crc12f (trellis_buf, 84);
-		for (int i = 0; i < 12; i++)
-		{
-			check = check << 1;
-			check = check | trellis_buf[i+84];
-		}
-	}
-
 	if (crc == check) NXDN_Elements_Content_decode(opts, state, 1, trellis_buf); 
 	// else if (opts->aggressive_framesync == 0) NXDN_Elements_Content_decode(opts, state, 0, trellis_buf);
 
@@ -169,7 +145,7 @@ void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60])
 	memset (trellis_buf, 0, sizeof(trellis_buf));
 
 	int o = 0;
-	uint8_t crc = 1; //value computed by crc6 on payload
+	uint8_t crc = 0; //value computed by crc6 on payload
 	uint8_t check = 0; //value pulled from last 6 bits
 	int sf = 0;
 	int ran = 0;
@@ -236,30 +212,6 @@ void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60])
 		check = check | trellis_buf[i+26];
 	}
 
-	//debug
-	// if (crc == check)
-	// 	fprintf (stderr, " Pass 1 ");
-
-	//if the crc fails, attempt again with the other trellis decoder
-	if (crc != check)
-	{
-		//debug
-		// fprintf (stderr, " Pass 2 "); 
-		crc = 1; check = 0;
-		memset (trellis_buf, 0, sizeof(trellis_buf));
-		memset (m_data, 0, sizeof(m_data));
-		trellis_decode(trellis_buf, depunc, 32);
-		//fill m_data bytes with trellis_buf
-		for(int i = 0; i < 4; i++)
-			m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-		crc = crc6(trellis_buf, 26); //32
-		for (int i = 0; i < 6; i++)
-		{
-			check = check << 1;
-			check = check | trellis_buf[i+26];
-		}
-	}
-
 	//FIRST! If part of a non_superframe, and CRC is good, send directly to NXDN_Elements_Content_decode
 	if (state->nxdn_sacch_non_superframe == TRUE)
 	{
@@ -280,8 +232,6 @@ void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60])
 		} 
 
 		fprintf (stderr, "PF 1/1");
-		if (state->nxdn_cipher_type == 1 && state->R != 0) state->payload_miN = state->R; //reset scrambler seed
-		else if (state->M == 1 && state->R != 0) state->payload_miN = state->R; //force reset scrambler seed
 
 		if (crc == check) NXDN_Elements_Content_decode(opts, state, 1, nsf_sacch); 
 		// else if (opts->aggressive_framesync == 0) NXDN_Elements_Content_decode(opts, state, 0, nsf_sacch);
@@ -333,47 +283,16 @@ void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60])
 		fprintf (stderr, "%s", KNRM);
 
 		fprintf (stderr, "PF %d/4", part_of_frame+1);
-		if (part_of_frame == 0)
-		{
-			if (state->nxdn_cipher_type == 1 && state->R != 0) state->payload_miN = state->R; //reset scrambler seed
-			else if (state->M == 1 && state->R != 0) state->payload_miN = state->R; //force reset scrambler seed
-		}
 
-		// if (crc != check)
-		// {
-		// 	fprintf (stderr, "%s", KRED);
-		// 	fprintf (stderr, " (CRC ERR)");
-		// 	fprintf (stderr, "%s", KNRM);
-		// }
+		if (crc != check)
+		{
+			fprintf (stderr, "%s", KRED);
+			fprintf (stderr, " (CRC ERR)");
+			fprintf (stderr, "%s", KNRM);
+		}
 		
 		//reset scrambler seed to key value on new superframe
-		// if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1) state->payload_miN = 0;
-
-		//reset scrambler seed to key value on new superframe
-		if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1)
-		{
-			if (state->nxdn_cipher_type == 1 && state->R != 0) state->payload_miN = state->R; //reset scrambler seed
-			else if (state->M == 1 && state->R != 0) state->payload_miN = state->R; //force reset scrambler seed
-		}
-		//this seems to work much better now
-		else if (part_of_frame != 0 && state->nxdn_cipher_type == 0x1)
-		{
-			if (state->nxdn_cipher_type == 1 && state->R != 0) state->payload_miN = state->R; //reset scrambler seed
-			else if (state->M == 1 && state->R != 0) state->payload_miN = state->R; //force reset scrambler seed
-
-			//advance seed by required number of turns depending on the current pf value
-			int start = 0; int end = part_of_frame;
-			char ambe_temp[49] = {0};
-			char ambe_d[49] = {0};
-			for (start = 0; start < end; start++)
-			{
-				//run 4 times
-				LFSRN(ambe_temp, ambe_d, state);
-				LFSRN(ambe_temp, ambe_d, state);
-				LFSRN(ambe_temp, ambe_d, state);
-				LFSRN(ambe_temp, ambe_d, state);
-			}
-		}
+		if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1) state->payload_miN = 0;
 
 		if (crc == check)
 		{
@@ -400,16 +319,16 @@ void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60])
 			NXDN_SACCH_Full_decode (opts, state);
 		} 
 
-		if (opts->payload == 1)
-		{ 
-			fprintf (stderr, "\n"); 
-			fprintf (stderr, " SACCH SF Segment #%d ", part_of_frame+1);
-			for (int i = 0; i < 4; i++)
-			{
-				fprintf (stderr, "[%02X]", m_data[i]);
-			}
-			if (crc != check) fprintf (stderr, " CRC ERR - %02X %02X", crc, check);
-		}
+		// if (opts->payload == 1)
+		// { 
+		// 	fprintf (stderr, "\n"); 
+		// 	fprintf (stderr, " SACCH SF Segment #%d ", part_of_frame+1);
+		// 	for (int i = 0; i < 4; i++)
+		// 	{
+		// 		fprintf (stderr, "[%02X]", m_data[i]);
+		// 	}
+		// 	// if (crc != check) fprintf (stderr, " CRC ERR - %02X %02X", crc, check);
+		// }
 
 	}	
 	
@@ -490,30 +409,6 @@ void nxdn_deperm_facch2_udch(dsd_opts * opts, dsd_state * state, uint8_t bits[34
 		check = check | trellis_buf[i+184];
 	}
 
-	//debug
-	// if (crc == check)
-		// fprintf (stderr, " Pass 1 ");
-
-	//if the crc fails, attempt again with the other trellis decoder
-	if (crc != check)
-	{
-		//debug
-		// fprintf (stderr, " Pass 2 "); 
-		crc = 1; check = 0;
-		memset (trellis_buf, 0, sizeof(trellis_buf));
-		memset (m_data, 0, sizeof(m_data));
-		trellis_decode(trellis_buf, depunc, 199);
-		//fill m_data bytes with trellis_buf
-		for(int i = 0; i < 26; i++)
-			m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-		crc = crc15(trellis_buf, 199);
-		for (int i = 0; i < 15; i++)
-		{
-			check = check << 1;
-			check = check | trellis_buf[i+184];
-		}
-	}
-
 	fprintf (stderr, "%s", KYEL);
 	if (type == 0) fprintf (stderr, " UDCH");
 	if (type == 1) fprintf (stderr, " FACCH2");
@@ -532,7 +427,7 @@ void nxdn_deperm_facch2_udch(dsd_opts * opts, dsd_state * state, uint8_t bits[34
 	if (crc == check)
 	{ 
 		if (type == 1) NXDN_Elements_Content_decode(opts, state, 1, f2u_message_buffer);
-		if (type == 0) {} //need handling for user data (text messages and AVL)
+		if (type == 0) ; //need handling for user data (text messages and AVL)
 	} 
 	// else if (opts->aggressive_framesync == 0)
 	// {
@@ -540,31 +435,6 @@ void nxdn_deperm_facch2_udch(dsd_opts * opts, dsd_state * state, uint8_t bits[34
 	// 	if (type == 0) {} //need handling for user data (text messages and AVL)
 	// } 
 
-	if (type == 0 && crc == check)
-	{
-		fprintf (stderr, "\n UDCH Data: "  );
-		for (int i = 0; i < 24; i++) //all but last crc portion
-			fprintf (stderr, "%02X", m_data[i]);
-
-		fprintf (stderr, "\n UDCH Data: ASCII - "  );
-		for (int i = 0; i < 24; i++) //remove crc portion
-		{
-			if (m_data[i] <= 0x7E && m_data[i] >=0x20)
-			{
-				fprintf (stderr, "%c", m_data[i]);
-			}
-			else fprintf (stderr, " ");
-		}
-
-		if (crc != check)
-		{
-			fprintf (stderr, "%s", KRED);
-			fprintf (stderr, " (CRC ERR)");
-			fprintf (stderr, "%s", KNRM);
-		}
-
-	}
-
 	if (opts->payload == 1)
 	{
 		fprintf (stderr, "\n");
@@ -586,22 +456,22 @@ void nxdn_deperm_facch2_udch(dsd_opts * opts, dsd_state * state, uint8_t bits[34
 
 		// if (crc != check) fprintf (stderr, " CRC ERR ");
 
-		// if (type == 0)
-		// {
-		// 	fprintf (stderr, "\n UDCH Data: ASCII - "  );
-		// 	for (int i = 0; i < 24; i++) //remove crc portion
-		// 	{
-		// 		if (m_data[i] <= 0x7E && m_data[i] >=0x20)
-		// 		{
-		// 			fprintf (stderr, "%c", m_data[i]);
-		// 		}
-		// 		else fprintf (stderr, " ");
-		// 	}
-		// }
+		if (type == 0)
+		{
+			fprintf (stderr, "\n UDCH Data: ASCII - "  );
+			for (int i = 0; i < 24; i++) //remove crc portion
+			{
+				if (m_data[i] <= 0x7E && m_data[i] >=0x20)
+				{
+					fprintf (stderr, "%c", m_data[i]);
+				}
+				else fprintf (stderr, " ");
+			}
+		}
 	}  
 
 }
-static int cac_fail = 0;
+
 void nxdn_deperm_cac(dsd_opts * opts, dsd_state * state, uint8_t bits[300])
 {
 	uint8_t deperm[300]; //300
@@ -671,23 +541,6 @@ void nxdn_deperm_cac(dsd_opts * opts, dsd_state * state, uint8_t bits[300])
 
 	crc = crc16cac(trellis_buf, 171); 
 
-	//debug
-	// if (crc == 0)
-	// 	fprintf (stderr, " Pass 1 ");
-
-	if (crc != 0)
-	{
-		//debug
-		// fprintf (stderr, " Pass 2 "); 
-		memset (trellis_buf, 0, sizeof(trellis_buf));
-		memset (m_data, 0, sizeof(m_data));
-		trellis_decode(trellis_buf, depunc, 171);
-		//fill m_data bytes with trellis_buf
-		for(int i = 0; i < 22; i++)
-			m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-		crc = crc16cac(trellis_buf, 171);
-	}
-
 	uint8_t cac_message_buffer[147]; //171
 	memset (cac_message_buffer, 0, sizeof(cac_message_buffer));
 
@@ -717,49 +570,6 @@ void nxdn_deperm_cac(dsd_opts * opts, dsd_state * state, uint8_t bits[300])
 		fprintf (stderr, "%s", KNRM);
 	}
 
-	//check for accumulative cac failures and reset if multiple errors pile up 
-	//(LZ issue and also issue very occasssionally noticed on remote)
-	if (crc != 0) cac_fail++;
-	else cac_fail = 0;
-
-	//reset some parameters if CAC continues to fail
-	if (cac_fail > 10)
-	{
-		//simple reset
-		state->synctype = 0;
-		state->lastsynctype = -1;
-		state->carrier = 0;
-		state->last_cc_sync_time = time(NULL)+2; //probably not necesary
-		cac_fail = 0; //reset
-
-		//more advanced modulator reset
-		state->center = 0;
-		state->jitter = -1;
-		state->synctype = -1;
-		state->min = -15000;
-		state->max = 15000;
-		state->lmid = 0;
-		state->umid = 0;
-		state->minref = -12000;
-		state->maxref = 12000;
-		state->lastsample = 0;
-		for (int i = 0; i < 128; i++) state->sbuf[i] = 0;
-		state->sidx = 0;
-		for (int i = 0; i < 1024; i++) state->maxbuf[i] = 15000;
-		for (int i = 0; i < 1024; i++) state->minbuf[i] = -15000;
-		state->midx = 0;
-		state->symbolcnt = 0;
-
-		//reset the dibit buffer
-		state->dibit_buf_p = state->dibit_buf + 200;
-		memset (state->dibit_buf, 0, sizeof (int) * 200);
-		state->offset = 0;
-
-		//debug notification
-		// fprintf (stderr, " RESET CARRIER; ");
-
-	}
-
 	if (crc == 0) NXDN_Elements_Content_decode(opts, state, 1, cac_message_buffer);
 	// else if (opts->aggressive_framesync == 0) NXDN_Elements_Content_decode(opts, state, 0, cac_message_buffer);  
 
@@ -859,30 +669,6 @@ void nxdn_deperm_scch(dsd_opts * opts, dsd_state * state, uint8_t bits[60], uint
 		check = check | trellis_buf[i+25];
 	}
 
-	//debug
-	// if (crc == check)
-		// fprintf (stderr, " Pass 1 ");
-
-	//if the crc fails, attempt again with the other trellis decoder
-	if (crc != check)
-	{
-		//debug
-		// fprintf (stderr, " Pass 2 "); 
-		crc = 1; check = 0;
-		memset (trellis_buf, 0, sizeof(trellis_buf));
-		memset (m_data, 0, sizeof(m_data));
-		trellis_decode(trellis_buf, depunc, 32); //32?
-		//fill m_data bytes with trellis_buf
-		for(int i = 0; i < 4; i++)
-			m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-		crc = crc7_scch(trellis_buf, 25);
-		for (int i = 0; i < 6; i++)
-		{
-			check = check << 1;
-			check = check | trellis_buf[i+25];
-		}
-	}
-
 	//check the sf early for scrambler reset, if required
 	sf = (trellis_buf[0] << 1) | trellis_buf[1];
 	if      (sf == 3) part_of_frame = 0;
@@ -892,14 +678,7 @@ void nxdn_deperm_scch(dsd_opts * opts, dsd_state * state, uint8_t bits[60], uint
 	else part_of_frame = 0; 
 
 	//reset scrambler seed to key value on new superframe
-	// if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1) state->payload_miN = 0;
-
-	//reset scrambler seed to key value on new superframe
-	if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1)
-	{
-		if (state->nxdn_cipher_type == 1 && state->R != 0) state->payload_miN = state->R; //reset scrambler seed
-		else if (state->M == 1 && state->R != 0) state->payload_miN = state->R; //force reset scrambler seed
-	}
+	if (part_of_frame == 0 && state->nxdn_cipher_type == 0x1) state->payload_miN = 0;
 
 	/*
 	4.3.2. Mapping to Functional Channel
@@ -1017,31 +796,6 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 			check[j] = check[j] | trellis_buf[84+i]; //84
 		
 		}
-
-		//debug
-		// if (crc[j] == check[j])
-		// 	fprintf (stderr, "P:%d Pass 1 ", j);
-
-		//if the crc fails, attempt again with the other trellis decoder
-		if (crc[j] != check[j])
-		{
-			//debug
-			// fprintf (stderr, "P:%d Pass 2 ", j); 
-			crc[j] = 1; check[j] = 0;
-			memset (trellis_buf, 0, sizeof(trellis_buf));
-			memset (m_data, 0, sizeof(m_data));
-			trellis_decode(trellis_buf, depunc, 92);
-			//fill m_data bytes with trellis_buf
-			for(int i = 0; i < 12; i++)
-				m_data[i] = (uint8_t)ConvertBitIntoBytes(&trellis_buf[i*8], 8);
-			crc[j] = crc12f (trellis_buf, 84);
-			for (int i = 0; i < 12; i++)
-			{
-				check[j] = check[j] << 1;
-				check[j] = check[j] | trellis_buf[i+84];
-			}
-		}
-
 		//transfer to storage sans crc and tail bits
 		for (int i = 0; i < 80; i++) f3_udch2[i+(j*80)] = trellis_buf[i];
 		for (int i = 0; i < 12; i++) f3_udch2_bytes[i+(j*12)] = m_data[i];
@@ -1056,7 +810,7 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 	if (crc[0] == check[0] && crc[1] == check[1])
 	{
 		if (type == 1) NXDN_Elements_Content_decode(opts, state, 1, trellis_buf);
-		if (type == 0) {} //need handling for user data (text messages and AVL)
+		if (type == 0) ; //need handling for user data (text messages and AVL)
 	}  
 	// else if (opts->aggressive_framesync == 0) 
 	// {
@@ -1064,38 +818,6 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 	// 	if (type == 0) {} //need handling for user data (text messages and AVL)
 	// }
 
-	if (type == 0)
-	{
-		fprintf (stderr, "\n UDCH2 Data: "  );
-		for (int i = 0; i < 22; i++) //all but last crc portion
-		{
-			if (i == 10)
-			{
-				fprintf (stderr, " "); //space seperator?
-				i = 12;  //skip first crc portion
-			}
-			fprintf (stderr, "%02X", f3_udch2_bytes[i]);
-		}
-
-		fprintf (stderr, "\n UDCH2 Data: ASCII - "  );
-		for (int i = 0; i < 22; i++) //all but last crc portion
-		{
-			if (i == 10) i = 12;  //skip first crc portion
-			if (f3_udch2_bytes[i] <= 0x7E && f3_udch2_bytes[i] >=0x20)
-			{
-				fprintf (stderr, "%c", f3_udch2_bytes[i]);
-			}
-			else fprintf (stderr, " ");
-		}
-
-		if (crc[0] != check[0] && crc[1] != check[1])
-		{
-			fprintf (stderr, "%s", KRED);
-			fprintf (stderr, " (CRC ERR)");
-			fprintf (stderr, "%s", KNRM);
-		}
-	}
-
 	if (opts->payload == 1)
 	{
 		fprintf (stderr, "\n");
@@ -1119,19 +841,19 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 			// fprintf (stderr, " - %03X %03X", check[1], crc[1]);
 		}
 
-		// if (type == 0)
-		// {
-		// 	fprintf (stderr, "\n UDCH2 Data: ASCII - "  );
-		// 	for (int i = 0; i < 22; i++) //all but last crc portion
-		// 	{
-		// 		if (i == 12) i = 14;  //skip first crc portion
-		// 		if (f3_udch2_bytes[i] <= 0x7E && f3_udch2_bytes[i] >=0x20)
-		// 		{
-		// 			fprintf (stderr, "%c", f3_udch2_bytes[i]);
-		// 		}
-		// 		else fprintf (stderr, " ");
-		// 	}
-		// }
+		if (type == 0)
+		{
+			fprintf (stderr, "\n UDCH2 Data: ASCII - "  );
+			for (int i = 0; i < 22; i++) //all but last crc portion
+			{
+				if (i == 12) i = 14;  //skip first crc portion
+				if (f3_udch2_bytes[i] <= 0x7E && f3_udch2_bytes[i] >=0x20)
+				{
+					fprintf (stderr, "%c", f3_udch2_bytes[i]);
+				}
+				else fprintf (stderr, " ");
+			}
+		}
 		
 	}
 
@@ -1139,7 +861,6 @@ void nxdn_deperm_facch3_udch2(dsd_opts * opts, dsd_state * state, uint8_t bits[2
 
 void nxdn_message_type (dsd_opts * opts, dsd_state * state, uint8_t MessageType)
 {
-	UNUSED(opts);
 
 	//NOTE: Most Req/Resp (request and respone) share same message type but differ depending on channel type
 	//RTCH Outbound will take precedent when differences may occur (except CALL_ASSGN)
@@ -1191,13 +912,6 @@ void nxdn_message_type (dsd_opts * opts, dsd_state * state, uint8_t MessageType)
 		memset (state->nxdn_sacch_frame_segment, 1, sizeof(state->nxdn_sacch_frame_segment));
 		sprintf (state->nxdn_call_type, "%s", "");
 	}
-
-	if (MessageType == 0x07 ||MessageType == 0x08 || MessageType == 0x11)
-	{
-		//reset gain
-		if (opts->floating_point == 1)
-			state->aout_gain = opts->audio_gain;
-	}
 	 
 }
 
@@ -1222,7 +936,7 @@ void LFSRN(char * BufferIn, char * BufferOut, dsd_state * state)
   state->payload_miN = lfsr & 0x7FFF;
 }
 
-int load_i(const uint8_t val[], int len) {
+static inline int load_i(const uint8_t val[], int len) {
 	int acc = 0;
 	for (int i=0; i<len; i++){
 		acc = (acc << 1) + (val[i] & 1);
@@ -1230,7 +944,7 @@ int load_i(const uint8_t val[], int len) {
 	return acc;
 }
 
-uint8_t crc6(const uint8_t buf[], int len)
+static uint8_t crc6(const uint8_t buf[], int len)
 {
 	uint8_t s[6];
 	uint8_t a;
@@ -1248,7 +962,7 @@ uint8_t crc6(const uint8_t buf[], int len)
 	return load_i(s, 6);
 }
 
-uint16_t crc12f(const uint8_t buf[], int len)
+static uint16_t crc12f(const uint8_t buf[], int len)
 {
 	uint8_t s[12];
 	uint8_t a;
@@ -1272,7 +986,7 @@ uint16_t crc12f(const uint8_t buf[], int len)
 	return load_i(s, 12);
 }
 
-uint16_t crc15(const uint8_t buf[], int len)
+static uint16_t crc15(const uint8_t buf[], int len)
 {
 	uint8_t s[15];
 	uint8_t a;
@@ -1299,7 +1013,7 @@ uint16_t crc15(const uint8_t buf[], int len)
 	return load_i(s, 15);
 }
 
-uint16_t crc16cac(const uint8_t buf[], int len)
+static uint16_t crc16cac(const uint8_t buf[], int len)
 {
 	uint32_t crc = 0xc3ee; //not sure why this though
 	uint32_t poly = (1<<12) + (1<<5) + 1; //poly is fine
@@ -1312,7 +1026,7 @@ uint16_t crc16cac(const uint8_t buf[], int len)
 	return crc & 0xffff;
 }
 
-uint8_t crc7_scch(uint8_t bits[], int len)
+static uint8_t crc7_scch(uint8_t bits[], int len)
 {
 	uint8_t s[7];
 	uint8_t a;

src/nxdn_element.c

@@ -62,7 +62,10 @@ void NXDN_SACCH_Full_decode(dsd_opts * opts, dsd_state * state)
 void NXDN_Elements_Content_decode(dsd_opts * opts, dsd_state * state,
                                   uint8_t CrcCorrect, uint8_t * ElementsContent)
 {
+  uint32_t i;
   uint8_t MessageType;
+  uint64_t CurrentIV = 0;
+  unsigned long long int FullMessage = 0;
   /* Get the "Message Type" field */
   MessageType  = (ElementsContent[2] & 1) << 5;
   MessageType |= (ElementsContent[3] & 1) << 4;
@@ -86,15 +89,6 @@ void NXDN_Elements_Content_decode(dsd_opts * opts, dsd_state * state,
   /* Decode the right "Message Type" */
   switch(MessageType)
   {
-
-    /*
-    //Note: CAC Message with same Message Type -- This is a private call request and rejection (TODO: Seperate handling depending on CAC, FACCH< Sacch, etc)
-    20:56:15 Sync: NXDN96  RCCH  Data   RAN 01  CAC VCALL (VCALL_REQ)
-      Private Call - Half Duplex 9600bps/EHR (02) - Src=211 - Dst/TG=1603 
-    20:56:15 Sync: NXDN96  RCCH  Data   RAN 01  CAC DISC (VCALL_REJECTION)
-      Private Call -        Disconnect       - Src=1603 - Dst/TG=211 
-
-    */
     //Debug: Disable DUP messages if they cause random issues with Type-C trunking (i.e. changing SRC ang TGT IDs, hopping in the middle of calls, etc)
 
     //VCALL_ASSGN_DUP
@@ -150,9 +144,9 @@ void NXDN_Elements_Content_decode(dsd_opts * opts, dsd_state * state,
       NXDN_decode_VCALL(opts, state, ElementsContent);
       memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
 
-      // #ifdef LIMAZULUTWEAKS
-      // ; //do nothing -- testing errors on CAC messages when returning quickly from RTCH
-      // #else
+      #ifdef LIMAZULUTWEAKS
+      ; //do nothing -- testing errors on CAC messages when returning quickly from RTCH
+      #else
 
       //tune back to CC here - save about 1-2 seconds
       if (opts->p25_trunk == 1 && state->p25_cc_freq != 0 && opts->p25_is_tuned == 1)
@@ -167,12 +161,6 @@ void NXDN_Elements_Content_decode(dsd_opts * opts, dsd_state * state,
           opts->p25_is_tuned = 0;
           if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
           SetFreq(opts->rigctl_sockfd, state->p25_cc_freq); 
-
-          state->nxdn_last_rid = 0;
-          state->nxdn_last_tg = 0;
-          if (state->M == 0)
-            state->nxdn_cipher_type = 0;
-          sprintf (state->nxdn_call_type, "%s", "");
           
         }
         //rtl
@@ -185,19 +173,13 @@ void NXDN_Elements_Content_decode(dsd_opts * opts, dsd_state * state,
           memset(state->active_channel, 0, sizeof(state->active_channel));
           opts->p25_is_tuned = 0;
           rtl_dev_tune (opts, state->p25_cc_freq);
-
-          state->nxdn_last_rid = 0;
-          state->nxdn_last_tg = 0;
-          if (state->M == 0)
-            state->nxdn_cipher_type = 0;
-          sprintf (state->nxdn_call_type, "%s", "");
           #endif
         }
 
         state->last_cc_sync_time = time(NULL); //allow tuners a second to catch up, particularly rtl input
       }
 
-      // #endif
+      #endif
       break;
 
     //Idle
@@ -268,7 +250,6 @@ void nxdn_location_id_handler (dsd_state * state, uint32_t location_id, uint8_t
 
 void nxdn_srv_info_handler (dsd_state * state, uint16_t svc_info)
 {
-  UNUSED(state);
   //handle the service information elements
   //Part 1-A Common Air Interface Ver.2.0
   //6.5.33. Service Information
@@ -295,8 +276,6 @@ void nxdn_srv_info_handler (dsd_state * state, uint16_t svc_info)
 
 void nxdn_rst_info_handler (dsd_state * state, uint32_t rst_info)
 {
-  UNUSED(state);
-
   //handle the restriction information elements
   //Part 1-A Common Air Interface Ver.2.0
   //6.5.34. Restriction Information
@@ -358,7 +337,6 @@ void nxdn_ca_info_handler (dsd_state * state, uint32_t ca_info)
   uint32_t step = (ca_info >> 21) & 0x3; //Stepping
   uint32_t base = (ca_info >> 18) & 0x7; //Base Frequency
   uint32_t spare = ca_info & 0x3FF;
-  UNUSED(spare);
 
   //set state variable here to tell us to use DFA or Channel Versions
   if (RCN == 1)
@@ -382,7 +360,7 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
   uint16_t DestinationID = 0;
   uint8_t  CallTimer = 0;
   uint16_t Channel = 0;
-  UNUSED(CallTimer);
+  uint8_t  LocationIDOption = 0;
 
   uint8_t  DuplexMode[32] = {0};
   uint8_t  TransmissionMode[32] = {0};
@@ -405,7 +383,6 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
   uint8_t  bw = 0;
   uint16_t OFN = 0;
   uint16_t IFN = 0;
-  UNUSED2(bw, IFN);
 
   /* Decode "CC Option" */
   CCOption = (uint8_t)ConvertBitIntoBytes(&Message[8], 8);
@@ -478,8 +455,8 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
 
   /* Print the "Voice Call Option" */
   if (MessageType == 0x4 || MessageType == 0x5) NXDN_Voice_Call_Option_To_Str(VoiceCallOption, DuplexMode, TransmissionMode);
-  if (MessageType == 0x4 || MessageType == 0x5) fprintf(stderr, "%s %s (%02X) - ", DuplexMode, TransmissionMode, VoiceCallOption);
-  else fprintf (stderr, "   Data Call Assignment (%02X) - ", VoiceCallOption); //DCALL_ASSGN or DCALL_ASSGN_DUP
+  if (MessageType == 0x4 || MessageType == 0x5) fprintf(stderr, "%s %s - ", DuplexMode, TransmissionMode);
+  else fprintf (stderr, "   Data Call Assignment - "); //DCALL_ASSGN or DCALL_ASSGN_DUP
 
   /* Print Source ID and Destination ID (Talk Group or Unit ID) */
   fprintf(stderr, "Src=%u - Dst/TG=%u ", SourceUnitID & 0xFFFF, DestinationID & 0xFFFF);
@@ -504,25 +481,11 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
     }
   }
 
-  //TG Hold during VCALL_ASSGN_DUP, allow tuning to TG hold channel assignment
-  if (MessageType == 0x5 && opts->p25_is_tuned == 1 && opts->p25_trunk == 1)
-  {
-    if ( state->tg_hold != 0 && state->tg_hold == DestinationID ) 
-    {
-      MessageType = 0x04; //convert to VCALL
-      // opts->p25_is_tuned = 0; //open tuning back up to tune
-    }
-  }
-
-  //use DUP to display any other rolling active channels while on a call (from the dup message)
-  int dup = 0;
-  if (MessageType == 0x5) dup = 1;
-
   //assign active call to string (might place inside of tune decision to get multiple ones?)
   if (state->nxdn_rcn == 0)
-    sprintf (state->active_channel[dup], "Active Ch: %d TG: %d SRC: %d; ", Channel, DestinationID, SourceUnitID);
+    sprintf (state->active_channel[0], "Active Ch: %d TG: %d; ", Channel, DestinationID);
   if (state->nxdn_rcn == 1)
-    sprintf (state->active_channel[dup], "Active Ch: %d TG: %d SRC: %d; ", OFN, DestinationID, SourceUnitID);
+    sprintf (state->active_channel[0], "Active Ch: %d TG: %d; ", OFN, DestinationID);
 
   state->last_active_time = time(NULL);
 
@@ -574,7 +537,6 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
   //run group/source analysis and tune if available/desired
   //group list mode so we can look and see if we need to block tuning any groups, etc
 	char mode[8]; //allow, block, digital, enc, etc
-  sprintf (mode, "%s", "");
 
   //if we are using allow/whitelist mode, then write 'B' to mode for block
   //comparison below will look for an 'A' to write to mode if it is allowed
@@ -582,43 +544,19 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
 
   for (int i = 0; i < state->group_tally; i++)
   {
-    if (state->group_array[i].groupNumber == DestinationID && DestinationID != 0) //destination, if it isn't 0
+    if (state->group_array[i].groupNumber == DestinationID) //source, or destination?
     {
       fprintf (stderr, " [%s]", state->group_array[i].groupName);
       strcpy (mode, state->group_array[i].groupMode);
-      break;
     }
     //might not be ideal if both source and group/target are both in the array
-    else if (state->group_array[i].groupNumber == SourceUnitID && DestinationID == 0) //source, if destination is 0
+    else if (state->group_array[i].groupNumber == SourceUnitID) //source, or destination?
     {
       fprintf (stderr, " [%s]", state->group_array[i].groupName);
       strcpy (mode, state->group_array[i].groupMode);
-      break;
     }
   }
 
-  //check purely by SourceUnitID as last resort -- this is a bugfix to block individual radios on selected systems
-  if ((strcmp(mode, "") == 0))
-  {
-    for (int i = 0; i < state->group_tally; i++)
-    {
-      if (state->group_array[i].groupNumber == SourceUnitID)
-      {
-        fprintf (stderr, " [%s]", state->group_array[i].groupName);
-        strcpy (mode, state->group_array[i].groupMode);
-        break;
-      }
-    }
-  }
-
-  //TG hold on NXDN -- block non-matching target, allow matching DestinationID
-  if (state->tg_hold != 0 && state->tg_hold != DestinationID) sprintf (mode, "%s", "B");
-  if (state->tg_hold != 0 && state->tg_hold == DestinationID) 
-  {
-    sprintf (mode, "%s", "A");
-    opts->p25_is_tuned = 0; //unlock tuner at this stage and not above check
-  }
-
   //check to see if the source/target candidate is blocked first
   if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0)) //DE is digital encrypted, B is block
   {
@@ -641,16 +579,10 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
         opts->p25_is_tuned = 1; //set to 1 to set as currently tuned so we don't keep tuning nonstop
 
         //set rid and tg when we actually tune to it
-        //only assign rid if not spare and not reserved (happens on private calls, unsure of its significance)
-        if ( (VoiceCallOption & 0xF) < 4) //ideally, only want 0, 2, or 3
-          state->nxdn_last_rid = SourceUnitID;
+        state->nxdn_last_rid = SourceUnitID;   
         state->nxdn_last_tg = DestinationID;
         sprintf (state->nxdn_call_type, "%s", NXDN_Call_Type_To_Str(CallType));
 
-        //Call String for Per Call WAV File
-        sprintf (state->call_string[0], "%s", NXDN_Call_Type_To_Str(CallType));
-        if (CCOption & 0x80) strcat (state->call_string[0], " Emergency");
-
         //check the rkey array for a scrambler key value
         //TGT ID and Key ID could clash though if csv or system has both with different keys
         if (state->rkey_array[DestinationID] != 0)
@@ -658,7 +590,6 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
           state->R = state->rkey_array[DestinationID];
           fprintf (stderr, " %s", KYEL);
           fprintf (stderr, " Key Loaded: %lld", state->rkey_array[DestinationID]);
-          state->payload_miN = state->R; //should be okay to load here, will test
         } 
         if (state->M == 1) state->nxdn_cipher_type = 0x1;
       }
@@ -679,16 +610,10 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
         opts->p25_is_tuned = 1;
 
         //set rid and tg when we actually tune to it
-        //only assign rid if not spare and not reserved (happens on private calls, unsure of its significance)
-        if ( (VoiceCallOption & 0xF) < 4) //ideally, only want 0, 2, or 3
-          state->nxdn_last_rid = SourceUnitID;  
+        state->nxdn_last_rid = SourceUnitID;   
         state->nxdn_last_tg = DestinationID;
         sprintf (state->nxdn_call_type, "%s", NXDN_Call_Type_To_Str(CallType));
 
-        //Call String for Per Call WAV File
-        sprintf (state->call_string[0], "%s", NXDN_Call_Type_To_Str(CallType));
-        if (CCOption & 0x80) strcat (state->call_string[0], " Emergency");
-
         //check the rkey array for a scrambler key value
         //TGT ID and Key ID could clash though if csv or system has both with different keys
         if (state->rkey_array[DestinationID] != 0)
@@ -696,7 +621,6 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
           state->R = state->rkey_array[DestinationID];
           fprintf (stderr, " %s", KYEL);
           fprintf (stderr, " Key Loaded: %lld", state->rkey_array[DestinationID]);
-          state->payload_miN = state->R; //should be okay to load here, will test
         }
         if (state->M == 1) state->nxdn_cipher_type = 0x1;
         #endif
@@ -712,16 +636,11 @@ void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Messa
 
 void NXDN_decode_Alias(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 {
-  UNUSED(opts);
-
-  uint8_t Alias1 = 0x20;
+  uint8_t Alias1 = 0x20; //value of an ascii 'space' character
   uint8_t Alias2 = 0x20;
   uint8_t Alias3 = 0x20;
   uint8_t Alias4 = 0x20;
   uint8_t blocknumber = 0; 
-  uint8_t total = 0;
-  uint8_t unk1 = 0;
-  uint8_t unk2 = 0;
   uint8_t CrcCorrect = 0;
   
   //alias can also hit on a facch1 -- do we still need this checkdown?
@@ -734,23 +653,12 @@ void NXDN_decode_Alias(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 
   //FACCH Payload [3F][68][82][04][2 <- block number4] "[69][6F][6E][20]" <- 4 alias octets [00][7F][1C]
   blocknumber = (uint8_t)ConvertBitIntoBytes(&Message[32], 4) & 0x7; // & 0x7, might just be three bits, unsure
-  total = (uint8_t)ConvertBitIntoBytes(&Message[36], 4) & 0x7; //second value seems to be total number of blocks? or len of alias in this segment?
-  unk1 = (uint8_t)ConvertBitIntoBytes(&Message[8], 8); //unknown values in first two bytes after the opcode
-  unk2 = (uint8_t)ConvertBitIntoBytes(&Message[16], 8); //could be related to the format of these (Iso8? etc)
-  UNUSED4(unk1, unk2, total, blocknumber);
   Alias1 = (uint8_t)ConvertBitIntoBytes(&Message[40], 8);
   Alias2 = (uint8_t)ConvertBitIntoBytes(&Message[48], 8);
   Alias3 = (uint8_t)ConvertBitIntoBytes(&Message[56], 8);
   Alias4 = (uint8_t)ConvertBitIntoBytes(&Message[64], 8);
-
-  char str_a[120]; char str_b[50];
-
-  //debug/test
-  // fprintf (stderr, " U1: %02X U2: %02X;", unk1, unk2);
-  // fprintf (stderr, " A:%d/%d; ", blocknumber, total);
-
   //sanity check to prevent OOB array assignment
-  if (blocknumber > 0 && blocknumber < 4) //last 'block' may have been assigning garbage name values -- I'm honestly not sure block'4' contains Alias data, but other data or something
+  if (blocknumber > 0 && blocknumber < 4) //last 'block' may have been assigning garbage name values -- needs testing
   {
     //assign to index -1, since block number conveyed here is 1,2,3,4, and index values are 0,1,2,3
     //only assign if within valid range of ascii characters (not including diacritical extended alphabet)
@@ -759,33 +667,16 @@ void NXDN_decode_Alias(dsd_opts * opts, dsd_state * state, uint8_t * Message)
     //since we are zeroing out the blocks on tx_rel and other conditions, better to just set nothing to bad Alias bytes
     //tends to zero out otherwise already good blocks set in a previous repitition.
     if (Alias1 > 0x19 && Alias1 < 0x7F) sprintf (state->nxdn_alias_block_segment[blocknumber-1][0], "%c", Alias1);
-    // else sprintf (state->nxdn_alias_block_segment[blocknumber-1][0], "%c", 0x20); //space
+    else ;// sprintf (state->nxdn_alias_block_segment[blocknumber-1][0], "%c", 32); //space
 
     if (Alias2 > 0x19 && Alias2 < 0x7F) sprintf (state->nxdn_alias_block_segment[blocknumber-1][1], "%c", Alias2);
-    // else sprintf (state->nxdn_alias_block_segment[blocknumber-1][1], "%c", 0x20); //space
+    else ; //sprintf (state->nxdn_alias_block_segment[blocknumber-1][1], "%c", 0); //space
 
     if (Alias3 > 0x19 && Alias3 < 0x7F) sprintf (state->nxdn_alias_block_segment[blocknumber-1][2], "%c", Alias3);
-    // else sprintf (state->nxdn_alias_block_segment[blocknumber-1][2], "%c", 0x20); //space
+    else ; //sprintf (state->nxdn_alias_block_segment[blocknumber-1][2], "%c", 0); //space
 
     if (Alias4 > 0x19 && Alias4 < 0x7F) sprintf (state->nxdn_alias_block_segment[blocknumber-1][3], "%c", Alias4);
-    // else sprintf (state->nxdn_alias_block_segment[blocknumber-1][3], "%c", 0x20); //space
-
-    sprintf (str_a, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-      state->nxdn_alias_block_segment[0][0], state->nxdn_alias_block_segment[0][1], state->nxdn_alias_block_segment[0][2], state->nxdn_alias_block_segment[0][3],
-      state->nxdn_alias_block_segment[1][0], state->nxdn_alias_block_segment[1][1], state->nxdn_alias_block_segment[1][2], state->nxdn_alias_block_segment[1][3],
-      state->nxdn_alias_block_segment[2][0], state->nxdn_alias_block_segment[2][1], state->nxdn_alias_block_segment[2][2], state->nxdn_alias_block_segment[2][3],
-      state->nxdn_alias_block_segment[3][0], state->nxdn_alias_block_segment[3][1], state->nxdn_alias_block_segment[3][2], state->nxdn_alias_block_segment[3][3]);
-
-    //juggle strings here so we don't get compiler warnings on assignment size
-    memcpy (str_b, str_a, 48); str_b[49] = '\0';
-
-    //one noteable issue is that on conventional, its possible to decode an alias before decong the src id
-    //just depends on reception and if VCALL is decoded before Alias, this will lead to alias being assigned
-    //to incorrect src values or placement in the ncurses terminal's call history section
-
-    if (state->nxdn_last_rid != 0)
-      sprintf (state->str50a, "%s", str_b);
-
+    else ; //sprintf (state->nxdn_alias_block_segment[blocknumber-1][3], "%c", 0); //space
   }
 
   //crc errs in one repitition may occlude an otherwise good alias, so test and change if needed
@@ -815,7 +706,6 @@ void NXDN_decode_cch_info(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   uint16_t channel2 = 0;
   long int freq1 = 0;
   long int freq2 = 0;
-  UNUSED2(channel2sts, freq2);
   
   //DFA
   uint8_t  bw1 = 0;
@@ -824,7 +714,6 @@ void NXDN_decode_cch_info(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   uint8_t  bw2 = 0;
   uint16_t OFN2 = 0;
   uint16_t IFN2 = 0;
-  UNUSED(bw2);
 
   location_id = (uint32_t)ConvertBitIntoBytes(&Message[8], 24);
   channel1sts = (uint8_t)ConvertBitIntoBytes(&Message[32], 6);
@@ -966,7 +855,6 @@ void NXDN_decode_site_info(dsd_opts * opts, dsd_state * state, uint8_t * Message
   uint16_t channel2 = 0;
   long int freq1 = 0;
   long int freq2 = 0;
-  UNUSED2(freq1, freq2);
 
   location_id = (uint32_t)ConvertBitIntoBytes(&Message[8], 24);
   cs_info     = (uint16_t)ConvertBitIntoBytes(&Message[32], 16);
@@ -1025,17 +913,21 @@ void NXDN_decode_adj_site(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   uint32_t adj1_site = 0; 
   uint32_t adj2_site = 0;
   uint32_t adj3_site = 0;
+  uint32_t adj4_site = 0;
   //options -- 6.5.38. Adjacent Site Option -- 4 LSB are Site Number, 2 MSB are spares
   uint8_t  adj1_opt = 0;
   uint8_t  adj2_opt = 0;
   uint8_t  adj3_opt = 0;
- //channel or OFN
+  uint8_t  adj4_opt = 0;
+  //channel or OFN
   uint16_t adj1_chan = 0;
   uint16_t adj2_chan = 0;
   uint16_t adj3_chan = 0;
+  uint16_t adj4_chan = 0;
   //DFA only BW value
   uint8_t adj1_bw = 0;
   uint8_t adj2_bw = 0;
+  uint8_t adj3_bw = 0;
 
   fprintf (stderr, "%s", KYEL);
 
@@ -1147,7 +1039,6 @@ void NXDN_decode_adj_site(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 
 void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 {
-  UNUSED(opts);
 
   uint8_t  CCOption = 0;
   uint8_t  CallType = 0;
@@ -1158,6 +1049,7 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   uint8_t  KeyID = 0;
   uint8_t  DuplexMode[32] = {0};
   uint8_t  TransmissionMode[32] = {0};
+  unsigned long long int FullMessage = 0;
 
   uint8_t MessageType;
   /* Get the "Message Type" field */
@@ -1198,7 +1090,6 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   uint8_t idas = 0;
   uint8_t rep1 = 0;
   uint8_t rep2 = 0;
-  UNUSED(rep2);
   if (strcmp (state->nxdn_location_category, "Type-D") == 0) idas = 1;
   if (idas)
   {
@@ -1223,11 +1114,6 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   if(CCOption & 0x40) fprintf(stderr, "Visitor ");
   if(CCOption & 0x20) fprintf(stderr, "Priority Paging ");
 
-  //Call String for Per Call WAV File
-  sprintf (state->call_string[0], "%s", NXDN_Call_Type_To_Str(CallType));
-  if (CCOption & 0x80) strcat (state->call_string[0], " Emergency");
-  if (CipherType) strcat (state->call_string[0], " Enc");
-
   if((CipherType == 2) || (CipherType == 3))
   {
     state->NxdnElementsContent.PartOfCurrentEncryptedFrame = 1;
@@ -1245,7 +1131,7 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 
   /* Print the "Voice Call Option" */
   if (MessageType == 0x1) NXDN_Voice_Call_Option_To_Str(VoiceCallOption, DuplexMode, TransmissionMode);
-  if (MessageType == 0x1) fprintf(stderr, "%s %s (%02X) - ", DuplexMode, TransmissionMode, VoiceCallOption);
+  if (MessageType == 0x1) fprintf(stderr, "%s %s - ", DuplexMode, TransmissionMode);
   else if (MessageType == 0x07) fprintf (stderr, "Transmission Release Ex - "); //TX_REL_EX
   else if (MessageType == 0x08) fprintf (stderr, "  Transmission Release  - "); //TX_REL
   else if (MessageType == 0x11) fprintf (stderr, "       Disconnect       - "); //DISC
@@ -1292,20 +1178,11 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   //only grab if VCALL
   if(MessageType == 0x1)
   {
-    //only assign rid if not spare and not reserved (happens on private calls, unsure of its significance)
-    if ( (VoiceCallOption & 0xF) < 4) //ideally, only want 0, 2, or 3
-      state->nxdn_last_rid = SourceUnitID;   
+    state->nxdn_last_rid = SourceUnitID;   
     state->nxdn_last_tg = DestinationID;
     state->nxdn_key = KeyID;
     state->nxdn_cipher_type = CipherType;
   }
-  else
-  {
-    state->nxdn_last_rid = 0;
-    state->nxdn_last_tg = 0;
-    sprintf (state->str50a, "%s", "");
-    memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
-  }
 
   //set enc bit here so we can tell playSynthesizedVoice whether or not to play enc traffic
   if (state->nxdn_cipher_type != 0)
@@ -1316,51 +1193,11 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
   {
     state->dmr_encL = 0;
   }
-
-  //TG ENC LO/B if ENC trunked following disabled #121 -- was locking out everything
-  if (opts->p25_trunk == 1 && opts->trunk_tune_enc_calls == 0 && MessageType == 0x1 && state->dmr_encL == 1)
-  {
-    int i, lo = 0;
-    uint16_t t = 0; char gm[8]; char gn[50];
-
-    //check to see if this group already exists, or has already been locked out, or is allowed
-    for (i = 0; i <= state->group_tally; i++)
-    {
-      t = (uint16_t)state->group_array[i].groupNumber;
-      if (DestinationID == t && t != 0)
-      {
-        lo = 1;
-        //write current mode and name to temp strings
-        sprintf (gm, "%s", state->group_array[i].groupMode);
-        sprintf (gn, "%s", state->group_array[i].groupName);
-        break;
-      }
-    }
-
-    //if group doesn't exist, or isn't locked out, then do so now.
-    if (lo == 0)
-    {
-      state->group_array[state->group_tally].groupNumber = DestinationID;
-      sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-      sprintf (state->group_array[state->group_tally].groupName, "%s", "ENC LO");
-      sprintf (gm, "%s", "DE");
-      sprintf (gn, "%s", "ENC LO");
-      state->group_tally++;
-    }
-
-    //Craft a fake DISC Message send it to return to CC
-    uint8_t dbits[96]; memset (dbits, 0, sizeof(dbits)); dbits[3] = 1; dbits[7] = 1; //DISC = 0x11; 
-    if ( (strcmp(gm, "DE") == 0) && (strcmp(gn, "ENC LO") == 0)  )
-      NXDN_Elements_Content_decode (opts, state, 1, dbits);
-
-  }
-
 } /* End NXDN_decode_VCALL() */
 
 void NXDN_decode_VCALL_IV(dsd_opts * opts, dsd_state * state, uint8_t * Message)
 {
-  UNUSED(opts);
-
+  uint32_t i;
   state->payload_miN = 0; //zero out
   unsigned long long int IV = 0; 
 
@@ -1552,7 +1389,6 @@ void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uin
         //run group/tgt analysis and tune if available/desired
         //group list mode so we can look and see if we need to block tuning any groups, etc
         char mode[8]; //allow, block, digital, enc, etc
-        sprintf (mode, "%s", "");
 
         //if we are using allow/whitelist mode, then write 'B' to mode for block
         //comparison below will look for an 'A' to write to mode if it is allowed
@@ -1564,18 +1400,9 @@ void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uin
           {
             fprintf (stderr, " [%s]", state->group_array[i].groupName);
             strcpy (mode, state->group_array[i].groupMode);
-            break;
           }
         }
 
-        //TG hold on IDAS -- block non-matching target, allow matching DestinationID
-        if (state->tg_hold != 0 && state->tg_hold != id) sprintf (mode, "%s", "B");
-        if (state->tg_hold != 0 && state->tg_hold == id) 
-        {
-          sprintf (mode, "%s", "A");
-          opts->p25_is_tuned = 0; //unlock tuner at this stage and not above check
-        }
-
         long int freq = 0;
         freq = nxdn_channel_to_frequency(opts, state, rep1);
 
@@ -1725,7 +1552,7 @@ char * NXDN_Call_Type_To_Str(uint8_t CallType)
   {
     case 0:  Ptr = "Broadcast Call";        break;
     case 1:  Ptr = "Group Call";            break;
-    case 2:  Ptr = "Idle";                  break; //"Unspecified Call" This value is used only on Idle Burst TX_REL message.
+    case 2:  Ptr = "Transmission Release";  break; //"Unspecified Call" This value is used only on TX_REL message.
     case 3:  Ptr = "Session Call";          break; //"reserved" is session call on Type D
     case 4:  Ptr = "Private Call";          break;
     case 5:  Ptr = "Reserved";              break;
@@ -1747,25 +1574,12 @@ void NXDN_Voice_Call_Option_To_Str(uint8_t VoiceCallOption, uint8_t * Duplex, ui
   if(VoiceCallOption & 0x10) strcpy((char *)Duplex, "Duplex");
   else strcpy((char *)Duplex, "Half Duplex");
 
-  switch(VoiceCallOption & 0xF)
-  { //added all options, getting a random one on an NXDN96 System, need to know what it is
-    case 0:  Ptr = "4800bps/EHR"; break;
-    case 1:  Ptr = "Reserved 1";  break;
-    case 2:  Ptr = "9600bps/EHR"; break;
-    case 3:  Ptr = "9600bps/EFR"; break;
-    case 4:  Ptr = "Reserved 4";  break;
-    case 5:  Ptr = "Reserved 5";  break;
-    case 6:  Ptr = "Reserved 6";  break;
-    case 7:  Ptr = "Reserved 7";  break;
-    case 8:  Ptr = "4800bps/EHR S:1"; break; //spare bit enabled
-    case 9:  Ptr = "Reserved 9; S:1"; break; //spare bit enabled
-    case 10: Ptr = "9600bps/EHR S:1"; break; //spare bit enabled
-    case 11: Ptr = "9600bps/EFR S:1"; break; //spare bit enabled
-    case 12: Ptr = "Reserved C; S1;"; break; //spare bit enabled
-    case 13: Ptr = "Reserved D; S1";  break; //spare bit enabled
-    case 14: Ptr = "Reserved E; S1";  break; //spare bit enabled
-    case 15: Ptr = "Reserved F: S1";  break; //spare bit enabled
-    default: Ptr = "Unk;";  break; //should never get here
+  switch(VoiceCallOption & 0x17)
+  {
+    case 0: Ptr = "4800bps/EHR"; break;
+    case 2: Ptr = "9600bps/EHR"; break;
+    case 3: Ptr = "9600bps/EFR"; break;
+    default: Ptr = "Reserved Voice Call Option";  break;
   }
 
   strcpy((char *)TransmissionMode, Ptr);

src/nxdn_frame.c

@@ -32,6 +32,7 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
   // length is implicitly 192, with frame sync in first 10 dibits
 	uint8_t dbuf[182]; 
 	uint8_t lich;
+	int answer_len = 0;
 	uint8_t answer[32];
 	uint8_t sacch_answer[32];
 	int lich_parity_received;
@@ -42,6 +43,8 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
 	int udch = 0;
 	int sacch = 0;
 	int cac = 0;
+	int sr_structure;
+	int sr_ran;
 
 	//new, and even more confusing NXDN Type-D / "IDAS" acronyms
 	int idas = 0;
@@ -54,7 +57,6 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
 	uint8_t lich_fc = 0; //Functional Channel Type
 	uint8_t lich_op = 0; //Options
 	uint8_t direction; //inbound or outbound direction
-	UNUSED2(lich_fc, lich_op);
 
 	uint8_t lich_dibits[8]; 
 	uint8_t sacch_bits[60];
@@ -419,11 +421,6 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
 		//roll the voice scrambler LFSR here if key available to advance seed (usually just needed on NXDN96)
 		if (state->nxdn_cipher_type == 0x1 && state->R != 0) 
 		{
-			if (state->payload_miN == 0)
-			{
-				state->payload_miN = state->R;
-			}
-
 			char ambe_temp[49] = {0};
 			char ambe_d[49] = {0};
 			for (int i = 0; i < 4; i++)
@@ -441,11 +438,6 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
 		//roll the voice scrambler LFSR here if key available to advance seed -- half rotation on a facch steal
 		if (state->nxdn_cipher_type == 0x1 && state->R != 0)
 		{
-			if (state->payload_miN == 0)
-			{
-				state->payload_miN = state->R;
-			}
-
 			char ambe_temp[49] = {0};
 			char ambe_d[49] = {0};
 			for (int i = 0; i < 2; i++)

src/nxdn_voice.c

@@ -55,10 +55,11 @@ const int nZ[36] = { 5, 3, 4, 2, 3, 1,
 
 void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182])
 {
-  int i;
+  int i, j, dibit;
   int start, stop;
   char ambe_fr[4][24];
 
+  unsigned char *pr;
   const int *w, *x, *y, *z;
 
   //these conditions will determine our starting and stopping value for voice
@@ -68,7 +69,7 @@ void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182
   if (voice == 2) start = 2;
   if (voice == 2 || voice == 3) stop = 4;
 
-  for (; start < stop; start++)
+  for (start; start < stop; start++)
   {
     w = nW;
     x = nX;
@@ -89,13 +90,6 @@ void nxdn_voice (dsd_opts * opts, dsd_state * state, int voice, uint8_t dbuf[182
 
     }
     processMbeFrame (opts, state, NULL, ambe_fr, NULL);
-
-    memcpy (state->f_l, state->audio_out_temp_buf, sizeof(state->f_l));
-    
-    if (opts->floating_point == 0 )
-      playSynthesizedVoiceMS(opts, state);
-    if (opts->floating_point == 1)
-      playSynthesizedVoiceFM(opts, state);
   }
   
   if (opts->payload == 1)

src/p25_12.c

@@ -1,167 +0,0 @@
-/*-------------------------------------------------------------------------------
- * p25_12.c
- * P25p1 1/2 Rate Simple Trellis Decoder
- *
- * LWVMOBILE
- * 2023-10 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-
-uint8_t p25_interleave[98] = {
-0, 1, 8,   9, 16, 17, 24, 25, 32, 33, 40, 41, 48, 49, 56, 57, 64, 65, 72, 73, 80, 81, 88, 89, 96, 97,
-2, 3, 10, 11, 18, 19, 26, 27, 34, 35, 42, 43, 50, 51, 58, 59, 66, 67, 74, 75, 82, 83, 90, 91,
-4, 5, 12, 13, 20, 21, 28, 29, 36, 37, 44, 45, 52, 53, 60, 61, 68, 69, 76, 77, 84, 85, 92, 93,
-6, 7, 14, 15, 22, 23, 30, 31, 38, 39, 46, 47, 54, 55, 62, 63, 70, 71, 78, 79, 86, 87, 94, 95};
-
-//this is a convertion table for converting the dibit pairs into constellation points
-uint8_t p25_constellation_map[16] = {
-11, 12, 0, 7, 14, 9, 5, 2, 10, 13, 1, 6, 15, 8, 4, 3
-};
-
-//digitized dibit to OTA symbol conversion for reference
-//0 = +1; 1 = +3; 
-//2 = -1; 3 = -3; 
-
-//finite state machine values
-uint8_t p25_fsm[16] = {
-0,15,12,3,
-4,11,8,7,
-13,2,1,14,
-9,6,5,10 };
-
-//this is a dibit-pair to trellis dibit transition matrix (SDRTrunk and Ossmann)
-//when evaluating hamming distance, we want to use this xor the dibit-pair nib,
-//and not the fsm xor the constellation point
-uint8_t p25_dtm[16] = {
-2,12,1,15,
-14,0,13,3,
-9,7,10,4,
-5,11,6,8 };
-
-int count_bits(uint8_t b, int slen)
-{
-  int i = 0; int j = 0;
-  for (j = 0; j < slen; j++)
-  {
-    if ( (b & 1) == 1) i++;
-    b = b >> 1;
-  }
-  return i;
-}
-
-uint8_t find_min(uint8_t list[4], int len)
-{
-  int min = list[0];
-  uint8_t index = 0;
-  int i;
-
-  for (i = 1; i < len; i++)
-  {
-    if (list[i] < min)
-    {
-      min = list[i];
-      index = (uint8_t)i;
-    }
-
-    //NOTE: Disqualifying result on uniqueness can impact decoding
-    //let the CRC determine if the result is good or bad
-    //its not uncommon for two values of the same min
-    //distance to emerge, so its 50/50 each time
-  }
-
-  return index;
-}
-
-
-int p25_12(uint8_t * input, uint8_t treturn[12])
-{
-  int i, j;
-  int irr_err = 0;
-
-  uint8_t deinterleaved_dibits[98];
-  memset (deinterleaved_dibits, 0, sizeof(deinterleaved_dibits));
-
-  //deinterleave our input dibits
-  for (i = 0; i < 98; i++)
-    deinterleaved_dibits[p25_interleave[i]] = input[i];
-
-  //pack the input into nibbles (dibit pairs)
-  uint8_t nibs[49];
-  memset (nibs, 0, sizeof(nibs));
-
-  for (i = 0; i < 49; i++)
-    nibs[i] = (deinterleaved_dibits[i*2+0] << 2) | (deinterleaved_dibits[i*2+1] << 0);
-
-  //convert our dibit pairs into constellation point values
-  uint8_t point[49];
-  memset (point, 0xFF, sizeof(point));
-
-  for (i = 0; i < 49; i++) 
-    point[i] = p25_constellation_map[nibs[i]];
-
-  //debug view points
-  // fprintf (stderr, "\n P =");
-  // for (i = 0; i < 49; i++) 
-  //   fprintf (stderr, " %02d", point[i]);
-
-  //convert constellation points into tdibit values using the FSM
-  uint8_t state = 0;
-  uint8_t tdibits[49]; //trellis dibits 1/2 rate
-  memset (tdibits, 0xF, sizeof(tdibits));
-  uint8_t hd[4]; //array of the four fsm words hamming distance
-  memset (hd, 0, sizeof(hd));
-  uint8_t min = 0;
-
-  for (i = 0; i < 49; i++)
-  {
-
-    for (j = 0; j < 4; j++)
-    {
-      if ( p25_fsm[(state*4)+j] == point[i] )
-      {
-        //return our tdibit value and state for the next point
-        tdibits[i] = state = (uint8_t)j;
-        break;
-      }
-    }
-
-    //if tdibit value is greater than 3, then we have a decoding error
-    if (tdibits[i] == 0xF)
-    {
-      irr_err++; //increment number of errors
-
-      //debug position of error and state value
-      // fprintf (stderr, " %d:%d;", i, state);
-
-      //this method only seems to be reliable up to 1-2 bit errors...sometimes
-      for (j = 0; j < 4; j++)
-        hd[j] = count_bits (  ((nibs[i] ^ p25_dtm[(state*4)+j]) & 0xF ), 4 );
-      min = find_min (hd, 4);
-      tdibits[i] = state = min;
-
-      memset (hd, 0, sizeof(hd));
-      min = 0;
-
-    }
-
-  }
-
-  //debug view tdibits/states
-  // fprintf (stderr, "\n T =");
-  // for (i = 0; i < 49; i++) 
-  //   fprintf (stderr, " %02d", tdibits[i]);
-
-  //pack tdibits into return payload bytes
-  for (i = 0; i < 12; i++)
-    treturn[i] = (tdibits[(i*4)+0] << 6) | (tdibits[(i*4)+1] << 4) | (tdibits[(i*4)+2] << 2) | tdibits[(i*4)+3];
-
-  //trellis point/state err tally
-  // if (irr_err != 0)
-  //   fprintf (stderr, " P_ERR = %d", irr_err);
-
-  return (irr_err);
-}
-
-
-

src/p25_crc.c

@@ -1,168 +0,0 @@
-/*-------------------------------------------------------------------------------
- * p25_crc.c
- * P25 Misc CRC checks
- *
- * LWVMOBILE
- * 2022-09 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-
-//modified from the LEH ComputeCrcCCITT to accept variable len buffer bits
-uint16_t ComputeCrcCCITT16b(const uint8_t buf[], unsigned int len)
-{
-  uint32_t i;
-  uint16_t CRC = 0x0000;
-  uint16_t Polynome = 0x1021;
-  for(i = 0; i < len; i++)
-  {
-    if(((CRC >> 15) & 1) ^ (buf[i] & 1))
-    {
-      CRC = (CRC << 1) ^ Polynome;
-    }
-    else
-    {
-      CRC <<= 1;
-    }
-  }
-
-  /* Invert the CRC */
-  CRC ^= 0xFFFF;
-
-  /* Return the CRC */
-  return CRC;
-} /* End ComputeCrcCCITT() */
-
-//modified from crc12_ok to run a quickie on 16 instead
-static uint16_t crc16_ok(const uint8_t bits[], unsigned int len) {
-	uint16_t crc = 0;
-  // fprintf (stderr, "\n  LEN = %d", len);
-  for (int i = 0; i < 16; i++)
-  {
-    crc = crc << 1;
-    crc = crc | bits[i+len];
-  }
-  uint16_t check = ComputeCrcCCITT16b(bits, len);
-
-  if (crc == check)
-  {
-    //fprintf (stderr, " CRC = %04X %04X", crc, check);
-    return (0);
-  }
-  else
-  {
-    //fprintf (stderr, " CRC = %04X %04X", crc, check);
-    return (-1);
-  }
-
-}
-
-//TSBK/LCCH CRC16 x-bit bridge to crc16b and crc16b_okay, wip, may need multi pdu format as well
-int crc16_lb_bridge (int payload[190], int len)
-{
-  int err = -2;
-  uint8_t buf[190] = {0};
-
-  for (int i = 0; i < len+16; i++) //add +16 here so we load the entire frame but only run crc on the len portion
-  {
-    buf[i] = payload[i];
-  }
-  err = crc16_ok(buf, len);
-  return (err);
-}
-
-//borrowing crc12 from OP25
-static uint16_t crc12(const uint8_t bits[], unsigned int len) {
-	uint16_t crc=0;
-	static const unsigned int K = 12;
-  //g12(x) = x12 + x11 + x7 + x4 + x2 + x + 1
-	static const uint8_t poly[13] = {1,1,0,0,0,1,0,0,1,0,1,1,1}; // p25 p2 crc 12 poly
-	uint8_t buf[256];
-	if (len+K > sizeof(buf)) {
-		//fprintf (stderr, "crc12: buffer length %u exceeds maximum %u\n", len+K, sizeof(buf));
-		return 0;
-	}
-	memset (buf, 0, sizeof(buf));
-	for (unsigned int i=0; i<len; i++){
-		buf[i] = bits[i];
-	}
-	for (unsigned int i=0; i<len; i++)
-		if (buf[i])
-			for (unsigned int j=0; j<K+1; j++)
-				buf[i+j] ^= poly[j];
-	for (unsigned int i=0; i<K; i++){
-		crc = (crc << 1) + buf[len + i];
-	}
-	return crc ^ 0xfff;
-}
-
-//borrowing crc12_ok from OP25
-static uint16_t crc12_ok(const uint8_t bits[], unsigned int len) {
-	uint16_t crc = 0;
-  for (int i = 0; i < 12; i++)
-  {
-    crc = crc << 1;
-    crc = crc | bits[i+len];
-  }
-  uint16_t check = crc12(bits,len);
-
-  if (crc == check)
-  {
-    //fprintf (stderr, " CRC = %03X %03X", crc, check);
-    return (0);
-  }
-  else
-  {
-    //fprintf (stderr, " CRC = %03X %03X", crc, check);
-    return (-1);
-  }
-
-}
-
-//xCCH CRC12 x-bit bridge to crc12b and crc12b_okay
-int crc12_xb_bridge (int payload[190], int len)
-{
-  int err = -5;
-  uint8_t buf[190] = {0};
-
-  //need to load up the 12 crc bits as well, else it will fail on the check, but not on the crc calc
-  for (int i = 0; i < len+12; i++)
-  {
-    buf[i] = payload[i];
-  }
-  err = crc12_ok(buf, len);
-  return (err);
-}
-
-uint8_t lsd_parity[256] = {
-0x00, 0x39, 0x72, 0x4B, 0xE4, 0xDD, 0x96, 0xAF, 0xF1, 0xC8, 0x83, 0xBA, 0x15, 0x2C, 0x67, 0x5E,
-0xDB, 0xE2, 0xA9, 0x90, 0x3F, 0x06, 0x4D, 0x74, 0x2A, 0x13, 0x58, 0x61, 0xCE, 0xF7, 0xBC, 0x85,
-0x8F, 0xB6, 0xFD, 0xC4, 0x6B, 0x52, 0x19, 0x20, 0x7E, 0x47, 0x0C, 0x35, 0x9A, 0xA3, 0xE8, 0xD1,
-0x54, 0x6D, 0x26, 0x1F, 0xB0, 0x89, 0xC2, 0xFB, 0xA5, 0x9C, 0xD7, 0xEE, 0x41, 0x78, 0x33, 0x0A,
-0x27, 0x1E, 0x55, 0x6C, 0xC3, 0xFA, 0xB1, 0x88, 0xD6, 0xEF, 0xA4, 0x9D, 0x32, 0x0B, 0x40, 0x79,
-0xFC, 0xC5, 0x8E, 0xB7, 0x18, 0x21, 0x6A, 0x53, 0x0D, 0x34, 0x7F, 0x46, 0xE9, 0xD0, 0x9B, 0xA2,
-0xA8, 0x91, 0xDA, 0xE3, 0x4C, 0x75, 0x3E, 0x07, 0x59, 0x60, 0x2B, 0x12, 0xBD, 0x84, 0xCF, 0xF6,
-0x73, 0x4A, 0x01, 0x38, 0x97, 0xAE, 0xE5, 0xDC, 0x82, 0xBB, 0xF0, 0xC9, 0x66, 0x5F, 0x14, 0x2D,
-0x4E, 0x77, 0x3C, 0x05, 0xAA, 0x93, 0xD8, 0xE1, 0xBF, 0x86, 0xCD, 0xF4, 0x5B, 0x62, 0x29, 0x10,
-0x95, 0xAC, 0xE7, 0xDE, 0x71, 0x48, 0x03, 0x3A, 0x64, 0x5D, 0x16, 0x2F, 0x80, 0xB9, 0xF2, 0xCB,
-0xC1, 0xF8, 0xB3, 0x8A, 0x25, 0x1C, 0x57, 0x6E, 0x30, 0x09, 0x42, 0x7B, 0xD4, 0xED, 0xA6, 0x9F,
-0x1A, 0x23, 0x68, 0x51, 0xFE, 0xC7, 0x8C, 0xB5, 0xEB, 0xD2, 0x99, 0xA0, 0x0F, 0x36, 0x7D, 0x44,
-0x69, 0x50, 0x1B, 0x22, 0x8D, 0xB4, 0xFF, 0xC6, 0x98, 0xA1, 0xEA, 0xD3, 0x7C, 0x45, 0x0E, 0x37,
-0xB2, 0x8B, 0xC0, 0xF9, 0x56, 0x6F, 0x24, 0x1D, 0x43, 0x7A, 0x31, 0x08, 0xA7, 0x9E, 0xD5, 0xEC,
-0xE6, 0xDF, 0x94, 0xAD, 0x02, 0x3B, 0x70, 0x49, 0x17, 0x2E, 0x65, 0x5C, 0xF3, 0xCA, 0x81, 0xB8,
-0x3D, 0x04, 0x4F, 0x76, 0xD9, 0xE0, 0xAB, 0x92, 0xCC, 0xF5, 0xBE, 0x87, 0x28, 0x11, 0x5A, 0x63};
-
-int p25p1_lsd_fec(uint8_t * input)
-{
-  uint8_t lsd = (uint8_t)ConvertBitIntoBytes(&input[0], 8);
-  uint8_t par = (uint8_t)ConvertBitIntoBytes(&input[8], 8);
-  uint8_t chk = lsd_parity[lsd];
-  //NOTE: Simply checking the parity doesn't account for the parity bits being bad, but the 
-  //low speed data bits being correct, but is better than nothing
-  if (chk == par) return 1;
-  else
-  {
-    //TODO: some FEC functions
-    return 0;
-  }
-}

src/p25_frequency.c

@@ -13,7 +13,6 @@
 //P25
 long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channel)
 {
-	UNUSED(opts);
 
 	//RX and SU TX frequencies.
 	//SU RX = (Base Frequency) + (Channel Number) x (Channel Spacing).
@@ -25,10 +24,6 @@ long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channe
 	(Channel Spacing) x (0.125 kHz).
 	*/
 
-	//return 0 if channel value is 0 or 0xFFFF
-	if (channel == 0) return 0;
-	if (channel == 0xFFFF) return 0;
-
 	//Note: Base Frequency is calculated as (Base Frequency) x (0.000005 MHz) from the IDEN_UP message.
 
 	long int freq = -1;
@@ -66,8 +61,6 @@ long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channe
 
 long int nxdn_channel_to_frequency(dsd_opts * opts, dsd_state * state, uint16_t channel)
 {
-	UNUSED(opts);
-
 	long int freq;
 	long int base = 0;
 	long int step = 0;
@@ -94,8 +87,8 @@ long int nxdn_channel_to_frequency(dsd_opts * opts, dsd_state * state, uint16_t
 		else base = 0; //just set to zero, will be system definable most likely and won't be able to calc
 
 		//determine the step value in Hz
-		if (state->nxdn_step == 2)				step = 1250; //1.25 kHz
-		else if (state->nxdn_step == 3)	step = 3125; //3.125 kHz
+		if (state->nxdn_step = 2)				step = 1250; //1.25 kHz
+		else if (state->nxdn_step = 3)	step = 3125; //3.125 kHz
 		else step = 0; //just set to zero, will be system definable most likely and won't be able to calc
 
 		//if we have a valid base and step, then calc frequency

src/p25_lcw.c

@@ -11,15 +11,12 @@
 //new p25_lcw function here -- TIA-102.AABF-D LCW Format Messages (if anybody wants to fill the rest out)
 void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t irrecoverable_errors)
 {
-  UNUSED(irrecoverable_errors);
-
   uint8_t lc_format = (uint8_t)ConvertBitIntoBytes(&LCW_bits[0], 8);  //format
-  uint8_t lc_opcode = (uint8_t)ConvertBitIntoBytes(&LCW_bits[2], 6);  //opcode portion of format
+  uint8_t lc_opcode = (uint8_t)ConvertBitIntoBytes(&LCW_bits[2], 8);  //opcode portion of format
   uint8_t lc_mfid   = (uint8_t)ConvertBitIntoBytes(&LCW_bits[8], 8);  //mfid
   uint8_t lc_svcopt = (uint8_t)ConvertBitIntoBytes(&LCW_bits[16], 8); //service options
   uint8_t lc_pf = LCW_bits[0]; //protect flag
   uint8_t lc_sf = LCW_bits[1]; //Implicit / Explicit MFID Format
-  UNUSED2(lc_opcode, lc_sf);
 
   if (lc_pf == 1) //check the protect flag -- if set, its an encrypted lcw
   {
@@ -63,7 +60,6 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         uint16_t group = (uint16_t)ConvertBitIntoBytes(&LCW_bits[32], 16);
         uint32_t source = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
         fprintf (stderr, " - Group %d Source %d", group, source);
-        UNUSED2(res, explicit);
 
         //don't set this when zero, annoying blink occurs in ncurses
         if (group != 0) state->lasttg = group;
@@ -93,9 +89,7 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
 
       }
 
-      //TODO: Allow Tuning from Call Grants either in LDU1 or TDULC? (TDMA to p1 fallback?)
-      //TODO: Allow TG Hold overrides here  either in LDU1 or TDULC?
-      //NOTE: If we have an active TG hold, we really should't be here anyways
+      //uses explicit bit?
       else if (lc_format == 0x42) //is this group only, or group and private?
       {
         fprintf (stderr, " Group Voice Channel Update - ");
@@ -127,7 +121,6 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         uint16_t channelt = (uint16_t)ConvertBitIntoBytes(&LCW_bits[40], 16);
         uint16_t channelr = (uint16_t)ConvertBitIntoBytes(&LCW_bits[56], 16);
         fprintf (stderr, "Ch: %04X TG: %d; ", channelt, group1);
-        UNUSED(channelr);
       }
 
       else if (lc_format == 0x45)
@@ -147,19 +140,15 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
 
       else if (lc_format == 0x49)
       {
-        fprintf (stderr, " Source ID Extension -");
-        uint32_t nid = (uint32_t)ConvertBitIntoBytes(&LCW_bits[16], 24);
-        uint32_t src = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 24);
-        fprintf (stderr, " Full SUID: %08X-%08d", nid, src);
-
+        fprintf (stderr, " Souce ID Extension");
       }
 
       else if (lc_format == 0x4A) 
       {
         fprintf (stderr, " Unit to Unit Voice Channel User – Extended");
         uint32_t target = (uint32_t)ConvertBitIntoBytes(&LCW_bits[16], 24);
-        uint32_t src   = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 24);
-        fprintf (stderr, "TGT: %d; SRC: %d; ", target, src);
+        uint32_t suid   = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 24);
+        fprintf (stderr, "TGT: %04X SUID: %d; ", target, suid);
       }
 
       else if (lc_format == 0x50)
@@ -197,6 +186,20 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         fprintf (stderr, " Call Alert");
       }
 
+      else if (lc_format == 0x57) 
+      {
+        fprintf (stderr, " Extended Function Command");
+      }
+
+      else if (lc_format == 0x58) 
+      {
+        fprintf (stderr, " Channel Identifier Update");
+      }
+
+      else if (lc_format == 0x59) 
+      {
+        fprintf (stderr, " Channel Identifier Update VU");
+      }
 
       else if (lc_format == 0x5A) 
       {
@@ -213,8 +216,6 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         fprintf (stderr, " System Service Broadcast");
       }
 
-      //this PDU does not have an associated MFID, often seen on kiwi and matches its TSBK counterpart
-      //its possible some of the other ones here don't as well, need to re-check all of them
       else if (lc_format == 0x61) 
       {
         fprintf (stderr, " Secondary Control Channel Broadcast");
@@ -256,7 +257,6 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         uint16_t channelr = (uint16_t)ConvertBitIntoBytes(&LCW_bits[48], 16);
         uint8_t cfva = (uint8_t)ConvertBitIntoBytes(&LCW_bits[64], 4);
         fprintf (stderr, " - RFSS %d Site %d CH %04X", rfssid, siteid, channelt);
-        UNUSED2(lra, channelr);
 
         //debug print only
         // fprintf (stderr, "\n  ");
@@ -265,7 +265,7 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
         // if (cfva & 0x4) fprintf (stderr, " Failure Condition");
         // if (cfva & 0x2) fprintf (stderr, " Up to Date (Correct)");
         // else fprintf (stderr, " Last Known");
-        if (cfva & 0x1) fprintf (stderr, " - Connection Active");
+        if (cfva & 0x1) fprintf (stderr, "- Connection Active");
         // process_channel_to_freq (opts, state, channelt);
         //end debug, way too much for a simple link control line 
 
@@ -295,19 +295,12 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
       //tune back to CC here - save about 1-2 seconds
       else if (lc_format == 0x4F) //# Call Termination/Cancellation 
       {
-        uint32_t tgt = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24); //can be individual, or all units (0xFFFFFF)
-        fprintf (stderr, " Call Termination; TGT: %d;", tgt);
+        fprintf (stderr, " Call Termination");
         if (opts->p25_trunk == 1 && state->p25_cc_freq != 0 && opts->p25_is_tuned == 1)
         {
           
           //Will we need to check for a symbolrate change here, can a P25p2 TDMA-CC system
           //revert back to a phase 1 traffic channel or carry a phase 1 traffic channel?
-          if (state->p25_cc_is_tdma == 1)
-          {
-            state->samplesPerSymbol = 8;
-            state->symbolCenter = 3;
-            opts->frame_p25p1 = 0; //turn it back off
-          }
 
           //clear heuristics from current traffic channel
           if (opts->frame_p25p1 == 1 && opts->use_heuristics == 1)
@@ -316,10 +309,6 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
             initialize_p25_heuristics(&state->inv_p25_heuristics);
           }
 
-          //re-enable both slots (failsafe)
-          opts->slot1_on = 1;
-          opts->slot2_on = 1;
-
           //rigctl
           if (opts->use_rigctl == 1)
           {
@@ -363,116 +352,8 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
       else fprintf (stderr, " Unknown Format %02X MFID %02X SVC %02X", lc_format, lc_mfid, lc_svcopt);
     }
 
-    //TODO: Look through all LCW format messages and move here if they don't use the MFID field
-    //just going to add/fix a few values I've observed for now, one issue with doing so may
-    //be where there is a reserved field that is also used as an MFID, i.e., Call Termination 0xF vs Moto Talker EOT 0xF with
-    //the reserved field showing the 0x90 for moto in it, and Harris 0xA vs Unit to Unit Voice Call 0xA
-
-    //TODO: Add Identification of Special SU Address values
-    //0 - No Unit
-    //1-0xFFFFFB - Assignable Units
-    //0xFFFFFC - FNE 16777212
-    //0xFFFFFD - System Default (FNE Calling Functions, Registration, Mobility)
-    //0xFFFFFE - Registration Default (registration transactions from SU)
-    //0xFFFFFF - All Units
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x42) 
-      fprintf (stderr, " Conventional Fallback Indication");
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x57)
-      fprintf (stderr, " Extended Function Command");
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x58)
-    {
-      uint8_t iden = (uint8_t)ConvertBitIntoBytes(&LCW_bits[8], 4);
-      uint32_t base = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 32);
-      fprintf (stderr, " Channel Identifier Update VU; Iden: %X; Base: %d;", iden, base*5);
-    }
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x59)
-    {
-      uint8_t iden = (uint8_t)ConvertBitIntoBytes(&LCW_bits[8], 4);
-      uint32_t base = (uint32_t)ConvertBitIntoBytes(&LCW_bits[40], 32);
-      fprintf (stderr, " Channel Identifier Update VU; Iden: %X; Base: %d;", iden, base*5);
-    }
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x61) 
-      fprintf (stderr, " Secondary Control Channel Broadcast");
-
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x62) 
-      fprintf (stderr, " Adjacent Site Status Broadcast");
-    
-    //This lc_format doesn't use the MFID field
-    else if (lc_format == 0x63) 
-      fprintf (stderr, " RFSS Status Broadcast");
-
-    //MFID 90 Embedded GPS
-    else if (lc_mfid == 0x90 && lc_opcode == 0x6)
-    {
-      fprintf (stderr, " MFID90 (Moto)");
-      apx_embedded_gps (opts, state, LCW_bits);
-    }
-
-    else if (lc_mfid == 0x90 && lc_opcode == 0x0)
-    {
-      //needed to fill this in, since tuning this on P1 will just leave the TG/SRC as zeroes
-      fprintf (stderr, " MFID90 (Moto) Group Regroup Channel User (LCGRGR)");
-      uint32_t sg = (uint32_t)ConvertBitIntoBytes(&LCW_bits[32], 16);
-      uint32_t src = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
-      fprintf (stderr, " SG: %d; SRC: %d;", sg, src);
-      if (LCW_bits[16] == 1) fprintf (stderr, " Res;"); //res bit (octet 2)
-      if (LCW_bits[17] == 1) fprintf (stderr, " ENC;"); //P-bit (octet 2)
-      if (LCW_bits[31] == 1) fprintf (stderr, " EXT;"); //Full SUID next LC (external) (octet 3)
-      state->lasttg = sg;
-      state->lastsrc = src;
-    }
-
-    else if (lc_mfid == 0x90 && lc_opcode == 0x1)
-    {
-      fprintf (stderr, " MFID90 (Moto) Group Regroup Channel Update (LCGRGU)");
-      uint32_t sg = (uint32_t)ConvertBitIntoBytes(&LCW_bits[24], 16);
-      uint32_t ch = (uint32_t)ConvertBitIntoBytes(&LCW_bits[56], 16);
-      fprintf (stderr, " SG: %d; CH: %04X;", sg, ch);
-      if (LCW_bits[16] == 1) fprintf (stderr, " Res;"); //res bit (octet 2)
-      if (LCW_bits[17] == 1) fprintf (stderr, " ENC;"); //P-bit (octet 2)
-    }
-
-    else if (lc_mfid == 0x90 && lc_opcode == 0x3)
-      fprintf (stderr, " MFID90 (Moto) Group Regroup Add");
-
-    else if (lc_mfid == 0x90 && lc_opcode == 0x4)
-      fprintf (stderr, " MFID90 (Moto) Group Regroup Delete");
-
-    else if (lc_mfid == 0x90 && lc_opcode == 0xF)
-    {
-      uint32_t src = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
-      fprintf (stderr, " MFID90 (Moto) Talker EOT; SRC: %d;", src);
-    }
-
-    //observed format value on Harris SNDCP data channel (Phase 2 CC to Phase 1 MPDU channel)
-    else if (lc_mfid == 0xA4 && lc_format == 0x0A)
-    {
-      //Could also just be a Unit to Unit Voice Channel User using the reserved field as the MFID?
-      //if it were similar to Unit to Unit though, the TGT and SRC values seem to be reversed
-      //this appears to be a data channel indicator, has a matching target and the FNE address in it
-      uint32_t src = (uint32_t)ConvertBitIntoBytes(&LCW_bits[24], 24);
-      uint32_t tgt = (uint32_t)ConvertBitIntoBytes(&LCW_bits[48], 24);
-      fprintf (stderr, " MFIDA4 (Harris) Data Channel; SRC: %d; TGT: %d;", src, tgt);
-    }
-
     //not a duplicate, this one will print if not MFID 0 or 1
-    else
-    {
-      fprintf (stderr, " Unknown Format %02X MFID %02X ", lc_format, lc_mfid);
-      if (lc_mfid == 0x90) fprintf (stderr, "(Moto)");
-      else if (lc_mfid == 0xA4) fprintf (stderr, "(Harris)");
-    }
+    else fprintf (stderr, " Unknown Format %02X MFID %02X ", lc_format, lc_mfid);
   }
 
   //ending line break
@@ -480,4 +361,3 @@ void p25_lcw (dsd_opts * opts, dsd_state * state, uint8_t LCW_bits[], uint8_t ir
 
 }
 
-

src/p25p1_block.cpp

@@ -0,0 +1,277 @@
+/*-------------------------------------------------------------------------------
+ * p25p1_block.c
+ * P25 Block Bridge for TSBK Deinterleaving, CRC12 and CRC16 checks
+ *
+ * original copyrights for portions used below (OP25, Ossman, and LEH)
+ *
+ * LWVMOBILE
+ * 2022-09 DSD-FME Florida Man Edition
+ *-----------------------------------------------------------------------------*/
+
+#include "dsd.h"
+#include <vector>
+
+typedef std::vector<bool> bit_vector;
+
+/* adapted from wireshark/plugins/p25/packet-p25cai.c */
+/* Copyright 2008, Michael Ossmann <mike@ossmann.com>  */
+/* deinterleave and trellis1_2 decoding, count_bits, and find_min*/
+/* buf is assumed to be a buffer of 12 bytes */
+
+//typedef std::vector<bool> bit_vector;
+
+//ugly copy and paste below
+static int count_bits(unsigned int n) {
+            int i = 0;
+            for (i = 0; n != 0; i++)
+                n &= n - 1;
+            return i;
+        }
+
+static int find_min(uint8_t list[], int len) {
+            int min = list[0];
+            int index = 0;
+            int unique = 1;
+            int i;
+
+            for (i = 1; i < len; i++) {
+                if (list[i] < min) {
+                    min = list[i];
+                    index = i;
+                    unique = 1;
+                } else if (list[i] == min) {
+                    //unique = 0;
+                    ; //do nothing, still can be correct and pass CRC
+                }
+            }
+            /* return -1 if a minimum can't be found */
+            if (!unique)
+                return -1;
+
+            return index;
+        }
+
+static int block_deinterleave(bit_vector& bv, unsigned int start, uint8_t* buf)
+{
+  static const uint16_t deinterleave_tb[] = {
+                0,  1,  2,  3,  52, 53, 54, 55, 100,101,102,103, 148,149,150,151,
+                4,  5,  6,  7,  56, 57, 58, 59, 104,105,106,107, 152,153,154,155,
+                8,  9, 10, 11,  60, 61, 62, 63, 108,109,110,111, 156,157,158,159,
+                12, 13, 14, 15,  64, 65, 66, 67, 112,113,114,115, 160,161,162,163,
+                16, 17, 18, 19,  68, 69, 70, 71, 116,117,118,119, 164,165,166,167,
+                20, 21, 22, 23,  72, 73, 74, 75, 120,121,122,123, 168,169,170,171,
+                24, 25, 26, 27,  76, 77, 78, 79, 124,125,126,127, 172,173,174,175,
+                28, 29, 30, 31,  80, 81, 82, 83, 128,129,130,131, 176,177,178,179,
+                32, 33, 34, 35,  84, 85, 86, 87, 132,133,134,135, 180,181,182,183,
+                36, 37, 38, 39,  88, 89, 90, 91, 136,137,138,139, 184,185,186,187,
+                40, 41, 42, 43,  92, 93, 94, 95, 140,141,142,143, 188,189,190,191,
+                44, 45, 46, 47,  96, 97, 98, 99, 144,145,146,147, 192,193,194,195,
+                48, 49, 50, 51 };
+
+            uint8_t hd[4];
+            int b, d, j;
+            int state = 0;
+            uint8_t codeword;
+
+            static const uint8_t next_words[4][4] = {
+                {0x2, 0xC, 0x1, 0xF},
+                {0xE, 0x0, 0xD, 0x3},
+                {0x9, 0x7, 0xA, 0x4},
+                {0x5, 0xB, 0x6, 0x8}
+            };
+
+            memset(buf, 0, 12);
+
+            for (b=0; b < 98*2; b += 4) {
+                codeword = (bv[start+deinterleave_tb[b+0]] << 3) +
+                    (bv[start+deinterleave_tb[b+1]] << 2) +
+                    (bv[start+deinterleave_tb[b+2]] << 1) +
+                    bv[start+deinterleave_tb[b+3]]     ;
+
+                /* try each codeword in a row of the state transition table */
+                for (j = 0; j < 4; j++) {
+                    /* find Hamming distance for candidate */
+                    hd[j] = count_bits(codeword ^ next_words[state][j]);
+                }
+                /* find the dibit that matches the most codeword bits (minimum Hamming distance) */
+                state = find_min(hd, 4);
+                /* error if minimum can't be found */
+                if(state == -1)
+                    return -1;	// decode error, return failure
+                /* It also might be nice to report a condition where the minimum is
+                 * non-zero, i.e. an error has been corrected.  It probably shouldn't
+                 * be a permanent failure, though.
+                 *
+                 * DISSECTOR_ASSERT(hd[state] == 0);
+                 */
+
+                /* append dibit onto output buffer */
+                d = b >> 2;	// dibit ctr
+                if (d < 48) {
+                    buf[d >> 2] |= state << (6 - ((d%4) * 2));
+                }
+            }
+            return 0;
+        }
+
+int bd_bridge (int payload[196], uint8_t decoded[12])
+{
+  std::vector<bool> vc(196,0);
+  int ec = 69; //initialize error value
+
+  //gather payload from tsbk handler and pass it to the block_deinterleave function
+  //and then return its payload back to the tsbk handler
+
+  //initialize our decoded byte buffer with zeroes
+  for (int i = 0; i < 12; i++)
+  {
+    decoded[i] = 0;
+  }
+
+  //convert/load payload into a vector vc to pass to block_deinterleave
+  for (int i = 0; i < 196; i++)
+  {
+    vc[i] = payload[i];
+  }
+  int block_count = 0; //
+  unsigned int start = block_count*196;
+
+  ec = block_deinterleave(vc, start, decoded);
+
+  return ec;
+}
+
+//modified from the LEH ComputeCrcCCITT to accept variable len buffer bits
+uint16_t ComputeCrcCCITT16b(const uint8_t buf[], unsigned int len)
+{
+  uint32_t i;
+  uint16_t CRC = 0x0000; /* Initialization value = 0x0000 */
+  /* Polynomial x^16 + x^12 + x^5 + 1
+   * Normal     = 0x1021
+   * Reciprocal = 0x0811
+   * Reversed   = 0x8408
+   * Reversed reciprocal = 0x8810 */
+  uint16_t Polynome = 0x1021;
+  for(i = 0; i < len; i++)
+  {
+    if(((CRC >> 15) & 1) ^ (buf[i] & 1))
+    {
+      CRC = (CRC << 1) ^ Polynome;
+    }
+    else
+    {
+      CRC <<= 1;
+    }
+  }
+
+  /* Invert the CRC */
+  CRC ^= 0xFFFF;
+
+  /* Return the CRC */
+  return CRC;
+} /* End ComputeCrcCCITT() */
+
+
+//modified from crc12_ok to run a quickie on 16 instead
+static uint16_t crc16_ok(const uint8_t bits[], unsigned int len) {
+	uint16_t crc = 0;
+  // fprintf (stderr, "\n  LEN = %d", len);
+  for (int i = 0; i < 16; i++)
+  {
+    crc = crc << 1;
+    crc = crc | bits[i+len];
+  }
+  // uint16_t check = crc16b(bits,len);
+  uint16_t check = ComputeCrcCCITT16b(bits, len);
+
+  if (crc == check)
+  {
+    //fprintf (stderr, " CRC = %04X %04X", crc, check);
+    return (0);
+  }
+  else
+  {
+    //fprintf (stderr, " CRC = %04X %04X", crc, check);
+    return (-1);
+  }
+
+}
+
+//TSBK/LCCH CRC16 x-bit bridge to crc16b and crc16b_okay, wip, may need multi pdu format as well
+int crc16_lb_bridge (int payload[190], int len)
+{
+  int err = -2;
+  uint16_t crc = -2;
+  uint8_t buf[190] = {0};
+
+  for (int i = 0; i < len+16; i++) //add +16 here so we load the entire frame but only run crc on the len portion
+  {
+    buf[i] = payload[i];
+  }
+  err = crc16_ok(buf, len);
+  return (err);
+}
+
+//borrowing crc12 from OP25
+static uint16_t crc12(const uint8_t bits[], unsigned int len) {
+	uint16_t crc=0;
+	static const unsigned int K = 12;
+  //g12(x) = x12 + x11 + x7 + x4 + x2 + x + 1
+	static const uint8_t poly[K+1] = {1,1,0,0,0,1,0,0,1,0,1,1,1}; // p25 p2 crc 12 poly
+	uint8_t buf[256];
+	if (len+K > sizeof(buf)) {
+		//fprintf (stderr, "crc12: buffer length %u exceeds maximum %u\n", len+K, sizeof(buf));
+		return 0;
+	}
+	memset (buf, 0, sizeof(buf));
+	for (unsigned int i=0; i<len; i++){
+		buf[i] = bits[i];
+	}
+	for (unsigned int i=0; i<len; i++)
+		if (buf[i])
+			for (unsigned int j=0; j<K+1; j++)
+				buf[i+j] ^= poly[j];
+	for (unsigned int i=0; i<K; i++){
+		crc = (crc << 1) + buf[len + i];
+	}
+	return crc ^ 0xfff;
+}
+
+//borrowing crc12_ok from OP25
+static uint16_t crc12_ok(const uint8_t bits[], unsigned int len) {
+	uint16_t crc = 0;
+  for (int i = 0; i < 12; i++)
+  {
+    crc = crc << 1;
+    crc = crc | bits[i+len];
+  }
+  uint16_t check = crc12(bits,len);
+
+  if (crc == check)
+  {
+    //fprintf (stderr, " CRC = %03X %03X", crc, check);
+    return (0);
+  }
+  else
+  {
+    //fprintf (stderr, " CRC = %03X %03X", crc, check);
+    return (-1);
+  }
+
+}
+
+//xCCH CRC12 x-bit bridge to crc12b and crc12b_okay
+int crc12_xb_bridge (int payload[190], int len)
+{
+  int err = -5;
+  uint16_t crc = -2;
+  uint8_t buf[190] = {0};
+
+  //need to load up the 12 crc bits as well, else it will fail on the check, but not on the crc calc
+  for (int i = 0; i < len+12; i++)
+  {
+    buf[i] = payload[i];
+  }
+  err = crc12_ok(buf, len);
+  return (err);
+}

src/p25p1_hdu.c

@@ -26,7 +26,6 @@ read_dibit (dsd_opts* opts, dsd_state* state, char* output, int* status_count, i
 {
     int dibit;
     int status;
-    UNUSED(status);
 
     if (*status_count == 35) {
 
@@ -66,6 +65,7 @@ read_dibit_update_analog_data (dsd_opts* opts, dsd_state* state, char* output, u
         AnalogSignal* analog_signal_array, int* analog_signal_index)
 {
   unsigned int i;
+  unsigned int debug_left, debug_right;
 
   for (i=0; i<count; i+=2)
     {
@@ -215,9 +215,9 @@ correct_golay_dibits_6(char* corrected_hex_data, int hex_count, AnalogSignal* an
 void
 processHDU(dsd_opts* opts, dsd_state* state)
 {
-  uint8_t mi[73];
-  char mfid[9], algid[9], kid[17], tgid[17];
+  char mi[73], mfid[9], algid[9], kid[17], tgid[17], tmpstr[255];
   int i, j;
+  long talkgroup;
   int algidhex, kidhex;
   char hex[6];
   int status_count;
@@ -225,7 +225,6 @@ processHDU(dsd_opts* opts, dsd_state* state)
   unsigned long long int mihex1, mihex2, mihex3;
   char hex_data[20][6];    // Data in hex-words (6 bit words). A total of 20 hex words.
   char hex_parity[16][6];  // Parity of the data, again in hex-word format. A total of 16 parity hex words.
-  UNUSED4(mfid, tgid, status, mihex3);
 
   int irrecoverable_errors;
 
@@ -502,9 +501,5 @@ processHDU(dsd_opts* opts, dsd_state* state)
       fprintf (stderr, " HDU FEC ERR \n");
       fprintf (stderr, "%s", KNRM);
   }
-
-  //reset gain
-  if (opts->floating_point == 1)
-    state->aout_gain = opts->audio_gain;
   
 }

src/p25p1_heuristics.c

@@ -315,6 +315,7 @@ int estimate_symbol(int rf_mod, P25Heuristics* heuristics, int previous_dibit, i
 static void debug_print_symbol_heuristics(int previous_dibit, int dibit, SymbolHeuristics* sh)
 {
     float mean, sd;
+    int k;
     int n;
 
     n = sh->count;

src/p25p1_ldu.c

@@ -67,7 +67,6 @@ process_IMBE (dsd_opts* opts, dsd_state* state, int* status_count)
   int j, dibit, status;
   char imbe_fr[8][23];
   const int *w, *x, *y, *z;
-  UNUSED(status);
 
   w = iW;
   x = iX;
@@ -145,22 +144,9 @@ process_IMBE (dsd_opts* opts, dsd_state* state, int* status_count)
               }
           }
 
-          /* //this is what is observed on the sigid wiki example (matches above pattern)
-            IMBE 000F920291AD6F06540980 err = [3] [A] 
-            IMBE 000F920294816F06540980 err = [3] [A] 
-            IMBE 000E1C0294816F06540980 err = [3] [B]
-
-            //this is what is observed on the 'hole' examples (not a match, TODO: Examine imbe_fr add this?)
-            IMBE FC00000000000000000300 err = [2] [B] 
-            IMBE FC00000000000000000300 err = [2] [B] 
-            IMBE FC00000000000000000300 err = [2] [B]
-
-          */
-
           if (match) {
               // Skip this particular value. If we let it pass it will be signaled as an erroneus IMBE
-              if (opts->payload == 1)
-                fprintf (stderr, "\n IMBE Non-standard c0 detected, skipped;");
+              fprintf (stderr, "(Non-standard IMBE c0 detected, skipped)");
           } else {
               processMbeFrame (opts, state, imbe_fr, NULL, NULL);
           }

src/p25p1_ldu1.c

@@ -28,10 +28,10 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
 {
   // extracts IMBE frames from LDU frame
   int i;
-  uint8_t lcformat[9], mfid[9], lcinfo[57];
+  char lcformat[9], mfid[9], lcinfo[57];
   char lsd1[9], lsd2[9];
-  uint8_t lsd_hex1, lsd_hex2; uint8_t lowspeeddata[32]; memset (lowspeeddata, 0, sizeof(lowspeeddata));
-  int status_count; int lsd1_okay, lsd2_okay = 0;
+
+  int status_count;
 
   char hex_data[12][6];    // Data in hex-words (6 bit words). A total of 12 hex words.
   char hex_parity[12][6];  // Parity of the data, again in hex-word format. A total of 12 parity hex words.
@@ -59,29 +59,12 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '0';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
 
   // IMBE 2
 #ifdef TRACE_DSD
   state->debug_prefix_2 = '1';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 2
   read_and_correct_hex_word (opts, state, &(hex_data[11][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[10][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -94,15 +77,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '2';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 3
   read_and_correct_hex_word (opts, state, &(hex_data[ 7][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[ 6][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -115,15 +89,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '3';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 4
   read_and_correct_hex_word (opts, state, &(hex_data[ 3][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[ 2][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -136,15 +101,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '4';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 5
   read_and_correct_hex_word (opts, state, &(hex_parity[11][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_parity[10][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -157,15 +113,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '5';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 6
   read_and_correct_hex_word (opts, state, &(hex_parity[ 7][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_parity[ 6][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -178,15 +125,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '6';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 7
   read_and_correct_hex_word (opts, state, &(hex_parity[ 3][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_parity[ 2][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -199,14 +137,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '7';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
 
   // Read data after IMBE 8: LSD (low speed data)
   {
@@ -221,14 +151,9 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
       {
         read_dibit(opts, state, cyclic_parity+i, &status_count, NULL, NULL);
       }
-      lsd_hex1 = 0;
     for (i=0; i<8; i++)
       {
-        lsd_hex1 = lsd_hex1 << 1;
         lsd1[i] = lsd[i] + '0';
-        lsd_hex1 |= (uint8_t)lsd[i];
-        lowspeeddata[i+0] = (uint8_t)lsd1[i];
-        lowspeeddata[i+8] = (uint8_t)cyclic_parity[i];
       }
 
     for (i=0; i<=6; i+=2)
@@ -239,18 +164,13 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
       {
         read_dibit(opts, state, cyclic_parity+i, &status_count, NULL, NULL);
       }
-      lsd_hex2 = 0;
     for (i=0; i<8; i++)
       {
-        lsd_hex2 = lsd_hex2 << 1;
         lsd2[i] = lsd[i] + '0';
-        lsd_hex2 |= (uint8_t)lsd[i];
-        lowspeeddata[i+16] = (uint8_t)lsd2[i];
-        lowspeeddata[i+24] = (uint8_t)cyclic_parity[i];
       }
 
-    // TODO: error correction of the LSD bytes... <--THIS!
-    // TODO: do something useful with the LSD bytes... <--THIS!
+    // TODO: error correction of the LSD bytes...
+    // TODO: do something useful with the LSD bytes...
 
     state->dropL += 2; //need to skip 2 here for the LSD bytes
   }
@@ -260,14 +180,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
   state->debug_prefix_2 = '8';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
 
   if (opts->errorbars == 1)
     {
@@ -284,7 +196,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
       int status;
       status = getDibit (opts, state) + '0';
       // TODO: do something useful with the status bits...
-      UNUSED(status);
   }
 
   // Error correct the hex_data using Reed-Solomon hex_parity
@@ -453,17 +364,6 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
     fprintf (stderr, "%s\n", KNRM);
   }
 
-  //NOTE: LSD is also encrypted if voice is encrypted, so let's just zip it for now
-  if (state->payload_algid != 0x80)
-  {
-    lsd_hex1 = 0;
-    lsd_hex2 = 0;
-  }
-
-  //WIP: LSD FEC
-  lsd1_okay = p25p1_lsd_fec (lowspeeddata+0);
-  lsd2_okay = p25p1_lsd_fec (lowspeeddata+16);
-
   if (opts->payload == 1)
   {
     fprintf (stderr, "%s",KCYN);
@@ -472,110 +372,7 @@ processLDU1 (dsd_opts* opts, dsd_state* state)
     {
       fprintf (stderr, "[%02X]", LCW_bytes[i]);
     }
-
-    #ifdef SOFTID
-    //view Low Speed Data
-    fprintf (stderr, "%s",KCYN);
-    fprintf (stderr, "    LSD: %02X %02X ", lsd_hex1, lsd_hex2);
-    if ( (lsd_hex1 > 0x19) && (lsd_hex1 < 0x7F) && (lsd1_okay == 1) ) fprintf (stderr, "(%c", lsd_hex1);
-    else fprintf (stderr, "( ");
-    if ( (lsd_hex2 > 0x19) && (lsd_hex2 < 0x7F) && (lsd2_okay == 1) ) fprintf (stderr, "%c)", lsd_hex2);
-    else fprintf (stderr, " )");
-    if (lsd1_okay == 0) fprintf (stderr, " L1 ERR");
-    if (lsd2_okay == 0) fprintf (stderr, " L2 ERR");
-    #endif
+    
     fprintf (stderr, "%s\n", KNRM);
   }
-  #ifdef SOFTID
-  //TEST: Store LSD into array if 0x02 0x08 (opcode and len?)
-  int k = 0;
-  if (state->dmr_alias_format[0] == 0x02)
-  {
-    k = state->data_block_counter[0];
-    if ( (lsd_hex1 > 0x19) && (lsd_hex1 < 0x7F) && (lsd1_okay == 1) )
-      state->dmr_alias_block_segment[0][0][k/4][k%4] = (char)lsd_hex1;
-    // else state->dmr_alias_block_segment[0][0][k/4][k%4] = 0x20;
-    k++;
-    if ( (lsd_hex2 > 0x19) && (lsd_hex2 < 0x7F) && (lsd2_okay == 1) )
-      state->dmr_alias_block_segment[0][0][k/4][k%4] = (char)lsd_hex2;
-    // else state->dmr_alias_block_segment[0][0][k/4][k%4] = 0x20;
-    k++;
-    state->data_block_counter[0] = k;
-  }
-
-  //reset format, len, counter.
-  if (lsd_hex1 == 0x02 && lsd1_okay == 1 && lsd2_okay == 1)
-  {
-    state->dmr_alias_format[0] = 0x02;
-    if (lsd_hex2 > 8) lsd_hex2 = 8; //sanity check
-    state->dmr_alias_len[0] = lsd_hex2;
-    state->data_block_counter[0] = 0;
-  }
-
-  if ( (k >= state->dmr_alias_len[0]) && (state->dmr_alias_format[0] == 0x02) )
-  {
-    //storage for completed string
-    char str[16]; int wr = 0; int tsrc = state->lastsrc; int z = 0; k = 0;
-    for (i = 0; i < 16; i++) str[i] = 0;
-
-    //print out what we've gathered
-    fprintf (stderr, "%s",KCYN);
-    fprintf (stderr, " LSD Soft ID: ");
-    for (i = 0; i < 4; i++)
-    {
-      for (int j = 0; j < 4; j++)
-      {
-        fprintf (stderr, "%c", state->dmr_alias_block_segment[0][0][i][j]);
-        if (state->dmr_alias_block_segment[0][0][i][j] != 0) str[k++] = state->dmr_alias_block_segment[0][0][i][j];
-      }
-    }
-
-    //debug
-    // fprintf (stderr, " STR: %s", str);
-
-    //assign to tg name string, but only if not trunking (this could clash with ENC LO functionality)
-    if (tsrc != 0) //&& opts->p25_trunk == 0 //should never get here if enc, should be zeroed out, but could potentially slip if HDU is missed and offchance of 02 opcode
-    {
-      for (int x = 0; x < state->group_tally; x++)
-      {
-        if (state->group_array[x].groupNumber == tsrc)
-        {
-          wr = 1; //already in there, so no need to assign it
-          z = x;
-          break;
-        }
-      }
-
-      //if not already in there, so save it there now
-      if (wr == 0)
-      {
-        state->group_array[state->group_tally].groupNumber = tsrc;
-        if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0)
-          sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-        else
-         sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
-        sprintf (state->group_array[state->group_tally].groupName, "%s", str);
-        state->group_tally++;
-      }
-
-      //if its in there, but doesn't match (bad/partial decode)
-      else if (strcmp(str, state->group_array[z].groupName) != 0)
-      {
-        state->group_array[z].groupNumber = tsrc;
-        if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0)
-          sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-        else
-         sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
-        sprintf (state->group_array[z].groupName, "%s", str);
-      }
-      
-    }
-
-    fprintf (stderr, "%s",KNRM);
-    fprintf (stderr, "\n");
-  }
-  #else
-  UNUSED2(lsd1_okay, lsd2_okay);
-  #endif //SOFTID
-
 }

src/p25p1_ldu2.c

@@ -28,14 +28,11 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
 {
   // extracts IMBE frames from LDU frame
   int i;
-  uint8_t mi[73];
-  char algid[9], kid[17];
+  char mi[73], algid[9], kid[17];
   char lsd1[9], lsd2[9];
   int algidhex, kidhex;
-  uint8_t lsd_hex1, lsd_hex2; uint8_t lowspeeddata[32]; memset (lowspeeddata, 0, sizeof(lowspeeddata));
   unsigned long long int mihex1, mihex2, mihex3;
-  int status_count; int lsd1_okay, lsd2_okay = 0;
-  UNUSED(mihex3);
+  int status_count;
 
   char hex_data[16][6];    // Data in hex-words (6 bit words). A total of 16 hex words.
   char hex_parity[8][6];   // Parity of the data, again in hex-word format. A total of 12 parity hex words.
@@ -64,29 +61,12 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '0';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
 
   // IMBE 2
 #ifdef TRACE_DSD
   state->debug_prefix_2 = '1';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 2
   read_and_correct_hex_word (opts, state, &(hex_data[15][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[14][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -99,15 +79,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '2';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 3
   read_and_correct_hex_word (opts, state, &(hex_data[11][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[10][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -120,15 +91,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '3';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 4
   read_and_correct_hex_word (opts, state, &(hex_data[ 7][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[ 6][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -141,15 +103,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '4';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 5
   read_and_correct_hex_word (opts, state, &(hex_data[ 3][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_data[ 2][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -162,15 +115,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '5';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 6
   read_and_correct_hex_word (opts, state, &(hex_parity[ 7][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_parity[ 6][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -183,13 +127,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '6';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 7
   read_and_correct_hex_word (opts, state, &(hex_parity[ 3][0]), &status_count, analog_signal_array, &analog_signal_index);
   read_and_correct_hex_word (opts, state, &(hex_parity[ 2][0]), &status_count, analog_signal_array, &analog_signal_index);
@@ -202,15 +139,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '7';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
-
   // Read data after IMBE 8: LSD (low speed data)
   {
     char lsd[8];
@@ -224,14 +152,9 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
       {
         read_dibit(opts, state, cyclic_parity+i, &status_count, NULL, NULL);
       }
-      lsd_hex1 = 0;
     for (i=0; i<8; i++)
       {
-        lsd_hex1 = lsd_hex1 << 1;
         lsd1[i] = lsd[i] + '0';
-        lsd_hex1 |= (uint8_t)lsd[i];
-        lowspeeddata[i+0] = (uint8_t)lsd1[i];
-        lowspeeddata[i+8] = (uint8_t)cyclic_parity[i];;
       }
 
     for (i=0; i<=6; i+=2)
@@ -242,18 +165,13 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
       {
         read_dibit(opts, state, cyclic_parity+i, &status_count, NULL, NULL);
       }
-      lsd_hex2 = 0;
     for (i=0; i<8; i++)
       {
-        lsd_hex2 = lsd_hex2 << 1;
         lsd2[i] = lsd[i] + '0';
-        lsd_hex2 |= (uint8_t)lsd[i];
-        lowspeeddata[i+16] = (uint8_t)lsd2[i];
-        lowspeeddata[i+24] = (uint8_t)cyclic_parity[i];
       }
 
-    // TODO: error correction of the LSD bytes... <--THIS!
-    // TODO: do something useful with the LSD bytes... <--THIS!
+    // TODO: error correction of the LSD bytes...
+    // TODO: do something useful with the LSD bytes...
 
     state->dropL += 2; //need to skip 2 here for the LSD bytes
   }
@@ -263,14 +181,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   state->debug_prefix_2 = '8';
 #endif
   process_IMBE (opts, state, &status_count);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 0 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceSS(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 1)
-    playSynthesizedVoiceFM(opts, state);
-  if (opts->floating_point == 1 && opts->pulse_digi_out_channels == 2)
-    playSynthesizedVoiceFS(opts, state);
 
   //set vc counter to 0
   state->p25vc = 0;
@@ -293,7 +203,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
       int status;
       status = getDibit (opts, state) + '0';
       // TODO: do something useful with the status bits...
-      UNUSED(status);
   }
 
   // Error correct the hex_data using Reed-Solomon hex_parity
@@ -459,17 +368,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
   mihex2 = (unsigned long long int)ConvertBitIntoBytes(&mi[32], 32);
   mihex3 = (unsigned long long int)ConvertBitIntoBytes(&mi[64], 8);
 
-  //NOTE: LSD is also encrypted if voice is encrypted, so let's just zip it for now
-  if (state->payload_algid != 0x80)
-  {
-    lsd_hex1 = 0;
-    lsd_hex2 = 0;
-  }
-
-  //WIP: LSD FEC
-  lsd1_okay = p25p1_lsd_fec (lowspeeddata+0);
-  lsd2_okay = p25p1_lsd_fec (lowspeeddata+16);
-
   if (irrecoverable_errors == 0)
   {
     fprintf (stderr, "%s", KYEL);
@@ -496,130 +394,16 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
       fprintf (stderr, " ENC");
       fprintf (stderr, "%s", KNRM);
     }
+
+    fprintf (stderr, "\n");
   }
   else
   {
       fprintf (stderr, "%s", KRED);
-      fprintf (stderr, " LDU2 FEC ERR ");
+      fprintf (stderr, " LDU2 FEC ERR \n");
       fprintf (stderr, "%s", KNRM);
   }
 
-  #ifdef SOFTID
-  if (opts->payload == 1)
-  {     
-    //view Low Speed Data
-    fprintf (stderr, "%s",KCYN);
-    fprintf (stderr, "    LSD: %02X %02X ", lsd_hex1, lsd_hex2);
-    if ( (lsd_hex1 > 0x19) && (lsd_hex1 < 0x7F) && (lsd1_okay == 1) ) fprintf (stderr, "(%c", lsd_hex1);
-    else fprintf (stderr, "( ");
-    if ( (lsd_hex2 > 0x19) && (lsd_hex2 < 0x7F) && (lsd2_okay == 1) ) fprintf (stderr, "%c)", lsd_hex2);
-    else fprintf (stderr, " )");
-    if (lsd1_okay == 0) fprintf (stderr, " L1 ERR");
-    if (lsd2_okay == 0) fprintf (stderr, " L2 ERR");
-    fprintf (stderr, "%s", KNRM);
-  }
-
-  fprintf (stderr, "\n");
-
-  //TEST: Store LSD into array if 0x02 0x08 (opcode and len?)
-  int k = 0;
-  if (state->dmr_alias_format[0] == 0x02)
-  {
-    k = state->data_block_counter[0];
-    if ( (lsd_hex1 > 0x19) && (lsd_hex1 < 0x7F) && (lsd1_okay == 1) )
-      state->dmr_alias_block_segment[0][0][k/4][k%4] = (char)lsd_hex1;
-    // else state->dmr_alias_block_segment[0][0][k/4][k%4] = 0x20;
-    k++;
-    if ( (lsd_hex2 > 0x19) && (lsd_hex2 < 0x7F) && (lsd2_okay == 1) )
-      state->dmr_alias_block_segment[0][0][k/4][k%4] = (char)lsd_hex2;
-    // else state->dmr_alias_block_segment[0][0][k/4][k%4] = 0x20;
-    k++;
-    state->data_block_counter[0] = k;
-  }
-
-  //reset format, len, counter.
-  if (lsd_hex1 == 0x02 && lsd1_okay == 1 && lsd2_okay == 1)
-  {
-    state->dmr_alias_format[0] = 0x02;
-    if (lsd_hex2 > 8) lsd_hex2 = 8; //sanity check
-    state->dmr_alias_len[0] = lsd_hex2;
-    state->data_block_counter[0] = 0;
-  }
-
-  if ( (k >= state->dmr_alias_len[0]) && (state->dmr_alias_format[0] == 0x02) )
-  {
-    //storage for completed string
-    char str[16]; int wr = 0; int tsrc = state->lastsrc; int z = 0; k = 0;
-    for (i = 0; i < 16; i++) str[i] = 0;
-
-    //print out what we've gathered
-    fprintf (stderr, "%s",KCYN);
-    fprintf (stderr, " LSD Soft ID: ");
-    for (i = 0; i < 4; i++)
-    {
-      for (int j = 0; j < 4; j++)
-      {
-        fprintf (stderr, "%c", state->dmr_alias_block_segment[0][0][i][j]);
-        if (state->dmr_alias_block_segment[0][0][i][j] != 0) str[k++] = state->dmr_alias_block_segment[0][0][i][j];
-      }
-    }
-
-    //debug
-    // fprintf (stderr, " STR: %s", str);
-
-    //assign to tg name string, but only if not trunking (this could clash with ENC LO functionality)
-    if (tsrc != 0) //&& opts->p25_trunk == 0 //should never get here if enc, should be zeroed out, but could potentially slip if HDU is missed and offchance of 02 opcode
-    {
-      for (int x = 0; x < state->group_tally; x++)
-      {
-        if (state->group_array[x].groupNumber == tsrc)
-        {
-          wr = 1; //already in there, so no need to assign it
-          z = x;
-          break;
-        }
-      }
-
-      //if not already in there, so save it there now
-      if (wr == 0)
-      {
-        state->group_array[state->group_tally].groupNumber = tsrc;
-        if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0)
-          sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-        else
-         sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
-        sprintf (state->group_array[state->group_tally].groupName, "%s", str);
-        state->group_tally++;
-      }
-
-      //if its in there, but doesn't match (bad/partial decode)
-      else if (strcmp(str, state->group_array[z].groupName) != 0)
-      {
-        state->group_array[z].groupNumber = tsrc;
-        if (state->payload_algid != 0x80 && opts->trunk_tune_enc_calls == 0 && state->R == 0)
-          sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-        else
-         sprintf (state->group_array[state->group_tally].groupMode, "%s", "D");
-        sprintf (state->group_array[z].groupName, "%s", str);
-      }
-      
-    }
-
-    fprintf (stderr, "%s",KNRM);
-    fprintf (stderr, "\n");
-
-    //reset values
-    state->dmr_alias_format[0] = 0;
-    state->data_block_counter[0] = 0;
-    state->dmr_alias_len[0] = 0;
-    // memset (state->dmr_alias_block_segment, 0, sizeof(state->dmr_alias_block_segment));
-  }
-  #else
-  UNUSED2(lsd1_okay, lsd2_okay);
-  fprintf (stderr, "%s",KNRM);
-  fprintf (stderr, "\n");
-  #endif //SOFTID
-
   //run LFSR on the MI if we have irrecoverable errors here
   if (irrecoverable_errors && state->payload_algid != 0x80 && state->payload_keyid != 0 && state->payload_miP != 0) 
   {
@@ -627,47 +411,6 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
     fprintf (stderr, "\n");
   }
 
-
-  #define P25p1_ENC_LO //disable if this behavior is detremental
-  #ifdef P25p1_ENC_LO
-  //If trunking and tuning ENC calls is disabled, lock out and go back to CC
-  int enc_lo = 1; int ttg = state->lasttg; //checking to a valid TG will help make sure we have a good LDU1 LCW or HDU first
-  if (irrecoverable_errors == 0 && state->payload_algid != 0x80 && state->payload_algid != 0 && opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && opts->trunk_tune_enc_calls == 0)
-  {
-    //NOTE: This may still cause an issue IF we havent' loaded the key yet from keyloader
-    if (state->payload_algid == 0xAA && state->R != 0) enc_lo = 0;
-    // else if (future condition) enc_lo = 0;
-    // else if (future condition) enc_lo = 0;
-
-    //if this is locked out by conditions above, then write it into the TG mode if we have a TG value assigned
-    if (enc_lo == 1 && ttg != 0)
-    {
-      int xx = 0; int enc_wr = 0;
-      for (xx = 0; xx < state->group_tally; xx++)
-      {
-        if (state->group_array[xx].groupNumber == ttg)
-        {
-          enc_wr = 1; //already in there, so no need to assign it
-          break;
-        }
-      }
-
-      //if not already in there, so save it there now
-      if (enc_wr == 0)
-      {
-        state->group_array[state->group_tally].groupNumber = ttg;
-        sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-        sprintf (state->group_array[state->group_tally].groupName, "%s", "ENC LO"); //was xx and not state->group_tally
-        state->group_tally++;
-      }
-
-      //return to the control channel
-      fprintf (stderr, " No Enc Following on P25p1 Trunking; Return to CC; \n");
-      return_to_cc (opts, state);
-    }
-  }
-  #endif //P25p1_ENC_LO
-
 }
 
 //LFSR code courtesy of https://github.com/mattames/LFSR/

src/p25p1_tdu.c

@@ -32,20 +32,14 @@ processTDU (dsd_opts* opts, dsd_state* state)
         int status;
         status = getDibit (opts, state) + '0';
         // TODO: do something useful with the status bits...
-        UNUSED(status);
     }
     
     //reset some strings -- since its a tdu, blank out any call strings, only want during actual call
     sprintf (state->call_string[0], "%s", "                     "); //21 spaces
     sprintf (state->call_string[1], "%s", "                     "); //21 spaces
 
-    //reset gain
-    if (opts->floating_point == 1)
-        state->aout_gain = opts->audio_gain;
-
-    //zero out MI, key, alg
-    state->payload_miP = 0;
+    //zero out on termination
     state->payload_algid = 0;
     state->payload_keyid = 0;
-    
+    state->payload_miP = 0;
 }

src/p25p1_tdulc.c

@@ -216,7 +216,7 @@ void
 processTDULC (dsd_opts* opts, dsd_state* state)
 {
   int i;
-  uint8_t lcinfo[57], lcformat[9], mfid[9];
+  char lcinfo[57], lcformat[9], mfid[9];
 
   int status_count;
 
@@ -305,7 +305,6 @@ processTDULC (dsd_opts* opts, dsd_state* state)
       int status;
       status = getDibit (opts, state) + '0';
       // TODO: do something useful with the status bits...
-      UNUSED(status);
   }
 
   // Put the corrected data into the DSD structures
@@ -447,13 +446,9 @@ processTDULC (dsd_opts* opts, dsd_state* state)
   sprintf (state->call_string[0], "%s", "                     "); //21 spaces
   sprintf (state->call_string[1], "%s", "                     "); //21 spaces
 
-  //reset gain
-  if (opts->floating_point == 1)
-    state->aout_gain = opts->audio_gain;
-
-  //zero out MI, key, alg
-  state->payload_miP = 0;
+  //zero out on termination
   state->payload_algid = 0;
   state->payload_keyid = 0;
+  state->payload_miP = 0;
 
 }

src/p25p1_tsbk.c

@@ -11,14 +11,6 @@
 void processTSBK(dsd_opts * opts, dsd_state * state)
 {
 
-  //p25p2 18v reset counters and buffers
-  state->voice_counter[0] = 0; //reset
-  state->voice_counter[1] = 0; //reset
-  memset (state->s_l4, 0, sizeof(state->s_l4));
-  memset (state->s_r4, 0, sizeof(state->s_r4));
-  opts->slot_preference = 2;
-  
-
   //reset some strings when returning from a call in case they didn't get zipped already
   sprintf (state->call_string[0], "%s", "                     "); //21 spaces
   sprintf (state->call_string[1], "%s", "                     "); //21 spaces
@@ -28,13 +20,16 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
   {
     memset (state->active_channel, 0, sizeof(state->active_channel));
   }
+  
+  int tsbkbit[196]; //tsbk bit array, 196 trellis encoded bits
+  int tsbk_dibit[98];
 
-  uint8_t tsbk_dibit[98];
+  memset (tsbkbit, 0, sizeof(tsbkbit));
   memset (tsbk_dibit, 0, sizeof(tsbk_dibit));
 
   int dibit = 0;
 
-  uint8_t tsbk_byte[12]; //12 byte return from p25_12
+  uint8_t tsbk_byte[12]; //12 byte return from bd_bridge (block_deinterleave)
   memset (tsbk_byte, 0, sizeof(tsbk_byte));
 
   unsigned long long int PDU[24]; //24 byte PDU to send to the tsbk_byte vPDU handler, should be same formats (mostly)
@@ -43,20 +38,17 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
   int tsbk_decoded_bits[190]; //decoded bits from tsbk_bytes for sending to crc16_lb_bridge
   memset (tsbk_decoded_bits, 0, sizeof(tsbk_decoded_bits));
 
-  int i, j, k, x;
-  int ec = -2; //error value returned from p25_12
+  int flushing_bits[196]; //for flushing the trellis state machine
+  memset (flushing_bits, 0, sizeof(flushing_bits));
+  
+  int i, j, k, b, x, y;
+  int ec = -2; //error value returned from (block_deinterleave)
   int err = -2; //error value returned from crc16_lb_bridge
-
+  int skipdibit = 14; //initial status dibit will occur at 14, then add 36 each time it occurs
   int protectbit = 0;
   int MFID = 0xFF; //Manufacturer ID - Might be beneficial to NOT send anything but standard 0x00 or 0x01 messages
-  int lb = 0; //last block
 
-  //now using modulus on skipdibit values (this was unneccesary on TSBK, but doing it to keep the two roughly the same code wise)
-  int skipdibit = 36-14; //when we arrive here, we are at this position in the counter after reading FS, NID, DUID, and Parity dibits
-  int status_count = 1; //we have already skipped the Status 1 dibit before arriving here
-  int dibit_count = 0; //number of gathered dibits
-  UNUSED(status_count); //debug counter
-  UNUSED(dibit_count); //debug counter
+  //TODO: Don't Print TSBKs/vPDUs unless verbosity levels set higher
 
   //collect three reps of 101 dibits (98 valid dibits with status dibits interlaced)
   for (j = 0; j < 3; j++)
@@ -66,33 +58,32 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
     {
 
       dibit = getDibit(opts, state);
-      if ( (skipdibit / 36) == 0)
+
+      if (i+(j*101) != skipdibit) //
       {
-        dibit_count++;
-        tsbk_dibit[k++] = dibit;
+        tsbk_dibit[k] =   dibit;
+        tsbkbit[k*2]   = (dibit >> 1) & 1;
+        tsbkbit[k*2+1] = (dibit & 1);
+        k++;
       }
 
-      else
+      if (i+(j*101) == skipdibit) 
       {
-        skipdibit = 0;
-        status_count++;
-
-        // fprintf (stderr, " S:%02d; D:%03d; i:%03d;", status_count, (j*101)+i+57, i); //debug Status Count, Total Dibit Count, and i (compare to symbol rx table)
-        // fprintf (stderr, " S:%02d; CD:%02d; i:%03d; d:%d;", status_count, dibit_count, i, dibit); //debug Status Count, Current Dibit Count, i, and status dibit
-
+        skipdibit += 36;
       }
 
-      skipdibit++; //increment
-
     }
 
-    // fprintf (stderr, " DC: %d", dibit_count); //debug
+    //flushing the trellis state machine
+    if (j == 0)
+    {
+      bd_bridge(flushing_bits, tsbk_byte);
+      //reset tsbk_byte afterwards
+      memset (tsbk_byte, 0, sizeof(tsbk_byte));
+    }
 
-    //send to p25_12 and return tsbk_byte
-    ec = p25_12 (tsbk_dibit, tsbk_byte);
-
-    //debug err tally from 1/2 decoder
-    // if (ec) fprintf (stderr, " #%d ERR = %d;", j+1, ec);
+    //send tsbkbit to block_deinterleave and return tsbk_byte
+    ec = bd_bridge(tsbkbit, tsbk_byte);
 
     //too many bit manipulations!
     k = 0;
@@ -141,453 +132,21 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
 
     //check the protect bit, don't run if protected
     protectbit = (tsbk_byte[0] >> 6) & 0x1;
-    lb         = (tsbk_byte[0] >> 7) & 0x1;
 
-    //zero out data calls after returning from a SNDCP data channel
-    if (err == 0)
-      sprintf (state->dmr_lrrp_gps[0], "%s", "");
-
-    //Don't run NET_STS out of this, or will set wrong NAC/CC
-    //Note: Running MFID 90 (moto) opcode 9 GRG Delete or Reserve will falsely trigger a telephone interconnect grant
-    if (MFID < 0x2 && protectbit == 0 && err == 0 && PDU[1] != 0x7B )
+    //Don't run NET_STS out of this, or will set wrong NAC/CC //&& PDU[1] != 0x49 && PDU[1] != 0x45
+    //0x49 is telephone grant, 0x46 Unit to Unit Channel Answer Request (seems bogus) (mfid 90)
+    // if (MFID < 0x2 && protectbit == 0 && err == 0 && ec == 0 && PDU[1] != 0x7B )
+    //running with A4 and 90 causing some false positives when sending to vPDU, issuing bad call grants to nowhere!
+    // if ( (MFID < 0x2 || MFID == 0xA4 || MFID == 0x90) && protectbit == 0 && err == 0 && ec == 0 && PDU[1] != 0x7B )  
+    if (MFID < 0x2 && protectbit == 0 && err == 0 && ec == 0 && PDU[1] != 0x7B ) 
     {
       fprintf (stderr, "%s",KYEL);
       process_MAC_VPDU(opts, state, 0, PDU);
       fprintf (stderr, "%s",KNRM);
     }
 
-    //look at Harris Opcodes and payload portion of TSBK
-    else if (MFID == 0xA4 && protectbit == 0 && err == 0)
-    {
-
-      //MFIDA4 Group Regroup Explicit Encryption Command
-      if ( (tsbk_byte[0] & 0x3F) == 0x30)
-      {
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, "\n MFID A4 (Harris) Group Regroup Explicit Encryption Command\n");
-        int sg = (tsbk_byte[3] << 8) | tsbk_byte[4];
-        int key = (tsbk_byte[5] << 8) | tsbk_byte[6];
-        int add = (tsbk_byte[7] << 16) | (tsbk_byte[8] << 8) | tsbk_byte[9];
-        int tga = tsbk_byte[2] >> 5; //3 bit TGA from GRG_Options
-        int ssn = tsbk_byte[2] & 0x1F; //5 bit SSN from GRG_Options
-
-        if ( (tga & 0x2) == 2) //WGID or WUID (working group id or working unit id)
-          fprintf (stderr, "  SG: %d; KEY: %04X; WGID: %d; ", sg, key, add);
-        else fprintf (stderr, "  SG: %d; KEY: %04X; WUID: %d; ", sg, key, add);
-
-        if ( (tga & 0x4) == 4) fprintf (stderr, " Simulselect"); //one-way regroup
-        else fprintf (stderr, " Patch"); //two-way regroup
-
-        if (tga & 1) fprintf (stderr, " Active;"); //activated
-        else fprintf (stderr, " Inactive;"); //deactivated
-
-        //debug
-        // fprintf (stderr, " T:%d G:%d A:%d;", (tga >> 2) & 1, (tga >> 1) & 1, tga & 1);
-
-        fprintf (stderr, " SSN: %02d \n", ssn);
-        fprintf (stderr, " %s",KNRM);
-      }
-      else
-      {
-        fprintf (stderr, "%s",KCYN);
-        fprintf (stderr, "\n MFID A4 (Harris); Opcode: %02X; ", tsbk_byte[0] & 0x3F);
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-        fprintf (stderr, " %s",KNRM);
-      }
-
-      if (opts->payload == 1)
-      {
-        fprintf (stderr, "%s",KCYN);
-        fprintf (stderr, "\n P25 PDU Payload #%d ", j+1);
-        for (i = 0; i < 12; i++)
-        {
-          fprintf (stderr, "[%02X]", tsbk_byte[i]);
-        }
-        fprintf (stderr, "\n MFID %02X Protected: %d Last Block: %d", MFID, protectbit, lb);
-        
-        if (ec != 0) 
-        {
-          fprintf (stderr, "%s",KRED);
-          fprintf (stderr, " ERR = %d", ec);
-        }
-        if (err != 0) 
-        {
-          fprintf (stderr, "%s",KRED);
-          fprintf (stderr, " (CRC ERR)");
-        }
-        fprintf (stderr, "%s ", KNRM);
-      }
-    }
-
-    //look at Motorola Opcodes and payload portion of TSBK
-    else if (MFID == 0x90 && protectbit == 0 && err == 0)
-    {
-      //group list mode so we can look and see if we need to block tuning any groups, etc
-      char mode[8]; //allow, block, digital, enc, etc
-      sprintf (mode, "%s", "");
-
-      //MFID 90 Group Regroup Channel Grant (MOT_GRG_CN_GRANT) TIA-102.AABH
-      if ( (tsbk_byte[0] & 0x3F) == 0x02 )
-      {
-        int svc = tsbk_byte[2]; //Just the Res, P-bit, and more res bits
-        int channel  = (tsbk_byte[3] << 8) | tsbk_byte[4];
-        long int source = (tsbk_byte[7] << 16) |(tsbk_byte[8] << 8) | tsbk_byte[9];
-        int group = (tsbk_byte[5] << 8) | tsbk_byte[6];
-        long int freq1 = 0;
-        UNUSED(source);
-        fprintf (stderr, "%s\n ",KYEL);
-
-        //unsure if this follows for GRG
-        // if (svc & 0x80) fprintf (stderr, " Emergency"); 
-        
-        if (svc & 0x40) fprintf (stderr, " Encrypted"); //P-bit
-
-        //unsure if this follows for GRG
-        // if (opts->payload == 1) //hide behind payload due to len
-        // {
-        //   if (svc & 0x20) fprintf (stderr, " Duplex");
-        //   if (svc & 0x10) fprintf (stderr, " Packet");
-        //   else fprintf (stderr, " Circuit");
-        //   if (svc & 0x8) fprintf (stderr, " R"); //reserved bit is on
-        //   fprintf (stderr, " Priority %d", svc & 0x7); //call priority
-        // }
-
-        fprintf (stderr, " MFID 90 (Moto) Group Regroup Channel Grant");
-        fprintf (stderr, "\n  SVC [%02X] CHAN [%04X] SG [%d][%04X]", svc, channel, group, group);
-        freq1 = process_channel_to_freq (opts, state, channel);
-
-        //add active channel to string for ncurses display
-        sprintf (state->active_channel[0], "MFID90 Ch: %04X SG: %d ", channel, group);
-        state->last_active_time = time(NULL);
-
-        if (opts->trunk_use_allow_list == 1) sprintf (mode, "%s", "B");
-
-        for (int i = 0; i < state->group_tally; i++)
-        {
-          if (state->group_array[i].groupNumber == group)
-          {
-            fprintf (stderr, " [%s]", state->group_array[i].groupName);
-            strcpy (mode, state->group_array[i].groupMode);
-            break;
-          }
-        }
-
-        //TG hold on MFID90 GRG -- block non-matching target, allow matching group
-        if (state->tg_hold != 0 && state->tg_hold != group) sprintf (mode, "%s", "B");
-        if (state->tg_hold != 0 && state->tg_hold == group) sprintf (mode, "%s", "A");
-
-        //Skip tuning group calls if group calls are disabled
-        if (opts->trunk_tune_group_calls == 0) goto SKIPCALL;
-
-        //Skip tuning encrypted calls if enc calls are disabled
-        if ( (svc & 0x40) && opts->trunk_tune_enc_calls == 0) goto SKIPCALL;
-
-        //tune if tuning available
-        if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0))
-        {
-          //reworked to set freq once on any call to process_channel_to_freq, and tune on that, independent of slot
-          if (state->p25_cc_freq != 0 && opts->p25_is_tuned == 0 && freq1 != 0) //if we aren't already on a VC and have a valid frequency
-          {
-
-            //changed to allow symbol rate change on C4FM Phase 2 systems as well as QPSK
-            if (1 == 1)
-            {
-              if (state->p25_chan_tdma[channel >> 12] == 1)
-              {
-                state->samplesPerSymbol = 8;
-                state->symbolCenter = 3;
-
-                //shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
-                //this will only occur in realtime tuning, not not required .bin or .wav playback
-                if (channel & 1) //VCH1
-                {
-                  opts->slot1_on = 0;
-                  opts->slot2_on = 1;
-                }
-                else //VCH0
-                {
-                  opts->slot1_on = 1;
-                  opts->slot2_on = 0;
-                }
-
-              }
-            }
-            //rigctl
-            if (opts->use_rigctl == 1)
-            {
-              if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
-              SetFreq(opts->rigctl_sockfd, freq1);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = freq1;
-              opts->p25_is_tuned = 1; //set to 1 to set as currently tuned so we don't keep tuning nonstop 
-              state->last_vc_sync_time = time(NULL);
-            }
-            //rtl
-            else if (opts->audio_in_type == 3)
-            {
-              #ifdef USE_RTLSDR
-              rtl_dev_tune (opts, freq1);
-              state->p25_vc_freq[0] = state->p25_vc_freq[1] = freq1;
-              opts->p25_is_tuned = 1;
-              state->last_vc_sync_time = time(NULL);
-              #endif
-            }
-          }    
-        }
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x03 )
-      {
-        //MFID 90 Group Regroup Channel Update (MOT_GRG_CN_GRANT_UPDT) TIA-102.AABH
-        int channel1  = (tsbk_byte[2] << 8) | tsbk_byte[3];
-        int group1 = (tsbk_byte[4] << 8) | tsbk_byte[5];
-        int channel2  = (tsbk_byte[6] << 8) | tsbk_byte[7];
-        int group2 = (tsbk_byte[8] << 8) | tsbk_byte[9];
-
-        long int freq1 = 0;
-        long int freq2 = 0;
-
-        int tempg = 0; //temp group
-        int tempc = 0; //temp chan
-        long int tempf = 0; //temp freq
-
-        fprintf (stderr, "%s\n ",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Group Regroup Channel Grant Update");
-        fprintf (stderr, "\n  CHAN1 [%04X] SG [%d][%04X] CHAN2 [%04X] SG [%d][%04X]", channel1, group1, group1, channel2, group2, group2);
-        freq1 = process_channel_to_freq (opts, state, channel1);
-        freq2 = process_channel_to_freq (opts, state, channel2);
-
-        //add active channel to string for ncurses display
-        sprintf (state->active_channel[0], "MFID90 Ch: %04X SG: %d; Ch: %04X SG: %d ", channel1, group1, channel2, group2);
-        state->last_active_time = time(NULL);
-
-        tempf = freq1;
-        tempc = channel1;
-        tempg = group1;
-
-        for (int j = 0; j < 2; j++)
-        {
-          if (j == 1)
-          {
-            tempf = freq2;
-            tempc = channel2;
-            tempg = group2;
-          }
-
-          if (opts->trunk_use_allow_list == 1) sprintf (mode, "%s", "B");
-
-          for (int i = 0; i < state->group_tally; i++)
-          {
-            if (state->group_array[i].groupNumber == tempg)
-            {
-              fprintf (stderr, " [%s]", state->group_array[i].groupName);
-              strcpy (mode, state->group_array[i].groupMode);
-              break;
-            }
-          }
-
-          //TG hold on MFID90 GRG -- block non-matching target, allow matching group
-          if (state->tg_hold != 0 && state->tg_hold != tempg) sprintf (mode, "%s", "B");
-          if (state->tg_hold != 0 && state->tg_hold == tempg) sprintf (mode, "%s", "A");
-
-          //Skip tuning group calls if group calls are disabled
-          if (opts->trunk_tune_group_calls == 0) goto SKIPCALL;
-
-          //Skip tuning encrypted calls if enc calls are disabled
-          // if (opts->trunk_tune_enc_calls == 0) goto SKIPCALL;
-
-          //tune if tuning available
-          if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0))
-          {
-            //reworked to set freq once on any call to process_channel_to_freq, and tune on that, independent of slot
-            if (state->p25_cc_freq != 0 && opts->p25_is_tuned == 0 && tempf != 0) //if we aren't already on a VC and have a valid frequency
-            {
-
-              //changed to allow symbol rate change on C4FM Phase 2 systems as well as QPSK
-              if (1 == 1)
-              {
-                if (state->p25_chan_tdma[tempc >> 12] == 1)
-                {
-                  state->samplesPerSymbol = 8;
-                  state->symbolCenter = 3;
-                }
-              }
-              //rigctl
-              if (opts->use_rigctl == 1)
-              {
-                if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
-                SetFreq(opts->rigctl_sockfd, tempf);
-                state->p25_vc_freq[0] = state->p25_vc_freq[1] = tempf;
-                opts->p25_is_tuned = 1; //set to 1 to set as currently tuned so we don't keep tuning nonstop 
-                state->last_vc_sync_time = time(NULL);
-              }
-              //rtl
-              else if (opts->audio_in_type == 3)
-              {
-                #ifdef USE_RTLSDR
-                rtl_dev_tune (opts, tempf);
-                state->p25_vc_freq[0] = state->p25_vc_freq[1] = tempf;
-                opts->p25_is_tuned = 1;
-                state->last_vc_sync_time = time(NULL);
-                #endif
-              }
-            }    
-          }
-        }
-
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x00)
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Group Regroup Add: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x01 )
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Group Regroup Delete: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x04 )
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Extended Function: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x06 )
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Queued Response: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x07 )
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Deny Response: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-      else if ( (tsbk_byte[0] & 0x3F) == 0x08 )
-      {
-        fprintf (stderr, "\n");
-        fprintf (stderr, "%s",KYEL);
-        fprintf (stderr, " MFID 90 (Moto) Acknoledge Response: ");
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-      }
-
-
-      //Some of these Opcodes that aren't found in any TIA manual come from SDRTrunk (or other sources), 
-      //but can't verify the accuracy of their meaning/context
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x05 )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Traffic Channel: "); //not sure about this one, don't understand what it means when its on a control channel (activity? but never seems to change even while call grants in progress)
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x09 )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Channel Loading: "); //don't understand the context for this one, waiting on units to arrive on channel?
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x0B )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Control Channel: "); //this appears to echo the 16-bit channel number for the main control channel/RFSS
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x0E )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Control Channel Planned Shutdown: ");
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x10 )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Something: "); //observed, but no idea
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x15 ) //noted on RR, but not observed as of yet, this may actualy be a LCW and not a TSBK?
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Talker Alias: ");
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      // else if ( (tsbk_byte[0] & 0x3F) == 0x16 )
-      // {
-      //   fprintf (stderr, "\n");
-      //   fprintf (stderr, " MFID 90 (Moto) Something: "); //observed, but no idea
-      //   for (i = 2; i < 10; i++)
-      //     fprintf (stderr, "%02X", tsbk_byte[i]);
-      // }
-
-      else
-      {
-        fprintf (stderr, "%s",KCYN);
-        fprintf (stderr, "\n MFID 90 (Moto); Opcode: %02X; ", tsbk_byte[0] & 0x3F);
-        for (i = 2; i < 10; i++)
-          fprintf (stderr, "%02X", tsbk_byte[i]);
-        fprintf (stderr, " %s",KNRM);
-      }
-
-      if (opts->payload == 1)
-      {
-        fprintf (stderr, "%s",KCYN);
-        fprintf (stderr, "\n P25 PDU Payload #%d ", j+1);
-        for (i = 0; i < 12; i++)
-        {
-          fprintf (stderr, "[%02X]", tsbk_byte[i]);
-        }
-        fprintf (stderr, "\n MFID %02X Protected: %d Last Block: %d", MFID, protectbit, lb);
-        
-        if (ec != 0) 
-        {
-          fprintf (stderr, "%s",KRED);
-          fprintf (stderr, " ERR = %d", ec);
-        }
-        if (err != 0) 
-        {
-          fprintf (stderr, "%s",KRED);
-          fprintf (stderr, " (CRC ERR)");
-        }
-        fprintf (stderr, "%s ", KNRM);
-      }
-
-      SKIPCALL: ; //do nothing
-
-    }
-
     //set our WACN and SYSID here now that we have valid ec and crc/checksum
-    else if (protectbit == 0 && err == 0 && (tsbk_byte[0] & 0x3F) == 0x3B) 
+    else if (protectbit == 0 && err == 0 && ec == 0 && (tsbk_byte[0] & 0x3F) == 0x3B) 
     {
       long int wacn = (tsbk_byte[3] << 12) | (tsbk_byte[4] << 4) | (tsbk_byte[5] >> 4);
       int sysid = ((tsbk_byte[5] & 0xF) << 8) | tsbk_byte[6];
@@ -615,7 +174,7 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
       if (opts->payload == 1)
       {
         fprintf (stderr, "%s",KCYN);
-        fprintf (stderr, "\n P25 PDU Payload #%d ", j+1);
+        fprintf (stderr, "\n P25 PDU Payload #%d ", j);
         for (i = 0; i < 12; i++)
         {
           fprintf (stderr, "[%02X]", tsbk_byte[i]);
@@ -636,14 +195,14 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
         {
           fprintf (stderr, "[%02X]", tsbk_byte[i]);
         }
-        fprintf (stderr, "\n MFID %02X Protected: %d Last Block: %d", MFID, protectbit, lb);
+        fprintf (stderr, "\n MFID %02X Protected: %d Last Block: %d", MFID, protectbit, (tsbk_byte[0] >> 7) );
         
         if (ec != 0) 
         {
           fprintf (stderr, "%s",KRED);
-          fprintf (stderr, " ERR = %d", ec);
+          fprintf (stderr, " (FEC ERR)");
         }
-        if (err != 0) 
+        else if (err != 0) 
         {
           fprintf (stderr, "%s",KRED);
           fprintf (stderr, " (CRC ERR)");
@@ -659,7 +218,10 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
     MFID = 0xFF;
 
     //check for last block bit
-    if (lb) break;
+    if ( (tsbk_byte[0] >> 7) == 1 ) 
+    {
+      j = 4; //set j to break the loop early
+    }
   }
 
   fprintf (stderr, "%s ", KNRM);

src/p25p2_frame.c

@@ -11,7 +11,7 @@
 #include "dsd.h"
 
 //DUID Look Up Table from OP25
-static const int16_t duid_lookup[256] = { //128 triggers false 4V on bad signal
+static const int16_t duid_lookup[256] = {
 	0,0,0,-1,0,-1,-1,1,0,-1,-1,4,-1,8,2,-1,
 	0,-1,-1,1,-1,1,1,1,-1,3,9,-1,5,-1,-1,1,
 	0,-1,-1,10,-1,6,2,-1,-1,3,2,-1,2,-1,2,2,
@@ -20,7 +20,7 @@ static const int16_t duid_lookup[256] = { //128 triggers false 4V on bad signal
 	-1,13,7,-1,5,-1,-1,1,5,-1,-1,4,5,5,5,-1,
 	-1,6,7,-1,6,6,-1,6,14,-1,-1,4,-1,6,2,-1,
 	7,-1,7,7,-1,6,7,-1,-1,3,7,-1,5,-1,-1,15,
-	-1,-1,-1,10,-1,8,12,-1,-1,8,9,-1,8,8,-1,8, //first value was 0 for 4V, changing to -1 for testing -- 1000 0000 (perfect 4V should be 0000 0000, so is this the correct hamming distance?)
+	0,-1,-1,10,-1,8,12,-1,-1,8,9,-1,8,8,-1,8,
 	-1,13,9,-1,11,-1,-1,1,9,-1,9,9,-1,8,9,-1,
 	-1,10,10,10,11,-1,-1,10,14,-1,-1,10,-1,8,2,-1,
 	11,-1,-1,10,11,11,11,-1,-1,3,9,-1,11,-1,-1,15,
@@ -74,12 +74,11 @@ int p2xbit[4320] = {0}; //bits xored from p2bit and p2lbit
 int dibit = 0;
 int vc_counter = 0;
 int framing_counter = 0;
-int voice = 0; //if voice in vch 0 or vch 1
 
 uint64_t isch = 0;
 int isch_decoded = -1;
-uint8_t p2_duid[8] = {0};
-int16_t duid_decoded = -1;
+int p2_duid[8] = {0};
+int16_t duid_decoded = 0;
 
 int ess_b[2][96] = {0}; //96 bits for 4 - 24 bit ESS_B fields starting bit 168 (RS 44,16,29)
 int ess_a[2][168] = {0}; //ESS_A 1 (96 bit) and 2 (72 bit) fields, starting at bit 168 and bit 266 (RS Parity)
@@ -110,8 +109,6 @@ void p2_dibit_buffer (dsd_opts * opts, dsd_state * state)
 
 void process_Frame_Scramble (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
   //The bits of the scramble sequence corresponding to signal bits that are not scrambled or not used are discarded.
   //descramble frame scrambled by LFSR of WACN, SysID, and CC(NAC)
   unsigned long long int seed = 0;
@@ -357,9 +354,7 @@ void process_SACCHs (dsd_opts * opts, dsd_state * state)
 
 void process_ISCH (dsd_opts * opts, dsd_state * state)
 {
-  UNUSED(opts);
-
-  isch = 0;
+	isch = 0;
   for (int i = 0; i < 40; i++)
   {
    	isch = isch << 1;
@@ -380,7 +375,6 @@ void process_ISCH (dsd_opts * opts, dsd_state * state)
 			int free = (isch_decoded >> 2) & 0x1;
 			int isch_loc = (isch_decoded >> 3) & 0x3;
 			int chan_num = (isch_decoded >> 5) & 0x3;
-			UNUSED2(uf_count, free);
 			state->p2_vch_chan_num = chan_num;
 
 			//old rules for entire superframe worth
@@ -481,86 +475,20 @@ void process_4V (dsd_opts * opts, dsd_state * state)
 		fprintf (stderr, "\n");
 	}
 
-	// #ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
-	// //Cygwin OSS Slot Preference Pre-emption shim
-	// if (opts->audio_out_type == 5)
-	// {
-	// 	//set to 21 for MBE OSS shim to preempt audio 
-	// 	if (state->currentslot == 0) state->dmrburstL = 21;
-	// 	else state->dmrburstR = 21;
-	// }
-	// #endif
-
-	//unsure of the best location for these counter resets
-	if (state->voice_counter[0] >= 18)
-		state->voice_counter[0] = 0;
-
-	if (state->voice_counter[1] >= 18)
-		state->voice_counter[1] = 0;
+	#ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
+	//Cygwin OSS Slot Preference Pre-emption shim
+	if (opts->audio_out_type == 5)
+	{
+		//set to 21 for MBE OSS shim to preempt audio 
+		if (state->currentslot == 0) state->dmrburstL = 21;
+		else state->dmrburstR = 21;
+	}
+	#endif
 	
 	processMbeFrame (opts, state, NULL, ambe_fr1, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-	}
-	else
-	{
-		memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
-	}
-
 	processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
-	}
-	else
-	{
-		memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[1], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[1], state->s_ru, sizeof(state->s_ru));
-	}
-
 	processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[2], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[2], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[2], state->s_lu, sizeof(state->s_lu));
-	}
-	else
-	{
-		memcpy(state->f_r4[2], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[2], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[2], state->s_ru, sizeof(state->s_ru));
-	}
-
 	processMbeFrame (opts, state, NULL, ambe_fr4, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[3], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[3], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[3], state->s_lu, sizeof(state->s_lu));
-	}
-	else
-	{
-		memcpy(state->f_r4[3], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[3], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[3], state->s_ru, sizeof(state->s_ru));
-	}
 
 }
 
@@ -645,70 +573,6 @@ void process_ESS (dsd_opts * opts, dsd_state * state)
 			}
 
 		}
-
-		#define P25p2_ENC_LO //disable if this behavior is detremental
-		#ifdef P25p2_ENC_LO
-
-		//If trunking and tuning ENC calls is disabled, lock out and go back to CC
-		int enc_lo = 1;
-		int ttg = 0; //checking to a valid TG will help make sure we have a good MAC_PTT or SACCH Channel Update First
-		int alg = 0; //set alg and key based on current slot values
-		unsigned long long int key = 0;
-
-		if (state->currentslot == 0)
-		{
-			ttg = state->lasttg;
-			alg = state->payload_algid;
-			if (alg == 0xAA) key = state->R;
-			// else if (future condition) key = 1;
-			// else if (future condition) key = 1;
-		}
-
-		if (state->currentslot == 1)
-		{
-			ttg = state->lasttgR;
-			alg = state->payload_algidR;
-			if (alg == 0xAA) key = state->RR;
-			// else if (future condition) key = 1;
-			// else if (future condition) key = 1;
-		}
-
-		if (alg != 0 && opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && opts->trunk_tune_enc_calls == 0)
-		{
-			//NOTE: This may still cause an issue IF we havent' loaded the key yet from keyloader
-			if (alg == 0xAA && key != 0) enc_lo = 0;
-			// else if (future condition) enc_lo = 0;
-			// else if (future condition) enc_lo = 0;
-
-			//if this is locked out by conditions above, then write it into the TG mode if we have a TG value assigned
-			if (enc_lo == 1 && ttg != 0)
-			{
-				int xx = 0; int enc_wr = 0;
-				for (xx = 0; xx < state->group_tally; xx++)
-				{
-					if (state->group_array[xx].groupNumber == ttg)
-					{
-						enc_wr = 1; //already in there, so no need to assign it
-						break;
-					}
-				}
-
-				//if not already in there, so save it there now
-				if (enc_wr == 0)
-				{
-					state->group_array[state->group_tally].groupNumber = ttg;
-					sprintf (state->group_array[state->group_tally].groupMode, "%s", "DE");
-					sprintf (state->group_array[state->group_tally].groupName, "%s", "ENC LO"); //was xx and not state->group_tally
-					state->group_tally++;
-				}
-
-				//return to the control channel -- NOTE: Disabled, just mark as lockout for now, return would require complex check of the other slot activity
-				// fprintf (stderr, " No Enc Following on P25p2 Trunking; Return to CC; \n");
-				// return_to_cc (opts, state);
-			}
-		}
-		#endif //P25p2_ENC_LO
-
 	}
 	if (ec == -1 || ec >= 15)
 	{
@@ -778,56 +642,19 @@ void process_2V (dsd_opts * opts, dsd_state * state)
 		fprintf (stderr, "\n");
 	}
 
-	// #ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
-	// //Cygwin OSS Slot Preference Pre-emption shim
-	// if (opts->audio_out_type == 5)
-	// {
-	// 	//set to 21 for MBE OSS shim to preempt audio 
-	// 	if (state->currentslot == 0) state->dmrburstL = 21;
-	// 	else state->dmrburstR = 21;
-	// }
-	// #endif
-
-	//unsure of the best location for these counter resets
-	if (state->voice_counter[0] >= 18)
-		state->voice_counter[0] = 0;
-
-	if (state->voice_counter[1] >= 18)
-		state->voice_counter[1] = 0;
+	#ifdef AERO_BUILD //FUN FACT: OSS stutters only on Cygwin, using padsp in linux, it actually opens two virtual /dev/dsp audio streams for output
+	//Cygwin OSS Slot Preference Pre-emption shim
+	if (opts->audio_out_type == 5)
+	{
+		//set to 21 for MBE OSS shim to preempt audio 
+		if (state->currentslot == 0) state->dmrburstL = 21;
+		else state->dmrburstR = 21;
+	}
+	#endif
 
 	processMbeFrame (opts, state, NULL, ambe_fr1, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[0], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[0], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[0], state->s_lu, sizeof(state->s_lu));
-	}
-	else
-	{
-		memcpy(state->f_r4[0], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[0], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[0], state->s_ru, sizeof(state->s_ru));
-	}
-
 	processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
-	if(state->currentslot == 0)
-	{
-		memcpy(state->f_l4[1], state->audio_out_temp_buf, sizeof(state->audio_out_temp_buf));
-		// memcpy(state->s_l4[1], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4[(state->voice_counter[0]++)%18], state->s_l, sizeof(state->s_l));
-		memcpy(state->s_l4u[1], state->s_lu, sizeof(state->s_lu));
 
-	}
-	else
-	{
-		memcpy(state->f_r4[1], state->audio_out_temp_bufR, sizeof(state->audio_out_temp_bufR));
-		// memcpy(state->s_r4[1], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4[(state->voice_counter[1]++)%18], state->s_r, sizeof(state->s_r));
-		memcpy(state->s_r4u[1], state->s_ru, sizeof(state->s_ru));
-	}
-	// if (state->currentslot == 0) state->voice_counter[0] = 0; if (state->currentslot == 1) state->voice_counter[1] = 0;
 	process_ESS(opts, state);
 
 	//reset drop bytes after a 2V
@@ -846,10 +673,26 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 	vc_counter = 0;
 	int err_counter = 0;
 
+	//add time to mirror printFrameSync
+  	time_t now;
+  	char * getTime(void) //get pretty hh:mm:ss timestamp
+  	{
+    	time_t t = time(NULL);
+
+    char * curr;
+    char * stamp = asctime(localtime( & t));
+
+    curr = strtok(stamp, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+    curr = strtok(NULL, " ");
+
+    return curr;
+  	}
+
   for (ts_counter = 0; ts_counter < 4; ts_counter++) //12
   {
-		duid_decoded = -2;
-		int sacch = 0; UNUSED(sacch);
+
 		p2_duid[0] = p2bit[0+(ts_counter*360)];
 		p2_duid[1] = p2bit[1+(ts_counter*360)];
 		p2_duid[2] = p2bit[74+(ts_counter*360)];
@@ -868,55 +711,30 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 		}
 		duid_decoded = duid_lookup[p2_duid_complete];
 
-		char * timestr = getTimeC();
-
 		fprintf (stderr, "\n");
-		fprintf (stderr,"%s ", timestr);
+		fprintf (stderr,"%s ", getTime());
 		fprintf (stderr, "       P25p2 ");
-		
-		if (timestr != NULL)
-		{
-			free (timestr);
-			timestr = NULL;
-		}
 
-
-		if (state->currentslot == 0 && duid_decoded != 3 && duid_decoded != 12 && duid_decoded != 13 && duid_decoded != 4)
+		//print our VCH channel number, or print S for SACCH since its inverted
+		if (state->currentslot == 0 && duid_decoded != 3 && duid_decoded != 12)
 		{
-			fprintf (stderr, "LCH 0 ");
+			fprintf (stderr, "VCH 0 ");
 			//open MBEout file - slot 1 - USE WITH CAUTION on Phase 2! Consider using a symbol capture bin instead!
 			if (duid_decoded == 0 || duid_decoded == 6) //4V or 2V (voice)
 			{
-				voice = 1;
 				if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_f == NULL)) openMbeOutFile (opts, state);
 			}
 		}
-		else if (state->currentslot == 1 && duid_decoded != 3 && duid_decoded != 12 && duid_decoded != 13 && duid_decoded != 4)
+		else if (state->currentslot == 1 && duid_decoded != 3 && duid_decoded != 12)
 		{
-			fprintf (stderr, "LCH 1 ");
+			fprintf (stderr, "VCH 1 ");
 			//open MBEout file - slot 2 - USE WITH CAUTION on Phase 2! Consider using a symbol capture bin instead!
 			if (duid_decoded == 0 || duid_decoded == 6) //4V or 2V (voice)
 			{
-				voice = 1;
       	if ((opts->mbe_out_dir[0] != 0) && (opts->mbe_out_fR == NULL)) openMbeOutFileR (opts, state);
 			}
 		}
-		//The LCCH may occupy LCH 0 or LCH 1 or both. BBAD 3.3 p8
-		else if (duid_decoded == 13) //MAC_SIGNAL, or clear LCCH
-		{
-			// sacch = 1; //only an 'inverted' slot when its TS index 10 or 11
-			fprintf (stderr, "LCCH  ");
-		}
-		else if (duid_decoded == 4) //Scrambled LCCH (TDMA_CC only...look in the manual again)
-		{
-			// sacch = 1; //only an 'inverted' slot when its TS index 10 or 11
-			fprintf (stderr, "LCCHs ");
-		}
-		else
-		{
-			sacch = 1; //always an "inverted" sacch slot
-			fprintf (stderr, "SACCH ");
-		}
+		else fprintf (stderr, "VCH S ");
 
 		//check to see when last voice activity occurred in order to allow tuning on phase 2
 		//mac_signal or mac_idle when no more voice activity on current channel
@@ -927,27 +745,11 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 			opts->p25_is_tuned = 0;
 			state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
 			memset (state->active_channel, 0, sizeof (state->active_channel)); //zero out here? I think this will be fine
-			//clear out stale voice samples left in the buffer and reset counter value
-			state->voice_counter[0] = 0;
-			state->voice_counter[1] = 0;
-			memset(state->s_l4, 0, sizeof(state->s_l4));
-			memset(state->s_r4, 0, sizeof(state->s_r4));
-		}
-		else if (duid_decoded == 13 && ((time(NULL) - state->last_active_time) > 2) && opts->p25_is_tuned == 0) //should we use && opts->p25_is_tuned == 1?
-		{
-			memset (state->active_channel, 0, sizeof (state->active_channel)); //zero out here? I think this will be fine
-			//clear out stale voice samples left in the buffer and reset counter value
-			state->voice_counter[0] = 0;
-			state->voice_counter[1] = 0;
-			memset(state->s_l4, 0, sizeof(state->s_l4));
-			memset(state->s_r4, 0, sizeof(state->s_r4));
 		}
 
 		if (duid_decoded == 0)
 		{
 			fprintf (stderr, " 4V %d", state->fourv_counter[state->currentslot]+1);
-			//debug see which 4V and which 2V randomly pop on Duke P25p2 CC (8 bit binary code)
-			// fprintf (stderr, " DUID: %d", p2_duid_complete);
 			if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0 &&
 					state->p2_wacn != 0xFFFFF && state->p2_cc != 0xFFF && state->p2_sysid != 0xFFF)
 			{
@@ -958,8 +760,6 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 		else if (duid_decoded == 6)
 		{
 			fprintf (stderr, " 2V");
-			//debug see which 4V and which 2V randomly pop on Duke P25p2 CC (8 bit binary code)
-			// fprintf (stderr, " DUID: %d", p2_duid_complete);
 			if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0 &&
 					state->p2_wacn != 0xFFFFF && state->p2_cc != 0xFFF && state->p2_sysid != 0xFFF)
 			{
@@ -998,6 +798,7 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 		}
 		else if (duid_decoded == 4)
 		{
+			fprintf (stderr, " LCCH Sc"); //w/ scrambling
 			if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0 &&
 					state->p2_wacn != 0xFFFFF && state->p2_cc != 0xFFF && state->p2_sysid != 0xFFF)
 			{
@@ -1027,8 +828,6 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 			state->p2_is_lcch = 0;
 			state->fourv_counter[0] = 0;
 			state->fourv_counter[1] = 0;
-			state->voice_counter[0] = 0;
-  		state->voice_counter[1] = 0;
 
 			goto END;
 		}
@@ -1040,38 +839,6 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 		//add 360 bits to each counter
 		vc_counter = vc_counter + 360;
 
-		//debug enable both slots before playback
-		// opts->slot1_on = 1;
-		// opts->slot2_on = 1;
-
-		//NOTE: Could be an issue if MAC_SIGNAL onn LCH 1 and voice in LCH 0? It might Stutter?
-		if (sacch == 0 && ts_counter & 1 && opts->floating_point == 1 && opts->pulse_digi_rate_out == 8000)
-				playSynthesizedVoiceFS4 (opts, state);
-
-		// if (sacch == 0 && ts_counter & 1 && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000)
-		// 		playSynthesizedVoiceSS4 (opts, state);
-
-		// fprintf (stderr, " VCH0: %d;", state->voice_counter[0]); //debug
-		// fprintf (stderr, " VCH1: %d;", state->voice_counter[1]); //debug
-
-		//this works, but may still have an element of 'dual voice stutter' which was my initial complaint, but shouldn't 'lag' during trunking operations (hopefully)
-		if ( (state->voice_counter[0] >= 18 || state->voice_counter[1] >= 18 ) && opts->floating_point == 0 && opts->pulse_digi_rate_out == 8000 && ts_counter & 1)
-		{
-			//debug test, see what each counter is at during playback on dual voice
-			// fprintf (stderr, " VC1: %02d; VC2: %02d;", state->voice_counter[0], state->voice_counter[1] );
-
-			playSynthesizedVoiceSS18 (opts, state);
-			state->voice_counter[0] = 0; //reset
-			state->voice_counter[1] = 0; //reset
-		}
-
-		//debug: fix burst indicator for ncurses if marginal signal
-		// if (voice)
-		// {
-		// 	if (state->currentslot == 0) state->dmrburstL = 21;
-		// 	else state->dmrburstR = 21;
-		// }
-
 		//flip slots after each TS processed
 		if (state->currentslot == 0)
 		{
@@ -1082,13 +849,12 @@ void process_P2_DUID (dsd_opts * opts, dsd_state * state)
 			state->currentslot = 0;
 		}
 
-		//reset voice after each compliment of 2 slots
-		if (ts_counter & 1)
-			voice = 0;
-
   }
 	END:
-	voice = 0; //reset before exit
+	if (1 == 2)
+	{
+		//go directly to END if 2 consecutive DUID errors occur
+	}
 
 }
 
@@ -1096,7 +862,6 @@ void processP2 (dsd_opts * opts, dsd_state * state)
 {
 	state->dmr_stereo = 1; 
 	p2_dibit_buffer (opts, state);
-	voice = 0;
 
 	//look at our ISCH values and determine location in superframe before running frame scramble
 	for (framing_counter = 0; framing_counter < 4; framing_counter++)
@@ -1117,7 +882,6 @@ void processP2 (dsd_opts * opts, dsd_state * state)
 
 	//process DUID will run through all collected frames and handle them appropriately
   process_P2_DUID (opts, state);
-
 	state->dmr_stereo = 0; 
 	state->p2_is_lcch = 0;
 

src/p25p2_xcch.c

@@ -36,22 +36,20 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 	opcode = (payload[0] << 2) | (payload[1] << 1) | (payload[2] << 0);
 	int mac_offset = 0;
 	mac_offset = (payload[3] << 2) | (payload[4] << 1) | (payload[5] << 0);
-	int res = (payload[6] << 1) | (payload[7] << 0);
 	int b = 9;
 	b = (payload[8] << 1) | (payload[9] << 0); //combined b1 and b2
 	int mco_a = 69;
 	//mco will tell us the number of octets to use in variable length MAC PDUs, need a table or something
 	mco_a = (payload[10] << 5) | (payload[11] << 4) | (payload[12] << 3) | (payload[13] << 2) | (payload[14] << 0) | (payload[15] << 0);
-	UNUSED3(mac_offset, b, mco_a);
 
 	//get the second mco after determining first message length, see what second mco is and plan accordingly
 	int mco_b = 69;
-	UNUSED(mco_b);
 
 	//attempt CRC12 check to validate or reject PDU
 	int err = -2;
 	if (state->p2_is_lcch == 0)
 	{
+		int len =
 		err = crc12_xb_bridge(payload, 180-12);
 		if (err != 0) //CRC Failure, warn or skip.
 		{
@@ -122,7 +120,6 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 		{
 			//reset fourv_counter and dropbyte on PTT
 			state->fourv_counter[0] = 0;
-			state->voice_counter[0] = 0;
 			state->dropL = 256;
 
 			state->dmrburstL = 20;
@@ -134,16 +131,6 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 			fprintf (stderr, "TG %d ", state->lasttg);
 			fprintf (stderr, "SRC %d ", state->lastsrc);
 
-			/*
-			When the talker radio is initiating an individual call (unit to unit or telephone interconnect), the reserved group ID of zero
-			is used in the group address portion of the MAC_PTT PDU and the source ID is that of the talker radio.
-
-			The outbound SACCH for the talker radio containing the talker ID information is required at the
-			talker radio site and optional at other sites. (So, if its from an external site, then it can be zero?)
-			
-			*/
-
-			// if (state->lastsrc == 0) fprintf (stderr, "External ");
 
 			state->payload_algid =  SMAC[10];
 			state->payload_keyid = (SMAC[11] << 8) | SMAC[12];
@@ -162,17 +149,12 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 				// fprintf (stderr, "ENC");
 			}
 
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gain = opts->audio_gain;
-
 		}
 
 		if (state->currentslot == 0)
 		{
 			//reset fourv_counter and dropbyte on PTT
 			state->fourv_counter[1] = 0;
-			state->voice_counter[1] = 0;
 			state->dropR = 256;
 			state->payload_algidR = 0; //zero this out as well
 
@@ -185,7 +167,6 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 			fprintf (stderr, "TG %d ", state->lasttgR);
 			fprintf (stderr, "SRC %d ", state->lastsrcR);
 
-			// if (state->lastsrcR == 0) fprintf (stderr, "External ");
 
 			state->payload_algidR =  SMAC[10];
 			state->payload_keyidR = (SMAC[11] << 8) | SMAC[12];
@@ -204,22 +185,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 				// fprintf (stderr, "ENC");
 			}
 
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gainR = opts->audio_gain;
-
 		}
-
-		if (opts->payload == 1)
-		{
-			fprintf (stderr, "\n MAC_PTT_PAYLOAD_S OFFSET: %d RES: %d \n ", mac_offset, res);
-			for (int i = 0; i < 24; i++)
-			{
-				if (i == 12) fprintf (stderr, "\n ");
-				fprintf (stderr, "[%02llX]", SMAC[i]);
-			}
-		}
-
 		fprintf (stderr, "%s", KNRM);
 	}
 	//do not permit MAC_PTT_END with CRC errs, help prevent false positives on calls
@@ -232,7 +198,6 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 		{
 			
 			state->fourv_counter[0] = 0;
-			state->voice_counter[0] = 0;
 			state->dropL = 256;
 			state->dmrburstL = 23;
 			state->payload_algid = 0; 
@@ -250,18 +215,13 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
  			if (opts->mbe_out_f != NULL) closeMbeOutFile (opts, state);
 
 			//blank the call string here -- slot variable is already flipped accordingly for sacch
-			sprintf (state->call_string[slot], "%s", "                     "); //21 spaces -- wrong placement!
-
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gain = opts->audio_gain;
+			sprintf (state->call_string[slot], "%s", "                     "); //21 spaces
 
 		}
 		if (state->currentslot == 0)
 		{
 			
 			state->fourv_counter[1] = 0;
-			state->voice_counter[1] = 0;
 			state->dropR = 256;
 			state->dmrburstR = 23;
 			state->payload_algidR = 0;
@@ -277,92 +237,7 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 
 			//close any open MBEout files
 			if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
-
-			//blank the call string here -- slot variable is already flipped accordingly for sacch
-			sprintf (state->call_string[slot], "%s", "                     "); //21 spaces -- wrong placement!
-
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gainR = opts->audio_gain;
-
 		}
-
-		//Return to CC on MAC_END_PTT if other slot is idle
-		//TODO: Look at the source address of the END_PTT, if it is 0xFFFFFF, then its from the FNE?
-		//if from the FNE, that may be when we know channel teardown will really occur vs using MAC_END_PTT directly
-
-		/*
-		Upon receipt of a MAC_END_PTT PDU on the assigned VCH, and having verified it contains the
-		correct color code, the SU shall return to the idle state on the control channel.
-		*/
-
-		//NOTE: Disable return later on if not desirable to use
-
-		//end_ptt in this slot, idle in the other slot (Normal Slots)
-		if ( ((state->currentslot == 0) && (state->dmrburstL == 24)) ||
-		     ((state->currentslot == 1) && (state->dmrburstR == 24))   )
-		{
-			if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1)
-			{
-
-				//if P25p2 VCH and going back to P25p1 CC, flip symbolrate
-				if (state->p25_cc_is_tdma == 0)
-				{
-					state->samplesPerSymbol = 10;
-					state->symbolCenter = 4;
-					//re-enable both slots
-					opts->slot1_on = 1;
-					opts->slot2_on = 1;
-				}
-
-				//rigctl
-				if (opts->use_rigctl == 1)
-				{
-					state->lasttg = 0;
-					state->lastsrc = 0;
-					state->lasttgR = 0;
-					state->lastsrcR = 0;
-					state->payload_algid = 0; 
-					state->payload_keyid = 0;
-					state->payload_algidR = 0; 
-					state->payload_keyidR = 0;
-					// state->payload_miP = 0;
-					//reset some strings
-					sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-					sprintf (state->call_string[1], "%s", "                     "); //21 spaces
-					sprintf (state->active_channel[0], "%s", "");
-					sprintf (state->active_channel[1], "%s", "");
-					opts->p25_is_tuned = 0;
-					state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-					if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
-					SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);        
-				}
-				//rtl
-				else if (opts->audio_in_type == 3)
-				{
-					#ifdef USE_RTLSDR
-					state->lasttg = 0;
-					state->lastsrc = 0;
-					state->lasttgR = 0;
-					state->lastsrcR = 0;
-					state->payload_algid = 0; 
-					state->payload_keyid = 0;
-					state->payload_algidR = 0; 
-					state->payload_keyidR = 0;
-					// state->payload_miP = 0;
-					//reset some strings
-					sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-					sprintf (state->call_string[1], "%s", "                     "); //21 spaces
-					sprintf (state->active_channel[0], "%s", "");
-					sprintf (state->active_channel[1], "%s", "");
-					opts->p25_is_tuned = 0;
-					state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-					rtl_dev_tune (opts, state->p25_cc_freq);
-					#endif
-				}
-			}
-		}
-
 		fprintf (stderr, "%s", KNRM);
 	}
 	if (opcode == 0x3 && err == 0)
@@ -374,20 +249,6 @@ void process_SACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[180]
 		process_MAC_VPDU(opts, state, 1, SMAC);
 		fprintf (stderr, "%s", KNRM);
 
-		// if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1)
-		// {
-		// 	if (state->currentslot == 1)
-		// 	{
-		// 		opts->slot1_on = 0;
-		// 		opts->slot2_on = 1;
-		// 	}
-		// 	else
-		// 	{
-		// 		opts->slot1_on = 1;
-		// 		opts->slot2_on = 0;
-		// 	}
-		// }
-
 		//blank the call string here -- slot variable is already flipped accordingly for sacch
 		sprintf (state->call_string[slot], "%s", "                     "); //21 spaces
 
@@ -473,8 +334,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 	opcode = (payload[0] << 2) | (payload[1] << 1) | (payload[2] << 0);
 	int mac_offset = 0;
 	mac_offset = (payload[3] << 2) | (payload[4] << 1) | (payload[5] << 0);
-	int res = (payload[6] << 1) | (payload[7] << 0);
-	UNUSED(mac_offset);
 
 	//attempt CRC check to validate or reject PDU
 	int err = -2;
@@ -516,7 +375,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 		{
 			//reset fourv_counter and dropbyte on PTT
 			state->fourv_counter[0] = 0;
-			state->voice_counter[0] = 0;
 			state->dropL = 256;
 
 			state->dmrburstL = 20;
@@ -528,7 +386,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 			fprintf (stderr, "TG %d ", state->lasttg);
 			fprintf (stderr, "SRC %d ", state->lastsrc);
 
-			// if (state->lastsrc == 0) fprintf (stderr, "External ");
 
 			state->payload_algid =  FMAC[10];
 			state->payload_keyid = (FMAC[11] << 8) | FMAC[12];
@@ -547,17 +404,12 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 				// fprintf (stderr, "ENC");
 			}
 
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gain = opts->audio_gain;
-
 		}
 
 		if (state->currentslot == 1)
 		{
 			//reset fourv_counter and dropbyte on PTT
 			state->fourv_counter[1] = 0;
-			state->voice_counter[1] = 0;
 			state->dropR = 256;
 
 			state->dmrburstR = 20;
@@ -569,7 +421,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 			fprintf (stderr, "TG %d ", state->lasttgR);
 			fprintf (stderr, "SRC %d ", state->lastsrcR);
 
-			// if (state->lastsrcR == 0) fprintf (stderr, "External ");
 
 			state->payload_algidR =  FMAC[10];
 			state->payload_keyidR = (FMAC[11] << 8) | FMAC[12];
@@ -588,20 +439,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 				// fprintf (stderr, "ENC");
 			}
 
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gainR = opts->audio_gain;
-
-		}
-
-		if (opts->payload == 1)
-		{
-			fprintf (stderr, "\n MAC_PTT_PAYLOAD_F OFFSET: %d RES: %d \n ", mac_offset, res);
-			for (int i = 0; i < 24; i++)
-			{
-				if (i == 12) fprintf (stderr, "\n ");
-				fprintf (stderr, "[%02llX]", FMAC[i]);
-			}
 		}
 		fprintf (stderr, "%s", KNRM);
 
@@ -614,7 +451,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 		{
 			
 			state->fourv_counter[0] = 0;
-			state->voice_counter[0] = 0;
 			state->dropL = 256;
 			state->dmrburstL = 23;
 			state->payload_algid = 0; //zero this out as well
@@ -633,17 +469,12 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 
 			//blank the call string here 
 			sprintf (state->call_string[slot], "%s", "                     "); //21 spaces
-
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gain = opts->audio_gain; //reset
 			
 		}
 		if (state->currentslot == 1)
 		{
 			
 			state->fourv_counter[1] = 0;
-			state->voice_counter[1] = 0;
 			state->dropR = 256;
 			state->dmrburstR = 23;
 			state->payload_algidR = 0; //zero this out as well
@@ -659,80 +490,7 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 
 			//close any open MBEout files
 			if (opts->mbe_out_fR != NULL) closeMbeOutFileR (opts, state);
-
-			//reset gain
-			if (opts->floating_point == 1)
-				state->aout_gainR = opts->audio_gain;
 		}
-
-		//Return to CC on MAC_END_PTT if other slot is idle
-		//NOTE: Disable return later on if not desirable to use
-
-		//end_ptt in this slot, idle in the other slot (Normal Slots)
-		if ( ((state->currentslot == 0) && (state->dmrburstR == 24)) ||
-		     ((state->currentslot == 1) && (state->dmrburstL == 24))   )
-		{
-			if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1)
-			{
-				
-				//if P25p2 VCH and going back to P25p1 CC, flip symbolrate
-				if (state->p25_cc_is_tdma == 0)
-				{
-					state->samplesPerSymbol = 10;
-					state->symbolCenter = 4;
-					//re-enable both slots
-					opts->slot1_on = 1;
-					opts->slot2_on = 1;
-				}
-
-				//rigctl
-				if (opts->use_rigctl == 1)
-				{
-					state->lasttg = 0;
-					state->lastsrc = 0;
-					state->lasttgR = 0;
-					state->lastsrcR = 0;
-					state->payload_algid = 0; 
-					state->payload_keyid = 0;
-					state->payload_algidR = 0; 
-					state->payload_keyidR = 0;
-					// state->payload_miP = 0;
-					//reset some strings
-					sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-					sprintf (state->call_string[1], "%s", "                     "); //21 spaces
-					sprintf (state->active_channel[0], "%s", "");
-					sprintf (state->active_channel[1], "%s", "");
-					opts->p25_is_tuned = 0;
-					state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-					if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
-					SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);        
-				}
-				//rtl
-				else if (opts->audio_in_type == 3)
-				{
-					#ifdef USE_RTLSDR
-					state->lasttg = 0;
-					state->lastsrc = 0;
-					state->lasttgR = 0;
-					state->lastsrcR = 0;
-					state->payload_algid = 0; 
-					state->payload_keyid = 0;
-					state->payload_algidR = 0; 
-					state->payload_keyidR = 0;
-					// state->payload_miP = 0;
-					//reset some strings
-					sprintf (state->call_string[0], "%s", "                     "); //21 spaces
-					sprintf (state->call_string[1], "%s", "                     "); //21 spaces
-					sprintf (state->active_channel[0], "%s", "");
-					sprintf (state->active_channel[1], "%s", "");
-					opts->p25_is_tuned = 0;
-					state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
-					rtl_dev_tune (opts, state->p25_cc_freq);
-					#endif
-				}
-			}
-		}
-
 		fprintf (stderr, "%s", KNRM);
 	}
 	if (opcode == 0x3 && err == 0)
@@ -745,7 +503,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 			state->payload_keyid = 0;
 			state->dmrburstL = 24;
 			state->fourv_counter[0] = 0;
-			state->voice_counter[0] = 0;
 			state->lastsrc = 0;
 			state->lasttg = 0;
 
@@ -756,7 +513,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 			state->payload_keyidR = 0;
 			state->dmrburstR = 24;
 			state->fourv_counter[1] = 0;
-			state->voice_counter[1] = 0;
 			state->lastsrcR = 0;
 			state->lasttgR = 0;
 
@@ -766,20 +522,6 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
 		process_MAC_VPDU(opts, state, 0, FMAC);
 		fprintf (stderr, "%s", KNRM);
 
-		// if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1)
-		// {
-		// 	if (state->currentslot == 0)
-		// 	{
-		// 		opts->slot1_on = 0;
-		// 		opts->slot2_on = 1;
-		// 	}
-		// 	else
-		// 	{
-		// 		opts->slot1_on = 1;
-		// 		opts->slot2_on = 0;
-		// 	}
-		// }
-
 		//blank the call string here 
 		sprintf (state->call_string[slot], "%s", "                     "); //21 spaces
 			

src/provoice.c

@@ -6,7 +6,6 @@
 void processProVoice (dsd_opts * opts, dsd_state * state)
 {
   int i, j, dibit;
-  uint16_t k = 0;
   char imbe7100_fr1[7][24];
   char imbe7100_fr2[7][24];
   const int *w, *x;
@@ -22,23 +21,19 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
   uint16_t lid = 0;     //lid value 16-bit
   unsigned long long int secondary = 0; //secondary 64-bits after lid, before voice
 
+  uint8_t spacer_bit[8]; //check this value to see if its a status thing (like P25 P1)
+  memset (spacer_bit, 0, sizeof (spacer_bit));
+  uint8_t spacer = 0;
   uint16_t bf = 0; //the 16-bit value in-between imbe 2 and imbe 3 that is usually 2175
 
   fprintf (stderr," VOICE");
 
-  //print group/target and source values if EA trunked
+  //print group and source values if EA trunked
   if (opts->p25_trunk == 1 && opts->p25_is_tuned == 1 && state->ea_mode == 1)
   {
     fprintf (stderr, "%s", KGRN);
-    if (state->lasttg > 100000) {
-      // I-Call
-      fprintf (stderr, " Site: %lld Target: %d Source: %d LCN: %d ", 
-                state->edacs_site_id, state->lasttg - 100000, state->lastsrc, state->edacs_tuned_lcn);
-    } else {
-      // Group call
-      fprintf (stderr, " Site: %lld Group: %d Source: %d LCN: %d ", 
-                state->edacs_site_id, state->lasttg, state->lastsrc, state->edacs_tuned_lcn);
-    }
+    fprintf (stderr, " Site: %lld Group: %d Source: %d LCN: %d ", 
+              state->edacs_site_id, state->lasttg, state->lastsrc, state->edacs_tuned_lcn);
     fprintf (stderr, "%s", KNRM);
   }
   //print afs value if standard/networked trunked
@@ -46,13 +41,13 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
   {
     fprintf (stderr, "%s", KGRN);
     fprintf (stderr, " Site: %lld AFS: %d-%d LCN: %d ", 
-              state->edacs_site_id, (state->lastsrc >> 7) & 0xF, state->lastsrc & 0x7F, state->edacs_tuned_lcn);
+              state->edacs_site_id, (state->lasttg >> 7) & 0xF, state->lasttg & 0x7F, state->edacs_tuned_lcn);
     fprintf (stderr, "%s", KNRM);
   }
 
   //load all initial bits before voice into raw_bits array for analysis/handling
   for (i = 0; i < 64+16+64; i++)
-    raw_bits[k++] = getDibit (opts, state);
+    raw_bits[i] = getDibit (opts, state);
 
   //Note: the initial 144-bits seem to be provisioned differently depending on system type
   initial = (unsigned long long int)ConvertBitIntoBytes(&raw_bits[0], 64);
@@ -77,7 +72,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[144+j+(i*12)] = dibit;
     }
 
     w -= 6;
@@ -88,7 +83,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[150+j+(i*12)] = dibit;
     }
 
   }
@@ -99,7 +94,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+282] = dibit;
   }
 
   w -= 6;
@@ -110,15 +105,17 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+288] = dibit;
   }
 
   // spacer bits
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[0] = dibit;
+  raw_bits[292] = dibit;
 
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[1] = dibit;
+  raw_bits[293] = dibit;
 
   // imbe frames 1,2 second half
   for (j = 0; j < 2; j++)
@@ -127,7 +124,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+294] = dibit;
   }
 
   for (i = 0; i < 3; i++)
@@ -138,7 +135,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[296+j+(i*12)] = dibit;
     }
     w -= 6;
     x -= 6;
@@ -148,7 +145,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[302+j+(i*12)] = dibit;
     }
   }
 
@@ -158,7 +155,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+338] = dibit;
   }
 
   w -= 5;
@@ -169,7 +166,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+343] = dibit;
   }
 
   for (i = 0; i < 7; i++)
@@ -180,7 +177,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[348+j+(i*12)] = dibit;
     }
 
     w -= 6;
@@ -191,7 +188,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[354+j+(i*12)] = dibit;
     }
 
   }
@@ -202,7 +199,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+438] = dibit;
   }
   w -= 5;
   x -= 5;
@@ -213,31 +210,28 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+443] = dibit;
   }
 
   processMbeFrame (opts, state, NULL, NULL, imbe7100_fr1);
-  if (opts->floating_point == 0)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 1)
-    playSynthesizedVoiceFM(opts, state);
   processMbeFrame (opts, state, NULL, NULL, imbe7100_fr2);
-  if (opts->floating_point == 0)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 1)
-    playSynthesizedVoiceFM(opts, state);
 
   // spacer bits
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[2] = dibit;
+  raw_bits[448] = dibit;
 
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[3] = dibit; 
+  raw_bits[449] = dibit;
+
+  //resume raw_bits at +6 current value to round out payload bytes
+  //easier to visualize patterns
 
   for (i = 0; i < 16; i++)
-    raw_bits[k++] = getDibit (opts, state); 
+    raw_bits[i+450+6] = getDibit (opts, state); 
 
-  bf = (uint16_t)ConvertBitIntoBytes(&raw_bits[54*8], 16);
+  bf = (uint16_t)ConvertBitIntoBytes(&raw_bits[456], 16);
 
   if (opts->payload == 1)
     fprintf (stderr, "\n BF: %04X ", bf);
@@ -253,7 +247,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+466+j+(i*12)] = dibit;
     }
 
     w -= 6;
@@ -264,7 +258,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+472+j+(i*12)] = dibit;
     }
   }
 
@@ -274,7 +268,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+604+6] = dibit;
   }
 
   w -= 6;
@@ -285,15 +279,17 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit; 
+    raw_bits[i+610+6] = dibit; 
   }
 
   // spacer bits
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[4];
+  raw_bits[614+2] = dibit;
 
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[5];
+  raw_bits[615+2] = dibit;
 
   // imbe frames 3,4 second half
   for (j = 0; j < 2; j++)
@@ -302,7 +298,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+616+6] = dibit;
   }
   for (i = 0; i < 3; i++)
   {
@@ -312,7 +308,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+618+j+(i*12)] = dibit;
     }
     w -= 6;
     x -= 6;
@@ -322,7 +318,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+624+j+(i*12)] = dibit;
     }
   }
 
@@ -332,7 +328,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+660+6] = dibit;
   }
   w -= 5;
   x -= 5;
@@ -342,7 +338,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+665+6] = dibit;
   }
 
   for (i = 0; i < 7; i++)
@@ -353,7 +349,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr1[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+670+j+(i*12)] = dibit;
     }
     w -= 6;
     x -= 6;
@@ -363,7 +359,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
       imbe7100_fr2[*w][*x] = dibit;
       w++;
       x++;
-      raw_bits[k++] = dibit;
+      raw_bits[6+676+j+(i*12)] = dibit;
     }
   }
 
@@ -373,7 +369,7 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr1[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+760+6] = dibit;
   }
 
   w -= 5;
@@ -384,48 +380,48 @@ void processProVoice (dsd_opts * opts, dsd_state * state)
     imbe7100_fr2[*w][*x] = dibit;
     w++;
     x++;
-    raw_bits[k++] = dibit;
+    raw_bits[j+765+6] = dibit;
   }
 
   processMbeFrame (opts, state, NULL, NULL, imbe7100_fr1);
-  if (opts->floating_point == 0)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 1)
-    playSynthesizedVoiceFM(opts, state);
   processMbeFrame (opts, state, NULL, NULL, imbe7100_fr2);
-  if (opts->floating_point == 0)
-    playSynthesizedVoiceMS(opts, state);
-  if (opts->floating_point == 1)
-    playSynthesizedVoiceFM(opts, state);
 
   // spacer bits
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[6] = dibit;
+  raw_bits[782] = dibit;
 
   dibit = getDibit (opts, state);
-  raw_bits[k++] = dibit;
+  spacer_bit[7] = dibit;
+  raw_bits[783] = dibit;
 
 #ifdef PVDEBUG
 
-  //payload on all raw bytes for analysis
+  spacer = (uint8_t)ConvertBitIntoBytes(&spacer_bit[0], 8);
   if (opts->payload == 1)
-  // if (opcode != 0x3333) //EA Voice
+    fprintf (stderr, "\n SP: %X", spacer);
+
+  //convert raw bits into raw bytes for payload analysis
+  for (j = 0; j < 98; j++)
   {
+    raw_bytes[j] = (uint8_t)ConvertBitIntoBytes(&raw_bits[(j*8)], 8);
+  }
 
+  //payload on all raw bytes for analysis...its a lot of 'em
+  if (opts->payload == 1) //find better thingy later or change this
+  // if (opcode != 0x3333)
+  {
+    fprintf (stderr, "%s", KCYN);
     fprintf (stderr, "\n pV Payload Dump: \n  ");
-    for (i = 0; i < k/8; i++)
+    for (j = 0; j < 98; j++)
     {
-      
-      // if ( (i != 0) && ((i%26) == 0) )
-      //   fprintf (stderr, "\n  ");
-
-      uint16_t top = (uint16_t)ConvertBitIntoBytes(raw_bits+(i*8), 16);
-      if (top == 0x0EBF && i != 0)
+      fprintf (stderr, "[%02X]", raw_bytes[j]);
+      if (j == 17 || j == 35 || j == 53 || j == 71 || j == 89)
+      {
         fprintf (stderr, "\n  ");
-
-      raw_bytes[i] = (uint8_t)ConvertBitIntoBytes(raw_bits+(i*8), 8);
-      fprintf (stderr, "%02X", raw_bytes[i]);
+      }
     }
+    fprintf (stderr, "%s", KNRM);
   }
 
 #endif

src/pulse_devices.c

@@ -1,248 +0,0 @@
-/*-------------------------------------------------------------------------------
- * pulse_devices.c
- * DSD-FME - Pulse Audio Sink and Source Enumeration
- *
- * based on gist found here
- * https://gist.github.com/andrewrk/6470f3786d05999fcb48
- *
- * LWVMOBILE
- * 2024-05 DSD-FME Florida Man Edition
- *-----------------------------------------------------------------------------*/
-
-#include "dsd.h"
-
-// This callback gets called when our context changes state.  We really only
-// care about when it's ready or if it has failed
-void pa_state_cb(pa_context *c, void *userdata)
-{
-  pa_context_state_t state;
-  int *pa_ready = userdata;
-
-  state = pa_context_get_state(c);
-  switch (state)
-  {
-    // There are just here for reference
-    case PA_CONTEXT_UNCONNECTED:
-    case PA_CONTEXT_CONNECTING:
-    case PA_CONTEXT_AUTHORIZING:
-    case PA_CONTEXT_SETTING_NAME:
-    default:
-      break;
-    case PA_CONTEXT_FAILED:
-    case PA_CONTEXT_TERMINATED:
-      *pa_ready = 2;
-      break;
-    case PA_CONTEXT_READY:
-      *pa_ready = 1;
-      break;
-  }
-}
-
-// pa_mainloop will call this function when it's ready to tell us about a sink.
-// Since we're not threading, there's no need for mutexes on the devicelist
-// structure
-void pa_sinklist_cb(pa_context *c, const pa_sink_info *l, int eol, void *userdata)
-{
-  pa_devicelist_t *pa_devicelist = userdata;
-  int ctr = 0;
-
-  UNUSED(c);
-
-  // If eol is set to a positive number, you're at the end of the list
-  if (eol > 0)
-    return;
-
-  // We know we've allocated 16 slots to hold devices.  Loop through our
-  // structure and find the first one that's "uninitialized."  Copy the
-  // contents into it and we're done.  If we receive more than 16 devices,
-  // they're going to get dropped.  You could make this dynamically allocate
-  // space for the device list, but this is a simple example.
-
-  for (ctr = 0; ctr < 16; ctr++)
-  {
-    if (! pa_devicelist[ctr].initialized)
-    {
-      strncpy(pa_devicelist[ctr].name, l->name, 511);
-      strncpy(pa_devicelist[ctr].description, l->description, 255);
-      pa_devicelist[ctr].index = l->index;
-      pa_devicelist[ctr].initialized = 1;
-      break;
-    }
-  }
-}
-
-// See above.  This callback is pretty much identical to the previous
-void pa_sourcelist_cb(pa_context *c, const pa_source_info *l, int eol, void *userdata)
-{
-  pa_devicelist_t *pa_devicelist = userdata;
-  int ctr = 0;
-
-  UNUSED(c);
-
-  if (eol > 0)
-    return;
-
-  for (ctr = 0; ctr < 16; ctr++)
-  {
-    if (! pa_devicelist[ctr].initialized)
-    {
-      strncpy(pa_devicelist[ctr].name, l->name, 511);
-      strncpy(pa_devicelist[ctr].description, l->description, 255);
-      pa_devicelist[ctr].index = l->index;
-      pa_devicelist[ctr].initialized = 1;
-      break;
-    }
-  }
-}
-
-int pa_get_devicelist(pa_devicelist_t *input, pa_devicelist_t *output)
-{
-  // Define our pulse audio loop and connection variables
-  pa_mainloop *pa_ml;
-  pa_mainloop_api *pa_mlapi;
-  pa_operation *pa_op;
-  pa_context *pa_ctx;
-
-
-  // We'll need these state variables to keep track of our requests
-  int state = 0;
-  int pa_ready = 0;
-
-  // Initialize our device lists
-  memset(input, 0, sizeof(pa_devicelist_t) * 16);
-  memset(output, 0, sizeof(pa_devicelist_t) * 16);
-
-  // Create a mainloop API and connection to the default server
-  pa_ml = pa_mainloop_new();
-  pa_mlapi = pa_mainloop_get_api(pa_ml);
-  pa_ctx = pa_context_new(pa_mlapi, "test");
-
-  // This function connects to the pulse server
-  pa_context_connect(pa_ctx, NULL, 0, NULL);
-
-
-  // This function defines a callback so the server will tell us it's state.
-  // Our callback will wait for the state to be ready.  The callback will
-  // modify the variable to 1 so we know when we have a connection and it's
-  // ready.
-  // If there's an error, the callback will set pa_ready to 2
-  pa_context_set_state_callback(pa_ctx, pa_state_cb, &pa_ready);
-
-  // Now we'll enter into an infinite loop until we get the data we receive
-  // or if there's an error
-  for (;;)
-  {
-    // We can't do anything until PA is ready, so just iterate the mainloop
-    // and continue
-    if (pa_ready == 0)
-    {
-        pa_mainloop_iterate(pa_ml, 1, NULL);
-        continue;
-    }
-    // We couldn't get a connection to the server, so exit out
-    if (pa_ready == 2)
-    {
-        pa_context_disconnect(pa_ctx);
-        pa_context_unref(pa_ctx);
-        pa_mainloop_free(pa_ml);
-        return -1;
-    }
-    // At this point, we're connected to the server and ready to make
-    // requests
-    switch (state)
-    {
-      // State 0: we haven't done anything yet
-      case 0:
-        // This sends an operation to the server.  pa_sinklist_info is
-        // our callback function and a pointer to our devicelist will
-        // be passed to the callback The operation ID is stored in the
-        // pa_op variable
-        pa_op = pa_context_get_sink_info_list(pa_ctx, pa_sinklist_cb, output);
-
-        // Update state for next iteration through the loop
-        state++;
-        break;
-      case 1:
-        // Now we wait for our operation to complete.  When it's
-        // complete our pa_output_devicelist is filled out, and we move
-        // along to the next state
-        if (pa_operation_get_state(pa_op) == PA_OPERATION_DONE) 
-        {
-          pa_operation_unref(pa_op);
-
-          // Now we perform another operation to get the source
-          // (input device) list just like before.  This time we pass
-          // a pointer to our input structure
-          pa_op = pa_context_get_source_info_list(pa_ctx, pa_sourcelist_cb, input);
-          // Update the state so we know what to do next
-          state++;
-        }
-        break;
-      case 2:
-        if (pa_operation_get_state(pa_op) == PA_OPERATION_DONE)
-        {
-          // Now we're done, clean up and disconnect and return
-          pa_operation_unref(pa_op);
-          pa_context_disconnect(pa_ctx);
-          pa_context_unref(pa_ctx);
-          pa_mainloop_free(pa_ml);
-          return 0;
-        }
-        break;
-      default:
-        // We should never see this state
-        fprintf(stderr, "in state %d\n", state);
-        return -1;
-    }
-
-    // Iterate the main loop and go again.  The second argument is whether
-    // or not the iteration should block until something is ready to be
-    // done.  Set it to zero for non-blocking.
-    pa_mainloop_iterate(pa_ml, 1, NULL);
-    
-  }
-}
-
-int pulse_list()
-{
-
-  fprintf (stderr, "\n");
-  int ctr;
-
-  // This is where we'll store the input device list
-  pa_devicelist_t pa_input_devicelist[16];
-
-  // This is where we'll store the output device list
-  pa_devicelist_t pa_output_devicelist[16];
-
-  if (pa_get_devicelist(pa_input_devicelist, pa_output_devicelist) < 0)
-  {
-    fprintf(stderr, "failed to get device list\n");
-    return 1;
-  }
-
-  for (ctr = 0; ctr < 16; ctr++)
-  {
-    if (! pa_output_devicelist[ctr].initialized)
-      break;
-
-    printf("=======[ Output Device #%d ]=======\n", ctr+1);
-    printf("Description: %s\n", pa_output_devicelist[ctr].description);
-    printf("Name: %s\n", pa_output_devicelist[ctr].name);
-    printf("Index: %d\n", pa_output_devicelist[ctr].index);
-    printf("\n");
-  }
-
-  for (ctr = 0; ctr < 16; ctr++)
-  {
-    if (! pa_input_devicelist[ctr].initialized)
-      break;
-
-    printf("=======[ Input Device #%d ]=======\n", ctr+1);
-    printf("Description: %s\n", pa_input_devicelist[ctr].description);
-    printf("Name: %s\n", pa_input_devicelist[ctr].name);
-    printf("Index: %d\n", pa_input_devicelist[ctr].index);
-    printf("\n");
-  }
-  return 0;
-}

src/rtl_sdr_fm.cpp

@@ -463,7 +463,9 @@ void dc_block_filter(struct demod_state *fm)
 	}
 	fm->dc_avg = avg;
 }
-
+//TODO: Fix This so we don't get random negative values in Cygwin (or 32-bit builds?)
+//Fixed -- I honestly think the issue is Cygwin can't keep up and if it can't run enough samples in the other thread,
+//then it reports some jank values, really unsure, I've never seen the issue in Linux side though
 long int rms(int16_t *samples, int len, int step)
 /* largely lifted from rtl_power */
 {
@@ -484,7 +486,7 @@ long int rms(int16_t *samples, int len, int step)
 
 	rms = (long int)sqrt((p-err) / len);
 	//going with a value that's easy to figure out when its done the thing
-	if (rms < 0){ rms = 999; }
+	if (rms < 0){ rms = 999; } //need to text nxdn with this setup to make sure it isn't broken in Windows Cygwin now
 	return rms;
 }
 
@@ -734,8 +736,6 @@ int verbose_reset_buffer(rtlsdr_dev_t *dev)
 
 static void optimal_settings(int freq, int rate)
 {
-	UNUSED(rate);
-
 	// giant ball of hacks
 	// seems unable to do a single pass, 2:1
 	int capture_freq, capture_rate;
@@ -815,62 +815,6 @@ void dongle_init(struct dongle_state *s)
 	s->demod_target = &demod;
 }
 
-void demod_init_analog(struct demod_state *s)
-{
-	s->rate_in = rtl_bandwidth;
-	s->rate_out = rtl_bandwidth;
-	s->squelch_level = 0;
-	s->conseq_squelch = 10;
-	s->terminate_on_squelch = 0;
-	s->squelch_hits = 11;
-	s->downsample_passes = 1; //
-	s->comp_fir_size = 0;
-	s->prev_index = 0;
-	s->post_downsample = 1;  //1 -- once this works, default = 4 -- doesn't work on the official rtl-sdr source code either
-	s->custom_atan = 0;
-	s->deemph = 1; //
-	s->rate_out2 = rtl_bandwidth;  // -1 flag for disabled -- this enables low_pass_real, seems to work okay
-	s->mode_demod = &fm_demod;
-	s->pre_j = s->pre_r = s->now_r = s->now_j = 0;
-	s->prev_lpr_index = 0;
-	s->deemph_a = 0; //
-	s->now_lpr = 0;
-	s->dc_block = 1; //
-	s->dc_avg = 0;
-	pthread_rwlock_init(&s->rw, NULL);
-	pthread_cond_init(&s->ready, NULL);
-	pthread_mutex_init(&s->ready_m, NULL);
-	s->output_target = &output;
-}
-
-void demod_init_ro2(struct demod_state *s)
-{
-	s->rate_in = rtl_bandwidth;
-	s->rate_out = rtl_bandwidth;
-	s->squelch_level = 0;
-	s->conseq_squelch = 10;
-	s->terminate_on_squelch = 0;
-	s->squelch_hits = 11;
-	s->downsample_passes = 0;
-	s->comp_fir_size = 0;
-	s->prev_index = 0;
-	s->post_downsample = 1;  //1 -- once this works, default = 4 -- doesn't work on the official rtl-sdr source code either
-	s->custom_atan = 0;
-	s->deemph = 0;
-	s->rate_out2 = rtl_bandwidth;  // -1 flag for disabled -- this enables low_pass_real, seems to work okay
-	s->mode_demod = &fm_demod;
-	s->pre_j = s->pre_r = s->now_r = s->now_j = 0;
-	s->prev_lpr_index = 0;
-	s->deemph_a = 0;
-	s->now_lpr = 0;
-	s->dc_block = 1; //enabling by default, but offset tuning is also enabled, so center spike shouldn't be an issue
-	s->dc_avg = 0;
-	pthread_rwlock_init(&s->rw, NULL);
-	pthread_cond_init(&s->ready, NULL);
-	pthread_mutex_init(&s->ready_m, NULL);
-	s->output_target = &output;
-}
-
 void demod_init(struct demod_state *s)
 {
 	s->rate_in = rtl_bandwidth;
@@ -885,7 +829,7 @@ void demod_init(struct demod_state *s)
 	s->post_downsample = 1;  //1 -- once this works, default = 4 -- doesn't work on the official rtl-sdr source code either
 	s->custom_atan = 0;
 	s->deemph = 0;
-	s->rate_out2 = -1;  // -1 flag for disabled -- this enables low_pass_real, seems to work okay
+	s->rate_out2 = rtl_bandwidth;  // -1 flag for disabled -- this enables low_pass_real, seems to work okay
 	s->mode_demod = &fm_demod;
 	s->pre_j = s->pre_r = s->now_r = s->now_j = 0;
 	s->prev_lpr_index = 0;
@@ -970,12 +914,12 @@ static unsigned int chars_to_int(unsigned char* buf) {
 }
 
 static void *socket_thread_fn(void *arg) {
-  UNUSED(arg);
-
-  int n;
-  int sockfd;
+	struct demod_state *d = static_cast<demod_state*>(arg);
+  int r, n;
+  int sockfd, newsockfd, portno;
+  socklen_t clilen;
   unsigned char buffer[5];
-  struct sockaddr_in serv_addr;
+  struct sockaddr_in serv_addr, cli_addr;
 
 	sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
@@ -997,7 +941,7 @@ static void *socket_thread_fn(void *arg) {
 
 	fprintf (stderr, "Main socket started! :-) Tuning enabled on UDP/%d \n", port);
 
-	int new_freq;
+	int new_freq, demod_type, new_squelch, new_gain, agc_mode;
 
 	while((n = read(sockfd,buffer,5)) != 0) {
 		if(buffer[0] == 0) {
@@ -1024,19 +968,14 @@ void rtlsdr_sighandler()
 
 void open_rtlsdr_stream(dsd_opts *opts)
 {
+  struct sigaction sigact;
   int r;
 	rtl_bandwidth =  opts->rtl_bandwidth * 1000; //reverted back to straight value
 	bandwidth_multiplier = (bandwidth_divisor / rtl_bandwidth);
-	volume_multiplier = 1; //moved to external handling to be more dynamic
 
 	//this needs to be initted first, then we set the parameters
   dongle_init(&dongle);
-	//init with low pass if decoding P25 or EDACS/Provoice
-	if (opts->frame_p25p1 == 1 || opts->frame_p25p2 == 1 || opts->frame_provoice == 1)
-  	demod_init_ro2(&demod);
-	else if (opts->analog_only == 1 || opts->m17encoder == 1)
-		demod_init_analog(&demod);
-	else demod_init(&demod);
+  demod_init(&demod);
   output_init(&output);
   controller_init(&controller);
 
@@ -1058,7 +997,9 @@ void open_rtlsdr_stream(dsd_opts *opts)
 	if (opts->rtl_udp_port != 0) port = opts->rtl_udp_port; //set this here, only open socket thread if set
 	if (opts->rtl_gain_value > 0) {
 		dongle.gain = opts->rtl_gain_value * 10; //multiple by ten to make it consitent with the way rtl_fm works
-	}	
+	}
+  volume_multiplier = opts->rtl_volume_multiplier;
+	// fprintf (stderr, "Setting RTL Volume Multiplier to %d\n", volume_multiplier);
 
   /* quadruple sample_rate to limit to Δθ to ±π/2 */
 	demod.rate_in *= demod.post_downsample;
@@ -1140,30 +1081,16 @@ void cleanup_rtlsdr_stream()
 // }
 
 //find way to modify this function to allow hopping (tuning) while squelched and send 0 sample?
-int get_rtlsdr_sample(int16_t *sample, dsd_opts * opts, dsd_state * state)
+void get_rtlsdr_sample(int16_t *sample, dsd_opts * opts, dsd_state * state)
 {
-	UNUSED2(opts, state);
-
-	while (output.queue.empty())
+	if (output.queue.empty())
 	{
-		struct timespec ts;
-		clock_gettime(CLOCK_REALTIME, &ts);
-		ts.tv_nsec += 10e6;
-
-		pthread_mutex_lock(&output.ready_m);
-		pthread_cond_timedwait(&output.ready, &output.ready_m, &ts);
-		pthread_mutex_unlock(&output.ready_m);
-
-		if (exitflag)
-		{
-			return -1;
-		}
+		safe_cond_wait(&output.ready, &output.ready_m);
 	}
 	pthread_rwlock_wrlock(&output.rw);
 	*sample = output.queue.front() * volume_multiplier;
 	output.queue.pop();
 	pthread_rwlock_unlock(&output.rw);
-	return 0;
 }
 
 //function may lag since it isn't running as its own thread
@@ -1190,15 +1117,11 @@ void rtl_dev_tune(dsd_opts * opts, long int frequency)
 long int rtl_return_rms()
 {
 	long int sr = 0;
-	// #ifdef __arm__
-	// sr = 100;
-	// #else
-	//debug -- on main machine, lp_len is around 6420, so this probably contributes to very high CPU usage
-	// fprintf (stderr, "LP_LEN: %d \n", demod.lp_len);
-	//I've found that just using a sample size of 160 will give us a good approximation without killing the CPU
-	// sr = rms(demod.lowpassed, demod.lp_len, 1);
-	sr = rms(demod.lowpassed, 160, 1); //I wonder what a reasonable value would be for #2 (input len) there
-	// #endif
+	#ifdef __arm__
+	sr = 100;
+	#else
+	sr = rms(demod.lowpassed, demod.lp_len, 1);
+	#endif
 	return (sr);
 }